负载分析接口代码优化

fiveep-model/src/main/java/com/bizmatics/model/RtAnalogData.java

@@ -8,11 +8,12 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ya
@@ -23,7 +24,7 @@ import java.util.Date;
 @Accessors(chain = true)
 public class RtAnalogData implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 伍继电力test_183消费组模拟量数据表ID
@@ -407,7 +408,7 @@ public class RtAnalogData implements Serializable {
      * 上报时间
      */
     @TableField("dataTime")
-    private Date dataTime;
+    private LocalDateTime dataTime;
 
 
 }

fiveep-model/src/main/java/com/bizmatics/model/Site.java

@@ -3,12 +3,13 @@ package com.bizmatics.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -104,7 +105,8 @@ public class Site implements Serializable {
     /**
      * 创建时间
      */
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 
     /**
      * 创建人

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/HtAnalogDataMapper.java

@@ -181,7 +181,9 @@ public interface HtAnalogDataMapper extends CrudMapper<HtAnalogData> {
                                            @Param("endTime") String endTime,
                                            @Param("table") String table);
 
-    List<HtAnalogData> getP(@Param("deviceCodes") List<String> deviceCodes);
+    List<HtAnalogData> getP(@Param("deviceCodes") List<String> deviceCodes,
+                            @Param("startTime") LocalDateTime startTime,
+                            @Param("endTime") LocalDateTime endTime);
 
     List<Map<String, Object>> aggregateAll(TimeRangeParams params);
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtAnalogDataMapper.java

@@ -69,4 +69,6 @@ public interface RtAnalogDataMapper extends CrudMapper<RtAnalogData> {
     List<RtAnalogData> getRtAnalogDataList(@Param("deviceCode") String deviceCode,
                                            @Param("table") String table);
 
+    List<RtAnalogData> getP(@Param("deviceCodes") List<String> deviceCodes);
+
 }

fiveep-persistence/src/main/resources/mapper/mysql/HtAnalogDataMapper.xml

@@ -1554,11 +1554,14 @@
         SELECT deviceName, MAX(id) AS max_id
         FROM ht_analog_data
         WHERE deviceName IN
-        <foreach item="item" collection="deviceCodes" open="(" separator="," close=")">
-            #{item}
+        <foreach collection="deviceCodes" item="code" open="(" separator="," close=")">
+            #{code}
         </foreach>
+        AND dataTime BETWEEN #{startTime} AND #{endTime}
         GROUP BY deviceName
-        ) latest ON t.deviceName = latest.deviceName AND t.id = latest.max_id
+        ) latest
+        ON t.deviceName = latest.deviceName
+        AND t.id = latest.max_id
     </select>
 
     <select id="aggregateAll" resultType="map">

fiveep-persistence/src/main/resources/mapper/mysql/RtAnalogDataMapper.xml

@@ -20,68 +20,68 @@
     </select>
     <select id="getOneMap" resultType="java.util.Map">
         select
-          `Busot` as '母线停电次数',
-          `COS` as '三相功率因数',
-          `COSa` as 'A相功率因数',
-          `COSb` as 'B相功率因数',
-          `COSc` as 'C相功率因数',
-          `Demand` as '实时有功需量',
-          `DevResetTimes` as '设备复位次数',
-          `DeviceTemp` as '设备温度',
-          `Epn` as '三相反向有功电度',
-          `Epn1` as '尖段反向有功电度',
-          `Epn2` as '峰段反向有功电度',
-          `Epn3` as '平段反向有功电度',
-          `Epn4` as '谷段反向有功电度',
-          `Epp` as '三相正向有功电度',
-          `Epp1` as '尖段正向有功电度',
-          `Epp2` as '峰段正向有功电度',
-          `Epp3` as '平段正向有功电度',
-          `Epp4` as '谷段正向有功电度',
-          `Eqn` as '三相反向无功电度',
-          `Eqp` as '三相正向无功电度',
-          `F` as '频率',
-          `I0` as '零序电流',
-          `I2` as '负序电流',
-          `IHa` as 'A相总谐波电流',
-          `IHb` as 'B相总谐波电流',
-          `IHc` as 'C相总谐波电流',
-          `Ia` as 'A相电流',
-          `Ib` as 'B相电流',
-          `Ic` as 'C相电流',
-          `Ir` as '剩余电流',
-          `LastDayMD` as '昨日有功最大需量',
-          `LastDayMDt` as '昨日有功最大需量发生时间',
-          `P` as '三相总有功功率',
-          `Pa` as 'A相有功功率',
-          `Pb` as 'B相有功功率',
-          `Pc` as 'C相有功功率',
-          `Q` as '三相总无功功率',
-          `Qa` as 'A相无功功率',
-          `Qb` as 'B相无功功率',
-          `Qc` as 'C相无功功率',
-          `SignalIntensity` as '信号强度',
-          `T1` as '第1路温度',
-          `T2` as '第2路温度',
-          `T3` as '第3路温度',
-          `T4` as '第4路温度',
-          `THDUa` as 'A相电压THD',
-          `THDUb` as 'B相电压THD',
-          `THDUc` as 'C相电压THD',
-          `Ua` as 'A相电压',
-          `Uab` as 'AB线电压',
-          `Ub` as 'B相电压',
-          `Ubc` as 'BC线电压',
-          `UblU0` as '零序电压不平衡度',
-          `UblU2` as '负序电压不平衡度',
-          `Uc` as 'C相电压',
-          `Uca` as 'CA线电压',
-          `Udt` as '电压暂降次数',
-          `Ul` as '线路侧电压',
-          `Upt` as '电压暂升次数',
-          `Ust` as '电压短时中断次数',
-          `freezingTime` as '冻结时间',
-          `dataTime` as '上报时间'
+        `Busot` as '母线停电次数',
+        `COS` as '三相功率因数',
+        `COSa` as 'A相功率因数',
+        `COSb` as 'B相功率因数',
+        `COSc` as 'C相功率因数',
+        `Demand` as '实时有功需量',
+        `DevResetTimes` as '设备复位次数',
+        `DeviceTemp` as '设备温度',
+        `Epn` as '三相反向有功电度',
+        `Epn1` as '尖段反向有功电度',
+        `Epn2` as '峰段反向有功电度',
+        `Epn3` as '平段反向有功电度',
+        `Epn4` as '谷段反向有功电度',
+        `Epp` as '三相正向有功电度',
+        `Epp1` as '尖段正向有功电度',
+        `Epp2` as '峰段正向有功电度',
+        `Epp3` as '平段正向有功电度',
+        `Epp4` as '谷段正向有功电度',
+        `Eqn` as '三相反向无功电度',
+        `Eqp` as '三相正向无功电度',
+        `F` as '频率',
+        `I0` as '零序电流',
+        `I2` as '负序电流',
+        `IHa` as 'A相总谐波电流',
+        `IHb` as 'B相总谐波电流',
+        `IHc` as 'C相总谐波电流',
+        `Ia` as 'A相电流',
+        `Ib` as 'B相电流',
+        `Ic` as 'C相电流',
+        `Ir` as '剩余电流',
+        `LastDayMD` as '昨日有功最大需量',
+        `LastDayMDt` as '昨日有功最大需量发生时间',
+        `P` as '三相总有功功率',
+        `Pa` as 'A相有功功率',
+        `Pb` as 'B相有功功率',
+        `Pc` as 'C相有功功率',
+        `Q` as '三相总无功功率',
+        `Qa` as 'A相无功功率',
+        `Qb` as 'B相无功功率',
+        `Qc` as 'C相无功功率',
+        `SignalIntensity` as '信号强度',
+        `T1` as '第1路温度',
+        `T2` as '第2路温度',
+        `T3` as '第3路温度',
+        `T4` as '第4路温度',
+        `THDUa` as 'A相电压THD',
+        `THDUb` as 'B相电压THD',
+        `THDUc` as 'C相电压THD',
+        `Ua` as 'A相电压',
+        `Uab` as 'AB线电压',
+        `Ub` as 'B相电压',
+        `Ubc` as 'BC线电压',
+        `UblU0` as '零序电压不平衡度',
+        `UblU2` as '负序电压不平衡度',
+        `Uc` as 'C相电压',
+        `Uca` as 'CA线电压',
+        `Udt` as '电压暂降次数',
+        `Ul` as '线路侧电压',
+        `Upt` as '电压暂升次数',
+        `Ust` as '电压短时中断次数',
+        `freezingTime` as '冻结时间',
+        `dataTime` as '上报时间'
         from user_site as us
         inner join device as d
         on us.site_id = d.site_id
@@ -89,10 +89,10 @@
         on d.device_code = rad.deviceName
         <where>
             <if test="siteId != null and siteId != 0">
-              us.site_id = #{siteId}
+                us.site_id = #{siteId}
             </if>
             <if test="userId != null and userId != 0">
-              and  us.user_id = #{userId}
+                and us.user_id = #{userId}
             </if>
         </where>
     </select>
@@ -121,7 +121,7 @@
         inner join device as d
         on us.site_id = d.site_id
         <where>
-                and d.enable=1
+            and d.enable=1
             <if test="siteId != null and siteId != 0">
                 and d.site_id = #{siteId}
             </if>
@@ -262,12 +262,12 @@
         FROM
         ht_analog_data
         <where>
-                and deviceName in
-            <foreach item="item"  collection="deviceCode" open="(" separator="," close=")">
+            and deviceName in
+            <foreach item="item" collection="deviceCode" open="(" separator="," close=")">
                 #{item.deviceCode}
             </foreach>
             <if test="endTime != null and startTime != null">
-                and dataTime BETWEEN   #{startTime} and #{endTime}
+                and dataTime BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
         ) t
@@ -412,11 +412,11 @@
         ht_analog_data
         <where>
             and deviceName in
-            <foreach item="item"  collection="deviceCode" open="(" separator="," close=")">
+            <foreach item="item" collection="deviceCode" open="(" separator="," close=")">
                 #{item.deviceCode}
             </foreach>
             <if test="endTime != null and startTime != null">
-                and dataTime BETWEEN   #{startTime} and #{endTime}
+                and dataTime BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
         ) t
@@ -580,11 +580,11 @@
         ht_analog_data
         <where>
             and deviceName in
-            <foreach item="item"  collection="deviceCode" open="(" separator="," close=")">
+            <foreach item="item" collection="deviceCode" open="(" separator="," close=")">
                 #{item.deviceCode}
             </foreach>
             <if test="endTime != null and startTime != null">
-                and dataTime BETWEEN   #{startTime} and #{endTime}
+                and dataTime BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
         ) t
@@ -731,11 +731,11 @@
         ht_analog_data
         <where>
             and deviceName in
-            <foreach item="item"  collection="deviceCode" open="(" separator="," close=")">
+            <foreach item="item" collection="deviceCode" open="(" separator="," close=")">
                 #{item.deviceCode}
             </foreach>
             <if test="endTime != null and startTime != null">
-                and dataTime BETWEEN   #{startTime} and #{endTime}
+                and dataTime BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
         ) t
@@ -827,11 +827,23 @@
 
 
     <select id="getRtAnalogDataList" resultType="com.bizmatics.model.RtAnalogData">
-        SELECT
-            *
-        FROM
-            ${table}
-        WHERE
-            deviceName = #{deviceCode}
+        SELECT *
+        FROM ${table}
+        WHERE deviceName = #{deviceCode}
     </select>
+
+    <select id="getP" resultType="com.bizmatics.model.RtAnalogData">
+        SELECT t.deviceName, t.p, t.dataTime
+        FROM rt_analog_data t
+        INNER JOIN (
+        SELECT deviceName, MAX(id) AS max_id
+        FROM rt_analog_data
+        WHERE deviceName IN
+        <foreach item="item" collection="deviceCodes" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY deviceName
+        ) latest ON t.deviceName = latest.deviceName AND t.id = latest.max_id
+    </select>
+
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/HtAnalogDataService.java

@@ -108,7 +108,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
     SingleLoopReportOneVo SingleLoopReportData(String deviceCode, Date time, int type);
 
     // 获取设备三相总有功功率值
-    List<HtAnalogData> getP(List<String> deviceCode);
+    List<HtAnalogData> getP(List<String> deviceCode, LocalDateTime startTime, LocalDateTime endTime);
 
     /**
      * 获取设备三相有功功率值

fiveep-service/src/main/java/com/bizmatics/service/RtAnalogDataService.java

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.model.RtAnalogData;
 import com.bizmatics.model.SiteDynamicProperties;
 import com.bizmatics.model.vo.EvaluationReporVo;
@@ -35,7 +36,7 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
      * @param siteId 站点id
      * @return
      */
-    List<Map<String,Object>> getOne(Integer siteId);
+    List<Map<String, Object>> getOne(Integer siteId);
 
     /**
      * 实时负荷
@@ -77,7 +78,7 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
      * @param queryType
      * @return
      */
-    List<Map<String,Object>> getDataReport(Integer siteId,Date startTime, Date endTime,String queryType);
+    List<Map<String, Object>> getDataReport(Integer siteId, Date startTime, Date endTime, String queryType);
 
     /**
      *
@@ -87,7 +88,7 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
      * @param queryType
      * @return
      */
-    List<Map<String,Object>> getHistoricalCurve(Integer siteId,Date startTime, Date endTime,String queryType);
+    List<Map<String, Object>> getHistoricalCurve(Integer siteId, Date startTime, Date endTime, String queryType);
 
     /**
      *
@@ -97,11 +98,14 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
      * @param queryType
      * @return
      */
-    String DataReportExport(Integer siteId,Date startTime, Date endTime,String queryType);
+    String DataReportExport(Integer siteId, Date startTime, Date endTime, String queryType);
 
 
     List<RealScoreVO> fillRealScoreDataTwo(List<EvaluationReporVo> evaluationReporVo);
 
     List<RealScoreVO> evaluationReport(int siteId, Date time, int type);
 
+    // 获取三项总有功功率
+    List<RtAnalogData> getP(List<String> deviceCode);
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -1501,8 +1501,8 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
     // 获取设备三相总有功功率值
     @Override
-    public List<HtAnalogData> getP(List<String> deviceCodes) {
-        return htAnalogDataMapper.getP(deviceCodes);
+    public List<HtAnalogData> getP(List<String> deviceCodes, LocalDateTime startTime, LocalDateTime endTime) {
+        return htAnalogDataMapper.getP(deviceCodes, startTime, endTime);
     }
 
     /**

fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java

@@ -131,7 +131,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
     public List<Map<String, Object>> getOne(Integer siteId) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> radMap = baseMapper.getOneMap(userId,siteId);
+        Map<String, Object> radMap = baseMapper.getOneMap(userId, siteId);
         Optional.ofNullable(radMap).ifPresent(rad -> {
             for (String name : rad.keySet()) {
                 Map<String, Object> map = new HashMap<>();
@@ -151,27 +151,27 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
     @Override
     public RealScoreVO realScore(String deviceCode) {
-        //查询设备
+        // 查询设备
         LambdaQueryWrapper<Device> deviceQuery = Wrappers.lambdaQuery();
         deviceQuery.eq(Device::getDeviceCode, deviceCode);
         Device device = deviceService.getOne(deviceQuery);
         Optional.ofNullable(device).orElseThrow(() -> new BusinessException("设备不存在"));
 
         String table = "rt_analog_data";
-        if (device.getDeviceType().equals("1")){
+        if (device.getDeviceType().equals("1")) {
             table = "rt_analog_data";
-        }else if (device.getDeviceType().equals("4")){
+        } else if (device.getDeviceType().equals("4")) {
             table = "rt_analog_173_data";
         }
 
-        List<RtAnalogData> rtAnalogDataList = baseMapper.getRtAnalogDataList(deviceCode,table);
+        List<RtAnalogData> rtAnalogDataList = baseMapper.getRtAnalogDataList(deviceCode, table);
         RtAnalogData rtAnalogData = new RtAnalogData();
-        if (rtAnalogDataList.size()>0){
+        if (rtAnalogDataList.size() > 0) {
             rtAnalogData = rtAnalogDataList.get(0);
-        }else {
+        } else {
             new BusinessException("设备实时信息不存在");
         }
-        //查询sd
+        // 查询sd
         LambdaQueryWrapper<SiteDynamicProperties> sdQuery = Wrappers.lambdaQuery();
         sdQuery.eq(SiteDynamicProperties::getSiteId, device.getSiteId());
         SiteDynamicProperties siteDynamicProperties = siteDynamicPropertiesService.getOne(sdQuery);
@@ -212,7 +212,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
     @Override
     public RealScoreOneVO realScoreOne(String deviceCode) {
-        //查询设备
+        // 查询设备
         LambdaQueryWrapper<Device> deviceQuery = Wrappers.lambdaQuery();
         deviceQuery.eq(Device::getDeviceCode, deviceCode);
         Device device = deviceService.getOne(deviceQuery);
@@ -220,21 +220,21 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
 
         String table = "rt_analog_data";
-        if (device.getDeviceType().equals("1")){
+        if (device.getDeviceType().equals("1")) {
             table = "rt_analog_data";
-        }else if (device.getDeviceType().equals("4")){
+        } else if (device.getDeviceType().equals("4")) {
             table = "rt_analog_173_data";
         }
 
-        List<RtAnalogData> rtAnalogDataList = baseMapper.getRtAnalogDataList(deviceCode,table);
+        List<RtAnalogData> rtAnalogDataList = baseMapper.getRtAnalogDataList(deviceCode, table);
         RtAnalogData rtAnalogData = new RtAnalogData();
-        if (rtAnalogDataList.size()>0){
+        if (rtAnalogDataList.size() > 0) {
             rtAnalogData = rtAnalogDataList.get(0);
-        }else {
+        } else {
             new BusinessException("设备实时信息不存在");
         }
 
-        //查询sd
+        // 查询sd
         LambdaQueryWrapper<SiteDynamicProperties> sdQuery = Wrappers.lambdaQuery();
         sdQuery.eq(SiteDynamicProperties::getSiteId, device.getSiteId());
         SiteDynamicProperties siteDynamicProperties = siteDynamicPropertiesService.getOne(sdQuery);
@@ -269,14 +269,14 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         checkList.add(realScoreVo.getIb());
         checkList.add(realScoreVo.getIc());
 
-        //电流不平衡
+        // 电流不平衡
         realScoreVo.setElBalun(checkBalun(checkList));
 
         checkList.clear();
         checkList.add(realScoreVo.getUa());
         checkList.add(realScoreVo.getUb());
         checkList.add(realScoreVo.getUc());
-        //ABC三相电压占比
+        // ABC三相电压占比
         Double max = checkList.stream().max(Double::compareTo).get();
         if (max == 0.00) {
             realScoreVo.setUaPercentage(0.00);
@@ -289,11 +289,11 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         }
 
 
-        //电压不平衡
+        // 电压不平衡
         realScoreVo.setVtBalun(checkBalun(checkList));
-        //当前频率
+        // 当前频率
         realScoreVo.setF(realScoreVo.getF());
-        //频率偏差
+        // 频率偏差
         if (realScoreVo.getF() == 0.00) {
             realScoreVo.setFdeviation(0.00);
         } else {
@@ -333,26 +333,26 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         checkList.add(realScoreVo.getIa());
         checkList.add(realScoreVo.getIb());
         checkList.add(realScoreVo.getIc());
-        //电流不平衡
+        // 电流不平衡
         realScoreVo.setElBalun(checkBalun(checkList));
         checkList.clear();
         checkList.add(realScoreVo.getUa());
         checkList.add(realScoreVo.getUb());
         checkList.add(realScoreVo.getUc());
-        //电压不平衡
+        // 电压不平衡
         realScoreVo.setVtBalun(checkBalun(checkList));
-        //电压合格率
+        // 电压合格率
         double voltageLevel = Double.parseDouble(siteDynamicProperties.getVoltageLevel());
         realScoreVo.setUaQualified(Arith.sub(rtAnalogData.getUa(), voltageLevel));
         realScoreVo.setUbQualified(Arith.sub(rtAnalogData.getUb(), voltageLevel));
         realScoreVo.setUcQualified(Arith.sub(rtAnalogData.getUc(), voltageLevel));
-        //电流负载率
+        // 电流负载率
         Double ratedCurrent = deviceAttribute.getRatedCurrent();
         realScoreVo.setIaLoad(Arith.div(realScoreVo.getIa(), ratedCurrent));
         realScoreVo.setIbLoad(Arith.div(realScoreVo.getIb(), ratedCurrent));
         realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(), ratedCurrent));
-        //计算分数
-        //电压分数
+        // 计算分数
+        // 电压分数
         realScoreVo.setUaQ(computeUScore(realScoreVo.getUaQualified(), voltageLevel));
         realScoreVo.setUbQ(computeUScore(realScoreVo.getUbQualified(), voltageLevel));
         realScoreVo.setUcQ(computeUScore(realScoreVo.getUcQualified(), voltageLevel));
@@ -362,7 +362,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         } else {
             realScoreVo.setUQ(false);
         }
-        //电流分数
+        // 电流分数
         realScoreVo.setIaLoadQ(realScoreVo.getIaLoad() <= 0.8);
         realScoreVo.setIbLoadQ(realScoreVo.getIbLoad() <= 0.8);
         realScoreVo.setIcLoadQ(realScoreVo.getIcLoad() <= 0.8);
@@ -372,17 +372,17 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         } else {
             realScoreVo.setILoadQ(false);
         }
-        //电压平衡分数
+        // 电压平衡分数
         realScoreVo.setElBalunQ(realScoreVo.getElBalun() <= 0.15);
         if (realScoreVo.getElBalunQ()) {
             score += 20;
         }
-        //电流平衡分数
+        // 电流平衡分数
         realScoreVo.setVtBalunQ(realScoreVo.getVtBalun() <= 0.15);
         if (realScoreVo.getVtBalunQ()) {
             score += 20;
         }
-        //功率
+        // 功率
         realScoreVo.setCosQ(realScoreVo.getCos() >= 0.9);
         if (realScoreVo.getCosQ()) {
             score += 20;
@@ -1181,8 +1181,6 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
     }
 
 
-
-
     @Override
     public List<RealScoreVO> evaluationReport(int siteId, Date time, int type) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1203,13 +1201,13 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
             }
         }
         LambdaQueryWrapper<Device> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(Device::getSiteId,siteId);
+        queryWrapper1.eq(Device::getSiteId, siteId);
         List<Device> deviceList = deviceService.list(queryWrapper1);
         List<String> fieldDisplayOne183 = new ArrayList();
         List<String> fieldDisplayOne171 = new ArrayList();
         List<String> fieldDisplayOne173 = new ArrayList();
         if (deviceList.size() > 0) {
-            for(int j = 0; j < deviceList.size(); j++){
+            for (int j = 0; j < deviceList.size(); j++) {
                 if (deviceList.get(j).getDeviceType().equals("1")) {
                     fieldDisplayOne183.add(deviceList.get(j).getDeviceCode());
                 } else if (deviceList.get(j).getDeviceType().equals("3")) {
@@ -1221,11 +1219,11 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         }
         List<EvaluationReporVo> evaluationReporVo1 = new ArrayList<>();
         List<EvaluationReporVo> evaluationReporVo2 = new ArrayList<>();
-        if (fieldDisplayOne183.size()>0){
-            evaluationReporVo1 = baseMapper.getEvaluationReportList(siteId, startTime, endtime,"ht_analog_data",fieldDisplayOne183);
+        if (fieldDisplayOne183.size() > 0) {
+            evaluationReporVo1 = baseMapper.getEvaluationReportList(siteId, startTime, endtime, "ht_analog_data", fieldDisplayOne183);
         }
-        if (fieldDisplayOne173.size()>0){
-            evaluationReporVo2 = baseMapper.getEvaluationReportList(siteId, startTime, endtime,"ht_analog_173_data",fieldDisplayOne173);
+        if (fieldDisplayOne173.size() > 0) {
+            evaluationReporVo2 = baseMapper.getEvaluationReportList(siteId, startTime, endtime, "ht_analog_173_data", fieldDisplayOne173);
         }
 
         List<EvaluationReporVo> evaluationReporVo = Stream.of(evaluationReporVo1, evaluationReporVo2).flatMap(Collection::stream).distinct().collect(Collectors.toList());
@@ -1262,8 +1260,8 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
      */
     public Boolean computeUScoreOne(Double qualified, Double voltageLevel) {
 //        double mul = Arith.mul(qualified, voltageLevel);
-        Double voltageLevels = voltageLevel+(voltageLevel / 100 * 7);
-        Double voltageLevelx = voltageLevel-(voltageLevel / 100 * 7);
+        Double voltageLevels = voltageLevel + (voltageLevel / 100 * 7);
+        Double voltageLevelx = voltageLevel - (voltageLevel / 100 * 7);
         if (voltageLevelx <= qualified && voltageLevels >= qualified) {
             return true;
         }
@@ -1285,26 +1283,26 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
                 checkList.add(realScoreVo.getIa());
                 checkList.add(realScoreVo.getIb());
                 checkList.add(realScoreVo.getIc());
-                //电流不平衡
+                // 电流不平衡
                 realScoreVo.setElBalun(checkBalun(checkList));
                 checkList.clear();
                 checkList.add(realScoreVo.getUa());
                 checkList.add(realScoreVo.getUb());
                 checkList.add(realScoreVo.getUc());
-                //电压不平衡
+                // 电压不平衡
                 realScoreVo.setVtBalun(checkBalun(checkList));
-                //电压合格率
+                // 电压合格率
                 double voltageLevel = Double.parseDouble(evaluationReporVo.get(i).getVoltageLevel());
                 realScoreVo.setUaQualified(Arith.sub(evaluationReporVo.get(i).getUa(), voltageLevel));
                 realScoreVo.setUbQualified(Arith.sub(evaluationReporVo.get(i).getUb(), voltageLevel));
                 realScoreVo.setUcQualified(Arith.sub(evaluationReporVo.get(i).getUc(), voltageLevel));
-                //电流负载率
+                // 电流负载率
                 Double ratedCurrent = evaluationReporVo.get(i).getRatedCurrent();
                 realScoreVo.setIaLoad(Arith.div(realScoreVo.getIa(), ratedCurrent));
                 realScoreVo.setIbLoad(Arith.div(realScoreVo.getIb(), ratedCurrent));
                 realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(), ratedCurrent));
-                //计算分数
-                //电压分数
+                // 计算分数
+                // 电压分数
                 realScoreVo.setUaQ(computeUScoreOne(realScoreVo.getUa(), voltageLevel));
                 realScoreVo.setUbQ(computeUScoreOne(realScoreVo.getUb(), voltageLevel));
                 realScoreVo.setUcQ(computeUScoreOne(realScoreVo.getUc(), voltageLevel));
@@ -1314,7 +1312,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
                 } else {
                     realScoreVo.setUQ(false);
                 }
