Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java

@@ -1,36 +1,36 @@
-package com.njcn.device.pms.pojo.po;
+//package com.njcn.device.pms.pojo.po;
-
+//
-import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+//import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
+//import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
+//import lombok.Data;
-import lombok.EqualsAndHashCode;
+//import lombok.EqualsAndHashCode;
-
+//
-/**
+///**
- * pms-device
+// * pms-device
- * 母线
+// * 母线
- * @author cdf
+// * @author cdf
- * @date 2022/10/26
+// * @date 2022/10/26
- */
+// */
-@Data
+//@Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
-@TableName("pms_generatrix")
+//@TableName("pms_generatrix")
-public class Generatrix extends BaseEntity {
+//public class Generatrix extends BaseEntity {
-
+//
-    private static final long serialVersionUID = 1L;
+//    private static final long serialVersionUID = 1L;
-
+//
-    @TableId
+//    @TableId
-    private String generatrixId;
+//    private String generatrixId;
-
+//
-    private String generatrixName;
+//    private String generatrixName;
-
+//
-    private String statationId;
+//    private String statationId;
-
+//
-    private String statationName;
+//    private String statationName;
-
+//
-    private String scale;
+//    private String scale;
-
+//
-    private Integer status;
+//    private Integer status;
-
+//
-
+//
-}
+//}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java

@@ -1,3 +1,4 @@
+/*
 package com.njcn.device.pms.controller.ledgerManger;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -29,12 +30,14 @@ import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Objects;
 
+*/
 /**
  * 母线信息
  *
  * @author yzh
  * @date 2022/10/18
- */
+ *//*
+
 
 @RestController
 @RequestMapping("/pmsGeneratrix")
@@ -45,12 +48,14 @@ public class PmsGeneratrixController extends BaseController {
 
     private final IPmsGeneratrixService pmsGeneratrixService;
 
-    /**
+    */
+/**
      * 获取指定母线信息
      *
      * @param param 获取指定的监测点信息条件
      * @return 指定母线信息
-     */
+     *//*
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getGeneratrixInfo")
     @ApiOperation("获取指定母线信息")
@@ -65,14 +70,16 @@ public class PmsGeneratrixController extends BaseController {
         }
     }
 
-    /**
+    */
+/**
      * 获取母线与电站关联信息
      *
      * @param param 条件参数
      * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>>
      * @author yzh
      * @date 2022/11/3
-     */
+     *//*
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getGeneratrixAndPowerStationInfo")
     @ApiOperation("获取母线与电站关联信息")
@@ -87,13 +94,15 @@ public class PmsGeneratrixController extends BaseController {
         }
     }
 
-    /**
+    */
+/**
     * @Description: 普测计划页面调用根据条件查询母线信息
     * @Param: [param]
     * @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>>
     * @Author: clam
     * @Date: 2022/12/5
-    */
+    *//*
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getGeneratrixByCondition")
     @ApiOperation("普测计划页面调用根据条件查询母线信息")
@@ -184,3 +193,4 @@ public class PmsGeneratrixController extends BaseController {
     }
 
 }
+*/

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java

@@ -1,47 +1,47 @@
-package com.njcn.device.pms.mapper.majornetwork;
+//package com.njcn.device.pms.mapper.majornetwork;
-
+//
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
-import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
-import com.njcn.device.pms.pojo.param.ConditionParam;
+//import com.njcn.device.pms.pojo.param.ConditionParam;
-import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+//import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import com.njcn.device.pms.pojo.po.Generatrix;
+//import com.njcn.device.pms.pojo.po.Generatrix;
-import org.apache.ibatis.annotations.Mapper;
+//import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+//import org.apache.ibatis.annotations.Param;
-
+//
-import java.util.List;
+//import java.util.List;
-
+//
-/**
+///**
- * @author yzh
+// * @author yzh
- * @date 2022/10/18
+// * @date 2022/10/18
- */
+// */
-@Mapper
+//@Mapper
-public interface PmsGeneratrixMapper extends BaseMapper<Generatrix> {
+//public interface PmsGeneratrixMapper extends BaseMapper<Generatrix> {
-
+//
-    /**
+//    /**
-     * 获取母线信息
+//     * 获取母线信息
-     *
+//     *
-     * @param pmsGeneratrixParam 入参
+//     * @param pmsGeneratrixParam 入参
-     * @return 母线信息
+//     * @return 母线信息
-     */
+//     */
-    List<PmsGeneratrixDTO> getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam);
+//    List<PmsGeneratrixDTO> getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam);
-
+//
-    /**
+//    /**
-     * 获取母线与电站关联信息
+//     * 获取母线与电站关联信息
-     *
+//     *
-     * @param param 条件参数
+//     * @param param 条件参数
-     * @return java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+//     * @return java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
-     * @author yzh
+//     * @author yzh
-     * @date 2022/11/3
+//     * @date 2022/11/3
-     */
+//     */
-    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param);
+//    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param);
-    /**
+//    /**
-    * @Description: 普测计划页面调用根据条件查询母线信息
+//    * @Description: 普测计划页面调用根据条件查询母线信息
-    * @Param: [data, param]
+//    * @Param: [data, param]
-    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+//    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
-    * @Author: clam
+//    * @Author: clam
-    * @Date: 2022/12/5
+//    * @Date: 2022/12/5
-    */
+//    */
-    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(@Param("orgList")List<String> data, @Param("param")ConditionParam param);
+//    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(@Param("orgList")List<String> data, @Param("param")ConditionParam param);
-}
+//}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java

@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -86,7 +87,7 @@ implements RMpPwAlarmDetailDService{
         //配网监测点id集合
         List<String> pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
         //配网监测点Map集合
-        Map<String, PwPmsMonitorDTO> pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, item -> item));
+        Map<String, PwPmsMonitorDTO> pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(Key1, kye2) -> Key1));
 
 
         //合并主网配网监测点id集合（并去重）

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java

