Merge remote-tracking branch 'origin/main'

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java

@@ -111,7 +111,6 @@ public class LineDetail{
     /**
      * 监测点对象名称
      */
-    @Deprecated
     private String objName;
 
     /**
@@ -171,19 +170,16 @@ public class LineDetail{
     /**
      * 监测点拥有者
      */
-    @Deprecated
     private String owner;
 
     /**
      * 拥有者职务
      */
-    @Deprecated
     private String ownerDuty;
 
     /**
      * 拥有者联系方式
      */
-    @Deprecated
     private String ownerTel;
 
     /**

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml

@@ -1504,7 +1504,10 @@
 
     <select id="getCustomDetailByLineId" resultType="map">
         SELECT line.id                                                                       AS lineId,
-               CONCAT(CONCAT(CONCAT(sub.NAME, '_'), vo.NAME), CONCAT('_', line.NAME))        AS lineName,
+               CASE
+                   WHEN detail.obj_id IS NOT NULL AND detail.obj_id != '' THEN CONCAT(obj.PROJECT_NAME,'_', line.NAME)
+                   ELSE CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME)
+                   END AS lineName,
                CONCAT(detail.pt1, ':', detail.pt2) AS pt,
                CONCAT(detail.ct1, ':', detail.ct2) AS ct,
                detail.Dev_Capacity                                                           AS Dev_Capacity,
@@ -1521,6 +1524,7 @@
                  JOIN pq_device pqd ON pqd.id = dev.id
                  JOIN sys_dict_data dic ON vg.scale = dic.id
                  JOIN pq_line sub ON sub.id = dev.pid
+                 LEFT JOIN SUPERVISION_USER_REPORT obj on detail.obj_id = obj.id
         WHERE line.id = #{lineId}
     </select>
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java

@@ -162,6 +162,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             lineDetailDataVO.setDevId(device.getId());
             lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName());
             lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
+            lineDetailDataVO.setObjId(lineDetail.getObjId());
             lineDetailDataVO.setObjName(lineDetail.getObjName());
             lineDetailDataVO.setId(lineDetail.getNum());
             lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType()));

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml

@@ -69,7 +69,7 @@
         select
             if(sum(real_time*1.0)/sum(due_time)*100>100,
                 100,
-                IFNULL(ROUND( sum(real_time)/sum(due_time)*100,2),0))
+                IFNULL(ROUND( sum(real_time*1.0)/sum(due_time)*100,2),0))
                  as integrityRate
         from
             r_stat_integrity_d

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java

@@ -577,7 +577,7 @@ public class GridServiceImpl implements IGridService {
                         //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点
                         long allNum = list2.stream().filter(o -> o.getAllOvertime() > 0 || o.getFlickerAllTime() > 0 ).count();
                         detail.setOverNum((int) allNum);
-                        detail.setOverRatio(PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum()));
+                        detail.setOverRatio(detail.getOnlineNum() == 0 ? 0 : PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum()));
                         //筛选出电压偏差超标监测点
                         long num1 = list2.stream().filter(o -> o.getFreqDevOvertime() > 0).count();
                         Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFreqDevOvertime)).get().getFreqDevOvertime();

pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java

@@ -10,9 +10,11 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
+import com.njcn.device.biz.commApi.CommLineClient;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pq.api.DeviceUnitClient;
+import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.harmonic.common.pojo.dto.DeviceUnitCommDTO;
 import com.njcn.harmonic.common.pojo.dto.HarmLineDetailDataCommDTO;
 import com.njcn.harmonic.common.pojo.dto.OverLimitInfoCommDTO;
@@ -48,6 +50,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * pqs
@@ -132,7 +135,12 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
             if (ObjectUtil.isNull(lineDto)) {
                 throw new BusinessException(CommonResponseEnum.NO_DATA);
             }
-            bdname = lineDto.getBdName();
+            if(StrUtil.isNotBlank(lineDto.getObjId())){
+                bdname = lineDto.getObjName();
+                name = lineDto.getLineName();
+            }else {
+                bdname = lineDto.getBdName();
+            }
             areaName = lineDto.getAreaName();
             if("冀北".equals(areaName)){
                 areaName="国网"+areaName;

pqs-system/system-boot/pom.xml

@@ -64,11 +64,11 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+  <!--      <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>prepare-api</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>process-api</artifactId>