-                //电流分数
+                // 电流分数
                 realScoreVo.setIaLoadQ(realScoreVo.getIaLoad() <= 0.8);
                 realScoreVo.setIbLoadQ(realScoreVo.getIbLoad() <= 0.8);
                 realScoreVo.setIcLoadQ(realScoreVo.getIcLoad() <= 0.8);
@@ -1324,17 +1322,17 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
                 } else {
                     realScoreVo.setILoadQ(false);
                 }
-                //电压平衡分数
+                // 电压平衡分数
                 realScoreVo.setElBalunQ(realScoreVo.getElBalun() <= 0.15);
                 if (realScoreVo.getElBalunQ()) {
                     score += 20;
                 }
-                //电流平衡分数
+                // 电流平衡分数
                 realScoreVo.setVtBalunQ(realScoreVo.getVtBalun() <= 0.15);
                 if (realScoreVo.getVtBalunQ()) {
                     score += 20;
                 }
-                //功率
+                // 功率
                 realScoreVo.setCosQ(realScoreVo.getCos() <= 0.15);
                 if (realScoreVo.getCosQ()) {
                     score += 20;
@@ -1394,4 +1392,8 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 //    }
 
 
+    @Override
+    public List<RtAnalogData> getP(List<String> deviceCodes) {
+        return baseMapper.getP(deviceCodes);
+    }
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -207,7 +207,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         }
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Site site1 = siteVOT.getSite();
-        site1.setCreateTime(new Date());
+        site1.setCreateTime(LocalDateTime.now());
         site1.setCreator(user.getUserName());
         site1.setCompanyCode(11111);
         site1.setEnable(1);
@@ -453,6 +453,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
                         .filter(StringUtils::isNotBlank)
                         .map(v -> Double.parseDouble(v) / 1000.0)
                         .orElse(0.0));
+        siteRow.setDataTime(site.getCreateTime());
         records.add(siteRow);
 
         // 设备行