From 3b5442ecf52238cf9ab571a9b40a63d267e04844 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 8 Aug 2024 16:26:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=8F=B0=E8=B4=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=BA=E5=B0=91=E5=8F=98=E7=94=B5=E7=AB=99=E4=B8=AA?=
 =?UTF-8?q?=E5=88=AB=E4=BF=A1=E6=81=AF=202.=E8=A7=A3=E5=86=B3=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E7=9B=91=E7=9D=A3=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BB=88=E7=AB=AF=E4=BF=A1=E6=81=AF=203.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A8=E6=99=AF=E5=B1=95=E7=A4=BA=E7=A8=B3=E6=80=819?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pq/mapper/mapping/DeptLineMapper.xml      |   2 +-
 .../device/pq/mapper/mapping/LineMapper.xml   | 139 ++++++++++--------
 .../service/impl/GridDiagramServiceImpl.java  |  33 ++++-
 .../pq/service/impl/RunManageServiceImpl.java |   5 +
 .../mapper/mapping/RStatLimitRateDMapper.xml  |  68 ++++++++-
 .../service/impl/GridServiceImpl.java         |   2 +-
 .../impl/RStatLimitServiceImpl.java           |   2 +-
 .../user/UserReportNormalController.java      |   3 +-
 ...SupervisionTempLineDebugPOServiceImpl.java |  17 +--
 .../SupervisionTempLineReportServiceImpl.java |  58 +++++---
 ...SupervisionTempLineRunTestServiceImpl.java |  30 ++--
 .../user/impl/UserReportPOServiceImpl.java    |  10 +-
 12 files changed, 242 insertions(+), 127 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
index ca7e3341d..13bf15d54 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
@@ -111,7 +111,7 @@
         inner join pq_line dev on voltage.pid = dev.id
         inner join pq_device device on dev.id = device.id
         inner join pq_line substation on dev.pid = substation.id
-        inner join pq_substation sub on sub.id = substation.id
+        left join pq_substation sub on sub.id = substation.id
         where device.Dev_Model = 1
         and point.state = 1
         and device.Run_Flag = 0
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 05f27a045..9987e73b5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -308,42 +308,46 @@
         FROM
         pq_line t1,
         pq_device t2
-        WHERE
-        t1.id = t2.id
-        <if test="deviceType.devModel!=null and deviceType.devModel.size()!=0">
-            AND t2.Dev_Model in
-            <foreach collection="deviceType.devModel" open="(" close=")" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="deviceType.runFlag!=null and deviceType.runFlag.size()!=0">
-            AND t2.Run_Flag in
-            <foreach collection="deviceType.runFlag" open="(" close=")" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="deviceType.dataType!=null and deviceType.dataType.size()!=0">
-            AND t2.Dev_Data_Type in
-            <foreach collection="deviceType.dataType" open="(" close=")" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="deviceType.comFlag!=null and deviceType.comFlag.size()!=0">
-            AND t2.Com_Flag in
-            <foreach collection="deviceType.comFlag" open="(" close=")" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="manufacturer!=null and manufacturer.size()!=0">
-            AND t2.manufacturer in
-            <foreach collection="manufacturer" open="(" close=")" item="item" separator=",">
-                #{item.id}
-            </foreach>
-        </if>
-        AND t1.id IN
-        <foreach collection="devIds" open="(" close=")" item="item" separator=",">
-            #{item}
-        </foreach>
+        <where>
+            t1.id = t2.id
+            <if test="deviceType.devModel!=null and deviceType.devModel.size()!=0">
+                AND t2.Dev_Model in
+                <foreach collection="deviceType.devModel" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="deviceType.runFlag!=null and deviceType.runFlag.size()!=0">
+                AND t2.Run_Flag in
+                <foreach collection="deviceType.runFlag" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="deviceType.dataType!=null and deviceType.dataType.size()!=0">
+                AND t2.Dev_Data_Type in
+                <foreach collection="deviceType.dataType" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="deviceType.comFlag!=null and deviceType.comFlag.size()!=0">
+                AND t2.Com_Flag in
+                <foreach collection="deviceType.comFlag" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="manufacturer!=null and manufacturer.size()!=0">
+                AND t2.manufacturer in
+                <foreach collection="manufacturer" open="(" close=")" item="item" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+            <if test="devIds!=null and devIds.size()!=0">
+                AND t1.id IN
+                <foreach collection="devIds" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
     </select>
 
 