@@ -1,108 +1,108 @@
-package com.njcn.device.pms.service.majornetwork;
+//package com.njcn.device.pms.service.majornetwork;
-
+//
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
+//import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
-import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
-import com.njcn.device.pms.pojo.param.ConditionParam;
+//import com.njcn.device.pms.pojo.param.ConditionParam;
-import com.njcn.device.pms.pojo.param.GeneratrixParam;
+//import com.njcn.device.pms.pojo.param.GeneratrixParam;
-import com.njcn.device.pms.pojo.param.PmsBaseParam;
+//import com.njcn.device.pms.pojo.param.PmsBaseParam;
-import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+//import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import com.njcn.device.pms.pojo.po.Generatrix;
+//import com.njcn.device.pms.pojo.po.Generatrix;
-import com.njcn.web.pojo.param.BaseParam;
+//import com.njcn.web.pojo.param.BaseParam;
-
+//
-import java.util.List;
+//import java.util.List;
-
+//
-/**
+///**
- * @author yzh
+// * @author yzh
- * @date 2022/10/18
+// * @date 2022/10/18
- */
+// */
-
+//
-public interface IPmsGeneratrixService extends IService<Generatrix> {
+//public interface IPmsGeneratrixService extends IService<Generatrix> {
-
+//
-    /**
+//    /**
-     * 获取母线信息
+//     * 获取母线信息
-     *
+//     *
-     * @param param 入参
+//     * @param param 入参
-     * @return 母线信息
+//     * @return 母线信息
-     */
+//     */
-    List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param);
+//    List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param);
-
+//
-    /**
+//    /**
-     * 新增母线
+//     * 新增母线
-     *
+//     *
-     * @param generatrixParam 母线
+//     * @param generatrixParam 母线
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    boolean addGeneratrix(GeneratrixParam generatrixParam);
+//    boolean addGeneratrix(GeneratrixParam generatrixParam);
-
+//
-    /**
+//    /**
-     * 修改母线
+//     * 修改母线
-     *
+//     *
-     * @param generatrixParam 母线
+//     * @param generatrixParam 母线
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    boolean updateGeneratrix(GeneratrixParam generatrixParam);
+//    boolean updateGeneratrix(GeneratrixParam generatrixParam);
-
+//
-    /**
+//    /**
-     * 删除母线
+//     * 删除母线
-     *
+//     *
-     * @param generatrixIds 母线
+//     * @param generatrixIds 母线
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    boolean delGeneratrix(List<String> generatrixIds);
+//    boolean delGeneratrix(List<String> generatrixIds);
-
+//
-    /**
+//    /**
-     * 查询母线
+//     * 查询母线
-     *
+//     *
-     * @param generatrixId 母线id
+//     * @param generatrixId 母线id
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    Generatrix getGeneratrixById(String generatrixId);
+//    Generatrix getGeneratrixById(String generatrixId);
-
+//
-    /**
+//    /**
-     * 查询母线列表
+//     * 查询母线列表
-     *
+//     *
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    List<Generatrix> getGeneratrixList(PmsBaseParam pmsBaseParam);
+//    List<Generatrix> getGeneratrixList(PmsBaseParam pmsBaseParam);
-
+//
-    /**
+//    /**
-     * 查询母线列表
+//     * 查询母线列表
-     *
+//     *
-     * @param baseParam 基础参数
+//     * @param baseParam 基础参数
-     * @return boolean
+//     * @return boolean
-     * @author cdf
+//     * @author cdf
-     * @date 2022/10/25
+//     * @date 2022/10/25
-     */
+//     */
-    Page<Generatrix> getGeneratrixPageList(BaseParam baseParam);
+//    Page<Generatrix> getGeneratrixPageList(BaseParam baseParam);
-
+//
-    /**
+//    /**
-     * 获取母线与电站关联信息
+//     * 获取母线与电站关联信息
-     *
+//     *
-     * @param param 条件参数
+//     * @param param 条件参数
-     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
+//     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
-     * @author yzh
+//     * @author yzh
-     * @date 2022/11/3
+//     * @date 2022/11/3
-     */
+//     */
-    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param);
+//    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param);
-    /**
+//    /**
-    * @Description: 普测计划页面调用根据条件查询母线信息
+//    * @Description: 普测计划页面调用根据条件查询母线信息
-    * @Param: [param]
+//    * @Param: [param]
-    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+//    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
-    * @Author: clam
+//    * @Author: clam
-    * @Date: 2022/12/5
+//    * @Date: 2022/12/5
-    */
+//    */
-    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param);
+//    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param);
-}
+//}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java

@@ -10,7 +10,6 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixWireMapper;
-import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
@@ -18,7 +17,6 @@ import com.njcn.device.pms.pojo.param.ConditionParam;
 import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
 import com.njcn.device.pms.pojo.param.PmsBaseParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import com.njcn.device.pms.pojo.po.Generatrix;
 import com.njcn.device.pms.pojo.po.GeneratrixWire;
 import com.njcn.device.pms.pojo.po.StatationStat;
 import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java

@@ -1,172 +1,172 @@
-package com.njcn.device.pms.service.majornetwork.impl;
+//package com.njcn.device.pms.service.majornetwork.impl;
-
+//
-import cn.hutool.core.collection.CollUtil;
+//import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
+//import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
+//import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.common.pojo.exception.BusinessException;
+//import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+//import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
-import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper;
+//import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper;
-import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
+//import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
-import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
+//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
-import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
-import com.njcn.device.pms.pojo.param.*;
+//import com.njcn.device.pms.pojo.param.*;
-import com.njcn.device.pms.pojo.po.Generatrix;
+//import com.njcn.device.pms.pojo.po.Generatrix;
-import com.njcn.device.pms.pojo.po.StatationStat;
+//import com.njcn.device.pms.pojo.po.StatationStat;
-import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
+//import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
-
+//
-import com.njcn.user.api.DeptFeignClient;
+//import com.njcn.user.api.DeptFeignClient;
-import com.njcn.web.factory.PageFactory;
+//import com.njcn.web.factory.PageFactory;
-import com.njcn.web.pojo.param.BaseParam;
+//import com.njcn.web.pojo.param.BaseParam;
-import lombok.RequiredArgsConstructor;
+//import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+//import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
+//import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
+//import org.springframework.stereotype.Service;
-
+//
-import java.util.List;
+//import java.util.List;
-import java.util.Objects;
+//import java.util.Objects;
-
+//
-/**
+///**
- * @author yzh
+// * @author yzh
- * @date 2022/10/18
+// * @date 2022/10/18
- */
+// */
-@Slf4j
+//@Slf4j
-@Service
+//@Service
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
-public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, Generatrix> implements IPmsGeneratrixService {
+//public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, Generatrix> implements IPmsGeneratrixService {
-
+//
-    private final PmsGeneratrixMapper pmsGeneratrixMapper;
+//    private final PmsGeneratrixMapper pmsGeneratrixMapper;
-
+//
-    private final StatationStatMapper statationStatMapper;
+//    private final StatationStatMapper statationStatMapper;
-
+//
-    private final DeptFeignClient deptFeignClient;
+//    private final DeptFeignClient deptFeignClient;
-
+//
-    /**
+//    /**
-     * 获取母线信息
+//     * 获取母线信息
-     *
+//     *
-     * @param param 入参
+//     * @param param 入参
-     * @return 母线信息
+//     * @return 母线信息
-     */
+//     */
-    @Override
+//    @Override
-    public List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param) {
+//    public List<PmsGeneratrixDTO> getGeneratrixInfo(PmsGeneratrixParam param) {
-        if (CollUtil.isEmpty(param.getGeneratrixIds())) {
+//        if (CollUtil.isEmpty(param.getGeneratrixIds())) {
-            return null;
+//            return null;
-        }
+//        }
-        return pmsGeneratrixMapper.getGeneratrixInfo(param);
+//        return pmsGeneratrixMapper.getGeneratrixInfo(param);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public boolean addGeneratrix(GeneratrixParam generatrixParam) {
+//    public boolean addGeneratrix(GeneratrixParam generatrixParam) {
-        checkName(generatrixParam,false);
+//        checkName(generatrixParam,false);
-        StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
+//        StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
-        if(Objects.isNull(statationStat)){
+//        if(Objects.isNull(statationStat)){
-            throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
+//            throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
-        }
+//        }
-        Generatrix generatrix = new Generatrix();
+//        Generatrix generatrix = new Generatrix();
-        BeanUtils.copyProperties(generatrixParam, generatrix);
+//        BeanUtils.copyProperties(generatrixParam, generatrix);
-        generatrix.setStatationName(statationStat.getPowerName());
+//        generatrix.setStatationName(statationStat.getPowerName());
-        generatrix.setStatus(DataStateEnum.ENABLE.getCode());
+//        generatrix.setStatus(DataStateEnum.ENABLE.getCode());
-        return this.save(generatrix);
+//        return this.save(generatrix);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public boolean updateGeneratrix(GeneratrixParam generatrixParam) {
+//    public boolean updateGeneratrix(GeneratrixParam generatrixParam) {
-        checkName(generatrixParam,true);
+//        checkName(generatrixParam,true);
-        StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
+//        StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
-        if(Objects.isNull(statationStat)){
+//        if(Objects.isNull(statationStat)){
-            throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
+//            throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
-        }
+//        }
-        Generatrix generatrix = new Generatrix();
+//        Generatrix generatrix = new Generatrix();
-        BeanUtils.copyProperties(generatrixParam, generatrix);
+//        BeanUtils.copyProperties(generatrixParam, generatrix);
-        generatrix.setStatationName(statationStat.getPowerName());
+//        generatrix.setStatationName(statationStat.getPowerName());
-        return this.updateById(generatrix);
+//        return this.updateById(generatrix);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public boolean delGeneratrix(List<String> generatrixIds) {
+//    public boolean delGeneratrix(List<String> generatrixIds) {
-        return this.removeByIds(generatrixIds);
+//        return this.removeByIds(generatrixIds);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public Generatrix getGeneratrixById(String generatrixId) {
+//    public Generatrix getGeneratrixById(String generatrixId) {
-        return this.getById(generatrixId);
+//        return this.getById(generatrixId);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public List<Generatrix> getGeneratrixList(PmsBaseParam pmsBaseParam) {
+//    public List<Generatrix> getGeneratrixList(PmsBaseParam pmsBaseParam) {
-        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){
+//        if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){
-            lambdaQueryWrapper.eq(Generatrix::getStatationId,pmsBaseParam.getStationId());
+//            lambdaQueryWrapper.eq(Generatrix::getStatationId,pmsBaseParam.getStationId());
-        }
+//        }
-        lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime);
+//        lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime);
-        return this.list(lambdaQueryWrapper);
+//        return this.list(lambdaQueryWrapper);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public Page<Generatrix> getGeneratrixPageList(BaseParam baseParam) {
+//    public Page<Generatrix> getGeneratrixPageList(BaseParam baseParam) {
-        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getGeneratrixName,baseParam.getSearchValue())
+//        lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getGeneratrixName,baseParam.getSearchValue())
-                .or(StrUtil.isNotBlank(baseParam.getSearchValue()))
+//                .or(StrUtil.isNotBlank(baseParam.getSearchValue()))
-                .like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getStatationName,baseParam.getSearchValue())
+//                .like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getStatationName,baseParam.getSearchValue())
-                .orderByAsc(Generatrix::getCreateTime);
+//                .orderByAsc(Generatrix::getCreateTime);
-        return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
+//        return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
-    }
+//    }
-
+//
-    /**
+//    /**
-     * 获取母线与电站关联信息
+//     * 获取母线与电站关联信息
-     *
+//     *
-     * @param param 条件参数
+//     * @param param 条件参数
-     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
+//     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>
-     * @author yzh
+//     * @author yzh
-     * @date 2022/11/3
+//     * @date 2022/11/3
-     */
+//     */
-    @Override
+//    @Override
-    public List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) {
+//    public List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) {
-        return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param);
+//        return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param);
-    }
+//    }
-
+//
-    /**
+//    /**
-     * @param param
+//     * @param param
-     * @Description: 普测计划页面调用根据条件查询母线信息
+//     * @Description: 普测计划页面调用根据条件查询母线信息
-     * @Param: [param]
+//     * @Param: [param]
-     * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+//     * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
-     * @Author: clam
+//     * @Author: clam
-     * @Date: 2022/12/5
+//     * @Date: 2022/12/5
-     */
+//     */
-    @Override
+//    @Override
-    public List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param) {
+//    public List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param) {
-
+//
-        List<String> data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( );
+//        List<String> data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( );
-
+//
-        return pmsGeneratrixMapper.getGeneratrixByCondition(data,param);
+//        return pmsGeneratrixMapper.getGeneratrixByCondition(data,param);
-    }
+//    }
-
+//
-
+//
-    private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){
+//    private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){
-
+//
-        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(Generatrix::getGeneratrixName,generatrixParam.getGeneratrixName())
+//        lambdaQueryWrapper.eq(Generatrix::getGeneratrixName,generatrixParam.getGeneratrixName())
-                .eq(Generatrix::getGeneratrixId,generatrixParam.getStatationId())
+//                .eq(Generatrix::getGeneratrixId,generatrixParam.getStatationId())
-                .eq(Generatrix::getStatus, DataStateEnum.ENABLE.getCode());
+//                .eq(Generatrix::getStatus, DataStateEnum.ENABLE.getCode());
-
+//
-        if(updateFlag){
+//        if(updateFlag){
-            //更新
+//            //更新
-            lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
+//            lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
-        }else {
+//        }else {
-            //新增校验
+//            //新增校验
-            LambdaQueryWrapper<Generatrix> lambdaQuery = new LambdaQueryWrapper<>();
+//            LambdaQueryWrapper<Generatrix> lambdaQuery = new LambdaQueryWrapper<>();
-            lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
+//            lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
-            int count = this.count(lambdaQuery);
+//            int count = this.count(lambdaQuery);
-            if(count>0){
+//            if(count>0){
-                throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME);
+//                throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME);
-            }
+//            }
-        }
+//        }
-        int count = this.count(lambdaQueryWrapper);
+//        int count = this.count(lambdaQueryWrapper);
-        if(count > 0){
+//        if(count > 0){
-            throw new BusinessException(PmsDeviceResponseEnum.GENERATRIX_NAME_REPEAT);
+//            throw new BusinessException(PmsDeviceResponseEnum.GENERATRIX_NAME_REPEAT);
-        }
+//        }
-    }
+//    }
-}
+//}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java

