feat(cs-device): 增加监测点列表查询接口及参数过滤功能

fix(device): 完善监测点相关接口与实体字段

- 在CsLinePO实体中新增monitorObj和govern字段
- 补充getLineByName和list接口，增强监测点查询能力

cs-device/cs-device-api/pom.xml

@@ -35,12 +35,6 @@
       <artifactId>common-microservice</artifactId>
       <version>${project.version}</version>
     </dependency>
-      <dependency>
-          <groupId>com.njcn</groupId>
-          <artifactId>cs-warn-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
-      </dependency>
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>user-api</artifactId>
@@ -59,6 +53,12 @@
           <artifactId>common-device-biz</artifactId>
           <version>1.0.0</version>
       </dependency>
+      <dependency>
+          <groupId>cn.afterturn</groupId>
+          <artifactId>easypoi-base</artifactId>
+          <version>4.4.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java

@@ -3,6 +3,7 @@ package com.njcn.csdevice.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.CsDeviceUserClientFallbackFactory;
+import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,4 +23,10 @@ public interface CsDeviceUserFeignClient {
 
     @PostMapping("/findUserById")
     HttpResult<List<String>> findUserById(@RequestParam("id") String id);
+
+    @PostMapping("/findDevByUserId")
+    HttpResult<List<String>> findDevByUserId(@RequestParam("id") String id);
+
+    @PostMapping("/channelDevByUserId")
+    HttpResult<List<String>> channelDevByUserId(@RequestBody UserDevParam param);
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java

@@ -1,18 +1,13 @@
 package com.njcn.csdevice.api;
 
-import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
-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.csdevice.api.fallback.CsLedgerFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.CsLedger;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -47,5 +42,15 @@ public interface CsLedgerFeignClient {
     @PostMapping("/getAllLedger")
     HttpResult<List<CsLedgerVO>> getAllLedger();
 
+    @PostMapping("/getInfoByIds")
+    HttpResult<List<DevDetailDTO>> getInfoByIds(@RequestBody @Validated List<String> list);
+
+    @PostMapping("/getDevInfoByEngineerIds")
+    @ApiOperation("根据工程获取设备信息")
+    HttpResult<List<DevDetailDTO>> getDevInfoByEngineerIds(@RequestBody @Validated List<String> list);
+
+    @PostMapping("/getEngineeringHaveDevs")
+    @ApiOperation("根据工程信息获取有设备的工程")
+    HttpResult<List<DevDetailDTO>> getEngineeringHaveDevs(@RequestBody @Validated List<String> list);
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.device.biz.pojo.po.Overlimit;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,4 +49,17 @@ public interface CsLineFeignClient {
 
     @PostMapping("/updateLineDataByList")
     HttpResult<String> updateDataByList(@RequestParam("list") List<String> list, @RequestParam("id") String id, @RequestParam("setId") String setId);
+
+    @PostMapping("/getLineByName")
+    HttpResult<List<CsLinePO>> getLineByName(@RequestParam("lineName") String lineName);
+
+    @PostMapping("/getAllLine")
+    HttpResult<List<String>> getAllLine();
+
+    @PostMapping("/getOverLimitDataByIds")
+    HttpResult<List<Overlimit>> getOverLimitData(@RequestBody List<String> ids);
+
+    @PostMapping("/list")
+    HttpResult<List<CsLinePO>> list(@RequestBody CsLinePO param);
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsTerminalReplyFeignClient.java

@@ -3,9 +3,12 @@ package com.njcn.csdevice.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.CsTerminalReplyClientFallbackFactory;
+import com.njcn.csdevice.param.IcdBzReplyParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author xy
@@ -15,6 +18,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface CsTerminalReplyFeignClient {
 
     @PostMapping("/updateData")
-    HttpResult<String> updateData(@RequestParam("id") String id,@RequestParam("state") Integer state,@RequestParam("deviceId") String deviceId);
+    @ApiOperation("更新推送结果")
+    HttpResult<String> updateData(@RequestBody @Validated IcdBzReplyParam param);
+
+
+    @PostMapping("/updateBzData")
+    @ApiOperation("更新补召推送结果")
+    HttpResult<String> updateBzData(@RequestBody @Validated IcdBzReplyParam param);
+
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/IcdFeignClient.java

@@ -0,0 +1,29 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.CsTerminalLogsClientFallbackFactory;
+import com.njcn.csdevice.api.fallback.IcdFallbackFactory;
+import com.njcn.csdevice.param.IcdBzParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/icd", fallbackFactory = IcdFallbackFactory.class,contextId = "icd")
+
+public interface IcdFeignClient {
+
+    @PostMapping("/bzEvent")
+    @ApiOperation("补召事件")
+    HttpResult<String> bzEvent(@RequestBody @Validated IcdBzParam param);
+
+    @PostMapping("/bzFile")
+    @ApiOperation("补召波形")
+    HttpResult<String> bzFile(@RequestBody @Validated IcdBzParam param);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
+import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,18 @@ public class CsDeviceUserClientFallbackFactory implements FallbackFactory<CsDevi
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<String>> findDevByUserId(String id) {
+                log.error("{}异常，降级处理，异常为：{}","根据用户Id查询设备集合",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<String>> channelDevByUserId(UserDevParam param) {
+                log.error("{}异常，降级处理，异常为：{}","根据用户Id解绑设备集合异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java

@@ -68,6 +68,24 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory<CsLed
                 log.error("{}异常，降级处理，异常为：{}","获取台账树所有数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<DevDetailDTO>> getInfoByIds(List<String> list) {
+                log.error("{}异常，降级处理，异常为：{}","根据设备集合查询工程，设备信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<DevDetailDTO>> getDevInfoByEngineerIds(List<String> list) {
+                log.error("{}异常，降级处理，异常为：{}","根据工程获取设备信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<DevDetailDTO>> getEngineeringHaveDevs(List<String> list) {
+                log.error("{}异常，降级处理，异常为：{}","根据工程获取设备信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.device.biz.pojo.po.Overlimit;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -86,6 +87,28 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
                 log.error("{}异常，降级处理，异常为：{}","根据装置集合修改监测点信息",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<String>> getAllLine() {
+                log.error("{}异常，降级处理，异常为：{}","获取所有监测点id",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<Overlimit>> getOverLimitData(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id集合获取国标限值异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+            @Override
+            public HttpResult<List<CsLinePO>> getLineByName(String lineName) {
+                log.error("{}异常，降级处理，异常为：{}","根据名称查询监测点异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+            @Override
+            public HttpResult<List<CsLinePO>> list(CsLinePO param) {
+                log.error("{}异常，降级处理，异常为：{}","查询监测点列表异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsTerminalReplyClientFallbackFactory.java

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.CsTerminalReplyFeignClient;
+import com.njcn.csdevice.param.IcdBzReplyParam;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -23,9 +24,16 @@ public class CsTerminalReplyClientFallbackFactory implements FallbackFactory<CsT
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new CsTerminalReplyFeignClient() {
+
             @Override
-            public HttpResult<String> updateData(String id, Integer state, String deviceId) {
-                log.error("{}异常，降级处理，异常为：{}","更新推送结果",cause.toString());
+            public HttpResult<String> updateData(IcdBzReplyParam param) {
+                log.error("{}异常，降级处理，异常为：{}","更新推送结果异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> updateBzData(IcdBzReplyParam param) {
+                log.error("{}异常，降级处理，异常为：{}","更新补召推送结果异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
         };

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/IcdFallbackFactory.java

@@ -0,0 +1,40 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.IcdFeignClient;
+import com.njcn.csdevice.param.IcdBzParam;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class IcdFallbackFactory implements FallbackFactory<IcdFeignClient> {
+    @Override
+    public IcdFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new IcdFeignClient() {
+            @Override
+            public HttpResult<String> bzEvent(IcdBzParam param) {
+                log.error("{}异常，降级处理，异常为：{}","定时补召事件异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> bzFile(IcdBzParam param) {
+                log.error("{}异常，降级处理，异常为：{}","定时补召波形异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java

@@ -58,7 +58,7 @@ public interface DataParam {
 
     String GOVERNANCE_SYSTEM = "治理系统";
 
-    String cldDev = "云前置设备";
+    String cldDev = "在线设备";
 
     String EvtParamPhase = "Evt_Param_Phase";
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/IcdBzParam.java

@@ -0,0 +1,24 @@
+package com.njcn.csdevice.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class IcdBzParam implements Serializable {
+
+    @ApiModelProperty("监测点集合")
+    private List<String> lineList;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/IcdBzReplyParam.java

@@ -0,0 +1,31 @@
+package com.njcn.csdevice.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class IcdBzReplyParam implements Serializable {
+
+    @ApiModelProperty("guid")
+    private String id;
+
+    @ApiModelProperty("状态")
+    private Integer state;
+
+    @ApiModelProperty("设备id")
+    private String deviceId;
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("响应码")
+    private Integer code;
+
+    @ApiModelProperty("响应消息")
+    private String msg;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/IcdNodeParam.java

@@ -0,0 +1,22 @@
+package com.njcn.csdevice.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class IcdNodeParam implements Serializable {
+
+    @ApiModelProperty("设备id")
+    private String id;
+
+    @ApiModelProperty("前置服务器id")
+    private String nodeId;
+
+    @ApiModelProperty("进程号")
+    private Integer processNo;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.Min;
+
 /**
  * 
  * Description:
@@ -53,21 +55,25 @@ public class CsLineParam extends BaseEntity {
     /**
      * PT一次变比
      */
+    @Min(value = 1, message = "PT一次变比必须大于等于1")
     private Double ptRatio;
 
     /**
      * PT二次变比
      */
+    @Min(value = 1, message = "PT二次变比必须大于等于1")
     private Double pt2Ratio;
 
     /**
      * CT一次变比
      */
+    @Min(value = 1, message = "CT一次变比必须大于等于1")
     private Double ctRatio;
 
     /**
      * CT二次变比
      */
+    @Min(value = 1, message = "CT二次变比必须大于等于1")
     private Double ct2Ratio;
 
     /**
@@ -99,4 +105,27 @@ public class CsLineParam extends BaseEntity {
      * 运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
      */
     private Integer runStatus;
+
+    /**
+     * 短路容量
+     */
+    private Integer shortCircuitCapacity;
+
+    /**
+     * 设备容量
+     */
+    private Integer devCapacity;
+
+    /**
+     * 基准容量
+     */
+    private Integer basicCapacity;
+
+    /**
+     * 协议容量
+     */
+    private Integer protocolCapacity;
+
+
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/UserDevParam.java

@@ -0,0 +1,18 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserDevParam implements Serializable {
+
+    @ApiModelProperty(value="用户id")
+    private String userId;
+
+    @ApiModelProperty(value="设备集合id")
+    private List<String> list;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java

@@ -122,4 +122,14 @@ public class CsLinePO  extends BaseEntity {
      */
     @TableField(value = "line_no")
     private Integer lineNo;
-}
+    /**
+     * 监测对象类型
+     */
+    @TableField(value = "monitor_obj")
+    private String monitorObj;
+    /**
+     * 是否治理(0:未治理 1:已治理)
+     */
+    @TableField(value = "is_govern")
+    private Integer govern;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTerminalLogs.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -34,6 +32,16 @@ public class CsTerminalLogs extends BaseEntity implements Serializable {
      */
     private String deviceId;
 
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
     /**
      * 前置服务器id
      */

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTerminalReply.java

@@ -48,14 +48,34 @@ public class CsTerminalReply extends BaseEntity implements Serializable {
     private Integer processNo;
 
     /**
-     * 设备id集合
+     * 设备id
      */
     private String deviceId;
 
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
     /**
      * 是否收到（0：未收到 1：收到）
      */
     private Integer isReceived;
 
+    /**
+     *  接收消息状态码
+     */
+    private Integer receivedCode;
+
+    /**
+     *  接收消息描述
+     */
+    private String receivedMsg;
+
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CldLogsVo.java

@@ -0,0 +1,42 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ * 日志信息
+ */
+@Data
+public class CldLogsVo implements Serializable {
+
+    @ApiModelProperty("工程名称")
+    private String engineeringName;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+    @ApiModelProperty("补召类型")
+    private String log;
+
+    @ApiModelProperty("补召时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime logTime;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("结果")
+    private String result;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java

@@ -1,7 +1,6 @@
 package com.njcn.csdevice.pojo.vo;
 
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

cs-device/cs-device-boot/pom.xml

@@ -88,11 +88,6 @@
         <artifactId>hutool-all</artifactId>
         <version>5.8.5</version>
       </dependency>
-      <dependency>
-          <groupId>com.njcn</groupId>
-          <artifactId>cs-warn-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
 
       <!-- zxing生成二维码 -->
       <dependency>
@@ -153,12 +148,21 @@
           <artifactId>access-api</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>com.njcn</groupId>
-          <artifactId>common-mq</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-mq</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.rocketmq</groupId>
+      <artifactId>rocketmq-spring-boot-starter</artifactId>
+      <version>2.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn.platform</groupId>
+      <artifactId>message-api</artifactId>
+      <version>1.0.0</version>
+    </dependency>
   </dependencies>
 
   <build>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java

@@ -12,7 +12,10 @@ import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.service.ICsGroupService;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
+import com.njcn.csharmonic.param.FittingDataQueryParam;
+import com.njcn.csharmonic.param.TrendDataQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
+import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -21,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -143,5 +147,26 @@ public class CsGroupController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/trendData")
+    @ApiOperation("查询指标趋势图数据")
+    @ApiImplicitParam(name = "param",required = true)
+    public HttpResult<List<ThdDataVO>> trendData(@RequestBody @Validated TrendDataQueryParam param){
+        String methodDescribe = getMethodDescribe("trendData");
+        List<ThdDataVO> list = csGroupService.trendData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/fittingData")
+    @ApiOperation("查询指标拟合图数据")
+    @ApiImplicitParam(name = "param",required = true)
+    public HttpResult<List<ThdDataVO>> fittingData(@RequestBody @Validated FittingDataQueryParam param){
+        String methodDescribe = getMethodDescribe("fittingData");
+        List<ThdDataVO> list = csGroupService.fittingData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.enums.DeviceOperate;
+import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
@@ -140,4 +141,24 @@ public class DeviceUserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/findDevByUserId")
+    @ApiOperation("根据用户Id查询设备集合")
+    @ApiImplicitParam(name = "id", value = "用户id", required = true)
+    public HttpResult<List<String>> findDevByUserId(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("findDevByUserId");
+        List<String> list = csDeviceUserPOService.findDevByUserId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/channelDevByUserId")
+    @ApiOperation("根据用户Id解绑设备集合")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<String>> channelDevByUserId(@RequestBody UserDevParam param){
+        String methodDescribe = getMethodDescribe("channelDevByUserId");
+        csDeviceUserPOService.channelDevByUserId(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java

@@ -2,6 +2,7 @@ package com.njcn.csdevice.controller.equipment;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -152,6 +153,9 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiImplicitParam(name = "ids", value = "设备id集合", required = true)
     public HttpResult<List<CsEquipmentDeliveryDTO>> queryEquipmentById(@RequestParam List<String> ids){
         String methodDescribe = getMethodDescribe("queryEquipmentById");
+        if (CollectionUtil.isEmpty(ids)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }
         List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.listByIds(ids);
         List<CsEquipmentDeliveryDTO> collect = csEquipmentDeliveryPOS.stream().map(temp -> {
             CsEquipmentDeliveryDTO csEquipmentDeliveryDTO = new CsEquipmentDeliveryDTO();
@@ -401,4 +405,14 @@ public class EquipmentDeliveryController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRunPortableDev")
+    @ApiOperation("获取用户未绑定的在运的便携式设备")
+    @ApiImplicitParam(name = "userId", value = "用户id", required = true)
+    public HttpResult<List<CsEquipmentDeliveryPO>> getRunPortableDev(@RequestParam("userId") String userId){
+        String methodDescribe = getMethodDescribe("getRunPortableDev");
+        List<CsEquipmentDeliveryPO> result = csEquipmentDeliveryService.getRunPortableDev(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/CsTerminalReplyController.java

@@ -1,23 +1,26 @@
 package com.njcn.csdevice.controller.icd;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.csdevice.param.IcdBzParam;
+import com.njcn.csdevice.param.IcdBzReplyParam;
+import com.njcn.csdevice.pojo.vo.CldLogsVo;
 import com.njcn.csdevice.service.ICsTerminalReplyService;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -51,14 +54,30 @@ public class CsTerminalReplyController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/updateData")
     @ApiOperation("更新推送结果")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "参数", required = true),
-            @ApiImplicitParam(name = "state", value = "状态", required = true),
-            @ApiImplicitParam(name = "deviceId", value = "设备id", required = true)
-    })
-    public HttpResult<String> updateData(@RequestParam String id,@RequestParam Integer state,@RequestParam String deviceId){
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> updateData(@RequestBody @Validated IcdBzReplyParam param){
         String methodDescribe = getMethodDescribe("updateData");
-        csTerminalReplyService.updateReplyData(id,state,deviceId);
+        csTerminalReplyService.updateReplyData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/bzLogs")
+    @ApiOperation("补召日志")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<Page<CldLogsVo>> bzLogs(@RequestBody @Validated BaseParam param){
+        String methodDescribe = getMethodDescribe("bzLogs");
+        Page<CldLogsVo> list = csTerminalReplyService.getBzLogs(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateBzData")
+    @ApiOperation("更新补召推送结果")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> updateBzData(@RequestBody @Validated IcdBzReplyParam param){
+        String methodDescribe = getMethodDescribe("updateBzData");
+        csTerminalReplyService.updateBzData(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/IcdController.java

@@ -5,12 +5,12 @@ 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.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.param.IcdLedgerParam;
 import com.njcn.csdevice.param.IcdParam;
 import com.njcn.csdevice.pojo.vo.CldLedgerVo;
 import com.njcn.csdevice.pojo.vo.DeviceInfo;
 import com.njcn.csdevice.service.IcdService;
-import com.njcn.mq.message.CldControlMessage;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -66,12 +66,32 @@ public class IcdController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/restartProcess")
-    @ApiOperation("重启前置机进程")
-    @ApiImplicitParam(name = "message", value = "message", required = true)
-    public HttpResult<String> restartProcess(@RequestBody CldControlMessage message){
-        String methodDescribe = getMethodDescribe("restartProcess");
-        icdService.restartProcess(message);
+    @PostMapping("/bzFileByEventId")
+    @ApiOperation("指定事件补召波形")
+    @ApiImplicitParam(name = "eventId", value = "事件id", required = true)
+    public HttpResult<String> bzFileByEventId(@RequestParam String eventId){
+        String methodDescribe = getMethodDescribe("bzFileByEventId");
+        icdService.bzFileByEventId(eventId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/bzEvent")
+    @ApiOperation("补召事件")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> bzEvent(@RequestBody @Validated IcdBzParam param){
+        String methodDescribe = getMethodDescribe("bzEvent");
+        icdService.bzEvent(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/bzFile")
+    @ApiOperation("补召波形")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> bzFile(@RequestBody @Validated IcdBzParam param){
+        String methodDescribe = getMethodDescribe("bzFile");
+        icdService.bzFile(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java

@@ -8,6 +8,7 @@ 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.csdevice.param.IcdNodeParam;
 import com.njcn.csdevice.pojo.param.NodeParam;
 import com.njcn.csdevice.pojo.po.Node;
 import com.njcn.csdevice.pojo.vo.NodeProcessDeviceVo;
@@ -174,5 +175,41 @@ public class NodeController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/restartProcess")
+    @ApiOperation("重启前置机进程")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nodeId", value = "前置服务器id", required = true),
+            @ApiImplicitParam(name = "processNo", value = "进程号", required = true)
+    })
+    public HttpResult<String> restartProcess(@RequestParam String nodeId,@RequestParam Integer processNo){
+        String methodDescribe = getMethodDescribe("restartProcess");
+        iNodeService.restartProcess(nodeId,processNo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateDevProcessNo")
+    @ApiOperation("更新设备进程号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "设备id", required = true),
+            @ApiImplicitParam(name = "processNo", value = "进程号", required = true)
+    })
+    public HttpResult<String> updateDevProcessNo(@RequestParam String id,@RequestParam Integer processNo){
+        String methodDescribe = getMethodDescribe("updateDevProcessNo");
+        String result = iNodeService.updateDevProcessNo(id,processNo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateDevNode")
+    @ApiOperation("更新设备前置信息")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> updateDevNode(@RequestBody IcdNodeParam param){
+        String methodDescribe = getMethodDescribe("updateDevNode");
+        String result = iNodeService.updateDevNode(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java

@@ -165,5 +165,35 @@ public class CsLedgerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getInfoByIds")
+    @ApiOperation("根据设备集合查询工程，设备信息")
+    @ApiImplicitParam(name = "list", value = "查询条件", required = true)
+    public HttpResult<List<DevDetailDTO>> getInfoByIds(@RequestBody @Validated List<String> list){
+        String methodDescribe = getMethodDescribe("getInfoByIds");
+        List<DevDetailDTO> details = csLedgerService.getInfoByIds(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, details, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDevInfoByEngineerIds")
+    @ApiOperation("根据工程获取设备信息")
+    @ApiImplicitParam(name = "list", value = "查询条件", required = true)
+    public HttpResult<List<DevDetailDTO>> getDevInfoByEngineerIds(@RequestBody @Validated List<String> list){
+        String methodDescribe = getMethodDescribe("getDevInfoByEngineerIds");
+        List<DevDetailDTO> details = csLedgerService.getDevInfoByEngineerIds(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, details, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEngineeringHaveDevs")
+    @ApiOperation("根据工程信息获取有设备的工程")
+    @ApiImplicitParam(name = "list", value = "查询条件", required = true)
+    public HttpResult<List<DevDetailDTO>> getEngineeringHaveDevs(@RequestBody @Validated List<String> list){
+        String methodDescribe = getMethodDescribe("getEngineeringHaveDevs");
+        List<DevDetailDTO> details = csLedgerService.getEngineeringHaveDevs(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, details, methodDescribe);
+    }
+
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.controller.line;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -136,12 +137,12 @@ public class CslineController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getOverLimitData")
-    @ApiOperation("根据监测点id获取国标限值")
-    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
-    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getOverLimitData");
-        Overlimit result = overlimitMapper.selectById(id);
+    @PostMapping("/getOverLimitDataByIds")
+    @ApiOperation("根据监测点id集合获取国标限值")
+    @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true)
+    public HttpResult<List<Overlimit>> getOverLimitData(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("getOverLimitDataByIds");
+        List<Overlimit> result = overlimitMapper.selectBatchIds(ids);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -220,4 +221,36 @@ public class CslineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllLine")
+    @ApiOperation("获取系统中所有监测点id")
+    public HttpResult<List<String>> getAllLine(){
+        String methodDescribe = getMethodDescribe("getAllLine");
+        List<String> list = csLinePOService.getAllLine();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLineByName")
+    @ApiOperation("根据名称获取监测点")
+    @ApiImplicitParam(name = "lineName", value = "监测点名称", required = true)
+    public HttpResult<List<CsLinePO>> getLineByName(@RequestParam("lineName") String lineName) {
+        String methodDescribe = getMethodDescribe("getLineByName");
+        List<CsLinePO> list = csLinePOService.getLineByName(lineName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("查询监测点列表")
+    @ApiImplicitParam(name = "param", value = "param", required = true)
+    public HttpResult<List<CsLinePO>> list(@RequestBody CsLinePO param) {
+        String methodDescribe = getMethodDescribe("list");
+        List<CsLinePO> list = csLinePOService.list(new LambdaQueryWrapper<CsLinePO>()
+                        .eq(StrUtil.isNotBlank(param.getPosition()), CsLinePO::getPosition, param.getPosition())
+                .orderByAsc(CsLinePO::getName));
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java

@@ -11,6 +11,7 @@ import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm;
 import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm;
 import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
 import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
 import com.njcn.csdevice.service.CsEngineeringService;
@@ -94,4 +95,14 @@ public class EngineeringController extends BaseController {
         CsEngineeringPO po = csEngineeringService.queryEngineeringById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getUnlinkedEngineering")
+    @ApiOperation("获取用户未绑定的工程信息")
+    @ApiImplicitParam(name = "userId", value = "用户id", required = true)
+    public HttpResult<List<CsEngineeringPO>> getUnlinkedEngineering(@RequestParam("userId") String userId){
+        String methodDescribe = getMethodDescribe("getUnlinkedEngineering");
+        List<CsEngineeringPO> result = csEngineeringService.getUnlinkedEngineering(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsTerminalReplyMapper.java

@@ -1,7 +1,11 @@
 package com.njcn.csdevice.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.csdevice.pojo.po.CsTerminalReply;
+import com.njcn.user.pojo.vo.RoleVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.njcn.csdevice.pojo.po.CsTerminalReply;
  */
 public interface CsTerminalReplyMapper extends BaseMapper<CsTerminalReply> {
 
+    Page<CsTerminalReply> page(@Param("page")Page<RoleVO> page, @Param("ew") QueryWrapper<CsTerminalReply> queryWrapper);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml

@@ -93,7 +93,7 @@
         from
             cs_equipment_delivery
         <where>
-            1=1
+            dev_access_method = 'MQTT'
             <if test="queryParam.process != null and queryParam.process !=''">
                 and process = #{queryParam.process}
             </if>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsTerminalReplyMapper.xml

@@ -0,0 +1,14 @@
+<?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.csdevice.mapper.CsTerminalReplyMapper">
+
+    <!--获取角色分页列表-->
+    <select id="page" resultType="CsTerminalReply">
+        select
+            cs_terminal_reply.*
+        from
+            cs_terminal_reply
+        WHERE ${ew.sqlSegment}
+    </select>
+
+</mapper>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java

@@ -1,6 +1,7 @@
 package com.njcn.csdevice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
@@ -48,4 +49,8 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
      * @return
      */
     List<String> findUserById(String devId);
+
+    List<String> findDevByUserId(String userId);
+
+    void channelDevByUserId(UserDevParam param);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java

@@ -57,4 +57,6 @@ public interface CsEngineeringService extends IService<CsEngineeringPO>{
     List<CsEngineeringPO> getEngineerings(List<String> list);
 
     CsEngineeringPO queryEngineeringById(String id);
+
+    List<CsEngineeringPO> getUnlinkedEngineering(String userId);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java

@@ -130,6 +130,12 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     List<CsEquipmentDeliveryPO> getAll();
 
+    /**
+     * 获取所有装置信息(投运且在线)
+     * @return
+     */
+    List<CsEquipmentDeliveryPO> getAllOnline();
+
     /**
      * 判断设备型号
      */
@@ -185,4 +191,8 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
 
     List<CsEquipmentDeliveryPO> getDataByNodeIdAndProcessNo(String nodeId, Integer processNo);
 
+    List<CsEquipmentDeliveryPO> getListByIds(List<String> devList);
+
+    List<CsEquipmentDeliveryPO> getRunPortableDev(String userId);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java

@@ -63,4 +63,13 @@ public interface CsLinePOService extends IService<CsLinePO>{
     void updateCldLineStatus(List<CsLinePO> lineList, Integer status);
 
     void updateLineDataByList(List<String> list, String id, String setId);
+
+    /**
+     * 根据名称获取监测点
+     * @param lineName
+     * @return
+     */
+    List<CsLinePO> getLineByName(String lineName);
+
+    List<String> getAllLine();
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java

@@ -7,10 +7,11 @@ import com.njcn.csdevice.pojo.po.CsGroup;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
+import com.njcn.csharmonic.param.FittingDataQueryParam;
+import com.njcn.csharmonic.param.TrendDataQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.vo.EleEpdPqdListVO;
 
 import java.util.List;
 
@@ -78,4 +79,16 @@ public interface ICsGroupService extends IService<CsGroup> {
      */
     void deleteGroup(String groupId);
 
+
+    /**
+     * 查询趋势数据
+     * @return
+     */
+    List<ThdDataVO> trendData(TrendDataQueryParam trendDataQueryParam);
+    /**
+     * 查询指标拟合图数据
+     * @return
+     */
+    List<ThdDataVO> fittingData(FittingDataQueryParam fittingDataQueryParam);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java

@@ -85,4 +85,11 @@ public interface ICsLedgerService extends IService<CsLedger> {
     List<CsLedgerVO> getProAndEngineer(List<String> id);
 
     CsLedgerVO cldTree();
+
+    List<DevDetailDTO> getInfoByIds(List<String> list);
+
+    List<DevDetailDTO> getDevInfoByEngineerIds(List<String> list);
+
+    List<DevDetailDTO> getEngineeringHaveDevs(List<String> list);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsTerminalReplyService.java

@@ -1,7 +1,13 @@
 package com.njcn.csdevice.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.param.IcdBzParam;
+import com.njcn.csdevice.param.IcdBzReplyParam;
 import com.njcn.csdevice.pojo.po.CsTerminalReply;
+import com.njcn.csdevice.pojo.vo.CldLogsVo;
+import com.njcn.web.pojo.param.BaseParam;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -17,6 +23,12 @@ public interface ICsTerminalReplyService extends IService<CsTerminalReply> {
 
     List<String> queryReplyData();
 
-    void updateReplyData(String id,Integer state,String deviceId);
+    void updateReplyData(IcdBzReplyParam param);
+
+    List<CsTerminalReply> getBzReplyData(String lineId);
+
+    Page<CldLogsVo> getBzLogs(BaseParam param);
+
+    void updateBzData(IcdBzReplyParam param);
 
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/INodeService.java

@@ -3,9 +3,11 @@ package com.njcn.csdevice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.param.IcdNodeParam;
 import com.njcn.csdevice.pojo.param.NodeParam;
 import com.njcn.csdevice.pojo.po.Node;
 import com.njcn.csdevice.pojo.vo.NodeProcessDeviceVo;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -79,4 +81,10 @@ public interface INodeService extends IService<Node> {
     Node getNodeByIp(String ip);
 
     NodeProcessDeviceVo getProcessNoAndDeviceById(String id);
+
+    void restartProcess(String nodeId, Integer processNo);
+
+    String updateDevProcessNo(String id, Integer processNo);
+
+    String updateDevNode(IcdNodeParam param);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IcdService.java

@@ -1,10 +1,10 @@
 package com.njcn.csdevice.service;
 
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.param.IcdLedgerParam;
 import com.njcn.csdevice.param.IcdParam;
 import com.njcn.csdevice.pojo.vo.CldLedgerVo;
 import com.njcn.csdevice.pojo.vo.DeviceInfo;
-import com.njcn.mq.message.CldControlMessage;
 
 import java.util.List;
 
@@ -16,6 +16,10 @@ public interface IcdService {
 
     CldLedgerVo getLedgerById(String id);
 
-    void restartProcess(CldControlMessage message);
+    void bzFileByEventId(String eventId);
+
+    void bzEvent(IcdBzParam param);
+
+    void bzFile(IcdBzParam param);
 
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -12,6 +11,7 @@ import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsDeviceUserPOMapper;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
 import com.njcn.csdevice.mapper.CsMarketDataMapper;
+import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
@@ -51,22 +51,17 @@ import static java.util.Objects.isNull;
 @Service
 @RequiredArgsConstructor
 public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper, CsDeviceUserPO> implements CsDeviceUserPOService{
-    private final CsDevModelRelationService csDevModelRelationService;
 
+    private final CsDevModelRelationService csDevModelRelationService;
     private final ICsLedgerService iCsLedgerService;
-//    private final CsEquipmentAlarmFeignClient csEquipmentAlarmFeignClient;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
     private final RoleEngineerDevService roleEngineerDevService;
-
     private final AppLineTopologyDiagramService appLineTopologyDiagramService;
-
     private final CsTouristDataPOService csTouristDataPOService;
-
     private final CsLinePOService csLinePOService;
     private final CsMarketDataMapper csMarketDataMapper;
     private final EventUserFeignClient eventUserFeignClient;
     private final UserFeignClient userFeignClient;
-
     private final FeedBackFeignClient feedBackFeignClient;
     private final IMqttUserService mqttUserService;
 
@@ -407,4 +402,22 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         }
         return result;
     }
+
+    @Override
+    public List<String> findDevByUserId(String userId) {
+        List<String> result = new ArrayList<>();
+        List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getPrimaryUserId,userId).list();
+        if (CollectionUtil.isNotEmpty(list)){
+            result = list.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    @Override
+    public void channelDevByUserId(UserDevParam param) {
+        LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId,param.getUserId())
+                .in(CsDeviceUserPO::getDeviceId,param.getList());
+        this.remove(queryWrapper);
+    }
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java

@@ -2,17 +2,20 @@ package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.Query;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.api.CsDeviceUserFeignClient;
+import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsEngineeringMapper;
 import com.njcn.csdevice.mapper.CsEngineeringUserMapper;
 import com.njcn.csdevice.mapper.CsLedgerMapper;
 import com.njcn.csdevice.mapper.CsMarketDataMapper;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
 import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm;
 import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm;
@@ -20,7 +23,6 @@ import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
 import com.njcn.csdevice.service.CsEngineeringService;
-import com.njcn.csdevice.service.CsMarketDataService;
 import com.njcn.csdevice.service.CsTouristDataPOService;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.AreaFeignClient;
@@ -34,10 +36,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -58,12 +58,10 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
     private final CsLedgerMapper csLedgerMapper;
     private final CsEngineeringUserMapper  csEngineeringUserMapper;
     private final RoleEngineerDevServiceImpl roleEngineerDevService;
-
     private final CsMarketDataMapper csMarketDataMapper;
     private final CsTouristDataPOService csTouristDataPOService;
-
-
-
+    private final CsLedgerFeignClient csLedgerFeignClient;
+    private final CsDeviceUserFeignClient csDeviceUserFeignClient;
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -222,6 +220,45 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         return this.lambdaQuery().eq(CsEngineeringPO::getId,id).eq(CsEngineeringPO::getStatus,"1").one();
     }
 
+    @Override
+    public List<CsEngineeringPO> getUnlinkedEngineering(String userId) {
+        List<CsEngineeringPO> result = new ArrayList<>();
+        List<String> list1 = new ArrayList<>();
+        //根据用户信息获取设备信息
+        List<String> devList = csDeviceUserFeignClient.findDevByUserId(userId).getData();
+        //根据设备查询工程信息
+        if (CollectionUtil.isNotEmpty(devList)) {
+            List<DevDetailDTO> ledger = csLedgerFeignClient.getInfoByIds(devList).getData();
+            ledger.forEach(item->{
+                if (!Objects.equals(item.getEngineeringid(),"/")) {
+                    list1.add(item.getEngineeringid());
+                }
+            });
+        }
+        //获取有设备的工程信息
+        LambdaQueryWrapper<CsEngineeringPO> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.eq(CsEngineeringPO::getStatus,"1");
+        if (CollectionUtil.isNotEmpty(list1)) {
+            queryWrapper2.notIn(CsEngineeringPO::getId,list1);
+        }
+        List<CsEngineeringPO> list = this.baseMapper.selectList(queryWrapper2);
+        //剔除没有设备的工程
+        if (CollectionUtil.isNotEmpty(list)) {
+            Map<String, CsEngineeringPO> map = list.stream().collect(Collectors.toMap(CsEngineeringPO::getId, Function.identity()));
+            List<String> list2 = list.stream().map(CsEngineeringPO::getId).collect(Collectors.toList());
+            List<DevDetailDTO> ledger = csLedgerFeignClient.getEngineeringHaveDevs(list2).getData();
+            if (CollectionUtil.isNotEmpty(ledger)) {
+                ledger.forEach(item->{
+                    CsEngineeringPO po = new CsEngineeringPO();
+                    po.setId(item.getEngineeringid());
+                    po.setName(map.get(item.getEngineeringid()).getName());
+                    result.add(po);
+                });
+            }
+        }
+        return result;
+    }
+
 
     public String getAreaById(String id){
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -48,6 +48,7 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.enums.DicTreeEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.user.enums.AppRoleEnum;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
@@ -428,6 +429,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 if (isCLdDevice) {
                     // 云前置数据集
                     addDataSet(dataSetList, item, "实时数据", "realtimedata");
+                    addDataSet(dataSetList, item, "暂态事件", "event");
                 }
                 deviceManagerVo.setDataLevel(item.getDataLevel());
             }
@@ -706,6 +708,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         return this.lambdaQuery().ne(CsEquipmentDeliveryPO::getRunStatus,0).list();
     }
 
+    @Override
+    public List<CsEquipmentDeliveryPO> getAllOnline() {
+        return this.lambdaQuery()
+                .ne(CsEquipmentDeliveryPO::getRunStatus,0)
+                .eq(CsEquipmentDeliveryPO::getUsageStatus,1)
+                .isNotNull(CsEquipmentDeliveryPO::getNodeId)
+                .list();
+    }
+
     @Override
     public boolean judgeDevModel(String nDid) {
         boolean result = false;
@@ -816,23 +827,24 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csTerminalLogs.setIsPush(0);
         csTerminalLogs.setNodeId(one.getNodeId());
         csTerminalLogs.setNodeProcess(one.getNodeProcess());
+        csTerminalLogs.setDeviceName(one.getName());
         csTerminalLogsMapper.insert(csTerminalLogs);
         return true;
     }
 
     @Override
     public Boolean updateCldDev(CsEquipmentDeliveryAuditParm param) {
-        //云前置设备判断，修改云前置判断设备是否达到上限
-        if(ObjectUtil.isNotNull(param.getNodeId())){
-            Node node = nodeService.getNodeById(param.getNodeId());
-            List<CsEquipmentDeliveryPO> devList = getListByNodeId(param.getNodeId());
-            if (ObjectUtil.isNotEmpty(devList) && devList.size() >= node.getNodeDevNum()) {
-                throw new BusinessException (AlgorithmResponseEnum.OVER_MAX_DEV_COUNT);
-            }
-            //自动分配进程号
-            int process = findLeastFrequentProcess(devList,node.getMaxProcessNum());
-            param.setNodeProcess(process);
-        }
+//        //云前置设备判断，修改云前置判断设备是否达到上限
+//        if(ObjectUtil.isNotNull(param.getNodeId())){
+//            Node node = nodeService.getNodeById(param.getNodeId());
+//            List<CsEquipmentDeliveryPO> devList = getListByNodeId(param.getNodeId());
+//            if (ObjectUtil.isNotEmpty(devList) && devList.size() >= node.getNodeDevNum()) {
+//                throw new BusinessException (AlgorithmResponseEnum.OVER_MAX_DEV_COUNT);
+//            }
+//            //自动分配进程号
+//            int process = findLeastFrequentProcess(devList,node.getMaxProcessNum());
+//            param.setNodeProcess(process);
+//        }
         StringUtil.containsSpecialCharacters(param.getNdid());
         boolean result;
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -969,6 +981,30 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         return this.list(lambdaQueryWrapper);
     }
 
+    @Override
+    public List<CsEquipmentDeliveryPO> getListByIds(List<String> devList) {
+        return this.lambdaQuery().in(CsEquipmentDeliveryPO::getId,devList).list();
+    }
+
+    @Override
+    public List<CsEquipmentDeliveryPO> getRunPortableDev(String userId) {
+        List<CsEquipmentDeliveryPO> result = new ArrayList<>();
+        DictTreeVO vo = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData();
+        if (ObjectUtil.isNotNull(vo)) {
+            LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getDevType,vo.getId())
+                    .ne(CsEquipmentDeliveryPO::getRunStatus,0)
+                    .eq(CsEquipmentDeliveryPO::getUsageStatus,1);
+            //获取用户已经绑定的便携式设备
+            List<String> devList = csDeviceUserPOService.findDevByUserId(userId);
+            if (CollectionUtil.isNotEmpty(devList)) {
+                lambdaQueryWrapper.notIn(CsEquipmentDeliveryPO::getId,devList);
+            }
+            result = this.list(lambdaQueryWrapper);
+        }
+        return result;
+    }
+
     //根据前置机id获取装置数量
     public List<CsEquipmentDeliveryPO> getListByNodeId(String nodeId) {
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -1,11 +1,14 @@
 package com.njcn.csdevice.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,6 +36,8 @@ import com.njcn.csharmonic.api.EventFeignClient;
 import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
+import com.njcn.csharmonic.param.FittingDataQueryParam;
+import com.njcn.csharmonic.param.TrendDataQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -42,7 +47,7 @@ import com.njcn.influx.pojo.dto.StatisticalDataDTO;
 import com.njcn.influx.service.CommonService;
 import com.njcn.influx.service.EvtDataService;
 import com.njcn.system.api.CsStatisticalSetFeignClient;
-import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.api.EleEvtFeignClient;
 import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.pojo.po.EleEpdPqd;
@@ -59,6 +64,7 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -85,7 +91,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     private final EpdFeignClient epdFeignClient;
     private final CsLineFeignClient csLineFeignClient;
     private final ICsLedgerService iCsLedgerService;
-    private final DicDataFeignClient dicDataFeignClient;
     private final EquipmentFeignClient equipmentFeignClient;
     private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
     private final EvtDataService evtDataService;
@@ -95,6 +100,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     private final CsDataSetMapper csDataSetMapper;
     private final EventFeignClient eventFeignClient;
     private final InfluxDbParamUtil influxDbParamUtil;
+    private final DictTreeFeignClient dictTreeFeignClient;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -784,6 +790,346 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         }
     }
 
+    @Override
+    public List<ThdDataVO> trendData(TrendDataQueryParam trendDataQueryParam) {
+        List<ThdDataVO> result = new ArrayList<>();
+        CsLinePO finalCsLinePO = csLineFeignClient.getById(trendDataQueryParam.getLineId()).getData();
+        CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePO.getDataSetId()));
+        if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
+            throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
+        }
+        Double ct = finalCsLinePO.getCtRatio();
+        Double pt = finalCsLinePO.getPtRatio();
+        if(CollectionUtil.isNotEmpty(trendDataQueryParam.getList())) {
+            for (TrendDataQueryParam param : trendDataQueryParam.getList()) {
+                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                for (EleEpdPqd epdPqd : eleEpdPqds) {
+                    CommonQueryParam commonQueryParam = new CommonQueryParam();
+                    commonQueryParam.setLineId(finalCsLinePO.getLineId());
+                    commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
+                    commonQueryParam.setColumnName(epdPqd.getName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
+                    commonQueryParam.setPhasic(epdPqd.getPhase());
+
+                    commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(trendDataQueryParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
+                    commonQueryParam.setEndTime(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(trendDataQueryParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN));
+
+                    commonQueryParam.setDataType(trendDataQueryParam.getValueType());
+
+                    commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(finalCsLinePO.getLineId()));
+
+                    List<StatisticalDataDTO> deviceRtData = commonService.getNewDeviceRtDataByTime(Collections.singletonList(commonQueryParam));
+                    List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
+                        String unit;
+                        ThdDataVO vo = new ThdDataVO();
+                        vo.setLineId(temp.getLineId());
+                        vo.setPhase(Objects.equals("M", temp.getPhaseType()) ? null : temp.getPhaseType());
+                        String position = finalCsLinePO.getPosition();
+                        vo.setPosition(position);
+                        vo.setTime(temp.getTime());
+                        vo.setStatMethod(temp.getValueType());
+                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                        if (temp.getValue() != null) {
+                            double re = 0;
+                            if (Objects.equals("Primary", trendDataQueryParam.getDataLevel())) {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                        re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000));
+                                        vo.setStatisticalData(re);
+                                        unit = "k" + epdPqd.getUnit();
+                                    } else {
+                                        vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
+                                        unit = epdPqd.getUnit();
+                                    }
+                                } else {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                re = temp.getValue() * pt / 1000;
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            case "*CT":
+                                                re = temp.getValue() * ct;
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                            case "*PT*CT":
+                                                re = temp.getValue() * pt * ct / 1000;
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            default:
+                                                re = temp.getValue();
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                        }
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    } else {
+                                        re = temp.getValue();
+                                        unit = epdPqd.getUnit();
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    }
+
+                                }
+                            } else {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                re = temp.getValue() / pt;
+                                                break;
+                                            case "*CT":
+                                                re = temp.getValue() / ct;
+                                                break;
+                                            case "*PT*CT":
+                                                re = temp.getValue() / pt / ct;
+                                                break;
+                                            default:
+                                                re = temp.getValue();
+                                                break;
+                                        }
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    } else {
+                                        re = temp.getValue();
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    }
+                                } else {
+                                    vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                }
+                                unit = epdPqd.getUnit();
+                            }
+                        } else {
+                            vo.setStatisticalData(null);
+                            if (Objects.equals("Primary", trendDataQueryParam.getDataLevel())) {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    unit = epdPqd.getUnit();
+                                } else {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            case "*CT":
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                            case "*PT*CT":
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            default:
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                        }
+                                    } else {
+                                        unit = epdPqd.getUnit();
+                                    }
+                                }
+                            } else {
+                                unit = epdPqd.getUnit();
+                            }
+                        }
+                        vo.setUnit(unit);
+                        vo.setStatisticalIndex(epdPqd.getId());
+                        vo.setStatisticalName(epdPqd.getName());
+                        vo.setAnotherName(epdPqd.getShowName());
+                        return vo;
+                    }).collect(Collectors.toList());
+                    result.addAll(collect1);
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public List<ThdDataVO> fittingData(FittingDataQueryParam fittingDataQueryParam) {
+        List<ThdDataVO> result = new ArrayList<>();
+        CsLinePO finalCsLinePO = csLineFeignClient.getById(fittingDataQueryParam.getLineId()).getData();
+        CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePO.getDataSetId()));
+        if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
+            throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
+        }
+        Double ct = finalCsLinePO.getCtRatio();
+        Double pt = finalCsLinePO.getPtRatio();
+       // String position = finalCsLinePO.getPosition();
+        Overlimit overlimit = overlimitMapper.selectById(finalCsLinePO.getLineId());
+        JSONObject entries = JSONUtil.parseObj(overlimit);
+        if(CollectionUtil.isNotEmpty(fittingDataQueryParam.getList())) {
+            for (FittingDataQueryParam param : fittingDataQueryParam.getList()) {
+                String dictCode = dictTreeFeignClient.queryById(param.getStatisticalId()).getData().getCode();
+                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                List<ThdDataVO> dataList = new ArrayList<>();
+                for (EleEpdPqd epdPqd : eleEpdPqds) {
+                    CommonQueryParam commonQueryParam = new CommonQueryParam();
+                    commonQueryParam.setLineId(finalCsLinePO.getLineId());
+                    commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
+                    commonQueryParam.setColumnName(epdPqd.getName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
+                    commonQueryParam.setPhasic(epdPqd.getPhase());
+
+                    commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(fittingDataQueryParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
+                    commonQueryParam.setEndTime(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(fittingDataQueryParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN));
+                    // 兼容用户功率需要该参数过滤
+                    String dataType = param.getValueType();
+                    if (StrUtil.isEmpty(dataType)) {
+                        // 电能质量指标，取限值计算类型，判断是否越限
+                        dataType = epdPqd.getFormula();
+                    }
+                    commonQueryParam.setDataType(dataType);
+
+                    commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(finalCsLinePO.getLineId()));
+
+                    List<StatisticalDataDTO> deviceRtData = commonService.getNewDeviceRtDataByTime(Collections.singletonList(commonQueryParam));
+                    dataList = deviceRtData.stream().map(temp -> {
+                        String unit;
+                        ThdDataVO vo = new ThdDataVO();
+                        vo.setLineId(temp.getLineId());
+                       // vo.setLineName(finalCsLinePO.getName());
+                        vo.setPhase(Objects.equals("M", temp.getPhaseType()) ? null : temp.getPhaseType());
+                       // vo.setPosition(position);
+                        vo.setTime(temp.getTime());
+                        vo.setStatMethod(commonQueryParam.getDataType());
+                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                        if (temp.getValue() != null) {
+                            double re;
+                            if (Objects.equals("Primary", fittingDataQueryParam.getDataLevel())) {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                        re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000));
+                                        vo.setStatisticalData(re);
+                                        unit = "k" + epdPqd.getUnit();
+                                    } else {
+                                        vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
+                                        unit = epdPqd.getUnit();
+                                    }
+                                } else {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                re = temp.getValue() * pt / 1000;
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            case "*CT":
+                                                re = temp.getValue() * ct;
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                            case "*PT*CT":
+                                                re = temp.getValue() * pt * ct / 1000;
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            default:
+                                                re = temp.getValue();
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                        }
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    } else {
+                                        re = temp.getValue();
+                                        unit = epdPqd.getUnit();
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    }
+
+                                }
+                            } else {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                re = temp.getValue() / pt;
+                                                break;
+                                            case "*CT":
+                                                re = temp.getValue() / ct;
+                                                break;
+                                            case "*PT*CT":
+                                                re = temp.getValue() / pt / ct;
+                                                break;
+                                            default:
+                                                re = temp.getValue();
+                                                break;
+                                        }
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    } else {
+                                        re = temp.getValue();
+                                        vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                    }
+                                } else {
+                                    vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                }
+                                unit = epdPqd.getUnit();
+                            }
+                        } else {
+                            vo.setStatisticalData(null);
+                            if (Objects.equals("Primary", fittingDataQueryParam.getDataLevel())) {
+                                if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                    unit = epdPqd.getUnit();
+                                } else {
+                                    if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                        switch (epdPqd.getPrimaryFormula()) {
+                                            case "*PT":
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            case "*CT":
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                            case "*PT*CT":
+                                                unit = "k" + epdPqd.getUnit();
+                                                break;
+                                            default:
+                                                unit = epdPqd.getUnit();
+                                                break;
+                                        }
+                                    } else {
+                                        unit = epdPqd.getUnit();
+                                    }
+                                }
+                            } else {
+                                unit = epdPqd.getUnit();
+                            }
+                        }
+                        vo.setUnit(unit);
+                       // vo.setStatisticalIndex(epdPqd.getId());
+                       // vo.setStatisticalName(epdPqd.getName());
+                        vo.setStatisticalIndex(param.getStatisticalId());
+                        vo.setAnotherName(epdPqd.getShowName());
+                        return vo;
+                    }).collect(Collectors.toList());
+                }
+                // 电能质量指标（越限为1，不越限为0）
+                List<String> hasKeys = entries.keySet().stream().filter(key -> key.startsWith(dictCode)).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(hasKeys)) {
+                    List<ThdDataVO> limitDataList = new ArrayList<>();
+                    Map<Instant, List<ThdDataVO>> timeMap = dataList.stream().collect(Collectors.groupingBy(ThdDataVO::getTime));
+                    // 限值
+                    ThdDataVO data;
+                    for (Map.Entry<Instant, List<ThdDataVO>> entry: timeMap.entrySet()) {
+                        data = new ThdDataVO();
+                        List<ThdDataVO> list = entry.getValue();
+                        if (CollUtil.isNotEmpty(list)) {
+                            ThdDataVO thdDataVO = list.get(0);
+                            //  data.setPosition(thdDataVO.getPosition());
+                            data.setLineId(thdDataVO.getLineId());
+                            //  data.setLineName(thdDataVO.getLineName());
+                            data.setFrequency(param.getFrequency());
+                            data.setStatMethod(thdDataVO.getStatMethod());
+                            data.setUnit(thdDataVO.getUnit());
+                            data.setAnotherName(thdDataVO.getAnotherName());
+                            data.setStatisticalIndex(param.getStatisticalId());
+                        }
+                        Instant time = entry.getKey();
+                        data.setTime(time);
+
+                        double limitValue = entries.getDouble(dictCode + (StringUtils.isEmpty(param.getFrequency()) ? "" : param.getFrequency()));
+                        double maxValue = list.stream().filter(v -> ObjectUtil.isNotEmpty(v.getStatisticalData())).mapToDouble(ThdDataVO::getStatisticalData).max().orElse(0.0);
+                        // 越限为1，不越限为0
+                        data.setStatisticalData(maxValue > limitValue ? 1.0 : 0.0);
+                        limitDataList.add(data);
+                    }
+                    limitDataList.sort(Comparator.comparing(ThdDataVO::getTime));
+                    result.addAll(limitDataList);
+                } else {
+                    result.addAll(dataList);
+                }
+              
+            }
+        }
+        return result;
+    }
+
     private List<EnergyTemplateVO> getChildren(String tabId, List<EnergyTemplateVO> all) {
         return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
     }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -4,14 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
+import com.njcn.csdevice.controller.project.EngineeringController;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
@@ -24,6 +24,8 @@ import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.Area;
 import com.njcn.system.pojo.vo.DictTreeVO;
+import com.njcn.user.enums.AppRoleEnum;
+import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -54,8 +56,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     private final CsDevModelRelationService csDevModelRelationService;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
     private final ICsDataSetService csDataSetService;
-    private final EquipmentFeignClient equipmentFeignClient;
     private final DictTreeFeignClient dictTreeFeignClient;
+    private final EngineeringController engineeringController;
+    private final CsDeviceUserPOMapper csDeviceUserPOMapper;
 
     @Override
     public List<CsLedgerVO> getLedgerTree() {
@@ -82,14 +85,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         //区分治理装置和云前置装置
         List<String> zhiLianDevice = new ArrayList<>();
         List<String> cldDevice = new ArrayList<>();
-        List<CsEquipmentDeliveryDTO> csEquipmentDeliveryPOS = equipmentFeignClient.queryDeviceById(device).getData();
-        if (CollectionUtil.isNotEmpty(csEquipmentDeliveryPOS)) {
+        if (CollectionUtil.isNotEmpty(device)) {
+            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
             DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
             Optional.ofNullable(vo1)
                     .map(DictTreeVO::getId)
                     .ifPresent(id -> csEquipmentDeliveryPOS.stream()
                             .filter(item -> Objects.equals(item.getDevType(), id))
-                            .map(CsEquipmentDeliveryDTO::getId)
+                            .map(CsEquipmentDeliveryPO::getId)
                             .forEach(cldDevice::add)
                     );
             DictTreeVO vo2 = dictTreeFeignClient.queryByCode(DicDataEnum.CONNECT_DEV.getCode()).getData();
@@ -97,11 +100,10 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     .map(DictTreeVO::getId)
                     .ifPresent(id -> csEquipmentDeliveryPOS.stream()
                             .filter(item -> Objects.equals(item.getDevType(), id))
-                            .map(CsEquipmentDeliveryDTO::getId)
+                            .map(CsEquipmentDeliveryPO::getId)
                             .forEach(zhiLianDevice::add)
                     );
         }
-
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
 
@@ -194,10 +196,29 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
-        //针对未启用的装置判断
-        List<CsLedgerVO> ledger = allList.stream()
-                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-                .collect(Collectors.toList());
+
+        //根据当前用户获取便携式设备
+        List<CsLedgerVO> ledger;
+        String role = RequestUtil.getUserRole();
+        List<String> roles = JSONArray.parseArray(role, String.class);
+        if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode())){
+            ledger = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
+                    .collect(Collectors.toList());
+        } else {
+            LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId,RequestUtil.getUserIndex());
+            List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
+            List<String> result = new ArrayList<>();
+            if (CollectionUtil.isNotEmpty(list1)){
+                result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
+            }
+            //针对未启用的装置判断
+            List<String> finalResult = result;
+            ledger = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
+                    .collect(Collectors.toList());
+        }
         Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
                 .collect(Collectors.toMap(
                         CsLedgerVO::getId,
@@ -287,14 +308,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
         List<String> zhiLianDevice = new ArrayList<>();
         List<String> cldDevice = new ArrayList<>();
-        List<CsEquipmentDeliveryDTO> csEquipmentDeliveryPOS = equipmentFeignClient.queryDeviceById(device).getData();
-        if (CollectionUtil.isNotEmpty(csEquipmentDeliveryPOS)) {
+        if (CollectionUtil.isNotEmpty(device)) {
+            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
             DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
             Optional.ofNullable(vo1)
                     .map(DictTreeVO::getId)
                     .ifPresent(id -> csEquipmentDeliveryPOS.stream()
                             .filter(item -> Objects.equals(item.getDevType(), id))
-                            .map(CsEquipmentDeliveryDTO::getId)
+                            .map(CsEquipmentDeliveryPO::getId)
                             .forEach(cldDevice::add)
                     );
             DictTreeVO vo2 = dictTreeFeignClient.queryByCode(DicDataEnum.CONNECT_DEV.getCode()).getData();
@@ -302,10 +323,11 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     .map(DictTreeVO::getId)
                     .ifPresent(id -> csEquipmentDeliveryPOS.stream()
                             .filter(item -> Objects.equals(item.getDevType(), id))
-                            .map(CsEquipmentDeliveryDTO::getId)
+                            .map(CsEquipmentDeliveryPO::getId)
                             .forEach(zhiLianDevice::add)
                     );
         }
+
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
 
@@ -379,10 +401,28 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
 
-        //针对未启用的装置判断
-        List<CsLedgerVO> ledger = allList.stream()
-                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-                .collect(Collectors.toList());
+        List<CsLedgerVO> ledger;
+        String role = RequestUtil.getUserRole();
+        List<String> roles = JSONArray.parseArray(role, String.class);
+        if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode())){
+            ledger = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
+                    .collect(Collectors.toList());
+        } else {
+            LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId,RequestUtil.getUserIndex());
+            List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
+            List<String> result = new ArrayList<>();
+            if (CollectionUtil.isNotEmpty(list1)){
+                result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
+            }
+            //针对未启用的装置判断
+            List<String> finalResult = result;
+            ledger = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
+                    .collect(Collectors.toList());
+        }
+
         Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
                 .collect(Collectors.toMap(
                         CsLedgerVO::getId,
@@ -674,6 +714,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                 Set<String> list1 = new HashSet<>();
                 List<String> devList = tree3.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
                 List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devList);
+                Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
                 DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
 
                 //list1是 cld设备
@@ -688,14 +729,30 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                 Set<String> list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
                 projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList());
 
-
                 List<CsLedgerVO> tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList());
                 Set<String> proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
                 engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList());
 
                 if (CollectionUtil.isNotEmpty(list1)) {
-                    deviceTree = tree3.stream().filter(vo -> list1.contains(vo.getId())).collect(Collectors.toList());
-                    lineTree = tree4.stream().filter(vo -> list1.contains(vo.getPid())).collect(Collectors.toList());
+                    deviceTree = tree3.stream()
+                            .filter(vo -> list1.contains(vo.getId()))
+                            .peek(item -> {
+                                CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
+                                if (dev != null) {
+                                    item.setComFlag(dev.getRunStatus());
+                                }
+                            })
+                            .collect(Collectors.toList());
+
+                    lineTree = tree4.stream()
+                            .filter(vo -> list1.contains(vo.getPid()))
+                            .peek(item -> {
+                                CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
+                                if (dev != null) {
+                                    item.setComFlag(dev.getRunStatus());
+                                }
+                            })
+                            .collect(Collectors.toList());
                 }
             }
         }
@@ -729,6 +786,78 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         return government;
     }
 
+    @Override
+    public List<DevDetailDTO> getInfoByIds(List<String> list) {
+        List<DevDetailDTO> details = new ArrayList<>();
+        List<CsLedger> ledgers = this.listByIds(list);
+        Set<String> enginingeringIds = new HashSet<>();
+        ledgers.forEach(item->{
+            DevDetailDTO device = new DevDetailDTO();
+            if(Objects.equals(item.getPid(),"0")){
+                device.setEquipmentName(item.getName());
+                device.setEquipmentId(item.getId());
+                device.setProjectId("/");
+                device.setProjectName("/");
+                device.setEngineeringid("/");
+                device.setEngineeringName("/");
+                details.add(device);
+            } else {
+                enginingeringIds.add(item.getPids().split(",")[1]);
+            }
+        });
+        if (CollectionUtil.isNotEmpty(enginingeringIds)) {
+            List<CsLedger> engineer = this.listByIds(enginingeringIds);
+            engineer.forEach(item->{
+                DevDetailDTO detail = new DevDetailDTO();
+                detail.setEngineeringid(item.getId());
+                detail.setEngineeringName(item.getName());
+                details.add(detail);
+            });
+        }
+        return details;
+    }
+
+    @Override
+    public List<DevDetailDTO> getDevInfoByEngineerIds(List<String> list) {
+        List<DevDetailDTO> details = new ArrayList<>();
+        LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(CsLedger::getPid, list);
+        List<CsLedger> project = this.list(queryWrapper);
+        //工程id
+        List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.in(CsLedger::getPid, projectIds);
+        List<CsLedger> dev = this.list(queryWrapper2);
+        dev.forEach(item->{
+            DevDetailDTO detail = new DevDetailDTO();
+            detail.setEquipmentName(item.getName());
+            detail.setEquipmentId(item.getId());
+            details.add(detail);
+        });
+        return details;
+    }
+
+    @Override
+    public List<DevDetailDTO> getEngineeringHaveDevs(List<String> list) {
+        List<DevDetailDTO> result = new ArrayList<>();
+        list.forEach(item->{
+            LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CsLedger::getPid, item);
+            List<CsLedger> project = this.list(queryWrapper);
+            //工程id
+            List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
+            LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.in(CsLedger::getPid, projectIds);
+            List<CsLedger> dev = this.list(queryWrapper2);
+            if (CollectionUtil.isNotEmpty(dev)) {
+                DevDetailDTO dto = new DevDetailDTO();
+                dto.setEngineeringid(item);
+                result.add(dto);
+            }
+        });
+        return result;
+    }
+
     /**
      * 获取子节点
      */

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java

@@ -211,6 +211,21 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         this.update(updateWrapper);
     }
 
+    @Override
+    public  List<CsLinePO> getLineByName(String lineName) {
+        return this.lambdaQuery().like(CsLinePO::getName,lineName).list();
+    }
+
+    @Override
+    public List<String> getAllLine() {
+        return this.lambdaQuery()
+                .eq(CsLinePO::getStatus, 1)
+                .list()
+                .stream()
+                .map(CsLinePO::getLineId)
+                .collect(Collectors.toList());
+    }
+
 //    /**
 //     * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template)
 //     *

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTerminalLogsServiceImpl.java

@@ -146,8 +146,10 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
             operateType = 0;
         } else if (Objects.equals(code, "ledger_modify")) {
             operateType = 1;
-        } else{
+        } else if (Objects.equals(code, "delete_terminal")){
             operateType = 2;
+        } else {
+            operateType = 3;
         }
         //找出最新的数据，将状态改为未推送，下次可以再次推送
         this.lambdaUpdate()
@@ -175,7 +177,7 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
                 List<CsEquipmentDeliveryPO> v1 = entry.getValue();
                 String guid = IdUtil.simpleUUID();
                 message.setGuid(guid);
-                message.setProcessNo(String.valueOf(k1));
+                message.setProcessNo(k1);
                 List<CldUpdateLedgerMessage.CldDeviceDto> list1 = new ArrayList<>();
                 v1.forEach(item -> {
                     CldUpdateLedgerMessage.CldDeviceDto deviceDto = new CldUpdateLedgerMessage.CldDeviceDto();
@@ -248,7 +250,7 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
             nodeProcessMap1.forEach((k1,v1)->{
                 String guid = IdUtil.simpleUUID();
                 message.setGuid(guid);
-                message.setProcessNo(String.valueOf(k1));
+                message.setProcessNo(k1);
                 List<CldUpdateLedgerMessage.CldDeviceDto> list1 = new ArrayList<>();
                 v1.forEach(item->{
                     CldUpdateLedgerMessage.CldDeviceDto deviceDto = new CldUpdateLedgerMessage.CldDeviceDto();
@@ -267,6 +269,7 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
                     csFmTerminalReply.setNodeId(k);
                     csFmTerminalReply.setProcessNo(k1);
                     csFmTerminalReply.setDeviceId(item.getDeviceId());
+                    csFmTerminalReply.setDeviceName(item.getDeviceName());
                     csFmTerminalReply.setIsReceived(0);
                     csTerminalReplyMapper.insert(csFmTerminalReply);
                 });

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTerminalReplyServiceImpl.java

@@ -1,23 +1,33 @@
 package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.mapper.CsTerminalReplyMapper;
+import com.njcn.csdevice.param.IcdBzReplyParam;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsTerminalReply;
+import com.njcn.csdevice.pojo.vo.CldLogsVo;
+import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.service.CsEquipmentDeliveryService;
 import com.njcn.csdevice.service.ICsTerminalLogsService;
 import com.njcn.csdevice.service.ICsTerminalReplyService;
 import com.njcn.csdevice.service.INodeService;
 import com.njcn.redis.utils.RedisUtil;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.web.pojo.param.BaseParam;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -37,6 +47,7 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
     private final INodeService nodeService;
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
     private final ICsTerminalLogsService csTerminalLogsService;
+    private final CsLedgerFeignClient csLedgerFeignClient;
 
     @Override
     public List<String> queryReplyData() {
@@ -58,25 +69,32 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
                 } else {
                     list.forEach(item->{
                         String key;
-                        String code;
+                        String code = "";
                         if (Objects.equals(item.getCode(), "add_terminal")) {
                             code = "新增";
                         } else if (Objects.equals(item.getCode(), "ledger_modify")) {
                             code = "修改";
-                        } else {
+                        } else if (Objects.equals(item.getCode(), "delete_terminal")){
                             code = "删除";
                         }
                         String nodeName = nodeService.getNodeById(item.getNodeId()).getName();
                         List<CsEquipmentDeliveryPO> devList1 = csEquipmentDeliveryService.getAll();
                         List<CsEquipmentDeliveryPO> devList2 = devList1.stream().filter(item1 -> Objects.equals(item1.getId(), item.getDeviceId())).collect(Collectors.toList());
                         List<String> devNameList = devList2.stream().map(CsEquipmentDeliveryPO::getName).collect(Collectors.toList());
-                        String devNameListString = devNameList.toString();
+                        String devNameListString;
+                        if (CollectionUtil.isNotEmpty(devNameList)) {
+                            devNameListString = devNameList.toString();
+                        } else {
+                            devNameListString = "[" + item.getDeviceName() + "]";
+                        }
                         if (item.getIsReceived() == 0) {
-                            key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + code + "数据失败";
+                            key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备未收到应答";
                             //将cs_terminal_logs数据置为未发送
                             csTerminalLogsService.updateLaterData(item.getDeviceId(),item.getCode());
+                        } else if (item.getIsReceived() == 1){
+                            key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备" + code + "数据成功";
                         } else {
-                            key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + code + "数据成功";
+                            key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备" + code + "数据失败";
                         }
                         result.add(key);
                     });
@@ -87,9 +105,137 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
     }
 
     @Override
-    public void updateReplyData(String id,Integer state,String deviceId) {
-        this.lambdaUpdate().set(CsTerminalReply::getIsReceived,state)
-                .eq(CsTerminalReply::getDeviceId,deviceId)
-                .eq(CsTerminalReply::getReplyId,id);
+    public void updateReplyData(IcdBzReplyParam param) {
+        LambdaUpdateWrapper<CsTerminalReply> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(CsTerminalReply::getIsReceived,param.getState())
+                .set(CsTerminalReply::getReceivedCode,param.getCode())
+                .set(CsTerminalReply::getReceivedMsg,param.getMsg())
+                .eq(CsTerminalReply::getReplyId,param.getId())
+                .eq(CsTerminalReply::getDeviceId,param.getDeviceId());
+        this.update(wrapper);
+    }
+
+    @Override
+    public List<CsTerminalReply> getBzReplyData(String lineId) {
+        LambdaQueryWrapper<CsTerminalReply> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(CsTerminalReply::getCode,Arrays.asList("allFile","allEvent","oneFile"))
+                .orderByDesc(CsTerminalReply::getCreateTime);
+        if (!Objects.isNull(lineId) && StringUtils.isNotBlank(lineId)) {
+            wrapper.like(CsTerminalReply::getLineId,lineId);
+        }
+        return this.list(wrapper);
+    }
+
+    @Override
+    public Page<CldLogsVo> getBzLogs(BaseParam param) {
+        Page<CldLogsVo> page = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param));
+        QueryWrapper<CsTerminalReply> queryWrapper = new QueryWrapper<>();
+        if (StrUtil.isNotBlank(param.getSearchValue())) {
+            queryWrapper.like("cs_terminal_reply.line_id", param.getSearchValue());
+//            //获取监测点id
+//            List<CsLinePO> list = csLinePOService.getLineByName(param.getSearchValue());
+//            if (CollectionUtil.isEmpty(list)) {
+//                return page;
+//            } else {
+//                queryWrapper.and(pr -> {
+//                    // 获取所有 lineId
+//                    List<String> lineIds = list.stream()
+//                            .map(CsLinePO::getLineId)
+//                            .collect(Collectors.toList());
+//                    // 使用 OR 条件连接多个 lineId
+//                    for (int i = 0; i < lineIds.size(); i++) {
+//                        if (i == 0) {
+//                            pr.like("cs_terminal_reply.line_id", lineIds.get(i));
+//                        } else {
+//                            pr.or().like("cs_terminal_reply.line_id", lineIds.get(i));
+//                        }
+//                    }
+//                });
+//            }
+        }
+        //排序
+        queryWrapper.orderBy(true, false, "cs_terminal_reply.create_time");
+        queryWrapper.in("cs_terminal_reply.code", Arrays.asList("allFile", "allEvent", "oneFile"));
+        Page<CsTerminalReply> csTerminalReplyPage = this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
+
+        List<CsTerminalReply> records = csTerminalReplyPage.getRecords();
+        if (CollectionUtil.isNotEmpty(records)) {
+            List<CsLedgerVO> data = csLedgerFeignClient.getAllLedger().getData();
+            Map<String, CsLedgerVO> ledgerMap = data.stream().collect(Collectors.toMap(CsLedgerVO::getId, Function.identity()));
+            List<CldLogsVo> cldLogsVos = new ArrayList<>();
+            records.forEach(item->{
+                String pids = ledgerMap.get(item.getDeviceId()).getPids();
+                String[] split = pids.split(",");
+                CldLogsVo cldLogsVo = new CldLogsVo();
+                cldLogsVo.setEngineeringName(ledgerMap.get(split[1]).getName());
+                cldLogsVo.setProjectName(ledgerMap.get(split[2]).getName());
+                cldLogsVo.setDeviceName(ledgerMap.get(item.getDeviceId()).getName());
+//                String lineId = item.getLineId();
+//                String[] lineSplit = lineId.split(",");
+//                String result;
+//                if (lineSplit.length == 1) {
+//                    result = ledgerMap.get(lineSplit[0]).getName();
+//                } else {
+//                    result = Arrays.stream(lineSplit)
+//                            .map(ledgerMap::get)
+//                            .filter(Objects::nonNull)
+//                            .map(CsLedgerVO::getName)
+//                            .collect(Collectors.joining(","));
+//                }
+//                cldLogsVo.setLineName(result);
+                cldLogsVo.setLineName(ledgerMap.get(param.getSearchValue()).getName());
+                cldLogsVo.setLog(getLogDescription(item.getCode()));
+                cldLogsVo.setLogTime(item.getCreateTime());
+                if (Objects.equals(item.getIsReceived(),0)) {
+                    cldLogsVo.setStatus("补召已下发");
+                    cldLogsVo.setResult("/");
+                } else {
+                    if (item.getReceivedCode() == 200) {
+                        cldLogsVo.setStatus("补召成功");
+                        cldLogsVo.setResult(item.getReceivedMsg());
+                    } else {
+                        cldLogsVo.setStatus("补召失败");
+                        cldLogsVo.setResult(item.getReceivedMsg());
+                    }
+                }
+                cldLogsVos.add(cldLogsVo);
+            });
+            page.setRecords(cldLogsVos);
+        }
+        page.setTotal(csTerminalReplyPage.getTotal());
+        page.setPages(csTerminalReplyPage.getPages());
+        return page;
+    }
+
+    @Override
+    public void updateBzData(IcdBzReplyParam param) {
+        LambdaUpdateWrapper<CsTerminalReply> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(CsTerminalReply::getIsReceived,param.getState())
+                .set(CsTerminalReply::getReceivedCode,param.getCode())
+                .set(CsTerminalReply::getReceivedMsg,param.getMsg())
+                .eq(CsTerminalReply::getReplyId,param.getId())
+                .eq(CsTerminalReply::getDeviceId,param.getDeviceId());
+        if (Objects.nonNull(param.getLineId()) && StringUtils.isNotBlank(param.getLineId())) {
+            wrapper.eq(CsTerminalReply::getLineId,param.getLineId());
+        }
+        this.update(wrapper);
+    }
+
+    public String getLogDescription(String code) {
+        String result;
+        switch (code) {
+            case "allFile":
+                result = "补召缺失波形文件";
+                break;
+            case "allEvent":
+                result = "补召事件";
+                break;
+            case "oneFile":
+                result = "补召单事件波形";
+                break;
+            default:
+                result = "未知";
+        }
+        return result;
     }
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java

@@ -1,12 +1,18 @@
 package com.njcn.csdevice.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.mapper.OverlimitMapper;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.param.IcdLedgerParam;
 import com.njcn.csdevice.param.IcdParam;
 import com.njcn.csdevice.pojo.param.AppProjectAddParm;
@@ -16,7 +22,12 @@ import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CldLedgerVo;
 import com.njcn.csdevice.pojo.vo.DeviceInfo;
 import com.njcn.csdevice.service.*;
-import com.njcn.mq.message.CldControlMessage;
+import com.njcn.csharmonic.api.EventFeignClient;
+import com.njcn.csharmonic.pojo.po.CsEventPO;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.biz.utils.COverlimitUtil;
+import com.njcn.mq.message.BZEventMessage;
+import com.njcn.mq.template.BZEventMessageTemplate;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.enums.DicDataEnum;
@@ -27,6 +38,8 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -44,7 +57,12 @@ class IcdServiceImpl implements IcdService {
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
     private final CsLinePOService csLinePOService;
     private final ICsLedgerService csLedgerService;
+    private final BZEventMessageTemplate bzEventMessageTemplate;
+    private final EventFeignClient eventFeignClient;
     private final ICsTerminalLogsService csTerminalLogsService;
+    private final ICsTerminalReplyService csTerminalReplyService;
+    private final OverlimitMapper overlimitMapper;
+    private final DateTimeFormatter microsecondFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
 
     @Override
     public List<DeviceInfo> getLedgerInfo(IcdParam param) {
@@ -109,7 +127,6 @@ class IcdServiceImpl implements IcdService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void addLedgerInfo(IcdLedgerParam param) {
         // 第一种：全流程创建
         if (isAllIndicesNull(param)) {
@@ -161,8 +178,316 @@ class IcdServiceImpl implements IcdService {
     }
 
     @Override
-    public void restartProcess(CldControlMessage message) {
+    @Transactional(rollbackFor = Exception.class)
+    public void bzFileByEventId(String eventId) {
+        CsEventPO po = eventFeignClient.queryById(eventId).getData();
+        if (ObjectUtil.isNull(po)) {
+            throw new BusinessException("事件缺失");
+        }
+        //获取设备信息
+        CsEquipmentDeliveryPO dev = csEquipmentDeliveryService.getDevByLineId(po.getLineId());
+        BZEventMessage.Event file = new BZEventMessage.Event();
+        file.setGuid(po.getId());
+        file.setTerminalId(po.getDeviceId());
+        file.setMonitorIdList(Collections.singletonList(po.getLineId()));
+        file.setTimeInterval(Collections.singletonList(po.getStartTime().format(microsecondFormatter)));
+        file.setDataType(2);
+        //记录发送日志
+        CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
+        csTerminalLogs.setId(po.getId());
+        csTerminalLogs.setDeviceId(dev.getId());
+        csTerminalLogs.setLineId(po.getLineId());
+        csTerminalLogs.setOperateType(3);
+        csTerminalLogs.setNodeId(dev.getNodeId());
+        csTerminalLogs.setNodeProcess(dev.getNodeProcess());
+        csTerminalLogs.setIsPush(1);
+        csTerminalLogsService.saveOrUpdate(csTerminalLogs);
+        //记录响应日志
+        CsTerminalReply csTerminalReply = new CsTerminalReply();
+        csTerminalReply.setId(IdUtil.simpleUUID());
+        csTerminalReply.setReplyId(po.getId());
+        csTerminalReply.setNodeId(dev.getNodeId());
+        csTerminalReply.setProcessNo(dev.getNodeProcess());
+        csTerminalReply.setDeviceId(dev.getId());
+        csTerminalReply.setLineId(po.getLineId());
+        csTerminalReply.setIsReceived(0);
+        csTerminalReply.setCode("oneFile");
+        csTerminalReplyService.saveOrUpdate(csTerminalReply);
+        //发送消息
+        bzEventMessageTemplate.sendMember(Collections.singletonList(file),dev.getNodeId());
+    }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bzEvent(IcdBzParam param) {
+        // 参数校验
+        if (StrUtil.isBlank(param.getStartTime()) || StrUtil.isBlank(param.getEndTime())) {
+            throw new BusinessException("开始时间和结束时间不能为空");
+        }
+        LocalDateTime startLocalDate;
+        LocalDateTime endLocalDate;
+        try {
+            startLocalDate = LocalDateTimeUtil.parse(param.getStartTime(), DatePattern.NORM_DATE_PATTERN);
+            endLocalDate = LocalDateTimeUtil.parse(param.getEndTime(), DatePattern.NORM_DATE_PATTERN);
+        } catch (Exception e) {
+            throw new BusinessException("时间格式不正确，请使用 yyyy-MM-dd 格式");
+        }
+        String beginDay = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.beginOfDay(startLocalDate),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+        String endDay = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.endOfDay(endLocalDate),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+        if (CollectionUtil.isNotEmpty(param.getLineList())) {
+            processWithLineIds(param.getLineList(), beginDay, endDay);
+        } else {
+            processWithoutLineIds(beginDay, endDay);
+        }
+    }
+
+    private void processWithLineIds(List<String> lineList, String beginDay, String endDay) {
+        List<CsLinePO> csLineList = csLinePOService.listByIds(lineList);
+        List<String> deviceIdList = csLineList.stream()
+                .map(CsLinePO::getDeviceId)
+                .distinct()
+                .collect(Collectors.toList());
+
+        List<CsEquipmentDeliveryPO> equipmentList = csEquipmentDeliveryService.listByIds(deviceIdList);
+        Map<String, List<CsEquipmentDeliveryPO>> devMap = equipmentList.stream()
+                .collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeId));
+
+        handleEventsAndLogs(devMap, csLineList, beginDay, endDay);
+    }
+
+    private void processWithoutLineIds(String beginDay, String endDay) {
+        List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryService.getAllOnline();
+        if (CollectionUtil.isEmpty(devList)) return;
+
+        List<String> deviceIds = devList.stream()
+                .map(CsEquipmentDeliveryPO::getId)
+                .collect(Collectors.toList());
+
+        List<CsLinePO> csLineList = csLinePOService.getLinesByDevList(deviceIds);
+        Map<String, List<CsEquipmentDeliveryPO>> devMap = devList.stream()
+                .collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeId));
+
+        handleEventsAndLogs(devMap, csLineList, beginDay, endDay);
+    }
+
+    private void handleEventsAndLogs(
+            Map<String, List<CsEquipmentDeliveryPO>> devMap,
+            List<CsLinePO> csLineList,
+            String beginDay,
+            String endDay
+    ) {
+        devMap.forEach((nodeId, devices) -> {
+            List<BZEventMessage.Event> events = new ArrayList<>();
+            List<CsTerminalLogs> logsToSave = new ArrayList<>();
+            List<CsTerminalReply> repliesToSave = new ArrayList<>();
+
+            for (CsEquipmentDeliveryPO device : devices) {
+                String uuid = IdUtil.simpleUUID();
+
+                BZEventMessage.Event event = buildEvent(uuid, device, csLineList, beginDay, endDay);
+                events.add(event);
+
+                CsTerminalLogs log = buildTerminalLog(uuid, device, csLineList);
+                logsToSave.add(log);
+
+                List<CsTerminalReply> reply = buildTerminalReply(uuid, device, csLineList);
+                repliesToSave.addAll(reply);
+            }
+            csTerminalLogsService.saveBatch(logsToSave);
+            csTerminalReplyService.saveBatch(repliesToSave);
+            bzEventMessageTemplate.sendMember(events, nodeId);
+        });
+    }
+
+    private BZEventMessage.Event buildEvent(String guid, CsEquipmentDeliveryPO device,
+                                            List<CsLinePO> csLineList, String beginDay, String endDay) {
+        BZEventMessage.Event event = new BZEventMessage.Event();
+        event.setGuid(guid);
+        event.setTerminalId(device.getId());
+
+        List<String> monitorIds = csLineList.stream()
+                .filter(line -> Objects.equals(line.getDeviceId(), device.getId()))
+                .map(CsLinePO::getLineId)
+                .collect(Collectors.toList());
+
+        event.setMonitorIdList(monitorIds);
+        event.setDataType(1);
+        event.setTimeInterval(Collections.singletonList(beginDay + "~" + endDay));
+        return event;
+    }
+
+    private CsTerminalLogs buildTerminalLog(String id, CsEquipmentDeliveryPO device,
+                                            List<CsLinePO> csLineList) {
+        List<String> lineIds = csLineList.stream()
+                .filter(line -> Objects.equals(line.getDeviceId(), device.getId()))
+                .map(CsLinePO::getLineId)
+                .collect(Collectors.toList());
+
+        CsTerminalLogs log = new CsTerminalLogs();
+        log.setId(id);
+        log.setDeviceId(device.getId());
+        log.setLineId(String.join(",", lineIds));
+        log.setOperateType(3);
+        log.setNodeId(device.getNodeId());
+        log.setNodeProcess(device.getNodeProcess());
+        log.setIsPush(1);
+        return log;
+    }
+
+    private List<CsTerminalReply> buildTerminalReply(String replyId, CsEquipmentDeliveryPO device,
+                                               List<CsLinePO> csLineList) {
+        List<CsTerminalReply> replies = new ArrayList<>();
+        List<String> lineIds = csLineList.stream()
+                .filter(line -> Objects.equals(line.getDeviceId(), device.getId()))
+                .map(CsLinePO::getLineId)
+                .collect(Collectors.toList());
+        lineIds.forEach(lineId -> {
+            CsTerminalReply reply = new CsTerminalReply();
+            reply.setId(IdUtil.simpleUUID());
+            reply.setReplyId(replyId);
+            reply.setNodeId(device.getNodeId());
+            reply.setProcessNo(device.getNodeProcess());
+            reply.setDeviceId(device.getId());
+            reply.setLineId(lineId);
+            reply.setIsReceived(0);
+            reply.setCode("allEvent");
+            replies.add(reply);
+        });
+        return replies;
+    }
+
+//    private CsTerminalReply buildTerminalReply(String replyId, CsEquipmentDeliveryPO device,
+//                                               List<CsLinePO> csLineList) {
+//        List<String> lineIds = csLineList.stream()
+//                .filter(line -> Objects.equals(line.getDeviceId(), device.getId()))
+//                .map(CsLinePO::getLineId)
+//                .collect(Collectors.toList());
+//
+//        CsTerminalReply reply = new CsTerminalReply();
+//        reply.setId(IdUtil.simpleUUID());
+//        reply.setReplyId(replyId);
+//        reply.setNodeId(device.getNodeId());
+//        reply.setProcessNo(device.getNodeProcess());
+//        reply.setDeviceId(device.getId());
+//        reply.setLineId(String.join(",", lineIds));
+//        reply.setIsReceived(0);
+//        reply.setCode("allEvent");
+//        return reply;
+//    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bzFile(IcdBzParam param) {
+        String beginDay = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(param.getStartTime(), DatePattern.NORM_DATE_PATTERN)),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+        String endDay = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(param.getEndTime(), DatePattern.NORM_DATE_PATTERN)),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+
+        // 获取监测点没有波形的事件信息
+        List<CsEventPO> eventList = eventFeignClient.getEventByTime(param.getLineList(), beginDay, endDay).getData();
+        if (CollUtil.isEmpty(eventList)) {
+            return;
+        }
+
+        // 获取装置信息，用于区分不同服务器
+        List<String> deviceIds = eventList.stream()
+                .map(CsEventPO::getDeviceId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(deviceIds)) {
+            return;
+        }
+
+        List<CsEquipmentDeliveryPO> equipmentList = csEquipmentDeliveryService.listByIds(deviceIds);
+        if (CollUtil.isEmpty(equipmentList)) {
+            return;
+        }
+
+        Map<String, List<CsEquipmentDeliveryPO>> nodeToDeviceMap = equipmentList.stream()
+                .collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeId));
+
+        // 构建 deviceId -> CsEventPO 映射，避免重复 filter
+        Map<String, List<CsEventPO>> deviceToEventMap = eventList.stream()
+                .filter(event -> event.getDeviceId() != null)
+                .collect(Collectors.groupingBy(CsEventPO::getDeviceId));
+
+        nodeToDeviceMap.forEach((nodeId, deviceList) -> {
+            List<BZEventMessage.Event> msgList = new ArrayList<>();
+            List<CsTerminalLogs> logList = new ArrayList<>();
+            List<CsTerminalReply> replyList = new ArrayList<>();
+
+            for (CsEquipmentDeliveryPO device : deviceList) {
+                String deviceId = device.getId();
+                List<CsEventPO> eventsForDevice = deviceToEventMap.getOrDefault(deviceId, Collections.emptyList());
+
+                Map<String, List<CsEventPO>> lineToEventMap = eventsForDevice.stream()
+                        .filter(event -> event.getLineId() != null)
+                        .collect(Collectors.groupingBy(CsEventPO::getLineId));
+
+                lineToEventMap.forEach((lineId, eventGroup) -> {
+                    BZEventMessage.Event event = new BZEventMessage.Event();
+                    String guid = IdUtil.simpleUUID();
+                    event.setGuid(guid);
+                    event.setTerminalId(deviceId);
+                    event.setMonitorIdList(Collections.singletonList(lineId));
+                    event.setDataType(2);
+
+                    List<String> timeList = eventGroup.stream()
+                            .map(CsEventPO::getStartTime)
+                            .filter(Objects::nonNull)
+                            .map(dt -> dt.format(microsecondFormatter))
+                            .collect(Collectors.toList());
+
+                    event.setTimeInterval(timeList);
+                    msgList.add(event);
+
+                    // 记录发送日志
+                    CsTerminalLogs log = new CsTerminalLogs();
+                    log.setId(guid);
+                    log.setDeviceId(deviceId);
+                    log.setLineId(lineId);
+                    log.setOperateType(3);
+                    log.setNodeId(device.getNodeId());
+                    log.setNodeProcess(device.getNodeProcess());
+                    log.setIsPush(1);
+                    logList.add(log);
+
+                    // 记录响应日志
+                    CsTerminalReply reply = new CsTerminalReply();
+                    reply.setId(IdUtil.simpleUUID());
+                    reply.setReplyId(guid);
+                    reply.setNodeId(device.getNodeId());
+                    reply.setProcessNo(device.getNodeProcess());
+                    reply.setDeviceId(deviceId);
+                    reply.setLineId(lineId);
+                    reply.setIsReceived(0);
+                    reply.setCode("allFile");
+                    replyList.add(reply);
+                });
+            }
+
+            if (CollUtil.isNotEmpty(logList)) {
+                csTerminalLogsService.saveBatch(logList);
+            }
+            if (CollUtil.isNotEmpty(replyList)) {
+                csTerminalReplyService.saveBatch(replyList);
+            }
+            if (CollUtil.isNotEmpty(msgList)) {
+                bzEventMessageTemplate.sendMember(msgList, nodeId);
+            }
+        });
     }
 
     /**
@@ -257,7 +582,8 @@ class IcdServiceImpl implements IcdService {
                 && ObjectUtil.isNull(param.getDevIndex());
     }
 
-    private void handleFullProcessCreation(@NotNull IcdLedgerParam param) {
+    @Transactional(rollbackFor = Exception.class)
+    public void handleFullProcessCreation(@NotNull IcdLedgerParam param) {
         if (ObjectUtil.isNotNull(param.getEngineering())) {
             CsEngineeringPO po1 = csEngineeringService.addEngineering(param.getEngineering());
             param.setEngineeringIndex(po1.getId());
@@ -265,15 +591,18 @@ class IcdServiceImpl implements IcdService {
         }
     }
 
-    private void handleFromEngineeringCreation(IcdLedgerParam param) {
+    @Transactional(rollbackFor = Exception.class)
+    public void handleFromEngineeringCreation(IcdLedgerParam param) {
         createProjectAndDevices(param);
     }
 
-    private void handleFromProjectCreation(IcdLedgerParam param) {
+    @Transactional(rollbackFor = Exception.class)
+    public void handleFromProjectCreation(IcdLedgerParam param) {
         saveDevicesAndLines(param);
     }
 
-    private void handleFromDeviceCreation(IcdLedgerParam param) {
+    @Transactional(rollbackFor = Exception.class)
+    public void handleFromDeviceCreation(IcdLedgerParam param) {
         saveLines(param);
     }
 
@@ -306,8 +635,8 @@ class IcdServiceImpl implements IcdService {
         saveLines(param);
     }
 
-    private void saveLines(IcdLedgerParam param) {
-        List<CsLinePO> list = new ArrayList<>();
+    @Transactional(rollbackFor = Exception.class)
+    public void saveLines(IcdLedgerParam param) {
         List<CsLineParam> lineList = param.getLine();
         if (CollectionUtil.isNotEmpty(lineList)) {
             boolean result = checkAndAlertDuplicates(lineList);
@@ -329,7 +658,10 @@ class IcdServiceImpl implements IcdService {
                     line.setDevId(param.getDevIndex());
                 }
                 CsLinePO po = csLinePOService.addCldLine(line);
-                list.add(po);
+                //新增监测点限值
+                Overlimit overlimit = COverlimitUtil.globalAssemble(line.getVolGrade().floatValue(), line.getProtocolCapacity().floatValue(),line.getDevCapacity().floatValue(),line.getShortCircuitCapacity().floatValue(),0,0);
+                overlimit.setId(po.getLineId());
+                overlimitMapper.insert(overlimit);
             }
 
             //新增台账日志

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/NodeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.csdevice.service.impl;
 
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -13,6 +14,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
 import com.njcn.csdevice.mapper.NodeMapper;
+import com.njcn.csdevice.param.IcdNodeParam;
 import com.njcn.csdevice.pojo.param.NodeParam;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.Node;
@@ -20,6 +22,8 @@ import com.njcn.csdevice.pojo.vo.NodeProcessDeviceVo;
 import com.njcn.csdevice.service.INodeService;
 import com.njcn.db.constant.DbConstant;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
+import com.njcn.mq.message.CldControlMessage;
+import com.njcn.mq.template.CldControlMessageTemplate;
 import com.njcn.web.factory.PageFactory;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -28,6 +32,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -46,6 +51,7 @@ import java.util.stream.Collectors;
 public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements INodeService {
 
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
+    private final CldControlMessageTemplate controlMessageTemplate;
 
     @Override
     public boolean addNode(NodeParam nodeParam) {
@@ -165,6 +171,84 @@ public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements IN
         return nodeProcessDeviceVo;
     }
 
+    @Override
+    public void restartProcess(String nodeId, Integer processNo) {
+        Node node = getNodeById(nodeId);
+        CldControlMessage cldControlMessage = new CldControlMessage();
+        cldControlMessage.setGuid(IdUtil.simpleUUID());
+        cldControlMessage.setCode("set_process");
+        cldControlMessage.setNodeId(nodeId);
+        cldControlMessage.setProcessNo(processNo);
+        cldControlMessage.setFun("delete");
+        cldControlMessage.setProcessNum(node.getMaxProcessNum());
+        controlMessageTemplate.sendMember(cldControlMessage,nodeId);
+    }
+
+    @Override
+    public String updateDevProcessNo(String id, Integer processNo) {
+        String result;
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CsEquipmentDeliveryPO::getId,id);
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectOne(wrapper);
+        if (Objects.equals(po.getNodeProcess(),processNo)) {
+            return "修改进程号前后一致，暂不调整";
+        }
+        int oldProcessNo = po.getNodeProcess();
+        po.setNodeProcess(processNo);
+        int count = csEquipmentDeliveryMapper.updateById(po);
+        if (count > 0) {
+            result = "修改成功";
+            //重启前置机进程(两个)
+            //原来的
+            restartProcess(po.getNodeId(), oldProcessNo);
+            //修改后的
+            restartProcess(po.getNodeId(), processNo);
+        } else {
+            result = "修改失败";
+        }
+        return result;
+    }
+
+    @Override
+    public String updateDevNode(IcdNodeParam param) {
+        String result;
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CsEquipmentDeliveryPO::getId,param.getId());
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectOne(wrapper);
+        if (Objects.equals(po.getNodeId(),param.getNodeId()) && Objects.equals(po.getNodeProcess(),param.getProcessNo())) {
+            return "前置机修改前后一致，暂不调整";
+        }
+        Node node = getNodeById(param.getNodeId());
+        List<CsEquipmentDeliveryPO> devList = getListByNodeId(param.getNodeId());
+        if (ObjectUtil.isNotEmpty(devList) && devList.size() >= node.getNodeDevNum()) {
+            throw new BusinessException (AlgorithmResponseEnum.OVER_MAX_DEV_COUNT);
+        }
+
+        int oldProcessNo = po.getNodeProcess();
+        po.setNodeId(param.getNodeId());
+        po.setNodeProcess(param.getProcessNo());
+        int count = csEquipmentDeliveryMapper.updateById(po);
+        if (count > 0) {
+            result = "修改成功";
+            //重启前置机进程(两个)
+            //原来的
+            restartProcess(po.getNodeId(), oldProcessNo);
+            //修改后的
+            restartProcess(param.getNodeId(), param.getProcessNo());
+        } else {
+            result = "修改失败";
+        }
+        return result;
+    }
+
+    //根据前置机id获取装置数量
+    public List<CsEquipmentDeliveryPO> getListByNodeId(String nodeId) {
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getNodeId,nodeId)
+                .in(CsEquipmentDeliveryPO::getRunStatus, Arrays.asList(1,2));
+        return csEquipmentDeliveryMapper.selectList(lambdaQueryWrapper);
+    }
+
     /**
      * 校验参数，检查是否存在相同编码的字典类型
      */

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatIntegrityDServiceImpl.java

@@ -6,11 +6,11 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.mapper.RStatIntegrityDMapper;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
+import com.njcn.csdevice.service.CsEquipmentDeliveryService;
 import com.njcn.csdevice.service.IRStatIntegrityDService;
 import com.njcn.csdevice.util.TimeUtil;
 import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
@@ -42,15 +42,21 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IRStatIntegrityDService {
 
-    private final EquipmentFeignClient equipmentFeignClient;
     private final CsLineFeignClient csLineFeignClient;
     private final CommonService commonService;
+    private final CsEquipmentDeliveryService csEquipmentDeliveryService;
 
     @Override
     public void addData(StatisticsDataParam param) {
         List<RStatIntegrityD> result = new ArrayList<>();
-        //获取库中正常的所有装置
-        List<CsEquipmentDeliveryPO> devList = equipmentFeignClient.getAll().getData();
+        List<CsEquipmentDeliveryPO> devList;
+        //判断是否指定设备补招
+        if (CollectionUtil.isNotEmpty(param.getIdList())) {
+            devList = csEquipmentDeliveryService.getListByIds(param.getIdList());
+        } else {
+            //获取库中正常的所有装置
+            devList = csEquipmentDeliveryService.getAll();
+        }
         if (CollectionUtil.isNotEmpty(devList)) {
             Map<String, CsEquipmentDeliveryPO> devMap = devList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
             //获取所有监测点

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java

@@ -6,16 +6,15 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.mapper.RStatOnlineRateDMapper;
 import com.njcn.csdevice.param.LineCountEvaluateParam;
 import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import com.njcn.csdevice.service.CsEquipmentDeliveryService;
 import com.njcn.csdevice.service.ICsCommunicateService;
 import com.njcn.csdevice.service.IRStatOnlineRateDService;
 import com.njcn.csdevice.util.TimeUtil;
-import com.njcn.csharmonic.param.DataParam;
 import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
 import com.njcn.influx.deprecated.InfluxDBPublicParam;
 import lombok.AllArgsConstructor;
@@ -25,7 +24,6 @@ import org.springframework.stereotype.Service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -46,14 +44,24 @@ import java.util.List;
 public class RStatOnlineRateDServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IRStatOnlineRateDService {
 
     private final Integer online = 1;
-    private final EquipmentFeignClient equipmentFeignClient;
     private final ICsCommunicateService pqsCommunicateService;
+    private final CsEquipmentDeliveryService csEquipmentDeliveryService;
 
     @Override
     public void addData(StatisticsDataParam param) {
         List<RStatOnlineRateD> list = new ArrayList<>();
-        //获取库中正常的所有装置
-        List<CsEquipmentDeliveryPO> devList = equipmentFeignClient.getAll().getData();
+        List<CsEquipmentDeliveryPO> devList;
+        //判断是否指定设备补招
+        if (CollectionUtil.isNotEmpty(param.getIdList())) {
+            devList = csEquipmentDeliveryService.getListByIds(param.getIdList());
+        } else {
+            //获取库中正常的所有装置
+            devList = csEquipmentDeliveryService.getAll();
+        }
+        if (CollectionUtil.isEmpty(devList)) {
+            return;
+        }
+
         if (CollectionUtil.isNotEmpty(devList)) {
             //获取需要计算的时间
             List<String> dateRange = TimeUtil.getDateRangeAsString(param.getStartTime(), param.getEndTime());
@@ -190,6 +198,8 @@ public class RStatOnlineRateDServiceImpl extends MppServiceImpl<RStatOnlineRateD
                     } catch (ParseException e) {
                         throw new RuntimeException(e);
                     }
+                } else {
+                    minute = InfluxDBPublicParam.DAY_MINUTE;
                 }
             }
         }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java

@@ -61,26 +61,24 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
             });
             List<CsDeviceUserPO> csDeviceUserPOS = csDeviceUserPOMapper.selectList(csDeviceUserPOQueryWrapper);
             List<String> collect1 = csDeviceUserPOS.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
-            if(CollectionUtils.isEmpty(collect1)){
-                return collect;
-            }else{
-                csLedgerQueryWrapper.in("id",collect1).eq("level",2);
+            if (!CollectionUtils.isEmpty(collect1)) {
+                csLedgerQueryWrapper.in("id", collect1).eq("level", 2);
                 List<CsLedger> csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper);
                 List<String> collect2 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
                 csLedgerQueryWrapper.clear();
-                if(CollectionUtils.isEmpty(collect2)){
+                if (CollectionUtils.isEmpty(collect2)) {
                     return collect;
                 }
-                csLedgerQueryWrapper.in("id",collect2).eq("level",1);
+                csLedgerQueryWrapper.in("id", collect2).eq("level", 1);
                 csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper);
                 List<String> collect3 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
-                if(CollectionUtils.isEmpty(collect3)){
-                    return  collect;
+                if (CollectionUtils.isEmpty(collect3)) {
+                    return collect;
                 }
                 collect.addAll(collect3);
                 collect = collect.stream().distinct().collect(Collectors.toList());
-                return collect;
             }
+            return collect;
 
         } else if ( Objects.equals(role,AppRoleEnum.MARKET_USER.getCode())||
                 Objects.equals(role, AppRoleEnum.ENGINEERING_USER.getCode())) {
@@ -94,7 +92,9 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
             List<CsTouristDataPO> csTouristDataPOS = csTouristDataPOMapper.selectList(null);
             collect = csTouristDataPOS.stream().map(CsTouristDataPO::getEnginerId).distinct().collect(Collectors.toList());
 
-        }else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role,"bxs_user")){
+        }
+        // ||Objects.equals(role,"bxs_user")
+        else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){
             List<CsEngineeringPO> csEngineeringPOS = csEngineeringMapper.selectList(null);
             collect =csEngineeringPOS.stream().filter(temp->Objects.equals(temp.getStatus(),"1")).map(CsEngineeringPO::getId).collect(Collectors.toList());
         }
@@ -196,7 +196,9 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
             List<CsTouristDataPO> csTouristDataPOS = csTouristDataPOMapper.selectList(null);
             collect = csTouristDataPOS.stream().map(CsTouristDataPO::getDeviceId).distinct().collect(Collectors.toList());
 
-        }else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role,"bxs_user")){
+        }
+        // ||Objects.equals(role,"bxs_user")
+        else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){
             csLedgerQueryWrapper.clear();
             csLedgerQueryWrapper.eq("level",2).eq("state",1);
             List<CsLedger> csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/util/InfluxDbParamUtil.java

@@ -53,7 +53,7 @@ public class InfluxDbParamUtil {
         //如果是云前置设备,直接返回clDid
         boolean isCLdDevice = DicDataEnum.DEV_CLD.getCode().equals(dictTreeFeignClient.queryById(csEquipmentDeliveryDTOList.get(0).getDevType()).getData().getCode());
         if(isCLdDevice){
-//            return String.valueOf(finalCsLinePOList.get(0).getLineNo());
+            return String.valueOf(finalCsLinePOList.get(0).getLineNo());
         }
         //之后的逻辑还是按照原来的不变
         String position = csLineFeignClient.getPositionById(lineId).getData();

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventFeignClient.java

@@ -1,19 +1,24 @@
 package com.njcn.csharmonic.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
+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.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csharmonic.api.fallback.EventFeignClientFallbackFactory;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
-import com.njcn.csharmonic.pojo.vo.CsEventVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -30,5 +35,9 @@ public interface EventFeignClient {
     @PostMapping("/queryByIndex")
     HttpResult<CsEventPO> queryByIndex(@RequestBody CsEventPO csEventPO);
 
+    @PostMapping("/queryById")
+    HttpResult<CsEventPO> queryById(@RequestParam("eventId") String eventId);
 
-    }
+    @PostMapping("/getEventByTime")
+    HttpResult<List<CsEventPO>> getEventByTime(@RequestParam(name = "lineList", required = false) List<String> lineList,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime);
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventFeignClientFallbackFactory.java

@@ -8,13 +8,10 @@ import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csharmonic.api.EventFeignClient;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
-import com.njcn.csharmonic.pojo.vo.CsEventVO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -49,6 +46,18 @@ public class EventFeignClientFallbackFactory implements FallbackFactory<EventFei
                 log.error("{}异常，降级处理，异常为：{}","根据根据表唯一索引查询(用于校验是否存在该事件)s",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<CsEventPO> queryById(String eventId) {
+                log.error("{}异常，降级处理，异常为：{}","根据事件id查询数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsEventPO>> getEventByTime(List<String> lineList, String startTime, String endTime) {
+                log.error("{}异常，降级处理，异常为：{}","根据时间获取无波形的暂态事件",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/FittingDataQueryParam.java

@@ -0,0 +1,40 @@
+package com.njcn.csharmonic.param;
+
+
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class FittingDataQueryParam {
+
+    @ApiModelProperty(value = "监测点")
+    @NotBlank(message = "监测点ID不可为空")
+    private String lineId;
+
+    @ApiModelProperty(name = "searchBeginTime", value = "开始时间")
+    @NotBlank(message = "起始时间不可为空")
+    @DateTimeStrValid(message = "起始时间格式出错")
+    private String searchBeginTime;
+
+    @ApiModelProperty(name = "searchEndTime", value = "结束时间")
+    @NotBlank(message = "结束时间不可为空")
+    private String searchEndTime;
+
+    @ApiModelProperty(value = "用于选择多个指标及谐波次数")
+    List<FittingDataQueryParam> list;
+    @ApiModelProperty(value = "指标组id")
+    private String statisticalId;
+    @ApiModelProperty(value = "一次值：Primary;二次值：Secondary")
+    private String dataLevel;
+
+    @ApiModelProperty(value = "取值类型：Max，Min，cp95，avg（用户功率专用）")
+    private String valueType;
+
+    @ApiModelProperty(value = "频次2-50（谐波电压、谐波电流专用）")
+    private String frequency;
+
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/TrendDataQueryParam.java

@@ -0,0 +1,40 @@
+package com.njcn.csharmonic.param;
+
+
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class TrendDataQueryParam {
+
+    @ApiModelProperty(value = "监测点")
+    @NotBlank(message = "监测点ID不可为空")
+    private String lineId;
+
+    @ApiModelProperty(name = "searchBeginTime", value = "开始时间")
+    @NotBlank(message = "起始时间不可为空")
+    @DateTimeStrValid(message = "起始时间格式出错")
+    private String searchBeginTime;
+
+    @ApiModelProperty(name = "searchEndTime", value = "结束时间")
+    @NotBlank(message = "结束时间不可为空")
+    private String searchEndTime;
+
+    @ApiModelProperty(value = "用于选择多个指标及谐波次数")
+    List<TrendDataQueryParam> list;
+    @ApiModelProperty(value = "指标组id")
+    private String statisticalId;
+    @ApiModelProperty(value = "取值类型（Max，Min，cp95，avg）")
+    private String valueType;
+
+    @ApiModelProperty(value = "一次值：Primary;二次值：Secondary")
+    private String dataLevel;
+
+    @ApiModelProperty(value = "频次2-50")
+    private String frequency;
+
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @NoArgsConstructor
-@TableName(value = "cs_configuration")
+    @TableName(value = "cs_configuration")
 public class CsConfigurationPO  extends BaseEntity {
     /**
      * id

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPagePO.java

@@ -54,6 +54,7 @@ public class CsPagePO extends BaseEntity {
     @TableField(value = "`status`")
     private String status;
 
+    private Integer sort;
 
 
     public static final String COL_ID = "id";
@@ -74,4 +75,7 @@ public class CsPagePO extends BaseEntity {
     public static final String COL_UPDATE_BY = "update_by";
 
     public static final String COL_UPDATE_TIME = "update_time";
+
+    public static final String SORT = "sort";
+
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsRtDataVO.java

@@ -27,6 +27,9 @@ public class CsRtDataVO {
     @ApiModelProperty("监测点id")
     private String lineId;
 
+    @ApiModelProperty("设备状态 1:离线 2:在线")
+    private Integer devStatus;
+
     @ApiModelProperty("相别")
     private String phaseType;
 

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java

@@ -19,6 +19,7 @@ import com.njcn.event.file.pojo.dto.WaveDataDTO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -111,6 +112,16 @@ public class CsEventController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryById")
+    @ApiOperation("根据事件id查询数据")
+    public HttpResult<CsEventPO> queryById(String eventId) {
+        String methodDescribe = getMethodDescribe("queryById");
+        CsEventPO po = csEventPOService.lambdaQuery().eq(CsEventPO::getId,eventId).one();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryByModelId")
     @ApiOperation("获取各模块事件")
@@ -130,4 +141,18 @@ public class CsEventController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEventByTime")
+    @ApiOperation("根据时间获取无波形的暂态事件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lineList", value = "监测点id"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间")
+    })
+    public HttpResult<List<CsEventPO>> getEventByTime(@RequestParam(required = false) List<String> lineList,@RequestParam String startTime,@RequestParam String endTime) {
+        String methodDescribe = getMethodDescribe("getEventByTime");
+        List<CsEventPO> list = csEventPOService.getEventByTime(lineList,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java

@@ -11,6 +11,7 @@ import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.csharmonic.pojo.vo.CsEventVO;
 import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.event.file.pojo.dto.WaveDataDTO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
@@ -59,4 +60,6 @@ public interface CsEventPOService extends IService<CsEventPO>{
 
     void addCldEvent(CldEventParam param);
 
+    List<CsEventPO> getEventByTime(List<String> lineList, String startTime, String endTime);
+
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java

@@ -72,7 +72,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
         String name = csConfigurationPO.getName();
         Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, name).eq(CsConfigurationPO::getStatus, "1").count();
         if(count>1){
-            throw new BusinessException("存在相同的组态项目名称");
+            throw new BusinessException("存在相同的组态项目名称在其他工程项目中，无法新建");
         }
         return save;
     }
@@ -86,7 +86,12 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
             boolean b = this.updateById(csConfigurationPO);
             return b;
         }
+        Integer count = this.lambdaQuery().eq(CsConfigurationPO::getName, auditParm.getName()).ne(CsConfigurationPO::getId,auditParm.getId()).eq(CsConfigurationPO::getStatus, "1").count();
+        if(count>0){
+            throw new BusinessException("修改名称失败,存在相同的组态项目");
+        }
         BeanUtils.copyProperties(auditParm,csConfigurationPO);
+
         List<String> projectIds = auditParm.getProjectIds();
         if(!CollectionUtils.isEmpty(projectIds)){
             String projects = String.join(",", projectIds);

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java

@@ -42,7 +42,6 @@ import com.njcn.influx.utils.InfluxDbUtils;
 import com.njcn.minioss.config.MinIossProperties;
 import com.njcn.minioss.util.MinIoUtils;
 import com.njcn.oss.constant.GeneralConstant;
-import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.EleEvtFeignClient;
 import com.njcn.system.api.EpdFeignClient;
@@ -62,7 +61,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
@@ -306,6 +304,18 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         }
     }
 
+    @Override
+    public List<CsEventPO> getEventByTime(List<String> lineList, String startTime, String endTime) {
+        LambdaQueryWrapper<CsEventPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.between(CsEventPO::getStartTime,startTime,endTime)
+                .eq(CsEventPO::getType,0)
+                .isNull(CsEventPO::getWavePath);
+        if (CollUtil.isNotEmpty(lineList)) {
+            lambdaQueryWrapper.in(CsEventPO::getLineId,lineList);
+        }
+        return this.list(lambdaQueryWrapper);
+    }
+
     public String getTag(Integer type) {
         String tag;
         switch (type) {

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java

@@ -107,7 +107,7 @@ public class CsPagePOServiceImpl extends ServiceImpl<CsPagePOMapper, CsPagePO> i
         queryWrapper.eq(StringUtils.isNotBlank (csPageParam.getPid()),CsPagePO.COL_PID,csPageParam.getPid()).
                 like(StringUtils.isNotBlank (csPageParam.getSearchValue()),CsPagePO.COL_NAME,csPageParam.getSearchValue()).
                 eq ("status",1).
-                orderByAsc(CsPagePO.COL_KID);
+                orderByAsc(CsPagePO.SORT);
 
         IPage<CsPagePO> pageData = this.page(new Page<>(csPageParam.getPageNum(), csPageParam.getPageSize()), queryWrapper);
         List<String> collect1 = pageData.getRecords().stream().map(CsPagePO::getCreateBy).collect(Collectors.toList());
@@ -123,7 +123,7 @@ public class CsPagePOServiceImpl extends ServiceImpl<CsPagePOMapper, CsPagePO> i
             CsPageVO csPageVO = new CsPageVO();
             CsConfigurationPO csConfigurationPO = csConfigurationMapper.selectById(temp.getPid());
             BeanUtils.copyProperties(temp, csPageVO);
-            csPageVO.setKId(temp.getKId());
+//            csPageVO.setKId(temp.getKId());
             csPageVO.setConfigurationName(csConfigurationPO.getName());
             InputStream fileStream = fileStorageUtil.getFileStream(temp.getPath());
             String text = new BufferedReader(

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java

@@ -5,8 +5,8 @@ import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.google.common.reflect.TypeToken;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.*;
-import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.pojo.po.CsDataArray;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.pojo.vo.LineTargetVO;
@@ -22,7 +22,6 @@ import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.enums.DicDataEnum;
-import dm.jdbc.util.StringUtil;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -74,6 +73,8 @@ public class LineTargetServiceImpl implements ILineTargetService {
 
     private final InfluxDbParamUtil influxDbParamUtil;
 
+    private final EquipmentFeignClient equipmentFeignClient;
+
     @Override
     public List<DataArrayTreeVO> getLineTarget(String lineId) {
         List<String> setList = new ArrayList<>();
@@ -125,7 +126,12 @@ public class LineTargetServiceImpl implements ILineTargetService {
                 String dataId = dataArray.getDataId();
                 String classId = epdFeignClient.selectById(dataId).getData().getClassId();
                 String clDid = influxDbParamUtil.getClDidByLineId(item.getLineId());
-                result.add(getLineRtData(item.getId(),item.getLineId(),influxDbParamUtil.getTableNameByClassId(classId),targetTag,phasic,dataType,targetName,clDid));
+                //基础信息
+                CsRtDataVO vo = getLineRtData(item.getId(),item.getLineId(),influxDbParamUtil.getTableNameByClassId(classId),targetTag,phasic,dataType,targetName,clDid);
+                //设备状态信息
+                CsEquipmentDeliveryPO po = equipmentFeignClient.getDevByLineId(item.getLineId()).getData();
+                vo.setDevStatus(po.getRunStatus());
+                result.add(vo);
             }
         });
         return result;

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java

@@ -74,7 +74,7 @@ public class RealDataServiceImpl implements RealDataService {
                 redisUtil.saveByKeyWithExpire("rtDataUserId:"+lineId, RequestUtil.getUserIndex(),600L);
             }
             //等待装置响应,获取询问结果
-            Thread.sleep(2000);
+            Thread.sleep(5000);
             Object object;
             if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
                 object = redisUtil.getObjectByKey("devResponse:" + lineId);

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java

@@ -9,6 +9,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
 import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
 import com.njcn.csharmonic.pojo.vo.DataVo;
 import com.njcn.csharmonic.pojo.vo.HalfMonthReportVO;
@@ -91,6 +92,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
         //获取装置
         List<CsEquipmentDeliveryPO> equipmentDeliveryList = equipmentFeignClient.getAll().getData();
         if (CollectionUtil.isNotEmpty(equipmentDeliveryList)) {
+            Map<String, CsEquipmentDeliveryPO> map = equipmentDeliveryList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
             List<CsEquipmentDeliveryPO> processList = Objects.isNull(param.getProcess())
                     ? equipmentDeliveryList
                     : equipmentDeliveryList.stream()
@@ -99,6 +101,9 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
             if (CollectionUtil.isNotEmpty(processList)) {
                 //获取监测点集合
                 List<String> devList = processList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
+                if (CollectionUtil.isEmpty(devList)) {
+                    return result;
+                }
                 List<CsLinePO> csLineList = csLineFeignClient.getLinesByDevList(devList).getData();
                 if (CollectionUtil.isNotEmpty(csLineList)) {
                     Map<String,List<CsLinePO>> devMap = csLineList.stream().collect(Collectors.groupingBy(CsLinePO::getDeviceId));
@@ -123,7 +128,11 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
                                 vo.setMac(dev.getMac());
                                 vo.setOperationalTime(dev.getCreateTime());
                                 vo.setOperationalStatus(dev.getUsageStatus() == 0 ? "停运" : "在运");
-                                vo.setLineName(line.getName());
+                                if (Objects.equals(line.getName(),"治理监测点")) {
+                                    vo.setLineName(line.getName() + "(" + map.get(dev.getId()).getModuleNumber() + "模块)");
+                                } else {
+                                    vo.setLineName(line.getName());
+                                }
                                 vo.setCommunicationStatus(dev.getRunStatus() == 1 ? "离线" : "在线");
                                 vo.setLatestTime(LocalDateTime.now());
                                 vo.setProcess(dev.getProcess());

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/WlUserParam.java

@@ -0,0 +1,25 @@
+package com.njcn.cssystem.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class WlUserParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "工程id集合")
+    private List<String> engineeringList;
+
+    @ApiModelProperty(value = "便携式设备id")
+    private List<String> portableDevList;
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/WlUserVo.java

@@ -0,0 +1,44 @@
+package com.njcn.cssystem.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class WlUserVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "工程集合")
+    private List<EngineeringVo> engineeringList;
+
+    @ApiModelProperty(value = "便携式设备集合")
+    private List<portableDevVo> portableDevList;
+
+
+    @Data
+    public static class EngineeringVo implements Serializable{
+
+        @ApiModelProperty(value = "工程id")
+        private String id;
+
+        @ApiModelProperty(value = "工程名称")
+        private String name;
+
+    }
+
+    @Data
+    public static class portableDevVo implements Serializable{
+
+        @ApiModelProperty(value = "设备id")
+        private String id;
+
+        @ApiModelProperty(value = "设备名称")
+        private String name;
+    }
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/WlUserController.java

@@ -0,0 +1,75 @@
+package com.njcn.cssystem.controller;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.common.utils.LogUtil;
+import com.njcn.cssystem.pojo.param.WlUserParam;
+import com.njcn.cssystem.pojo.vo.WlUserVo;
+import com.njcn.cssystem.service.IWlUserService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-12
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/wlUser")
+@Api(tags = "用户设备分配")
+@AllArgsConstructor
+public class WlUserController extends BaseController {
+
+    private final IWlUserService wlUserService;
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/selectDevByUserId")
+    @ApiOperation("根据用户id查询工程和便携式设备")
+    @ApiImplicitParam(name = "userId", value = "用户id", required = true)
+    public HttpResult<WlUserVo> selectDevByUserId(@RequestParam @Validated String userId ) {
+        String methodDescribe = getMethodDescribe("selectDevByUserId");
+        LogUtil.njcnDebug(log, "{}，用户数据为：{}", methodDescribe, userId);
+        WlUserVo vo = wlUserService.selectDevByUserId(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/addUserDev")
+    @ApiOperation("用户绑定工程和便携式设备")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<WlUserVo> addUserDev(@RequestBody @Validated WlUserParam param) {
+        String methodDescribe = getMethodDescribe("addUserDev");
+        LogUtil.njcnDebug(log, "{}，参数：{}", methodDescribe, param);
+        wlUserService.addUserDev(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/deleteUserDev")
+    @ApiOperation("用户取消绑定工程和便携式设备")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<WlUserVo> deleteUserDev(@RequestBody @Validated WlUserParam param) {
+        String methodDescribe = getMethodDescribe("deleteUserDev");
+        LogUtil.njcnDebug(log, "{}，参数：{}", methodDescribe, param);
+        wlUserService.deleteUserDev(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IWlUserService.java

@@ -0,0 +1,16 @@
+package com.njcn.cssystem.service;
+
+import com.njcn.cssystem.pojo.param.WlUserParam;
+import com.njcn.cssystem.pojo.vo.WlUserVo;
+
+/**
+ * @author xy
+ */
+public interface IWlUserService {
+
+    WlUserVo selectDevByUserId(String userId);
+
+    void addUserDev(WlUserParam param);
+
+    void deleteUserDev(WlUserParam param);
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/WlUserServiceImpl.java

@@ -0,0 +1,112 @@
+package com.njcn.cssystem.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.csdevice.api.CsDeviceUserFeignClient;
+import com.njcn.csdevice.api.CsLedgerFeignClient;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
+import com.njcn.csdevice.pojo.param.UserDevParam;
+import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
+import com.njcn.cssystem.pojo.param.WlUserParam;
+import com.njcn.cssystem.pojo.vo.WlUserVo;
+import com.njcn.cssystem.service.IWlUserService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author xy
+ */
+@Service
+@AllArgsConstructor
+public class WlUserServiceImpl implements IWlUserService {
+
+    private final CsDeviceUserFeignClient csDeviceUserFeignClient;
+    private final CsLedgerFeignClient csLedgerFeignClient;
+
+    @Override
+    public WlUserVo selectDevByUserId(String userId) {
+        WlUserVo wlUserVo = new WlUserVo();
+        List<WlUserVo.EngineeringVo> list1 = new ArrayList<>();
+        List<WlUserVo.portableDevVo> list2 = new ArrayList<>();
+        //根据用户信息获取设备信息
+        List<String> devList = csDeviceUserFeignClient.findDevByUserId(userId).getData();
+        //根据设备查询工程信息
+        if (CollectionUtil.isNotEmpty(devList)) {
+            List<DevDetailDTO> ledger = csLedgerFeignClient.getInfoByIds(devList).getData();
+            ledger.forEach(item->{
+                if (Objects.equals(item.getEngineeringid(),"/")) {
+                    WlUserVo.portableDevVo portableDevVo = new WlUserVo.portableDevVo();
+                    portableDevVo.setId(item.getEquipmentId());
+                    portableDevVo.setName(item.getEquipmentName());
+                    list2.add(portableDevVo);
+                } else {
+                    WlUserVo.EngineeringVo engineeringVo = new WlUserVo.EngineeringVo();
+                    engineeringVo.setId(item.getEngineeringid());
+                    engineeringVo.setName(item.getEngineeringName());
+                    list1.add(engineeringVo);
+                }
+            });
+        }
+        wlUserVo.setEngineeringList(list1);
+        wlUserVo.setPortableDevList(list2);
+        return wlUserVo;
+    }
+
+    @Override
+    public void addUserDev(WlUserParam param) {
+        List<String> devList = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(param.getEngineeringList())) {
+            //根据工程id获取设备id
+            List<DevDetailDTO> dto = csLedgerFeignClient.getDevInfoByEngineerIds(param.getEngineeringList()).getData();
+            if (CollectionUtil.isNotEmpty(dto)) {
+                devList.addAll(dto.stream().map(DevDetailDTO::getEquipmentId).collect(Collectors.toList()));
+            }
+        }
+        if (CollectionUtil.isNotEmpty(param.getPortableDevList())) {
+            devList.addAll(param.getPortableDevList());
+        }
+        //存储用户和设备的关系
+        if (CollectionUtil.isNotEmpty(devList)) {
+            List<CsDeviceUserPO> list = new ArrayList<>();
+            devList.forEach(item->{
+                CsDeviceUserPO po = new CsDeviceUserPO();
+                po.setPrimaryUserId(param.getUserId());
+                po.setSubUserId(param.getUserId());
+                po.setDeviceId(item);
+                po.setStatus("1");
+                list.add(po);
+            });
+            csDeviceUserFeignClient.add(list);
+        }
+    }
+
+    @Override
+    public void deleteUserDev(WlUserParam param) {
+        List<String> devList = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(param.getEngineeringList())) {
+            //根据工程id获取设备id
+            List<DevDetailDTO> dto = csLedgerFeignClient.getDevInfoByEngineerIds(param.getEngineeringList()).getData();
+            if (CollectionUtil.isNotEmpty(dto)) {
+                devList.addAll(dto.stream().map(DevDetailDTO::getEquipmentId).collect(Collectors.toList()));
+            }
+        }
+        if (CollectionUtil.isNotEmpty(param.getPortableDevList())) {
+            devList.addAll(param.getPortableDevList());
+        }
+        //解绑用户和设备的关系
+        if (CollectionUtil.isNotEmpty(devList)) {
+            UserDevParam par = new UserDevParam();
+            par.setUserId(param.getUserId());
+            par.setList(devList);
+            csDeviceUserFeignClient.channelDevByUserId(par);
+        }
+    }
+
+
+
+}