Merge remote-tracking branch 'origin/liaoning' into liaoning

pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java

@@ -24,7 +24,7 @@ import java.util.*;
 public class DrawPicUtil {
 
     //目前写死，后续作为配置
-    @Value("${DrawPicUtil.URL:http://192.168.1.24:5174/picture}")
+    @Value("${DrawPicUtil.URL:http://localhost:3008/generate-chart}")
     private String URL;
 
 

pqs-common/common-web/src/main/java/com/njcn/web/advice/ResponseAdvice.java

@@ -1,17 +1,13 @@
 package com.njcn.web.advice;
 
 import com.njcn.common.config.GeneralInfo;
-import com.njcn.common.pojo.constant.SecurityConstants;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.pojo.constant.LogInfo;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.utils.ReflectCommonUtil;
-import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.service.ILogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
@@ -19,7 +15,6 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 import javax.annotation.Nonnull;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java

@@ -56,6 +56,7 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
 
     void updateLineRunFlag(@Param("id")String lineId, @Param("runFlag")Integer status);
 
+    void updateLineRunFlagBatch(@Param("lineIds") List<String> lineIds, @Param("runFlag") Integer status);
 
     /**
      * 根据监测点信息获取监测点详情（关联终端和母线）
@@ -69,4 +70,6 @@ public interface LineDetailMapper extends BaseMapper<LineDetail> {
      * 判断该新能源场站信息是否绑定了测点ID
      */
     Integer checkExistsLineByNewStationId(@Param("newStationId") String newStationId);
+
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java

@@ -581,4 +581,9 @@ public interface LineMapper extends BaseMapper<Line> {
     List<DevDetailVO> getLineDeviceByDevIds(@Param("powerFlag") Integer powerFlag,
                                             @Param("lineIds") List<String> lineIds,
                                             @Param("devIds") List<String> devIds);
+
+    /**
+     * 根据Pid获取所有子节点
+     */
+    List<String> getSubIdByPid(@Param("pid") String pid);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml

@@ -101,6 +101,15 @@
         where id = #{id}
     </update>
 
+    <update id="updateLineRunFlagBatch" >
+        update pq_line_detail
+        set run_flag = #{runFlag}
+        where id in
+             <foreach item="item" collection="lineIds" index="index"  separator="," open="(" close=")">
+                 #{item}
+             </foreach>
+    </update>
+
     <select id="checkExistsLineByNewStationId" resultType="int">
         select count(1) from pq_line pl inner join pq_line_detail pld
         on pl.id = pld.id and pl.State = 1 and pld.New_Station_Id = #{newStationId}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml

@@ -104,6 +104,7 @@
         <if test="lineGrade != null and lineGrade != ''">
             and pld.Line_Grade = #{lineGrade}
         </if>
+        order by line.sort
     </select>
     <select id="getAlarmAlgoDescribe" resultType="com.njcn.device.pq.pojo.vo.AlarmStrategyVO">
         SELECT

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

@@ -1893,4 +1893,9 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getSubIdByPid" resultType="String">
+        SELECT id from pq_line where pid = #{pid}
+    </select>
+
 </mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java

@@ -249,4 +249,13 @@ public interface LineService extends IService<Line> {
      */
     List<PollutionLineInfoDTO> getPollutionLineInfo(List<String> id);
 
+    /**
+     * 根据pid获取所有子节点的ID
+     */
+    List<String> getSubIdByPid(String pid);
+
+    /**
+     * 终端运行状态修改时，同时调整监测点的运行状态
+     */
+    void updateLineRunFlag(String id, Integer status);
 }

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

@@ -865,6 +865,30 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return pollutionLineInfoDTOList;
     }
 
+    @Override
+    public List<String> getSubIdByPid(String pid) {
+        List<String> subIdList = lineMapper.getSubIdByPid(pid);
+        if(CollUtil.isNotEmpty(subIdList)){
+            return subIdList;
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void updateLineRunFlag(String devId, Integer status) {
+        List<String> lineIds = new ArrayList<>();
+        // 获取母线
+        List<String> subLineIds = lineMapper.getSubIdByPid(devId);
+        // 母线再获取所有监测点id
+        for (String subLineId : subLineIds) {
+            List<String> lineIdsTemp = lineMapper.getSubIdByPid(subLineId);
+            lineIds.addAll(lineIdsTemp);
+        }
+        if(CollUtil.isNotEmpty(lineIds)){
+            lineDetailMapper.updateLineRunFlagBatch(lineIds, status);
+        }
+    }
+
 
     @Override
     public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java

@@ -77,6 +77,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
     private final DevFuctionMapper devFuctionMapper;
 
     private final CldStatisticsFlowMapper cldStatisticsFlowMapper;
+    private final LineService lineService;
 
     @Override
     public List<TerminalMaintainVO> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) {
@@ -139,12 +140,17 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
 
     @Override
     public boolean updateRunFlagManage(TerminalParam terminalParam) {
+        List<String> devIds = terminalParam.getIds();
+        if(CollectionUtils.isEmpty(devIds)){
+            return true;
+        }
         QueryWrapper<Device> wrapper = new QueryWrapper<>();
-        wrapper.in("id", terminalParam.getIds());
+        wrapper.in("id", devIds);
         List<Device> newList = iDeviceService.listByIds(terminalParam.getIds());
         boolean b = iDeviceService.update(new LambdaUpdateWrapper<Device>()
                         .set(Device::getRunFlag,terminalParam.getRunFlag())
                         .in(Device::getId,terminalParam.getIds()));
+        devIds.forEach(id -> {lineService.updateLineRunFlag(id,terminalParam.getRunFlag());});
         //添加日志信息
         if (b) {
             List<Device> oldList = iDeviceService.list(wrapper);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java

@@ -299,8 +299,6 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
             mapAlarm.put(0,0);
         }
 
-
-
         for (TerminalOnlineRateDataVO proItem : terminalOnlineRateData) {
             List<TerminalOnlineRateDataVO> gds = proItem.getChildren();
             if (CollectionUtil.isNotEmpty(gds)) {