@@ -353,19 +357,25 @@
         from
         pq_line t1 ,
         pq_voltage t2
-        where
-        t1.id = t2.id
-        and
-        t1.id in
-        <foreach collection="voltageIds" separator="," open="(" close=")" item="item">
-            #{item}
-        </foreach>
-        <if test="scale!=null and scale.size()!=0">
-            AND t2.scale in
-            <foreach collection="scale" open="(" close=")" item="item" separator=",">
-                #{item.id}
-            </foreach>
-        </if>
+        <where>
+            t1.id = t2.id
+            <if test="voltageIds!=null and voltageIds.size()!=0">
+                and t1.id in
+                <foreach collection="voltageIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="scale!=null and scale.size()!=0">
+                AND t2.scale in
+                <foreach collection="scale" open="(" close=")" item="item" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+        </where>
+
+
+
+
     </select>
 
     <select id="getVoltageIdByScale" resultType="String">
@@ -1728,21 +1738,22 @@
         select
         t1.*
         from
-        pq_line t1 ,
-        pq_substation t2
-        where
-        t1.id = t2.id
-        and
-        t1.id in
-        <foreach collection="subIds" separator="," open="(" close=")" item="item">
-            #{item}
-        </foreach>
-        <if test="scale!=null and scale.size()!=0">
-            AND t2.scale in
-            <foreach collection="scale" open="(" close=")" item="item" separator=",">
-                #{item.id}
-            </foreach>
-        </if>
+        pq_line t1
+        left join pq_substation t2 on  t1.id = t2.id
+        <where>
+            <if test="subIds!=null and subIds.size()!=0">
+                AND  t1.id in
+                <foreach collection="subIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="scale!=null and scale.size()!=0">
+                AND t2.scale in
+                <foreach collection="scale" open="(" close=")" item="item" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+        </where>
     </select>
     <select id="selectByName" resultType="com.njcn.device.pq.pojo.po.LineDetail">
         select
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
index c05c6cc2b..f922a800e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
@@ -282,6 +282,9 @@ public class GridDiagramServiceImpl implements GridDiagramService {
     @Override
     public Map<String, Long> getGridDiagramDevTendency(GridDiagramParam param, Integer type) {
         param.getDeviceInfoParam().setLineRunFlag(0);
+        if(type==3){
+            param.getDeviceInfoParam().setPowerFlag(0);
+        }
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(param.getDeviceInfoParam(), Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         Map<String, Long> map = new LinkedHashMap<>();
         DateField dateField;
@@ -312,13 +315,29 @@ public class GridDiagramServiceImpl implements GridDiagramService {
             List<Line> list = lineService.list(new LambdaQueryWrapper<Line>().in(CollUtil.isNotEmpty(ids), Line::getId, ids).eq(Line::getState, DataStateEnum.ENABLE.getCode()).eq(Line::getLevel, type));
             times = list.stream().map(x -> Date.from(x.getCreateTime().atZone(ZoneId.systemDefault()).toInstant())).collect(Collectors.toList());
         }
-        for (DateTime dateTime : dateTimes) {
-            if (1 == param.getType()) {
-                long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfYear(dateTime), DateUtil.endOfYear(dateTime))).count();
-                map.put(dateTime.toString().substring(0, 4), count);
-            } else {
-                long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfMonth(dateTime), DateUtil.endOfMonth(dateTime))).count();
-                map.put(dateTime.toString().substring(0, 7), count);
+        long num =0;
+        for (int i = 0; i < dateTimes.size(); i++) {
+            if(i==0){
+                if (1 == param.getType()) {
+                    long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfYear(DateUtil.parse("1970-01-01 00:00:00")), DateUtil.endOfYear(dateTimes.get(0)))).count();
+                    num=num+count;
+                    map.put(dateTimes.get(0).toString().substring(0, 4), num);
+                } else {
+                    long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfYear(DateUtil.parse("1970-01-01 00:00:00")), DateUtil.endOfMonth(dateTimes.get(0)))).count();
+                    num=num+count;
+                    map.put(dateTimes.get(0).toString().substring(0, 7), num);
+                }
+            }else{
+                int finalI = i;
+                if (1 == param.getType()) {
+                    long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfYear(dateTimes.get(finalI)), DateUtil.endOfYear(dateTimes.get(finalI)))).count();
+                    num=num+count;
+                    map.put(dateTimes.get(finalI).toString().substring(0, 4), num);
+                } else {
+                    long count = times.stream().filter(x -> DateUtil.isIn(x, DateUtil.beginOfMonth(dateTimes.get(finalI)), DateUtil.endOfMonth(dateTimes.get(finalI)))).count();
+                    num=num+count;
+                    map.put(dateTimes.get(finalI).toString().substring(0, 7), num);
+                }
             }
         }
         return map;
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
index d02079255..e2ea8f78d 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
@@ -118,6 +118,11 @@ public class RunManageServiceImpl implements RunManageService {
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         BeanUtil.copyProperties(runManageParam, deviceInfoParam);
         deviceInfoParam.setServerName("pqs-common");
+        if(CollUtil.isNotEmpty(runManageParam.getRunFlag())){
+            if(runManageParam.getRunFlag().get(0)==0){
+                deviceInfoParam.setLineRunFlag(0);
+            }
+        }
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
         if (CollectionUtils.isEmpty(generalDeviceDTOList)) {
             throw new BusinessException("当前部门没有装置台账");
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
index 7ae2ffae3..a972c04c6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
@@ -315,7 +315,73 @@
             SUM(voltage_dev_overtime) as voltageDevOvertime,
             SUM(flicker_overtime) as flickerOvertime,
             SUM(ubalance_overtime) as ubalanceOvertime,
-            SUM(uaberrance_overtime) as uaberranceOvertime
+            SUM(uaberrance_overtime) as uaberranceOvertime,
+            sum(uharm_2_overtime)  uharm2Overtime,
+            sum(uharm_3_overtime)  uharm3Overtime,
+            sum(uharm_4_overtime)  uharm4Overtime,
+            sum(uharm_5_overtime)  uharm5Overtime,
+            sum(uharm_6_overtime)  uharm6Overtime,
+            sum(uharm_7_overtime)  uharm7Overtime,
+            sum(uharm_8_overtime)  uharm8Overtime,
+            sum(uharm_9_overtime)  uharm9Overtime,
+            sum(uharm_10_overtime)  uharm10Overtime,
+            sum(uharm_11_overtime)  uharm11Overtime,
+            sum(uharm_12_overtime)  uharm12Overtime,
+            sum(uharm_13_overtime)  uharm13Overtime,
+            sum(uharm_14_overtime)  uharm14Overtime,
+            sum(uharm_15_overtime)  uharm15Overtime,
+            sum(uharm_16_overtime)  uharm16Overtime,
+            sum(uharm_17_overtime)  uharm17Overtime,
+            sum(uharm_18_overtime)  uharm18Overtime,
+            sum(uharm_19_overtime)  uharm19Overtime,
+            sum(uharm_20_overtime)  uharm20Overtime,
+            sum(uharm_21_overtime)  uharm21Overtime,
+            sum(uharm_22_overtime)  uharm22Overtime,
+            sum(uharm_23_overtime)  uharm23Overtime,
+            sum(uharm_24_overtime)  uharm24Overtime,
+            sum(uharm_25_overtime)  uharm25Overtime,
+            sum(iharm_2_overtime)  iharm2Overtime,
+            sum(iharm_3_overtime)  iharm3Overtime,
+            sum(iharm_4_overtime)  iharm4Overtime,
+            sum(iharm_5_overtime)  iharm5Overtime,
+            sum(iharm_6_overtime)  iharm6Overtime,
+            sum(iharm_7_overtime)  iharm7Overtime,
+            sum(iharm_8_overtime)  iharm8Overtime,
+            sum(iharm_9_overtime)  iharm9Overtime,
+            sum(iharm_10_overtime)  iharm10Overtime,
+            sum(iharm_11_overtime)  iharm11Overtime,
+            sum(iharm_12_overtime)  iharm12Overtime,
+            sum(iharm_13_overtime)  iharm13Overtime,
+            sum(iharm_14_overtime)  iharm14Overtime,
+            sum(iharm_15_overtime)  iharm15Overtime,
+            sum(iharm_16_overtime)  iharm16Overtime,
+            sum(iharm_17_overtime)  iharm17Overtime,
+            sum(iharm_18_overtime)  iharm18Overtime,
+            sum(iharm_19_overtime)  iharm19Overtime,
+            sum(iharm_20_overtime)  iharm20Overtime,
+            sum(iharm_21_overtime)  iharm21Overtime,
+            sum(iharm_22_overtime)  iharm22Overtime,
+            sum(iharm_23_overtime)  iharm23Overtime,
+            sum(iharm_24_overtime)  iharm24Overtime,
+            sum(iharm_25_overtime)  iharm25Overtime,
+            sum(inuharm_1_overtime) inuharm1Overtime,
+            sum(inuharm_2_overtime) inuharm2Overtime,
+            sum(inuharm_3_overtime) inuharm3Overtime,
+            sum(inuharm_4_overtime) inuharm4Overtime,
+            sum(inuharm_5_overtime) inuharm5Overtime,
+            sum(inuharm_6_overtime) inuharm6Overtime,
+            sum(inuharm_7_overtime) inuharm7Overtime,
+            sum(inuharm_8_overtime) inuharm8Overtime,
+            sum(inuharm_9_overtime) inuharm9Overtime,
+            sum(inuharm_10_overtime) inuharm10Overtime,
+            sum(inuharm_11_overtime) inuharm11Overtime,
+            sum(inuharm_12_overtime) inuharm12Overtime,
+            sum(inuharm_13_overtime) inuharm13Overtime,
+            sum(inuharm_14_overtime) inuharm14Overtime,
+            sum(inuharm_15_overtime) inuharm15Overtime,
+            sum(inuharm_16_overtime) inuharm16Overtime,
+            sum(i_neg_overtime)  iNegOvertime
+
         from
             r_stat_limit_rate_d
         where
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
index 104af5f69..9723d918e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
@@ -458,7 +458,7 @@ public class GridServiceImpl implements IGridService {
                 Field field = limitRateDPO.getClass().getDeclaredField(fieldName);
                 //设置对象的访问权限，保证对private的属性的访问
                 field.setAccessible(true);
-                int v = Integer.parseInt(field.get(field).toString());
+                int v = Integer.parseInt(field.get(limitRateDPO).toString());
                 if(v>0){
                     return true;
                 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
index be6739e95..36d3acdfc 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
@@ -259,7 +259,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
         List<String> online = onData.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());
 
         StatSubstationBizBaseParam baseParam=new StatSubstationBizBaseParam();
-        baseParam.setIds(line);
+        baseParam.setIds(online);
         baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString());
         baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString());
         List<String>  linesTarget=targetDService.getLinesTarget(baseParam);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java
index 25ba1fe70..b4233cd82 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java
@@ -13,6 +13,7 @@ import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.IUserReportNormalService;
 import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Operation;
@@ -30,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("userReportNormal")
-@ApiOperation("干扰源常态化管理")
+@Api("干扰源常态化管理")
 @RequiredArgsConstructor
 public class UserReportNormalController extends BaseController {
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
index 22586567b..77c05b382 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
@@ -269,12 +269,12 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
     @Override
     public SupervisionTempLineDebugVO getDetailTempLineDebug(String id) {
-        SupervisionTempLineDebugVO supervisionTempLineDebugVO = new SupervisionTempLineDebugVO();
+        SupervisionTempLineDebugVO supervisionTempLineDebugVO =null;
         SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportService.getById(id);
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.getById(id);
         if(ObjectUtil.isNotNull(supervisionTempLineDebugPO)){
+            supervisionTempLineDebugVO = new SupervisionTempLineDebugVO();
             supervisionTempLineDebugVO.setId(id);
-
             supervisionTempLineDebugVO.setUserName(supervisionTempLineReport.getUserName());
             supervisionTempLineDebugVO.setConnectedBus(supervisionTempLineReport.getConnectedBus());
             supervisionTempLineDebugVO.setMonitoringTerminalCode(supervisionTempLineReport.getMonitoringTerminalCode());
@@ -287,8 +287,6 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             supervisionTempLineDebugVO.setProcessInstanceId(supervisionTempLineDebugPO.getProcessInstanceId());
             supervisionTempLineDebugVO.setStatus(supervisionTempLineDebugPO.getStatus());
         }
-
-
         return supervisionTempLineDebugVO;
     }
 
@@ -306,12 +304,13 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineDebugVO.getHistoryInstanceId());
             String sign = "";
             if(StrUtil.isNotBlank(supervisionTempLineDebugVO.getPowerSubstationName())){
-                 sign = supervisionTempLineDebugVO.getPowerSubstationName()
-                        .concat(StrPool.SLASH)
-                        .concat(supervisionTempLineDebugVO.getMonitoringTerminalName())
-                        .concat(StrPool.SLASH)
-                        .concat(supervisionTempLineDebugVO.getLineName());
+                sign=supervisionTempLineDebugVO.getPowerSubstationName()
+                        .concat(StrPool.SLASH);
             }
+                sign =  sign
+                    .concat(supervisionTempLineDebugVO.getMonitoringTerminalName())
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineDebugVO.getLineName());
             bpmInstanceInfo.setInstanceSign(sign);
         }
         return bpmInstanceInfo;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index f37bd0e0b..769009c8b 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -3,6 +3,7 @@ package com.njcn.supervision.service.device.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -46,6 +47,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static javafx.beans.binding.Bindings.concat;
