1.调整适配辽宁现场新能源场站

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