From 4059db12ba9ff65d82de6b81f7e02c056be547dc Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 25 Aug 2023 14:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E6=8A=80=E6=9C=AF=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=EF=BC=8C=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/process/mapper/SupvPlanMapper.java    |  4 +++-
 .../njcn/process/mapper/SupvProblemMapper.java |  3 +++
 .../njcn/process/mapper/SupvReportMMapper.java |  2 ++
 .../process/mapper/mapping/SupvPlanMapper.xml  |  3 +++
 .../mapper/mapping/SupvProblemMapper.xml       |  3 +++
 .../mapper/mapping/SupvReportMMapper.xml       |  3 +++
 .../service/impl/SupvPushGwServiceImpl.java    | 18 ++++--------------
 .../service/impl/SupvReportMServiceImpl.java   |  4 ++--
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanMapper.java
index 3dbd7d3fb..ac43b5bbc 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.process.pojo.param.SupvPlanParam;
 import com.njcn.process.pojo.po.SupvPlan;
 import com.njcn.process.pojo.vo.SupvPlanVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -17,5 +18,6 @@ import com.njcn.process.pojo.vo.SupvPlanVO;
  */
 public interface SupvPlanMapper extends BaseMapper<SupvPlan> {
 
-
+    Boolean updateId(@Param("isUploadHead")Integer isUploadHead,
+                     @Param("id") String id);
 }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvProblemMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvProblemMapper.java
index 150059d97..c9baf0d1a 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvProblemMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvProblemMapper.java
@@ -3,6 +3,7 @@ package com.njcn.process.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.process.pojo.po.SupvProblem;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,6 @@ import com.njcn.process.pojo.po.SupvProblem;
  */
 public interface SupvProblemMapper extends BaseMapper<SupvProblem> {
 
+    Boolean updateId(@Param("isUploadHead")Integer isUploadHead,
+                     @Param("id") String id);
 }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java
index d32b19fa9..92c05de47 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java
@@ -25,4 +25,6 @@ public interface SupvReportMMapper extends MppBaseMapper<SupvReportM> {
 
 
     List<ProcessPublicDTO> statisticQueReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
+    Boolean updateId(@Param("isUploadHead")Integer isUploadHead,
+                     @Param("id") String id);
 }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvPlanMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvPlanMapper.xml
index 5edf428b3..8fecbcdcd 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvPlanMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvPlanMapper.xml
@@ -3,4 +3,7 @@
 <mapper namespace="com.njcn.process.mapper.SupvPlanMapper">
 
 
+    <update id="updateId">
+        update supv_plan set is_upload_head= #{isUploadHead} where plan_Id=#{id}
+    </update>
 </mapper>
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
index 014adbe49..ab80c0ab5 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.process.mapper.SupvProblemMapper">
 
+    <update id="updateId">
+        update supv_problem set is_upload_head= #{isUploadHead} where problem_Id=#{id}
+    </update>
 </mapper>
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvReportMMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvReportMMapper.xml
index 31b475044..5c9ba6490 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvReportMMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvReportMMapper.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.process.mapper.SupvReportMMapper">
+    <update id="updateId">
+        update supv_report_m set is_upload_head= #{isUploadHead} where month_Report_Id=#{id}
+    </update>
 
     <select id="statisticPlanReport" resultType="ProcessPublicDTO">
         select count(1) value,supv_Org_Id id from supv_plan
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
index 4866e0580..6896e5785 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
@@ -217,10 +217,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
             String status = mapData.get("status").toString();
             if ("000000".equals(status)) {
                 for (SupvPlan supvPlan : supvPlanList) {
-                    SupvPlan supvPlanPO = new SupvPlan();
-                    supvPlanPO.setPlanId(supvPlan.getPlanId());
-                    supvPlanPO.setIsUploadHead(1);
-                    supvPlanMapper.updateById(supvPlanPO);
+                    supvPlanMapper.updateId(1,supvPlan.getPlanId());
                 }
                 String result = mapData.get("result").toString();
                 Map mapCount = JSON.parseObject(result, Map.class);
@@ -299,10 +296,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
             String status = map.get("status").toString();
             if ("000000".equals(status)) {
                 for (SupvProblem supvProblem : supvProblemList) {
-                    SupvProblem supvProblemPO = new SupvProblem();
-                    supvProblemPO.setProblemId(supvProblem.getProblemId());
-                    supvProblemPO.setIsUploadHead(1);
-                    supvProblemMapper.updateById(supvProblemPO);
+                    supvProblemMapper.updateId(1,supvProblem.getProblemId());
                 }
                 String result = map.get("result").toString();
                 Map mapCount = JSON.parseObject(result, Map.class);
@@ -385,10 +379,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
             String status = map.get("status").toString();
             if ("000000".equals(status)) {
                 for (SupvReportM supvReportM : supvReportMList) {
-                    SupvReportM supvReportMPO = new SupvReportM();
-                    supvReportMPO.setMonthReportId(supvReportM.getMonthReportId());
-                    supvReportMPO.setIsUploadHead(1);
-                    supvReportMMapper.updateById(supvReportMPO);
+                    supvReportMMapper.updateId(1,supvReportM.getMonthReportId());
                 }
                 String result = map.get("result").toString();
                 Map mapCount = JSON.parseObject(result, Map.class);
@@ -439,8 +430,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
             String status = map.get("status").toString();
             if ("000000".equals(status)) {
                 for (SupvPlan supvPlan : supvPlanList) {
-                    supvPlan.setIsUploadHead(2);
-                    supvPlanMapper.updateById(supvPlan);
+                    supvPlanMapper.updateId(2,supvPlan.getPlanId());
                 }
                 String result = map.get("result").toString();
                 Map mapCount = JSON.parseObject(result, Map.class);
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
index 5817567db..72c34d301 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
@@ -135,11 +135,11 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
         List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
         List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
 
-        //换流站问题总数量
+        //敏感用户问题总数量
         List<ProcessPublicDTO> processPublicDTOQesMingGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
         List<ProcessPublicDTO> processPublicDTOQesMingGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
 
-        //换流站问题已整改数量
+        //敏感用户问题已整改数量
         List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
         List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);