+
 /**
  *
  * Description:
@@ -202,15 +205,22 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SupervisionTempLineReportVO supervisionTempLineReportVO = this.getDetailTempLine(businessId);
-        bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineReportVO.getHistoryInstanceId());
-        String sign = supervisionTempLineReportVO.getPowerSubstationName()
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineReportVO.getMonitoringTerminalName())
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineReportVO.getConnectedBus())
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineReportVO.getLineName());
-        bpmInstanceInfo.setInstanceSign(sign);
+        if(ObjectUtil.isNotNull(supervisionTempLineReportVO)){
+            bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineReportVO.getHistoryInstanceId());
+            String powerSubstationName = supervisionTempLineReportVO.getPowerSubstationName();
+            if(StrUtil.isNotBlank(powerSubstationName)){
+                powerSubstationName.concat(StrPool.SLASH);
+            }else{
+                powerSubstationName="";
+            }
+            String sign = powerSubstationName
+                    .concat(supervisionTempLineReportVO.getMonitoringTerminalName())
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineReportVO.getConnectedBus())
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineReportVO.getLineName());
+            bpmInstanceInfo.setInstanceSign(sign);
+        }
         return bpmInstanceInfo;
     }
 
@@ -228,21 +238,23 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
 
     @Override
     public SupervisionTempLineReportVO getDetailTempLine(String id) {
-        SupervisionTempLineReportVO vo  =new SupervisionTempLineReportVO();
+        SupervisionTempLineReportVO vo=null;
         SupervisionTempLineReport byId = this.getById(id);
-        BeanUtils.copyProperties(byId,vo);
-
-        //处理特殊字段，用户名、部门名
-        UserVO userVO = userFeignClient.getUserById(vo.getCreateBy()).getData();
-        vo.setReporter(userVO.getName());
-        if(StringUtils.isNotEmpty(vo.getOrgId())){
-            vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
-        }
-        if(StringUtils.isNotEmpty(vo.getLoadType())){
-            vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());
-        }
-        if(StringUtils.isNotEmpty(vo.getBusinessType())){
-            vo.setBusinessType(dictTreeFeignClient.queryById(vo.getBusinessType()).getData().getName());
+        if(ObjectUtil.isNotNull(byId)){
+            vo  =new SupervisionTempLineReportVO();
+            BeanUtils.copyProperties(byId,vo);
+            //处理特殊字段，用户名、部门名
+            UserVO userVO = userFeignClient.getUserById(vo.getCreateBy()).getData();
+            vo.setReporter(userVO.getName());
+            if(StringUtils.isNotEmpty(vo.getOrgId())){
+                vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
+            }
+            if(StringUtils.isNotEmpty(vo.getLoadType())){
+                vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());
+            }
+            if(StringUtils.isNotEmpty(vo.getBusinessType())){
+                vo.setBusinessType(dictTreeFeignClient.queryById(vo.getBusinessType()).getData().getName());
+            }
         }
         return vo;
     }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
index 04d74778f..0b0df462a 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -237,7 +238,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
         if (CollUtil.isNotEmpty(usePoList)) {
             List<String> lineRunTestIds = usePoList.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList());
             List<SupervisionTempLineReport> supervisionTempLineReports = supervisionTempLineReportMapper.selectBatchIds(lineRunTestIds);
-            Map<String, String> lineReportMap = supervisionTempLineReports.stream().collect(Collectors.toMap(SupervisionTempLineReport::getId, SupervisionTempLineReport::getMainWiringDiagram));
+            Map<String, String> lineReportMap = supervisionTempLineReports.stream().filter(x -> StrUtil.isNotBlank(x.getMainWiringDiagram())).collect(Collectors.toMap(SupervisionTempLineReport::getId, SupervisionTempLineReport::getMainWiringDiagram));
             Map<String, List<SupervisionTempLineRunTestPO>> map = usePoList.stream().collect(Collectors.groupingBy(SupervisionTempLineRunTestPO::getTestRunTime));
             map.forEach((key, val) -> {
                 String startTime = key.split("--")[0];
@@ -271,11 +272,12 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
                         po.setOnlineRate(dto.getOnlineRate());
                         po.setIntegrityRate(dto.getIntegrityRate());
                         po.setSuitRate(dto.getSuitRate());
-                        MockMultipartFile file;
+                        MockMultipartFile file= new MockMultipartFile("file", new byte[0]);
                         if (lineReportMap.containsKey(supervisionTempLineRunTestPO.getId())) {
                             String url = lineReportMap.get(supervisionTempLineRunTestPO.getId());
-                            InputStream fileStream = fileStorageUtil.getFileStream(url.substring(url.indexOf("/")));
+                            InputStream fileStream = null;
                             try {
+                                fileStream = fileStorageUtil.getFileStream(url.substring(url.indexOf("/")));
                                 file = new MockMultipartFile("file", url.substring(url.lastIndexOf("/") + 1), MediaType.IMAGE_PNG_VALUE, fileStream);
                             } catch (IOException e) {
                                 throw new RuntimeException(e);
@@ -288,8 +290,6 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
                                     e.printStackTrace();
                                 }
                             }
-                        } else {
-                            file = new MockMultipartFile("file", new byte[0]);
                         }
                         try {
                             startTime = DateUtil.beginOfDay(DateUtil.parse(startTime)).toString();
@@ -344,15 +344,17 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         SupervisionTempLineRunTestVO supervisionTempLineRunTestVO = this.getRunTestById(businessId);
-        bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineRunTestVO.getHistoryInstanceId());
-        String sign = supervisionTempLineRunTestVO.getPowerSubstationName()
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineRunTestVO.getMonitoringTerminalName())
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineRunTestVO.getConnectedBus())
-                .concat(StrPool.SLASH)
-                .concat(supervisionTempLineRunTestVO.getLineName());
-        bpmInstanceInfo.setInstanceSign(sign);
+        if(ObjectUtil.isNotNull(supervisionTempLineRunTestVO)){
+            bpmInstanceInfo.setHistoryInstanceId(supervisionTempLineRunTestVO.getHistoryInstanceId());
+            String sign = supervisionTempLineRunTestVO.getPowerSubstationName()
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineRunTestVO.getMonitoringTerminalName())
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineRunTestVO.getConnectedBus())
+                    .concat(StrPool.SLASH)
+                    .concat(supervisionTempLineRunTestVO.getLineName());
+            bpmInstanceInfo.setInstanceSign(sign);
+        }
         return bpmInstanceInfo;
     }
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index 4e8336b8c..3e93665b4 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -753,11 +753,11 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
                     userReportSensitivePO.setDeviceName(userExcel.getDeviceName());
                     userReportSensitivePO.setPowerSupplyCount(userExcel.getPowerSupplyCount());
                     //处理多指标数据
-                    String[] indexArr = userExcel.getEnergyQualityIndex().split(",");
-                    for (String s : indexArr) {
-                        indexList.add(PubUtil.getDicById(s, problemIndicators));
-                    }
-                    userReportSensitivePO.setEnergyQualityIndex(indexList.stream().map(String::valueOf).collect(Collectors.joining(",")));
+//                    String[] indexArr = userExcel.getEnergyQualityIndex().split(",");
+//                    for (String s : indexArr) {
+//                        indexList.add(PubUtil.getDicById(s, problemIndicators));
+//                    }
+                    userReportSensitivePO.setEnergyQualityIndex(userExcel.getEnergyQualityIndex());
                     userReportSensitivePO.setEvaluationType(PubUtil.getDicById(userExcel.getEvaluationType(), evaluationType));
                     userReportSensitivePO.setAntiInterferenceTest(userExcel.getAntiInterferenceTest() + "");
                     userReportSensitivePO.setEvaluationChekDept(userExcel.getEvaluationChekDept());