@@ -3,8 +3,6 @@ package com.njcn.device.pms.service.majornetwork.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.api.PmsGeneratrixClient;
 import com.njcn.device.pms.mapper.majornetwork.RStatBusbarHarmonicMapper;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
@@ -15,7 +13,6 @@ import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;
 import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
 import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;
 import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService;
-import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
 import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel
-public class AlarmParam {
+public class AlarmParam extends BaseParam{
 
     @NotBlank(message = "起始时间不可为空")
     @DateTimeStrValid
@@ -45,12 +45,4 @@ public class AlarmParam {
 
     @ApiModelProperty(name = "processTime",value = "处理时间")
     private String processTime;
-
-
-
-    @ApiModelProperty("页码")
-    private Integer pageNum;
-
-    @ApiModelProperty("页面尺寸")
-    private Integer pageSize;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java

@@ -0,0 +1,40 @@
+package com.njcn.device.pq.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.biz.enums.LineFlagEnum;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/20
+ */
+@Data
+public class LargeScreenParam implements Serializable {
+
+    @ApiModelProperty(name = "deptIndex", value = "部门索引", required = true)
+    @NotBlank(message = "部门索引不可为空")
+    private String deptIndex;
+
+    @ApiModelProperty("开始时间")
+    @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+    private String searchBeginTime;
+
+    @ApiModelProperty("结束时间")
+    @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+    private String searchEndTime;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java

@@ -0,0 +1,30 @@
+package com.njcn.device.pq.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/21
+ */
+@Data
+public class MonitoringPointScaleParam {
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty("部门名称")
+    private String name;
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private String index;
+    /**
+     * 监测点个数
+     */
+    @ApiModelProperty("监测点个数")
+    private int count;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MonitoringPointScaleVO.java

@@ -0,0 +1,35 @@
+package com.njcn.device.pq.pojo.vo;
+
+import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/21
+ */
+@Data
+public class MonitoringPointScaleVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 部门信息
+     */
+    @ApiModelProperty("部门信息")
+    private List<MonitoringPointScaleParam> param;
+    /**
+     * 监测点总个数
+     */
+    @ApiModelProperty("监测点总个数")
+    private String monitorTotalCount;
+    /**
+     * 监测点新增个数
+     */
+    @ApiModelProperty("监测点新增个数")
+    private String monitorAddCount;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 public class TerminalAlarmVO implements Serializable {
 
 
+    // 变电站
     private String subName;
 
     private String lineGrade;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java

@@ -1,23 +1,62 @@
 package com.njcn.device.pq.controller;
 
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.pojo.param.LargeScreenParam;
+import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
+import com.njcn.device.pq.service.LargeScreenService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * pqs
+ * @version 1.0.0
- * 大屏接口终端服务
+ * @author: zbj
- * @author cdf
+ * @date: 2023/03/21
- * @date 2023/3/20
  */
 @Slf4j
-@Api(tags = "大屏-台账相关")
+@Api(tags = "大屏监测点规模")
 @RestController
-@RequestMapping("/screenTerminal")
+@RequestMapping("/largeScreen")
 @RequiredArgsConstructor
-public class LargeScreenController {
+public class LargeScreenController extends BaseController {
 
+    private final LargeScreenService largeScreenService;
 
-}
+    /**
+     * 监测点规模
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonitoringPointScale")
+    @ApiOperation("监测点规模(区域)")
+    @ApiImplicitParam(name = "largeScreenParam", value = "监测点规模(区域)", required = true)
+    public HttpResult<MonitoringPointScaleVO> getMonitoringPointScale(@RequestBody @Validated LargeScreenParam largeScreenParam) {
+        String methodDescribe = getMethodDescribe("getMonitoringPointScale");
+        MonitoringPointScaleVO result = largeScreenService.getMonitoringPointScale(largeScreenParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    /**
+     * 监测点规模
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLoadType")
+    @ApiOperation("监测点规模(负荷类型)")
+    @ApiImplicitParam(name = "getLoadType", value = "监测点规模(负荷类型)", required = true)
+    public HttpResult<MonitoringPointScaleVO> getLoadType(@RequestBody @Validated LargeScreenParam largeScreenParam) {
+        String methodDescribe = getMethodDescribe("getLoadType");
+        MonitoringPointScaleVO result = largeScreenService.getLoadType(largeScreenParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.device.pq.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/21
+ */
+public interface LargeScreenMapper {
+
+    Map<String, Object> getMonitorAddCount(@Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
+}

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

@@ -64,7 +64,7 @@ FROM
 			f.NAME type,
 		    f.id typeId,
 			f.`Level`,
-			max( a.Occurred_Time ) occurredTime,
+			max(a.Occurred_Time) occurredTime,
 			e.NAME subName,
 			b.NAME devLineName,
 			b.id devLineId,

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

@@ -0,0 +1,22 @@
+<?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.device.pq.mapper.LargeScreenMapper">
+
+    <!--查询监测点新增个数-->
+    <select id="getMonitorAddCount" resultType="java.util.Map">
+        select
+        count(1) as count
+        from pq_line pl
+        where
+        pl.id in
+        <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            and date_format(pl.Create_Time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and date_format(pl.Create_Time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+        </if>
+    </select>
+</mapper>

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

@@ -0,0 +1,17 @@
+package com.njcn.device.pq.service;
+
+import com.njcn.device.pq.pojo.param.LargeScreenParam;
+import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
+
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/21
+ */
+public interface LargeScreenService {
+
+    MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam);
+
+    MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam);
+}

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

@@ -0,0 +1,107 @@
+package com.njcn.device.pq.service.impl;
+
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.pq.mapper.LargeScreenMapper;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.LargeScreenParam;
+import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam;
+import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
+import com.njcn.device.pq.service.LargeScreenService;
+
+import com.njcn.system.pojo.enums.StatisticsEnum;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/03/21
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class LargeScreenServiceImpl implements LargeScreenService {
+
+    private final GeneralDeviceService generalDeviceService;
+
+    private final LargeScreenMapper largeScreenMapper;
+
+    /**
+     * 监测点规模(区域)
+     */
+    @Override
+    public MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam) {
+        //创建返回VO
+        MonitoringPointScaleVO result = new MonitoringPointScaleVO();
+        ArrayList<MonitoringPointScaleParam> list = new ArrayList<>();
+        DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
+        //部门索引
+        deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
+        //统计类型
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK));
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //添加时间
+        deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
+        deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
+        // 获取所有数据
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
+
+        for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
+            MonitoringPointScaleParam param = new MonitoringPointScaleParam();
+            param.setIndex(generalDeviceDTO.getIndex());
+            param.setName(generalDeviceDTO.getName());
+            param.setCount(generalDeviceDTO.getLineIndexes().size());
+            list.add(param);
+        }
+        result.setParam(list);
+        //所有监测点id
+        List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
+        Map<String, Object> count = largeScreenMapper.getMonitorAddCount(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
+        result.setMonitorTotalCount(String.valueOf(lineIds.size()));
+        result.setMonitorAddCount(count.get("count").toString());
+        return result;
+    }
+
+    /**
+     * 监测点规模(负荷类型)
+     */
+    @Override
+    public MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam) {
+        //创建返回VO
+        MonitoringPointScaleVO result = new MonitoringPointScaleVO();
+        ArrayList<MonitoringPointScaleParam> list = new ArrayList<>();
+        DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
+        //部门索引
+        deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
+        //统计类型
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setCode(String.valueOf(StatisticsEnum.LOAD_TYPE));
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //添加时间
+        deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
+        deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
+        // 获取所有数据
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
+
+        for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
+            MonitoringPointScaleParam param = new MonitoringPointScaleParam();
+            param.setIndex(generalDeviceDTO.getIndex());
+            param.setName(generalDeviceDTO.getName());
+            param.setCount(generalDeviceDTO.getLineIndexes().size());
+            list.add(param);
+        }
+        result.setParam(list);
+        return result;
+    }
+
+}

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

@@ -401,12 +401,6 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             if (CollectionUtils.isEmpty(deviceIndexes)) {
                 continue;
             }
-            // 监测点流量统计
-//            deviceList = lineMapper.getNewDeviceRunStatistics(lineIndexes,
-//                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
-//                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())),
-//                    (deviceInfoParam.getPageNum()-1)*deviceInfoParam.getPageSize(),
-//                    deviceInfoParam.getPageSize());
 
             page = lineMapper.getNewDeviceRunStatistics(
                     new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),

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

@@ -29,19 +29,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
     @Override
     public Page<TerminalAlarmVO> alarmList(AlarmParam alarmParam) {
 
-        String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type  FROM pqs_alarm  group by type,line_id,dev_line_type";
+       // String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type  FROM pqs_alarm  group by type,line_id,dev_line_type";
-
+        Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
-
+        return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
-
-
-
-
-
-
-
-        //Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
-        //return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
-        return null;
     }
 
     @Override

pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwEventMonitorReportServiceImpl.java

@@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -60,7 +61,7 @@ public class PwEventMonitorReportServiceImpl implements PwEventMonitorReportServ
         //查询监测点信息
         List<PwPmsMonitorDTO> monitorList = this.getMonitorList(eventMonitorReportParam);
         List<String> monitorIdList = monitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //监测点id信息
-        Map<String, PwPmsMonitorDTO> monitorMap = monitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor));
+        Map<String, PwPmsMonitorDTO> monitorMap = monitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(kye1,key2)->kye1));
 
         //获取电压等级的字典
         List<DictData> voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();

pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java

@@ -18,7 +18,9 @@ public enum ProcessResponseEnum {
     PROCESS_COMMON_ERROR("A00550","监督管理模块异常"),
     ARCHIVE_ERROR("A00552","不满足归档调节，操作失败！"),
     PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"),
-
+    QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
+    ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
+    THERE_IS_ONLY_ONE_STRATEGY("A00556","自动策略或手动策略，通用策略只能有一条!"),
     ;
 
     private final String code;

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java

@@ -28,6 +28,10 @@ public class ExcessiveParam extends IssuesParam {
     @NotNull(message = "监测点ID不可为空")
     private String measurementPointId;
 
+    @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
+    @NotNull(message = "监测点ID不可为空")
+    private String measurementPointName;
+
     @ApiModelProperty(name = "warnLastTime",value = "告警持续时间")
     @NotNull(message = "告警持续时间不可为空")
     private String warnLastTime;

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java

@@ -0,0 +1,37 @@
+package com.njcn.process.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * <策略监测点绑定>
+ *
+ * @author wr
+ * @createTime: 2023-03-22
+ */
+
+@Data
+public class MonitorParam {
+
+    @ApiModelProperty(value = "单位id")
+    @NotBlank(message = "单位id不能为空")
+    private String deptId;
+
+    @ApiModelProperty(value = "类型 0.预警策略 1.告警策略")
+    @NotEmpty(message = "类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty(value = "预警策略/告警策略id")
+    @NotEmpty(message = "策略id集合不能为空")
+    private List<String> alarmId;
+
+    @ApiModelProperty(value = "监测点id")
+    @NotEmpty(message = "监测点id集合不能为空")
+    private List<String> monitorId;
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java

@@ -37,7 +37,7 @@ public class StrategyParam {
         private String name;
 
         @ApiModelProperty("等级（0：一级；1：二级；2：三级）")
-        private String grade;
+        private Integer grade;
 
         @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
         private Integer type;
@@ -57,6 +57,10 @@ public class StrategyParam {
         @NotNull(message = "等级不能为空")
         private Integer grade;
 
+        @ApiModelProperty(value = "0.通用策略  1.定值策略")
+        @NotNull(message = "策略选择不能为空")
+        private Integer bigType;
+
         @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
         @NotNull(message = "区分类别不能为空")
         private Integer type;
@@ -71,7 +75,7 @@ public class StrategyParam {
         private String id;
 
         @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
-        @TableField("Operation")
+        @NotNull(message = "id不能为空")
         private Integer operation;
 
         @ApiModelProperty(value = "监测点标签")
@@ -84,7 +88,23 @@ public class StrategyParam {
     }
 
     @Data
-    public static class StrategyUpdateParam {
+    public static class StrategyUpdateParam extends  StrategyUpParam{
+
+        @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
+        private Integer operation;
+
+        @ApiModelProperty(value = "监测点标签")
+        @NotBlank(message = "监测点标签不能为空")
+        private List<String> monitorTag;
+
+        @ApiModelProperty(value = "指标类型")
+        @NotEmpty(message = "指标类型集合不能为空")
+        private List<String> indicatorTypes;
+
+    }
+
+    @Data
+    public static class StrategyUpParam {
         @ApiModelProperty(value = "预警单id")
         private String id;
 
@@ -92,22 +112,14 @@ public class StrategyParam {
         @NotBlank(message = "名称不能为空")
         private String name;
 
+        @ApiModelProperty(value = "0.通用策略  1.定值策略")
+        @NotNull(message = "策略选择不能为空")
+        private Integer bigType;
+
         @ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）")
         @NotNull(message = "等级不能为空")
         private Integer grade;
 
-        @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
-        @TableField("Operation")
-        private Integer operation;
-
-        @ApiModelProperty(value = "监测点标签")
-        @NotBlank(message = "监测点标签不能为空")
-        private String monitorTag;
-
-        @ApiModelProperty(value = "指标类型")
-        @NotEmpty(message = "指标类型集合不能为空")
-        private List<String> indicatorTypes;
-
     }
 
     @Data
@@ -116,7 +128,7 @@ public class StrategyParam {
         @NotBlank(message = "id不能为空")
         private String id;
 
-        @ApiModelProperty(value = "0.删除 1.正常")
+        @ApiModelProperty(value = "0.删除 1.启用 2.关闭")
         private Integer state;
 
     }
@@ -130,23 +142,22 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("变电站信息")
+//        @ApiModelProperty("变电站信息")
-        private List<Power> childPower;
+//        private List<Power> childPower;
 
         @ApiModelProperty("子节点详细信息")
-        private List<MonitorTree> children;
+        private List<?> children;
     }
 
     @Data
-    public static class Power {
+    public static class Monitor {
         @ApiModelProperty("id")
         private String id;
 
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("监测点信息")
+        @ApiModelProperty("标识")
-        private List<Power> childMonitor;
+        private Integer leven=3;
     }
-
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java

@@ -128,4 +128,7 @@ public class RGeneralSurveyPlanPO {
     @TableField(value = "upload_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
+    @TableField(value = "create_person")
+    private  String createPerson;
+
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java

@@ -45,6 +45,11 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable {
      */
     private String measurementPointId;
 
+    /**
+     * 监测点ID
+     */
+    private String measurementPointName;
+
     /**
      * 操作时间
      */

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java

@@ -1,6 +1,9 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+
 import com.njcn.db.bo.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,10 +44,14 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
     @TableField("Operation")
     private Integer operation;
 
+    @ApiModelProperty(value = "0.通用策略  1.定值策略")
+    @TableField("Big_Type")
+    private Integer bigType;
+
     @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
     private Integer type;
 
-    @ApiModelProperty(value = "0.删除 1.正常")
+    @ApiModelProperty(value = "0.删除 1.启用 2.关闭")
     @TableField("State")
     @TableLogic(value = "1",delval = "0")
     private Integer state;
@@ -54,11 +61,6 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
 
     @TableField("Update_By")
     private String updateBy;
-    /**
-     * 0.通用策略  1.定值策略
-     */
-    @TableField("Big_Type")
-    private String bigType;
 
 
 }

pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java

@@ -158,7 +158,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlan");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()),"1");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
@@ -169,7 +169,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlanAudit");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()),"2");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
@@ -191,7 +191,7 @@ public class RGeneralSurveyPlanController extends BaseController {
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlanResult");
 
-        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()));
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()),"3");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 

pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java

@@ -8,8 +8,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.process.pojo.param.MonitorParam;
 import com.njcn.process.pojo.param.StrategyParam;
-import com.njcn.process.pojo.po.ThsDeptAlarm;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import com.njcn.process.service.ThsWarnStrategyService;
 import com.njcn.web.controller.BaseController;
@@ -40,7 +40,7 @@ public class ThsWarnStrategyController extends BaseController {
     private final ThsWarnStrategyService thsWarnStrategyService;
 
     @PostMapping("/getStrategyPage")
-    @ApiOperation("预警单/告警单策略分页查询")
+    @ApiOperation("分页查询")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     public HttpResult<Page<ThsWarnStrategy>> getStrategyPage(@RequestBody @Validated StrategyParam.StrategyPageParam param) {
         String methodDescribe = getMethodDescribe("getStrategyPage");
@@ -49,7 +49,7 @@ public class ThsWarnStrategyController extends BaseController {
     }
 
     @PostMapping("/insertStrategy")
-    @ApiOperation(value = "预警单/告警单单条新增")
+    @ApiOperation(value = "数据添加")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     public HttpResult<Boolean> insertStrategy(@RequestBody @Validated StrategyParam.StrategyInsertParam param) {
         String methodDescribe = getMethodDescribe("insertStrategy");
@@ -58,7 +58,7 @@ public class ThsWarnStrategyController extends BaseController {
     }
 
     @PostMapping("/bindStrategy")
-    @ApiOperation(value = "预警单/告警单信息绑定")
+    @ApiOperation(value = "信息绑定")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     public HttpResult<Boolean> bindStrategy(@RequestBody @Validated StrategyParam.BindParam param) {
         String methodDescribe = getMethodDescribe("bindStrategy");
@@ -67,7 +67,7 @@ public class ThsWarnStrategyController extends BaseController {
     }
 
     @PostMapping("/getUpdateStrategy")
-    @ApiOperation(value = "预警单/告警单修改详细查询")
+    @ApiOperation(value = "详细查询")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     public HttpResult<StrategyParam.StrategyUpdateParam> getUpdateStrategy(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("getUpdateStrategy");
@@ -76,16 +76,16 @@ public class ThsWarnStrategyController extends BaseController {
     }
 
     @PostMapping("/updateStrategy")
-    @ApiOperation(value = "预警单/告警单修改")
+    @ApiOperation(value = "信息修改")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
-    public HttpResult<Boolean> updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpdateParam param) {
+    public HttpResult<Boolean> updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpParam param) {
         String methodDescribe = getMethodDescribe("updateStrategy");
         Boolean flag = thsWarnStrategyService.updateStrategy(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
     @PostMapping("/updateStrategyState")
-    @ApiOperation(value = "预警单/告警单修改状态")
+    @ApiOperation(value = "修改状态")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     public HttpResult<Boolean> updateStrategyState(@RequestBody @Validated StrategyParam.StrategyStateParam param) {
         String methodDescribe = getMethodDescribe("updateStrategyState");
@@ -93,28 +93,36 @@ public class ThsWarnStrategyController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
-    @PostMapping("/getMonitor")
+    @GetMapping("/getMonitor")
     @ApiOperation(value = "监测点查询接口")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("monitorTag") String monitorTag, @Param("orgId") String orgId) {
+    public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("orgId") String orgId) {
         String methodDescribe = getMethodDescribe("getMonitor");
-        List<StrategyParam.MonitorTree> monitor = thsWarnStrategyService.getMonitor(monitorTag, orgId);
+        List<StrategyParam.MonitorTree> monitor = thsWarnStrategyService.getMonitor( orgId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
     }
 
     @PostMapping("/bindMonitor")
-    @ApiOperation(value = "预警单/告警单监测点绑定")
+    @ApiOperation(value = "监测点绑定")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-    public HttpResult<Boolean> bindMonitor(@RequestBody List<ThsDeptAlarm> param) {
+    public HttpResult<Boolean> bindMonitor(@RequestBody MonitorParam param) {
         String methodDescribe = getMethodDescribe("bindMonitor");
         Boolean flag = thsWarnStrategyService.bindMonitor(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
+    @GetMapping("/echoMonitor")
+    @ApiOperation(value = "监测点回显")
+    public HttpResult<List<String>> echoMonitor(@Param("deptId") String deptId,@Param("type") Integer type) {
+        String methodDescribe = getMethodDescribe("echoMonitor");
+        List<String> strings = thsWarnStrategyService.echoMonitor(deptId, type);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, strings, methodDescribe);
+    }
+
     @PostMapping("/delStrategy")
-    @ApiOperation(value = "预警单/告警单信息删除")
+    @ApiOperation(value = "信息删除")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-    public HttpResult<Boolean> bindStrategy(@RequestBody List<String> ids) {
+    public HttpResult<Boolean> delStrategy(String ids) {
         String methodDescribe = getMethodDescribe("delStrategy");
         Boolean flag = thsWarnStrategyService.delStrategy(ids);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java

@@ -37,6 +37,15 @@ public interface ThsWarnStrategyMapper extends BaseMapper<ThsWarnStrategy> {
      */
     List<String> getStrategyDetail(@Param("id") String id);
 
+    /***
+     * 获取监测点标签id
+     * @author wr
+     * @date 2023-03-10 13:46
+     * @param id
+     * @return List<String>
+     */
+    List<String> getMonitorTagDetail(@Param("id") String id);
+
     /**
      * 查询所有部门的策略列表
      *

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml

@@ -21,7 +21,11 @@
         <result column="Name" property="name" />
         <result column="Grade" property="grade" />
         <result column="Operation" property="operation" />
-        <result column="monitorTag" property="monitorTag" />
+        <collection
+                property="monitorTag"
+                column="{id = id}"
+                select="com.njcn.process.mapper.ThsWarnStrategyMapper.getMonitorTagDetail">
+        </collection>
         <collection
                 property="indicatorTypes"
                 column="{id = id}"
@@ -33,12 +37,9 @@
             ts.Id AS id,
             ts.NAME AS NAME,
             ts.Grade AS grade,
-            ts.Operation AS operation,
+            ts.Operation AS operation
-            ta.Ass_Id AS monitorTag
         FROM
             ths_warn_strategy ts
-            INNER JOIN ths_warn_strategy_ass ta ON ts.Id = ta.Warn_Id
-            AND ta.Type = 0
         WHERE
             id = #{id}
     </select>
@@ -67,5 +68,13 @@
         tws.State = 1 and tws.Grade in(0,2)
     </select>
 
+    <select id="getMonitorTagDetail" resultType="java.lang.String">
+          SELECT
+                Ass_Id
+            FROM
+                ths_warn_strategy_ass ts
+            WHERE
+                Warn_Id = #{id} and ts.Type=0
+    </select>
 
 </mapper>

pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java

@@ -37,7 +37,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
         * @Author: clam
         * @Date: 2022/11/15
         */
-        IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List<String> statusList);
+        IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List<String> statusList,String type);
     /** 
     * @Description: surveyResultUpload 
     * @Param: [surveyResultUploadParam] 

pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java

@@ -1,8 +1,8 @@
 package com.njcn.process.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.process.pojo.param.MonitorParam;
 import com.njcn.process.pojo.param.StrategyParam;
-import com.njcn.process.pojo.po.ThsDeptAlarm;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -63,7 +63,7 @@ public interface ThsWarnStrategyService extends IService<ThsWarnStrategy> {
      * @param param
      * @return Boolean
      */
-    Boolean updateStrategy(StrategyParam.StrategyUpdateParam param);
+    Boolean updateStrategy(StrategyParam.StrategyUpParam param);
 
     /***
      * 预警单/告警单修改状态
@@ -74,14 +74,14 @@ public interface ThsWarnStrategyService extends IService<ThsWarnStrategy> {
      */
     Boolean updateStrategyState(StrategyParam.StrategyStateParam param);
 
-    /***
+   /***
-     * 监测点查询接口
+    * 监测点查询接口
-     * @author wr
+    * @author wr
-     * @date 2023-03-10 14:52
+    * @date 2023-03-22 17:38
-     * @param monitorTag
+    * @param orgId
-     * @return List<PmsMonitorInfoDTO>
+    * @return List<MonitorTree>
-     */
+    */
-    List<StrategyParam.MonitorTree> getMonitor(String monitorTag, String orgId);
+    List<StrategyParam.MonitorTree> getMonitor( String orgId);
 
 
     /***
@@ -91,8 +91,17 @@ public interface ThsWarnStrategyService extends IService<ThsWarnStrategy> {
      * @param param
      * @return Boolean
      */
-    Boolean bindMonitor(List<ThsDeptAlarm> param);
+    Boolean bindMonitor(MonitorParam param);
 
+    /***
+     * 监测点回显
+     * @author wr
+     * @date 2023-03-22 10:44
+     * @param org
+     * @param type
+     * @return List<ThsDeptAlarm>
+     */
+    List<String> echoMonitor(String org,Integer type);
 
     /***
      * 预警单/告警单删除
@@ -101,5 +110,5 @@ public interface ThsWarnStrategyService extends IService<ThsWarnStrategy> {
      * @param ids
      * @return Boolean
      */
-    Boolean delStrategy(List<String> ids);
+    Boolean delStrategy(String ids);
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java

@@ -122,7 +122,7 @@ public class IssuesServiceImpl implements IssuesService {
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public void addExcessiveIssues(ExcessiveParam excessiveParam) {
+    public void   addExcessiveIssues(ExcessiveParam excessiveParam) {
         IssuesParam issuesParam = new IssuesParam();
         BeanUtil.copyProperties(excessiveParam, issuesParam);
         String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam);
@@ -284,9 +284,12 @@ public class IssuesServiceImpl implements IssuesService {
         ExcessiveDetailVO detail = new ExcessiveDetailVO();
         BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo), detail);
         detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName());
+
+
         LambdaQueryWrapper<RMpOnlineMonitorOverproofProblem> excessiveQuery = new LambdaQueryWrapper<>();
         excessiveQuery.eq(RMpOnlineMonitorOverproofProblem::getPowerQualityProblemNo, powerQualityProblemNo);
         RMpOnlineMonitorOverproofProblem excessiveOut = excessiveMapper.selectOne(excessiveQuery);
+
         BeanUtil.copyProperties(excessiveOut, detail);
         RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo);
         BeanUtil.copyProperties(processFlowDetail(flowDetails), detail);
@@ -484,7 +487,7 @@ public class IssuesServiceImpl implements IssuesService {
      */
     @Override
     public String uploadFile(MultipartFile issuesFile) {
-        return fileStorageUtil.uploadMultipart(issuesFile, OssPath.ELECTRICITY_QUALITY);
+        return fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(issuesFile, OssPath.ELECTRICITY_QUALITY));
     }
 
     /**
@@ -661,6 +664,7 @@ public class IssuesServiceImpl implements IssuesService {
                         toMap(PvTerminalTreeVO::getId,
                                 PvTerminalTreeVO::getName));
         List<RStatElectricQualityProblemLogVO> rStatElectricQualityProblemLogVOList = rStatElectricQualityProblemLogMapper.selectByProblemNo(powerQualityProblemNo);
+
         rStatElectricQualityProblemLogVOList.stream ().forEach (temp->temp.setOrgName (pvTerminalTreeVOMap.get (temp.getOrgName ())));
 
         return rStatElectricQualityProblemLogVOList;

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java

@@ -34,7 +34,9 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
+import com.njcn.web.utils.RequestUtil;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,7 +115,11 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         RSurveyCyclePO rSurveyCyclePO = rSurveyCycleMapper.selectOne (rSurveyCyclePOQueryWrapper);
 
         rGeneralSurveyPlanPO.setCycleId (rSurveyCyclePO.getId ( ));
-        boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
+        String deptIndex = RequestUtil.getDeptIndex ( );
+        Dept data = deptFeignClient.getDeptById (deptIndex).getData ( );
+        rGeneralSurveyPlanPO.setCheckPerson (data.getPid ());
+        rGeneralSurveyPlanPO.setCreatePerson (RequestUtil.getUserIndex ());
+         boolean b = this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO);
 
         QueryWrapper<RGeneralSurveyPlanDetail> queryWrapper = new QueryWrapper ( );
         queryWrapper.lambda ( ).eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ( ));
@@ -149,11 +155,18 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
      * @Date: 2022/11/15
      */
     @Override
-    public IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList) {
+    public IPage<RGeneralSurveyPlanVO> query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List<String> statusList,String type) {
         IPage<RGeneralSurveyPlanPO> page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
         IPage<RGeneralSurveyPlanVO> returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( ));
 
         LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ( );
+        /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/
+        if(type=="1"||type=="3"){
+            queryWrapper.eq (RGeneralSurveyPlanPO::getCreatePerson,RequestUtil.getUserIndex ());
+        }
+        if(type=="2"){
+            queryWrapper.eq (RGeneralSurveyPlanPO::getCheckPerson,RequestUtil.getDeptIndex ());
+        }
         if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ( ))) {
             List<String> data = deptFeignClient.getDepSonIdtByDeptId (rGeneralSurveyPlanQueryParm.getOrgNo ( )).getData ( );
 
@@ -382,7 +395,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         UpdateWrapper<RGeneralSurveyPlanPO> updateWrapper = new UpdateWrapper ( );
         updateWrapper.eq ("plan_no", rGeneralSurveyPlanChcekParm.getPlanNo ( ));
         updateWrapper.set ("check_comment", rGeneralSurveyPlanChcekParm.getCheckComment ( ));
-        updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( ));
+//        updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( ));
         updateWrapper.set ("status", Objects.equals ("1", rGeneralSurveyPlanChcekParm.getCheckResult ( )) ? 3 : 2);
         result = this.update (updateWrapper);
         return result;

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java

@@ -1,19 +1,20 @@
 package com.njcn.process.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.process.enums.ProcessResponseEnum;
+import com.njcn.process.pojo.param.MonitorParam;
 import com.njcn.process.pojo.param.StrategyParam;
-import com.njcn.process.pojo.po.PmsTerminalDetection;
 import com.njcn.process.pojo.po.ThsDeptAlarm;
 import com.njcn.process.pojo.po.ThsWarnStrategy;
 import com.njcn.process.mapper.ThsWarnStrategyMapper;
@@ -27,6 +28,7 @@ import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -54,32 +56,47 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
                 , new LambdaQueryWrapper<ThsWarnStrategy>()
                         .like(StrUtil.isNotBlank(param.getName()), ThsWarnStrategy::getName, param.getName())
                         .eq(param.getGrade() != null, ThsWarnStrategy::getGrade, param.getGrade())
-                        .le(param.getType() != null, ThsWarnStrategy::getType, param.getType())
+                        .eq(param.getType() != null, ThsWarnStrategy::getType, param.getType())
+                        .ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode())
 
         );
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public Boolean insertStrategy(StrategyParam.StrategyInsertParam param) {
-        int count = this.count(new LambdaQueryWrapper<ThsWarnStrategy>()
+        ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>()
                 .eq(ThsWarnStrategy::getName, param.getName())
+                .or(wrapper ->
+                        wrapper.eq(ThsWarnStrategy::getGrade, param.getGrade())
+                                .eq(ThsWarnStrategy::getBigType, 0)
+                )
         );
-        if (count > 0) {
+
-            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+        if (ObjectUtil.isNotNull(one)) {
+            if(one.getName().equals(param.getName())){
+                throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+            }
+            throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY);
         }
         ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class);
-        thsWarnStrategy.setCreateBy(RequestUtil.getLoginName());
+        thsWarnStrategy.setCreateBy(RequestUtil.getUserNickname());
-        thsWarnStrategy.setState(1);
+        thsWarnStrategy.setState(2);
+        thsWarnStrategy.setBigType(param.getBigType());
         return this.save(thsWarnStrategy);
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public Boolean bindStrategy(StrategyParam.BindParam param) {
         List<ThsWarnStrategyAss> assList = new ArrayList<>();
+        //删除之前绑定信息
+        thsWarnStrategyAssService.removeById(param.getId());
+
         //监测点标签绑定
-        add(assList,param.getId(),0,param.getMonitorTag());
+        add(assList, param.getId(), 0, param.getMonitorTag());
         //指标类型绑定
-        add(assList,param.getId(),1,param.getIndicatorTypes());
+        add(assList, param.getId(), 1, param.getIndicatorTypes());
 
         thsWarnStrategyAssService.saveBatch(assList);
         ThsWarnStrategy warnStrategy = new ThsWarnStrategy();
@@ -88,6 +105,120 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
         return this.updateById(warnStrategy);
 
     }
+
+    @Override
+    public StrategyParam.StrategyUpdateParam getUpdateStrategy(String id) {
+        return this.baseMapper.selectUpdateStrategy(id);
+    }
+
+    @Override
+    public Boolean updateStrategy(StrategyParam.StrategyUpParam param) {
+        ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>()
+                .ne(ThsWarnStrategy::getId, param.getId())
+                .and(wrapper ->
+                        wrapper.eq(ThsWarnStrategy::getName, param.getName())
+                )
+                .or(wrapper ->
+                        wrapper.eq( ThsWarnStrategy::getGrade, param.getGrade())
+                                .eq(ThsWarnStrategy::getBigType, 0)
+                )
+
+        );
+        if (ObjectUtil.isNotNull(one)) {
+            if(one.getName().equals(param.getName())){
+                throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+            }
+            throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY);
+        }
+        ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class);
+        thsWarnStrategy.setUpdateBy(RequestUtil.getUserNickname());
+        thsWarnStrategy.setBigType(param.getBigType());
+        return this.updateById(thsWarnStrategy);
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public Boolean updateStrategyState(StrategyParam.StrategyStateParam param) {
+        ThsWarnStrategy thsWarnStrategy = new ThsWarnStrategy();
+        thsWarnStrategy.setId(param.getId());
+        thsWarnStrategy.setState(param.getState());
+        return this.updateById(thsWarnStrategy);
+    }
+
+    @Override
+    public List<StrategyParam.MonitorTree> getMonitor(String orgId) {
+        PmsMonitorParam param = new PmsMonitorParam();
+        List<PmsMonitorDTO> data = monitorClient.getMonitorInfoListByCond(param).getData();
+        //获取部门结构
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(orgId, WebUtil.filterDeptType()).getData();
+
+        List<DeptDTO> deptDTOS = deptInfos.stream().filter(org -> org.getId().equals(orgId)).collect(Collectors.toList());
+        //递归监测点信息
+        List<StrategyParam.MonitorTree> monitorTrees = new ArrayList<>();
+        StrategyParam.MonitorTree tree = new StrategyParam.MonitorTree();
+        tree.setId(deptDTOS.get(0).getId());
+        tree.setName(deptDTOS.get(0).getName());
+        List<StrategyParam.MonitorTree> powers = getPowers(deptDTOS.get(0).getCode(), data);
+        powers.addAll(recursionSelectList(orgId, deptInfos, data));
+        tree.setChildren(powers);
+        monitorTrees.add(tree);
+        return monitorTrees;
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public Boolean bindMonitor(MonitorParam param) {
+        //删除之前数据(根据部门和策略类型)
+        LambdaQueryWrapper<ThsDeptAlarm> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ThsDeptAlarm::getDeptId, param.getDeptId());
+        lambdaQueryWrapper.eq(ThsDeptAlarm::getType, param.getType());
+        thsDeptAlarmService.remove(lambdaQueryWrapper);
+
+        //信息添加
+        List<ThsDeptAlarm> info=new ArrayList();
+        List<String> alarmIds= param.getAlarmId();
+        List<String> monitorIds= param.getMonitorId();
+        String deptId= param.getDeptId();
+        Integer type= param.getType();
+        //便利信息
+        ThsDeptAlarm alarm;
+        for (String s : alarmIds) {
+            for (String monitorId : monitorIds) {
+                alarm=new ThsDeptAlarm();
+                alarm.setDeptId(deptId);
+                alarm.setType(type);
+                alarm.setAlarmId(s);
+                alarm.setMonitorId(monitorId);
+                info.add(alarm);
+            }
+        }
+        return thsDeptAlarmService.saveBatch(info);
+    }
+
+    @Override
+    public List<String> echoMonitor(String org,Integer type) {
+        List<ThsDeptAlarm> list = thsDeptAlarmService.list(new LambdaQueryWrapper<ThsDeptAlarm>()
+                                    .eq(ThsDeptAlarm::getDeptId, org)
+                                    .eq(ThsDeptAlarm::getType, type)
+        );
+        return list.stream().map(ThsDeptAlarm::getMonitorId).distinct().collect(Collectors.toList());
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public Boolean delStrategy(String ids) {
+        Assert.isTrue(StrUtil.isNotBlank(ids), "id为空,不能删除");
+        ThsWarnStrategy byId = this.getById(ids);
+        if(ObjectUtil.isNull(byId)){
+            throw new BusinessException(ProcessResponseEnum.QUERY_IS_EMPTY);
+        }
+        if(byId.getState() == 1){
+            throw new BusinessException(ProcessResponseEnum.ENABLED_CANNOT_BE_DELETED);
+        }
+        thsWarnStrategyAssService.removeById(ids);
+        return this.removeById(ids);
+    }
+
     /***
      * 告警单 监测点标签或指标类型绑定
      * @author wr
@@ -97,8 +228,8 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
      * @param type 0:监测点标签 1：指标类型
      * @param ids 监测点标签集合 或 指标类型集合
      */
-    private void add( List<ThsWarnStrategyAss> assList,String id,Integer type,List<String> ids){
+    private void add(List<ThsWarnStrategyAss> assList, String id, Integer type, List<String> ids) {
-        ThsWarnStrategyAss ass ;
+        ThsWarnStrategyAss ass;
         for (String indicatorType : ids) {
             ass = new ThsWarnStrategyAss();
             ass.setWarnId(id);
@@ -107,54 +238,6 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
             assList.add(ass);
         }
     }
-    @Override
-    public StrategyParam.StrategyUpdateParam getUpdateStrategy(String id) {
-        return this.baseMapper.selectUpdateStrategy(id);
-    }
-
-    @Override
-    public Boolean updateStrategy(StrategyParam.StrategyUpdateParam param) {
-        ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>()
-                .ne(ThsWarnStrategy::getId, param.getId())
-                .and(wrapper ->
-                        wrapper.eq(ThsWarnStrategy::getName, param.getName())
-                )
-
-        );
-        if (ObjectUtil.isNotNull(one)) {
-            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
-        }
-        ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class);
-        return this.updateById(thsWarnStrategy);
-    }
-
-    @Override
-    public Boolean updateStrategyState(StrategyParam.StrategyStateParam param) {
-        ThsWarnStrategy thsWarnStrategy = new ThsWarnStrategy();
-        thsWarnStrategy.setId(param.getId());
-        thsWarnStrategy.setState(param.getState());
-        return this.updateById(thsWarnStrategy);
-    }
-
-    @Override
-    public List<StrategyParam.MonitorTree> getMonitor(String monitorTag, String orgId) {
-        PmsMonitorParam param = new PmsMonitorParam();
-        param.setMonitorTags(Arrays.asList(monitorTag));
-        List<PmsMonitorDTO> data = monitorClient.getMonitorInfoListByCond(param).getData();
-        //获取部门结构
-        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(orgId, WebUtil.filterDeptType()).getData();
-
-        List<DeptDTO> deptDTOS = deptInfos.stream().filter(org -> org.getId().equals(orgId)).collect(Collectors.toList());
-
-        List<StrategyParam.MonitorTree> monitorTrees = new ArrayList<>();
-        StrategyParam.MonitorTree tree = new StrategyParam.MonitorTree();
-        tree.setId(deptDTOS.get(0).getId());
-        tree.setName(deptDTOS.get(0).getName());
-        tree.setChildPower(getPowers(deptDTOS.get(0).getCode(), data));
-        tree.setChildren(recursionSelectList(orgId, deptInfos, data));
-        monitorTrees.add(tree);
-        return monitorTrees;
-    }
 
     /**
      * 递归生成监测点树
@@ -172,8 +255,9 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
                     StrategyParam.MonitorTree tree = new StrategyParam.MonitorTree();
                     tree.setId(customer.getId());
                     tree.setName(customer.getName());
-                    tree.setChildPower(getPowers(customer.getCode(), data));
+                    List<StrategyParam.MonitorTree> children = new ArrayList<>();
-                    List<StrategyParam.MonitorTree> children = recursionSelectList(customer.getId(), deptInfos, data);
+                    children.addAll(getPowers(customer.getCode(), data));
+                    children.addAll(recursionSelectList(customer.getId(), deptInfos, data));
                     tree.setChildren(children);
                     menuSelectList.add(tree);
                 }));
@@ -188,9 +272,9 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
      * @param data
      * @return List<Power>
      */
-    private static List<StrategyParam.Power> getPowers(String orgCode, List<PmsMonitorDTO> data) {
+    private static List<StrategyParam.MonitorTree> getPowers(String orgCode, List<PmsMonitorDTO> data) {
         //变电站信息初始化
-        List<StrategyParam.Power> powers = new ArrayList<>();
+        List<StrategyParam.MonitorTree> powers = new ArrayList<>();
         //获取监测点信息
         List<PmsMonitorDTO> monitorDTOS = data.stream().filter(dept -> dept.getOrgId().equals(orgCode)).collect(Collectors.toList());
         Map<String, List<PmsMonitorDTO>> collect = monitorDTOS.stream().collect(
@@ -198,32 +282,21 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
         //获取变电站和监测点信息
         collect.forEach((key, value) -> {
             String[] split = key.split("_");
-            StrategyParam.Power power = new StrategyParam.Power();
+            StrategyParam.MonitorTree power = new StrategyParam.MonitorTree();
             power.setId(split[0]);
-            power.setName(split[1]);
+            power.setName("变电站名称: "+split[1]);
             //监测点信息
-            List<StrategyParam.Power> monitors = new ArrayList();
+            List<StrategyParam.Monitor> monitors = new ArrayList();
             for (PmsMonitorDTO dto : value) {
-                StrategyParam.Power childMonitor = new StrategyParam.Power();
+                StrategyParam.Monitor childMonitor = new StrategyParam.Monitor();
                 childMonitor.setId(dto.getId());
-                childMonitor.setName(dto.getName());
+                childMonitor.setName("监测点名称: "+dto.getName());
                 monitors.add(childMonitor);
             }
-            power.setChildMonitor(monitors);
+            power.setChildren(monitors);
             powers.add(power);
         });
         return powers;
     }
 
-    @Override
-    public Boolean bindMonitor(List<ThsDeptAlarm> param) {
-        return thsDeptAlarmService.saveBatch(param);
-    }
-
-    @Override
-    public Boolean delStrategy(List<String> ids) {
-        Assert.isTrue(CollectionUtil.isNotEmpty(ids), "id为空,不能删除");
-        thsWarnStrategyAssService.removeByIds(ids);
-        return this.removeByIds(ids);
-    }
 }