refactor(logs): 重构日志服务相关配置和线路数据分析逻辑

- 将CsLogsPOMapper.xml从cs-device模块迁移至cs-system模块
- 更新CsLogsFeignClient的服务器配置从CS_DEVICE_BOOT到CS_SYSTEM_BOOT
- 优化CsGroupServiceImpl中的设备线路查询逻辑，直接使用敏感用户ID获取线路数据
- 在StableDataServiceImpl中新增电网侧和负荷侧字典常量定义
- 重构线路数据过滤逻辑，按电网侧和负荷侧分别处理数据
- 添加数据分组处理机制，区分治理前后数据并设置相应标识

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

@@ -59,6 +59,11 @@
           <version>4.4.0</version>
           <scope>compile</scope>
       </dependency>
+      <dependency>
+          <groupId>org.eclipse.paho</groupId>
+          <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+          <version>1.2.5</version>
+      </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -6,6 +6,7 @@ import com.njcn.csdevice.api.fallback.AppProjectClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.AppProjectAddParm;
 import com.njcn.csdevice.pojo.po.AppProjectPO;
 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;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,7 +26,7 @@ public interface AppProjectFeignClient {
     @PostMapping("/getProjectByName")
     HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name);
 
-    @PostMapping("/addAppProject")
+    @PostMapping("/addPortableProject")
-    HttpResult<AppProjectPO> addAppProject(@RequestBody AppProjectAddParm appProjectAddParm);
+    HttpResult<AppProjectPO> addPortableProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm);
 
 }

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

@@ -3,8 +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.CsCommTerminalFeignClientFallbackFactory;
-import com.njcn.csdevice.api.fallback.CsDeviceUserClientFallbackFactory;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
-import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,4 +30,7 @@ public interface CsCommTerminalFeignClient {
 
     @GetMapping("getPqUserIdsByUser")
     HttpResult<List<String>> getPqUserIdsByUser(@RequestParam("userId") String userId);
+
+    @PostMapping("/getLedgerByLineId")
+    HttpResult<List<DevDetailDTO>> getLedgerByLineId(@RequestBody List<String> list);
 }

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

@@ -6,7 +6,6 @@ import com.njcn.csdevice.api.fallback.CsDeviceUserClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
-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;
@@ -36,6 +35,8 @@ public interface CsDeviceUserFeignClient {
     HttpResult<DevUserVO> queryUserById(@RequestParam("devId") String devId);
 
     @PostMapping("/getList")
-    @ApiOperation("根据设备集合获取数据")
     HttpResult<List<CsDeviceUserPO>> getList(@RequestBody UserDevParam param);
+
+    @PostMapping("/getIdList")
+    HttpResult<List<String>> getIdList(@RequestParam("param") String param);
 }

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

@@ -6,6 +6,8 @@ import com.njcn.csdevice.api.fallback.CsEdDataFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.po.CsEdDataPO;
 import com.njcn.csdevice.pojo.vo.CsEdDataVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -14,7 +16,7 @@ import java.util.List;
 /**
  * @author xy
  */
-@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/edData", fallbackFactory = CsEdDataFeignClientFallbackFactory.class,contextId = "edData")
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/edData", fallbackFactory = CsEdDataFeignClientFallbackFactory.class, contextId = "edData")
 public interface CsEdDataFeignClient {
 
     @PostMapping("/findByDevTypeId")
@@ -22,4 +24,7 @@ public interface CsEdDataFeignClient {
 
     @PostMapping("/getAll")
     HttpResult<List<CsEdDataPO>> getAll(@RequestParam("devType") String devType);
+
+    @GetMapping("/getById")
+    HttpResult<CsEdDataPO> getById(@RequestParam("id") String id);
 }

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

@@ -1,14 +1,11 @@
 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.CsLineClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -75,9 +72,9 @@ public interface CsLineFeignClient {
     @PostMapping("/getOverLimitDataByIds")
     HttpResult<List<Overlimit>> getOverLimitData(@RequestBody List<String> ids);
 
-    @PostMapping("/getLineBySensitiveUser")
+    @PostMapping("/getDevBySensitiveUser")
-    @ApiOperation("根据敏感用户查询监测点")
+    @ApiOperation("根据敏感用户查询装置")
-    HttpResult<List<CsLinePO>> getLineBySensitiveUser(@RequestBody List<String> list);
+    HttpResult<List<CsEquipmentDeliveryPO>> getDevBySensitiveUser(@RequestBody List<String> list);
 
     @PostMapping("/list")
     HttpResult<List<CsLinePO>> list(@RequestBody CsLinePO param);

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

@@ -4,9 +4,12 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.CsLineTopologyClientFallbackFactory;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
+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.util.List;
 
@@ -19,4 +22,8 @@ public interface CsLineTopologyFeignClient {
     @PostMapping("/addList")
     HttpResult<String> addList(@RequestBody List<AppLineTopologyDiagramPO> list);
 
+    @PostMapping("/queryTopologyDiagram")
+    @ApiOperation("查询装置拓扑图")
+    HttpResult<AppTopologyDiagramVO> queryTopologyDiagram(@RequestParam(value="devId") String devId);
+
 }

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

@@ -0,0 +1,22 @@
+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.CsUpgradeLogsClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsUpgradeLogs;
+import io.swagger.annotations.ApiImplicitParam;
+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;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csUpgradeLogs", fallbackFactory = CsUpgradeLogsClientFallbackFactory.class,contextId = "csSoftInfo")
+public interface CsUpgradeLogsFeignClient {
+    @PostMapping("/add")
+    HttpResult add(@RequestBody CsUpgradeLogs csUpgradeLogs);
+
+}

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

@@ -0,0 +1,35 @@
+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.DeviceMessageClientFallbackFactory;
+import com.njcn.csdevice.param.DeviceMessageParam;
+import com.njcn.csdevice.param.LineInfoParam;
+import com.njcn.user.pojo.po.User;
+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.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/deviceMessage", fallbackFactory = DeviceMessageClientFallbackFactory.class,contextId = "deviceMessage")
+public interface DeviceMessageFeignClient {
+
+    @PostMapping("/getEventUserByDeviceId")
+    @ApiOperation("根据设备获取需要推送的用户id")
+    HttpResult<List<String>> getEventUserByDeviceId(@RequestParam("devId") String devId, @RequestParam("isAdmin") Boolean isAdmin);
+
+    @PostMapping("/getSendUserByType")
+    @ApiOperation("根据事件类型和用户id查询打开推送的用户信息")
+    HttpResult<List<User>> getSendUserByType(@RequestBody DeviceMessageParam param);
+
+    @PostMapping("/getLineInfo")
+    @ApiOperation("获取监测点信息")
+    HttpResult<String> getLineInfo(@RequestBody LineInfoParam param);
+
+}

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

@@ -51,9 +51,6 @@ public interface EquipmentFeignClient {
     @PostMapping("/updateModuleNumber")
     HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number);
 
-    @PostMapping("/updateLedger")
-    HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId);
-
     @PostMapping("/getAll")
     HttpResult<List<CsEquipmentDeliveryPO>> getAll();
 

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

@@ -41,8 +41,8 @@ public class AppProjectClientFallbackFactory implements FallbackFactory<AppProje
             }
 
             @Override
-            public HttpResult<AppProjectPO> addAppProject(AppProjectAddParm appProjectAddParm) {
+            public HttpResult<AppProjectPO> addPortableProject(AppProjectAddParm appProjectAddParm) {
-                log.error("{}异常，降级处理，异常为：{}","新增项目异常",cause.toString());
+                log.error("{}异常，降级处理，异常为：{}","新增便携式项目",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
         };

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsCommTerminalFeignClientFallbackFactory.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.CsCommTerminalFeignClient;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -51,6 +52,12 @@ public class CsCommTerminalFeignClientFallbackFactory implements FallbackFactory
                 log.error("{}异常，降级处理，异常为：{}","根据登录用户id获取电能质量用户id集合",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<DevDetailDTO>> getLedgerByLineId(List<String> list) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id集合获取所有台账信息异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -64,6 +64,12 @@ public class CsDeviceUserClientFallbackFactory implements FallbackFactory<CsDevi
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<String>> getIdList(String param) {
+                log.error("{}异常，降级处理，异常为：{}","获取事件id集合数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -39,6 +39,12 @@ public class CsEdDataFeignClientFallbackFactory implements FallbackFactory<CsEdD
                 log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<CsEdDataPO> getById(String id) {
+                log.error("{}异常，降级处理，异常为：{}","根据id获取装置类型",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.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -117,7 +118,7 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
             }
 
             @Override
-            public HttpResult<List<CsLinePO>> getLineBySensitiveUser(List<String> list) {
+            public HttpResult<List<CsEquipmentDeliveryPO>> getDevBySensitiveUser(List<String> list) {
                 log.error("{}异常，降级处理，异常为：{}","根据敏感用户查询监测点异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.CsLineTopologyFeignClient;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -33,6 +34,12 @@ public class CsLineTopologyClientFallbackFactory implements FallbackFactory<CsLi
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<AppTopologyDiagramVO> queryTopologyDiagram(String devId) {
+                log.error("{}异常，降级处理，异常为：{}","查询装置拓扑图异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

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

@@ -0,0 +1,36 @@
+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.CsUpgradeLogsFeignClient;
+import com.njcn.csdevice.pojo.po.CsUpgradeLogs;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+@Slf4j
+@Component
+public class CsUpgradeLogsClientFallbackFactory implements FallbackFactory<CsUpgradeLogsFeignClient> {
+    @Override
+    public CsUpgradeLogsFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+
+        return new CsUpgradeLogsFeignClient() {
+            @Override
+            public HttpResult add(CsUpgradeLogs csUpgradeLogs) {
+                log.error("{}异常，降级处理，异常为：{}", "新增升级日志异常", cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,51 @@
+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.DeviceMessageFeignClient;
+import com.njcn.csdevice.param.DeviceMessageParam;
+import com.njcn.csdevice.param.LineInfoParam;
+import com.njcn.user.pojo.po.User;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class DeviceMessageClientFallbackFactory implements FallbackFactory<DeviceMessageFeignClient> {
+    @Override
+    public DeviceMessageFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new DeviceMessageFeignClient() {
+
+            @Override
+            public HttpResult<List<String>> getEventUserByDeviceId(String devId, Boolean isAdmin) {
+                log.error("{}异常，降级处理，异常为：{}","根据设备获取需要推送的用户id数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<User>> getSendUserByType(DeviceMessageParam param) {
+                log.error("{}异常，降级处理，异常为：{}","根据事件类型和用户id查询打开推送的用户信息数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> getLineInfo(LineInfoParam param) {
+                log.error("{}异常，降级处理，异常为：{}","获取监测点信息数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -72,12 +72,6 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
                 throw new BusinessException(finalExceptionEnum);
             }
 
-            @Override
-            public HttpResult<String> updateLedger(String nDid, String engineeringId, String projectId) {
-                log.error("{}异常，降级处理，异常为：{}","更新设备预设工程和项目id数据异常",cause.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
-
             @Override
             public HttpResult<List<CsEquipmentDeliveryPO>> getAll() {
                 log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString());

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

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class DeviceMessageParam {
+
+    @ApiModelProperty("用户id集合")
+    private List<String> userList;
+
+    @ApiModelProperty("事件类型 0:暂态 1:稳态 2:运行 3:告警")
+    private Integer eventType;
+
+}

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

@@ -21,4 +21,7 @@ public class IcdBzParam implements Serializable {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    @ApiModelProperty("补召类型 0:稳态 1:暂态事件 2:波形）")
+    private Integer bzType;
+
 }

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

@@ -0,0 +1,21 @@
+package com.njcn.csdevice.param;
+
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class LineInfoParam {
+
+    @ApiModelProperty("nDid")
+    private String nDid;
+
+    @ApiModelProperty("监测点集合")
+    List<CsLinePO> list;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java

@@ -115,4 +115,24 @@ public class CsEquipmentDeliveryDTO  {
      * 日志等级(NORMAL、DEBUG、WARN、ERROR)
      */
     private String devLogLevel;
+
+    /**
+     * 设备软件信息id
+     */
+    private String softinfoId;
+
+    /**
+     * 治理方法
+     */
+    private String governMethod;
+
+    /**
+     * 敏感用户id
+     */
+    private String monitorUser;
+
+    /**
+     * 治理类型(稳态:harmonic 暂态:event)
+     */
+    private String governType;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java

@@ -3,6 +3,8 @@ package com.njcn.csdevice.pojo.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2023/9/6  13:59【需求编号】
@@ -32,9 +34,27 @@ public class DevDetailDTO {
     @ApiModelProperty(value = "设备名称")
     private String equipmentName;
 
+    @ApiModelProperty(value = "监测点id")
+    private String lineId;
+
+    @ApiModelProperty(value = "监测点名称")
+    private String lineName;
+
     @ApiModelProperty(value = "设备通讯状态")
     private Integer runStatus;
 
     @ApiModelProperty(value = "设备MAC地址")
     private String devMac;
+
+    @ApiModelProperty(value = "nDid")
+    private String nDid;
+
+    @ApiModelProperty(value = "监测对象")
+    private String objType;
+
+    @ApiModelProperty(value = "设备治理方案")
+    private String governType;
+
+    @ApiModelProperty(value = "监测点id集合")
+    private List<String> lineList;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java

@@ -1,8 +1,10 @@
 package com.njcn.csdevice.pojo.dto;
 
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -13,7 +15,7 @@ import java.util.List;
  * @version V1.0.0
  */
 @Data
-public class LineParamDTO {
+public class LineParamDTO extends BaseParam implements Serializable {
     @ApiModelProperty(value = "工程id")
     private String engineerId;
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/SendResult.java

@@ -0,0 +1,21 @@
+package com.njcn.csdevice.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+@AllArgsConstructor
+public class SendResult implements Serializable {
+
+    private final boolean success;
+    private final String messageId;
+    private final String failReason;
+    private final boolean isTimeOut;
+    private final boolean unauthorized;
+
+}

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

@@ -44,5 +44,6 @@ public class AppLineTopologyDiagramParm extends BaseEntity {
 
     private Double lat;
 
+    private String target;
 
 }

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

@@ -67,7 +67,7 @@ public class CsEdDataAuditParm {
     private String versionType;
 
     @ApiModelProperty(value = "crc信息")
-    private String crcInfo;
+    private String crc;
     @ApiModelProperty(value="0：删除 1：正常")
     private String status;
     @ApiModelProperty(value = ".bin文件")

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

@@ -106,4 +106,18 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
     @ApiModelProperty(value="所属项目")
     private String associatedProject;
 
+    @ApiModelProperty(value="icd")
+    private String icd;
+
+    @ApiModelProperty(value="是否支持升级(0:否 1:是)")
+    private Integer upgrade;
+
+    @ApiModelProperty(value="治理方法")
+    private String governMethod;
+
+    @ApiModelProperty(value="敏感用户id")
+    private String monitorUser;
+
+    @ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
+    private String governType;
 }

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

@@ -110,4 +110,19 @@ public class CsEquipmentDeliveryAuditParm {
 
     @ApiModelProperty(value="所属项目")
     private String associatedProject;
+
+    @ApiModelProperty(value="icd")
+    private String icd;
+
+    @ApiModelProperty(value="是否支持升级(0:否 1:是)")
+    private Integer upgrade;
+
+    @ApiModelProperty(value="治理方法")
+    private String governMethod;
+
+    @ApiModelProperty(value="敏感用户id")
+    private String monitorUser;
+
+    @ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
+    private String governType;
 }

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

@@ -2,6 +2,7 @@ package com.njcn.csdevice.pojo.param;
 
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -40,4 +41,9 @@ public class CsEquipmentDeliveryQueryParm extends BaseParam {
     @ApiModelProperty("物联通讯状态 0:未连接 1:已连接")
     private Integer connectStatus;
 
+    @ApiModelProperty("ICD")
+    private String icd;
+
+    @ApiModelProperty("是否支持升级(0:否 1:是)")
+    private Integer upgrade;
 }

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

@@ -0,0 +1,15 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author caozehui
+ * @data 2026-04-07
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DevVersionParam extends BaseParam {
+    private String keyword;
+}

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

@@ -45,5 +45,7 @@ public class AppLineTopologyDiagramPO  extends BaseEntity {
     @TableField(value = "lat")
     private Double lat;
 
+    @TableField(value = "target")
+    private String target;
 
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
@@ -43,6 +44,12 @@ public class CsDataArray extends BaseEntity {
      */
     private String anotherName;
 
+    /**
+     * influxdb 存储的名称
+     */
+    @TableField(exist = false)
+    private String influxDbName;
+
     /**
      * 字典序号
      */

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

@@ -7,10 +7,9 @@ import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
- * 
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2023/4/7  11:29【需求编号】
@@ -62,7 +61,7 @@ public class CsEdDataPO extends BaseEntity {
      * 版本日期
      */
     @TableField(value = "version_date")
-    private Date versionDate;
+    private LocalDateTime versionDate;
 
     /**
      * 描述
@@ -88,6 +87,11 @@ public class CsEdDataPO extends BaseEntity {
     @TableField(value = "file_path")
     private String filePath;
 
+    /**
+     * crc文件校验码
+     */
+    @TableField(value = "crc")
+    private String crc;
 
 
 }

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

@@ -148,4 +148,32 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "associated_project")
     private String associatedProject;
 
+    /**
+     * icd模型
+     */
+    @TableField(value = "icd")
+    private String icd;
+
+    /**
+     * 是否支持升级(0:否 1:是)
+     */
+    private Integer upgrade;
+
+    /**
+     * 治理方法
+     */
+    @TableField(value = "govern_method")
+    private String governMethod;
+
+    /**
+     * 敏感用户id
+     */
+    @TableField(value = "monitor_user")
+    private String monitorUser;
+
+    /**
+     * 治理类型(稳态:harmonic 暂态:event)
+     */
+    @TableField(value = "govern_type")
+    private String governType;
 }

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

@@ -127,14 +127,7 @@ public class CsLinePO  extends BaseEntity {
      */
     @TableField(value = "monitor_obj")
     private String monitorObj;
-    /**
-     * 是否治理(0:未治理 1:已治理)
-     */
-    @TableField(value = "is_govern")
-    private Integer govern;
 
-    @TableField(value = "monitor_user")
-    private String monitorUser;
 
     /**
      * 短路容量

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

@@ -0,0 +1,75 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ * @description 设备升级日志
+ */
+@Data
+@TableName(value = "cs_upgrade_logs")
+public class CsUpgradeLogs {
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 设备id
+     */
+    @TableField(value = "dev_id")
+    private String devId;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "version_no")
+    private String versionNo;
+
+    /**
+     * 升级结果(0:失败 1:成功)
+     */
+    private Integer result;
+
+    /**
+     * 用户名称
+     */
+    @TableField(value = "user_name")
+    private String userName;
+
+    /**
+     * 登录名称
+     */
+    @TableField(value = "login_name")
+    private String loginName;
+
+    /**
+     * 创建用户
+     */
+    @TableField(fill = FieldFill.INSERT, insertStrategy = FieldStrategy.IGNORED)
+    private String createBy;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT, insertStrategy = FieldStrategy.IGNORED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE, insertStrategy = FieldStrategy.IGNORED)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE, insertStrategy = FieldStrategy.IGNORED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+}

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

@@ -1,8 +1,6 @@
 package com.njcn.csdevice.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 
 /**
@@ -43,5 +41,6 @@ public class AppLineTopologyDiagramVO  {
 
     private String linePostion;
 
-
+    @ApiModelProperty(value="绑定的指标")
+    private String target;
 }

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

@@ -70,12 +70,11 @@ public class CsEdDataVO  extends BaseEntity {
     @ApiModelProperty(value = "版本类型")
     private String versionType;
 
-    @ApiModelProperty(value = "crc信息")
-    private String crcInfo;
-
     @ApiModelProperty(value = ".bin文件")
     private String filePath;
 
+    @ApiModelProperty(value = "CRC校验")
+    private String crc;
 
 
 }

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

@@ -106,4 +106,13 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="所属项目名称")
     private String associatedProjectName;
 
+    @ApiModelProperty(value="治理方法")
+    private String governMethod;
+
+    @ApiModelProperty(value="敏感用户id")
+    private String monitorUser;
+
+    @ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
+    private String governType;
+
 }

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -31,6 +30,9 @@ public class    DataGroupEventVO {
     @ApiModelProperty("装置ID")
     private String deviceId;
 
+    @ApiModelProperty("设备网络码")
+    private String nDid;
+
     @ApiModelProperty("装置名称")
     private String devName;
 
@@ -65,9 +67,24 @@ public class    DataGroupEventVO {
     private Double amplitude;
 
     @ApiModelProperty("严重度")
-    private String severity;
+    private Double severity;
 
     @ApiModelProperty("波形路径")
     private String wavePath;
 
+    @ApiModelProperty("事件落点")
+    private String landPoint;
+
+    @ApiModelProperty("暂降原因")
+    private String advanceReason;
+
+    @ApiModelProperty("暂降类型")
+    private String advanceType;
+
+    @ApiModelProperty("暂降源与监测位置关系 0-未知、1-上游、2-下游")
+    private String sagSource;
+
+    @ApiModelProperty("监测点电压等级")
+    private Double lineVoltage;
+
 }

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

@@ -71,4 +71,7 @@ public class  DevCountVO implements Serializable {
 
     @ApiModelProperty(value = "反馈数")
     private Integer feedBackCount = 0;
+
+    @ApiModelProperty(value = "当前工程监测点数")
+    private Integer lineCount = 0;
 }

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

@@ -0,0 +1,100 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author caozehui
+ * @data 2026-04-07
+ */
+@Data
+public class DevVersionVO {
+    /**
+     * 设备Id
+     */
+    private String id;
+    /**
+     * 设备名称
+     */
+    private String name;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 协议版本号
+     */
+    private String protocolVersion;
+
+    /**
+     * 版本日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime versionDate;
+
+    /**
+     * 设备型号
+     */
+    private String devModel;
+
+    /**
+     * 设备类型名称
+     */
+    private String devModelName;
+
+    /**
+     * icd型号
+     */
+    private String icd;
+
+
+    /**
+     * 所属工程
+     */
+    private String associatedEngineering;
+
+    /**
+     * 所属项目
+     */
+    private String associatedProject;
+
+    /**
+     * 装置启用状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改人员
+     */
+    private String updateBy;
+
+    /**
+     * 修改人名称
+     */
+    private String updateByName;
+
+    /**
+     * 设备运行状态(0:删除 1:离线 2:在线)
+     */
+    private Integer runStatus;
+
+    /**
+     * 是否支持升级(0:否 1:是)
+     */
+    private Integer upgrade;
+
+    /**
+     * 设备与MQTT服务器连接状态 (0:未连接 1:已连接)
+     */
+    private Integer connectStatus;
+}

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

@@ -62,5 +62,8 @@ public class DeviceManagerVO {
 
         @ApiModelProperty(value = "数据类型 rt:实时数据 history:历史数据")
         private String type;
+
+        @ApiModelProperty(value = "排序")
+        private Integer sort;
     }
 }

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

@@ -8,17 +8,25 @@ import java.time.LocalDateTime;
 
 @Data
 public class PqSensitiveUserLineVO {
+    @ApiModelProperty("工程名称")
+    private String engineeringName;
+    @ApiModelProperty("项目名称")
+    private String projectName;
+    @ApiModelProperty("设备id")
+    private String devId;
+    @ApiModelProperty("设备名称")
+    private String devName;
     @ApiModelProperty("治理对象")
     private String sensitiveUser;
     @ApiModelProperty("监测点ID")
     private String lineId;
     @ApiModelProperty("测点名称")
     private String lineName;
-    @ApiModelProperty("是否治理")
+    @ApiModelProperty("治理方案")
     private String govern;
     @ApiModelProperty("电压等级")
     private double volGrade;
-    @ApiModelProperty("监测类型")
+    @ApiModelProperty("监测位置")
     private String position;
     @ApiModelProperty("运行状态")
     private String runStatus;

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

@@ -66,6 +66,9 @@ public class ProjectEquipmentVO  {
     @ApiModelProperty(value = "设备类型(监测设备:DEV_CLD 治理设备:Direct_Connected_Device)")
     private String devType;
 
+    @ApiModelProperty(value = "是否存在告警(告警通过查询当日的未读的暂态事件判断)")
+    private Boolean isAlarm;
+
     @ApiModelProperty(value = "监测点集合")
     private List<CsLinePO> lineList;
 

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

@@ -2,6 +2,7 @@ package com.njcn.csdevice.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.List;
 
 /**
@@ -20,6 +21,9 @@ public class RecordAllDevTreeVo {
     @ApiModelProperty("设备名称")
     private String name;
 
+    @ApiModelProperty("设备状态")
+    private Integer runStatus;
+
     @ApiModelProperty("线路")
     private List<RecordAllLineTreeVo> children;
 

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

@@ -1,74 +1,74 @@
-package com.njcn.csdevice.utils;
+//package com.njcn.csdevice.utils;
-
+//
-import org.eclipse.paho.client.mqttv3.*;
+//import org.eclipse.paho.client.mqttv3.*;
-
+//
-import java.io.File;
+//import java.io.File;
-import java.io.FileInputStream;
+//import java.io.FileInputStream;
-import java.io.FileOutputStream;
+//import java.io.FileOutputStream;
-import java.io.IOException;
+//import java.io.IOException;
-import java.nio.file.Files;
+//import java.nio.file.Files;
-import java.nio.file.Paths;
+//import java.nio.file.Paths;
-
+//
-/**
+///**
- * Description:
+// * Description:
- * Date: 2023/8/2  13:41【需求编号】
+// * Date: 2023/8/2  13:41【需求编号】
- *
+// *
- * @author clam
+// * @author clam
- * @version V1.0.0
+// * @version V1.0.0
- */
+// */
-public class MqttTest {
+//public class MqttTest {
-    private static final String MQTT_BROKER = "tcp://192.168.1.13:1883";
+//    private static final String MQTT_BROKER = "tcp://192.168.1.13:1883";
-    private static final String MQTT_TOPIC = "file/upload";
+//    private static final String MQTT_TOPIC = "file/upload";
-    private static final String FILE_PATH = "C:\\Users\\无名\\Desktop\\111.json"; // Replace with the path to your file
+//    private static final String FILE_PATH = "C:\\Users\\无名\\Desktop\\111.json"; // Replace with the path to your file
-
+//
-    public static void main(String[] args) {
+//    public static void main(String[] args) {
-        MqttClient mqttClient = null;
+//        MqttClient mqttClient = null;
-        try {
+//        try {
-            // Connect to the MQTT broker
+//            // Connect to the MQTT broker
-            mqttClient = new MqttClient(MQTT_BROKER, MqttClient.generateClientId());
+//            mqttClient = new MqttClient(MQTT_BROKER, MqttClient.generateClientId());
-            MqttConnectOptions connOpts = new MqttConnectOptions();
+//            MqttConnectOptions connOpts = new MqttConnectOptions();
-            connOpts.setUserName("t_user");
+//            connOpts.setUserName("t_user");
-            connOpts.setPassword("njcnpqs".toCharArray());
+//            connOpts.setPassword("njcnpqs".toCharArray());
-
+//
-            mqttClient.connect(connOpts);
+//            mqttClient.connect(connOpts);
-
+//
-            // Read the file
+//            // Read the file
-            File file = new File(FILE_PATH);
+//            File file = new File(FILE_PATH);
-            FileInputStream fis = new FileInputStream(file);
+//            FileInputStream fis = new FileInputStream(file);
-            byte[] fileContent = new byte[(int) file.length()];
+//            byte[] fileContent = new byte[(int) file.length()];
-            fis.read(fileContent);
+//            fis.read(fileContent);
-            fis.close();
+//            fis.close();
-
+//
-            // Create a new MQTT message
+//            // Create a new MQTT message
-            MqttMessage message = new MqttMessage(fileContent);
+//            MqttMessage message = new MqttMessage(fileContent);
-
+//
-            // Set QoS level and retain flag as per your requirement
+//            // Set QoS level and retain flag as per your requirement
-            message.setQos(1);
+//            message.setQos(1);
-//            message.setRetained(false);
+////            message.setRetained(false);
-
+//
-            // Record the start time
+//            // Record the start time
-            long startTime = System.currentTimeMillis();
+//            long startTime = System.currentTimeMillis();
-
+//
-            // Publish the message to the MQTT topic
+//            // Publish the message to the MQTT topic
-            mqttClient.publish(MQTT_TOPIC, message);
+//            mqttClient.publish(MQTT_TOPIC, message);
-
+//
-            // Record the end time
+//            // Record the end time
-            long endTime = System.currentTimeMillis();
+//            long endTime = System.currentTimeMillis();
-
+//
-            System.out.println("File published successfully!");
+//            System.out.println("File published successfully!");
-            System.out.println("Time taken: " + (endTime - startTime) + " ms");
+//            System.out.println("Time taken: " + (endTime - startTime) + " ms");
-        } catch (MqttException | IOException e) {
+//        } catch (MqttException | IOException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
-        } finally {
+//        } finally {
-            // Disconnect from the MQTT broker
+//            // Disconnect from the MQTT broker
-            if (mqttClient != null && mqttClient.isConnected()) {
+//            if (mqttClient != null && mqttClient.isConnected()) {
-                try {
+//                try {
-                    mqttClient.disconnect();
+//                    mqttClient.disconnect();
-                } catch (MqttException e) {
+//                } catch (MqttException e) {
-                    e.printStackTrace();
+//                    e.printStackTrace();
-                }
+//                }
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-}
+//}

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

@@ -21,6 +21,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.github.tocrhz</groupId>
+      <artifactId>mqtt-spring-boot-starter</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.njcn</groupId>
       <artifactId>common-web</artifactId>
@@ -163,6 +167,11 @@
       <artifactId>message-api</artifactId>
       <version>1.0.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>event-common</artifactId>
+      <version>1.0.0</version>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -101,7 +100,6 @@ public class CsDataArrayController extends BaseController {
     @PostMapping("/findListByParam")
     @ApiOperation("根据条件查询详细数据")
     @ApiImplicitParam(name = "param", value = "参数集合", required = true)
-    @ApiIgnore
     public HttpResult<List<CsDataArray>> findListByParam(@RequestBody DataArrayParam param){
         String methodDescribe = getMethodDescribe("findListByParam");
         List<CsDataArray> list = csDataArrayService.findListByParam(param);

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

@@ -1,7 +1,6 @@
 package com.njcn.csdevice.controller.equipment;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -10,7 +9,6 @@ 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.po.CsEventSendMsg;
-import com.njcn.csdevice.pojo.po.CsLogsPO;
 import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO;
 import com.njcn.csdevice.service.ICsEventSendMsgService;
 import com.njcn.web.controller.BaseController;

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

@@ -66,7 +66,5 @@ public class CsSoftInfoController extends BaseController {
         csSoftInfoService.removeById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
-
-
 }
 

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

@@ -0,0 +1,59 @@
+package com.njcn.csdevice.controller.equipment;
+
+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.csdevice.pojo.po.CsUpgradeLogs;
+import com.njcn.csdevice.service.CsUpgradeLogsService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.RequestUtil;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csUpgradeLogs")
+@Api(tags = "装置升级日志")
+@AllArgsConstructor
+@Validated
+public class CsUpgradeLogsController extends BaseController {
+    private final CsUpgradeLogsService csUpgradeLogsService;
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("新增升级日志")
+    @ApiImplicitParam(name = "csUpgradeLogs", value = "日志参数", required = true)
+    public HttpResult add(@RequestBody CsUpgradeLogs csUpgradeLogs) {
+        csUpgradeLogs.setUserName(RequestUtil.getUsername());
+        csUpgradeLogs.setLoginName(RequestUtil.getLoginName());
+        String methodDescribe = getMethodDescribe("add");
+        return HttpResultUtil.assembleCommonResponseResult(csUpgradeLogsService.save(csUpgradeLogs) ? CommonResponseEnum.SUCCESS : CommonResponseEnum.FAIL, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/getByDevId")
+    @ApiOperation("查询指定devId的所有升级日志")
+    @ApiImplicitParam(name = "devId", value = "装置Id", required = true)
+    public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestBody String devId) {
+        String methodDescribe = getMethodDescribe("getByDevId");
+        List<CsUpgradeLogs> result = csUpgradeLogsService.lambdaQuery().eq(CsUpgradeLogs::getDevId, devId).list();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}

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

@@ -23,6 +23,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -45,9 +47,9 @@ public class DevModelController extends BaseController {
     @ApiOperation("新增设备模板")
     @ApiImplicitParam(name = "csDevModelAddParm", value = "新增设备模板参数", required = true)
     @Deprecated
-    public HttpResult<CsDevModelPO> addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm){
+    public HttpResult<CsDevModelPO> addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm) {
         String methodDescribe = getMethodDescribe("addDevModel");
-        CsDevModelPO flag = csDevModelService.addDevModel (csDevModelAddParm);
+        CsDevModelPO flag = csDevModelService.addDevModel(csDevModelAddParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
@@ -56,7 +58,7 @@ public class DevModelController extends BaseController {
     @PostMapping("/AuditDevModel")
     @ApiOperation("更新/删除设备模板参数")
     @ApiImplicitParam(name = "csDevModelAuditParm", value = "更新/删除设备模板参数", required = true)
-    public HttpResult<Boolean> AuditDevModel(@RequestBody @Validated CsDevModelAuditParm csDevModelAuditParm ){
+    public HttpResult<Boolean> AuditDevModel(@RequestBody @Validated CsDevModelAuditParm csDevModelAuditParm) {
         String methodDescribe = getMethodDescribe("AuditDevModel");
 
         Boolean flag = csDevModelService.AuditDevModel(csDevModelAuditParm);
@@ -64,15 +66,14 @@ public class DevModelController extends BaseController {
     }
 
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryDevModelPage")
     @ApiOperation("设备模板分页查询")
     @ApiImplicitParam(name = "csDevModelQueryParm", value = "设备模板查询参数", required = true)
-    public HttpResult<IPage<CsDevModelPageVO>> queryDevModelPage(@RequestBody @Validated CsDevModelQueryParm csDevModelQueryParm ){
+    public HttpResult<IPage<CsDevModelPageVO>> queryDevModelPage(@RequestBody @Validated CsDevModelQueryParm csDevModelQueryParm) {
         String methodDescribe = getMethodDescribe("queryDevModelPage");
 
-        IPage<CsDevModelPageVO> page  = csDevModelService.queryPage (csDevModelQueryParm);
+        IPage<CsDevModelPageVO> page = csDevModelService.queryPage(csDevModelQueryParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 
@@ -80,10 +81,10 @@ public class DevModelController extends BaseController {
     @PostMapping("/queryDevModelOne")
     @ApiOperation("设备模板查询")
     @ApiImplicitParam(name = "csDevModelQueryListParm", value = "设备模板信息", required = true)
-    public HttpResult<CsDevModelPageVO> queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm){
+    public HttpResult<CsDevModelPageVO> queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm) {
         String methodDescribe = getMethodDescribe("queryDevModelOne");
 
-        CsDevModelPageVO csDevModelPageVO  = csDevModelService.queryDevModelOne(csDevModelQueryListParm);
+        CsDevModelPageVO csDevModelPageVO = csDevModelService.queryDevModelOne(csDevModelQueryListParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPageVO, methodDescribe);
     }
 
@@ -91,13 +92,13 @@ public class DevModelController extends BaseController {
     @PostMapping("/findModel")
     @ApiOperation("根据条件查询模板")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "devType", value = "装置类型", required = true),
+            @ApiImplicitParam(name = "devType", value = "装置类型", required = true),
-        @ApiImplicitParam(name = "version", value = "版本", required = true),
+            @ApiImplicitParam(name = "version", value = "版本", required = true),
-        @ApiImplicitParam(name = "time", value = "时间", required = true)
+            @ApiImplicitParam(name = "time", value = "时间", required = true)
     })
-    public HttpResult<CsDevModelPO> findModel(@RequestParam("devType") String devType,@RequestParam("version") String version,@RequestParam("time") String time){
+    public HttpResult<CsDevModelPO> findModel(@RequestParam("devType") String devType, @RequestParam("version") String version, @RequestParam("time") String time) {
         String methodDescribe = getMethodDescribe("findModel");
-        CsDevModelPO csDevModelPo  = csDevModelService.findModel(devType,version,time);
+        CsDevModelPO csDevModelPo = csDevModelService.findModel(devType, version, time);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPo, methodDescribe);
     }
 
@@ -105,10 +106,9 @@ public class DevModelController extends BaseController {
     @PostMapping("/getModelById")
     @ApiOperation("根据模板Id获取模板数据")
     @ApiImplicitParam(name = "id", value = "模板id", required = true)
-    public HttpResult<CsDevModelPO> getModelById(@RequestParam("id") String id){
+    public HttpResult<CsDevModelPO> getModelById(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("getModelById");
-        CsDevModelPO po  = csDevModelService.getModelById(id);
+        CsDevModelPO po = csDevModelService.getModelById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
-
 }

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

@@ -11,8 +11,11 @@ import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
 import com.njcn.csdevice.service.CsDeviceUserPOService;
+import com.njcn.csharmonic.api.EventUserFeignClient;
+import com.njcn.csharmonic.param.CsEventUserQueryParam;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,7 +24,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -37,6 +42,8 @@ import java.util.List;
 public class DeviceUserController extends BaseController {
 
     private final CsDeviceUserPOService csDeviceUserPOService;
+    private final EventUserFeignClient eventUserFeignClient;
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/add")
     @ApiOperation("新增设备扫码设备用户绑定")
@@ -174,4 +181,25 @@ public class DeviceUserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getIdList")
+    @ApiOperation("获取事件id集合")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<String>> getIdList(@RequestParam("param") String param){
+        String methodDescribe = getMethodDescribe("getIdList");
+        List<String> list = new ArrayList<>();
+        CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+        param1.setUserId(RequestUtil.getUserIndex());
+        param1.setStartTime(null);
+        param1.setEndTime(null);
+        param1.setEventIds(null);
+
+        if (Objects.equals(param, "1")) {
+            list = eventUserFeignClient.queryTempHarmonic(param1).getData();
+        } else if (Objects.equals(param, "3")) {
+            list = eventUserFeignClient.queryAlarmEvent(param1).getData();
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

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

@@ -15,6 +15,7 @@ import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.param.*;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.csdevice.pojo.vo.DevVersionVO;
 import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
 import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 import com.njcn.csdevice.service.CsDevModelRelationService;
@@ -46,6 +47,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 /**
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -63,20 +65,20 @@ public class EquipmentDeliveryController extends BaseController {
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
     private final IMqttUserService mqttUserService;
     private final CsDevModelRelationService csDevModelRelationService;
-    private  final DictTreeFeignClient dictTreeFeignClient;
+    private final DictTreeFeignClient dictTreeFeignClient;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addEquipmentDelivery")
     @ApiOperation("新增出厂设备")
     @ApiImplicitParam(name = "csEquipmentDeliveryAddParm", value = "新增项目参数", required = true)
     @DeviceLog(operateType = DeviceOperate.ADD)
-    public HttpResult<CsEquipmentDeliveryPO> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
+    public HttpResult<CsEquipmentDeliveryPO> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) {
         String methodDescribe = getMethodDescribe("addEquipmentDelivery");
         CsEquipmentDeliveryPO po = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
-        if (Objects.nonNull(po)){
+        if (Objects.nonNull(po)) {
             //查询mqtt用户名和密码是否存在
             boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAddParm.getNdid());
-            if (result){
+            if (result) {
                 //初始化装置mqtt连接信息(使用sha256加密)
                 mqttUserService.insertMqttUser(csEquipmentDeliveryAddParm.getNdid());
             }
@@ -88,7 +90,7 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/AuditEquipmentDelivery")
     @ApiOperation("删除出厂设备")
     @DeviceLog(operateType = DeviceOperate.DELETE)
-    public HttpResult<Boolean> AuditEquipmentDelivery(@RequestParam("id")String id ){
+    public HttpResult<Boolean> AuditEquipmentDelivery(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("AuditEquipmentDelivery");
         Boolean flag = csEquipmentDeliveryService.AuditEquipmentDelivery(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
@@ -99,13 +101,13 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiOperation("修改出厂设备")
     @DeviceLog(operateType = DeviceOperate.UPDATE)
     @ApiImplicitParam(name = "csEquipmentDeliveryAuditParm", value = "新增项目参数", required = true)
-    public HttpResult<Boolean> updateEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm ){
+    public HttpResult<Boolean> updateEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm) {
         String methodDescribe = getMethodDescribe("updateEquipmentDelivery");
         Boolean flag = csEquipmentDeliveryService.updateEquipmentDelivery(csEquipmentDeliveryAuditParm);
-        if (flag){
+        if (flag) {
             //查询mqtt用户名和密码是否存在
             boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAuditParm.getNdid());
-            if (result){
+            if (result) {
                 //初始化装置mqtt连接信息(使用sha256加密)
                 mqttUserService.insertMqttUser(csEquipmentDeliveryAuditParm.getNdid());
             }
@@ -117,9 +119,9 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/queryEquipmentByndid")
     @ApiOperation("通过ndid查询出厂设备")
     @ApiImplicitParam(name = "ndid", value = "网关识别码", required = true)
-    public HttpResult<CsEquipmentDeliveryVO> queryEquipmentByndid(@RequestParam("ndid")String ndid){
+    public HttpResult<CsEquipmentDeliveryVO> queryEquipmentByndid(@RequestParam("ndid") String ndid) {
         String methodDescribe = getMethodDescribe("queryEquipmentByndid");
-        CsEquipmentDeliveryVO csEquipmentDeliveryVO  = csEquipmentDeliveryService.queryEquipmentByndid (ndid);
+        CsEquipmentDeliveryVO csEquipmentDeliveryVO = csEquipmentDeliveryService.queryEquipmentByndid(ndid);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEquipmentDeliveryVO, methodDescribe);
     }
 
@@ -127,9 +129,9 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/queryEquipmentByProject")
     @ApiOperation("通过项目查询出厂设备")
     @ApiImplicitParam(name = "projectEquipmentQueryParm", value = "项目信息", required = true)
-    public HttpResult<IPage<ProjectEquipmentVO>> queryEquipmentByProject(@RequestBody ProjectEquipmentQueryParm projectEquipmentQueryParm){
+    public HttpResult<IPage<ProjectEquipmentVO>> queryEquipmentByProject(@RequestBody ProjectEquipmentQueryParm projectEquipmentQueryParm) {
         String methodDescribe = getMethodDescribe("queryEquipmentByProject");
-        IPage<ProjectEquipmentVO> projectEquipmentVos  = csEquipmentDeliveryService.queryEquipmentByProject(projectEquipmentQueryParm);
+        IPage<ProjectEquipmentVO> projectEquipmentVos = csEquipmentDeliveryService.queryEquipmentByProject(projectEquipmentQueryParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, projectEquipmentVos, methodDescribe);
     }
 
@@ -141,9 +143,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "status", value = "状态", required = true)
     })
     @DeviceLog(operateType = DeviceOperate.UPDATESTATUSBYNDID)
-    public HttpResult<Boolean> updateStatusBynDid(@RequestParam("nDId") String nDid,@RequestParam("status") Integer status){
+    public HttpResult<Boolean> updateStatusBynDid(@RequestParam("nDId") String nDid, @RequestParam("status") Integer status) {
         String methodDescribe = getMethodDescribe("updateStatusBynDid");
-        csEquipmentDeliveryService.updateStatusBynDid(nDid,status);
+        csEquipmentDeliveryService.updateStatusBynDid(nDid, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -151,7 +153,7 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/queryEquipmentById")
     @ApiOperation("设备查询通过id获取")
     @ApiImplicitParam(name = "ids", value = "设备id集合", required = true)
-    public HttpResult<List<CsEquipmentDeliveryDTO>> queryEquipmentById(@RequestParam List<String> ids){
+    public HttpResult<List<CsEquipmentDeliveryDTO>> queryEquipmentById(@RequestParam List<String> ids) {
         String methodDescribe = getMethodDescribe("queryEquipmentById");
         if (CollectionUtil.isEmpty(ids)) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -171,7 +173,7 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/list")
     @ApiOperation("出厂设备列表")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
-    public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param){
+    public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param) {
         String methodDescribe = getMethodDescribe("list");
         Page<CsEquipmentDeliveryVO> page = csEquipmentDeliveryService.list(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
@@ -185,9 +187,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "type", value = "类型", required = true),
             @ApiImplicitParam(name = "lineId", value = "监测点id", required = false)
     })
-    public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type,@RequestParam String lineId){
+    public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId, @RequestParam String type, @RequestParam String lineId) {
         String methodDescribe = getMethodDescribe("getDeviceData");
-        DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId,type,lineId);
+        DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId, type, lineId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
     }
 
@@ -200,9 +202,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "module", value = "模块个数", required = true)
     })
     @Deprecated
-    public HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid,@RequestParam("id")  String id,@RequestParam("module")  Integer module){
+    public HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid, @RequestParam("id") String id, @RequestParam("module") Integer module) {
         String methodDescribe = getMethodDescribe("updateSoftInfoBynDid");
-        csEquipmentDeliveryService.updateSoftInfoBynDid(nDid,id,module);
+        csEquipmentDeliveryService.updateSoftInfoBynDid(nDid, id, module);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -210,9 +212,9 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/findDevByNDid")
     @ApiOperation("通过nDid查询设备信息")
     @ApiImplicitParam(name = "nDid", value = "网关识别码", required = true)
-    public HttpResult<CsEquipmentDeliveryPO> findDevByNDid(@RequestParam("nDid")String nDid){
+    public HttpResult<CsEquipmentDeliveryPO> findDevByNDid(@RequestParam("nDid") String nDid) {
         String methodDescribe = getMethodDescribe("findDevByNDid");
-        CsEquipmentDeliveryPO po  = csEquipmentDeliveryService.findDevByNDid(nDid);
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryService.findDevByNDid(nDid);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
 
@@ -225,13 +227,13 @@ public class EquipmentDeliveryController extends BaseController {
         exportParams.setStyle(ExcelStyleUtil.class);
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DeviceExcelTemplete.class, new ArrayList<DeviceExcelTemplete>());
         List<SysDicTreePO> deviceType = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.DEVICE_TYPE.getCode()).getData();
-        if(!CollectionUtils.isEmpty(deviceType)){
+        if (!CollectionUtils.isEmpty(deviceType)) {
             List<String> collect = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getName).collect(Collectors.toList());
             ExcelUtil.selectList(workbook, 2, 2, collect.toArray(new String[]{}));
             List<String> collect2 = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getChildren).flatMap(Collection::stream).map(SysDicTreePO::getName).collect(Collectors.toList());
             ExcelUtil.selectList(workbook, 3, 3, collect2.toArray(new String[]{}));
         }
-        ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT","CLD").collect(Collectors.toList()).toArray(new String[]{}));
+        ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT", "CLD").collect(Collectors.toList()).toArray(new String[]{}));
         String fileName = "设备模板.xlsx";
         ExportParams exportExcel = new ExportParams("设备模板", "设备模板");
         PoiUtil.exportFileByWorkbook(workbook, fileName, response);
@@ -244,11 +246,11 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<String> importEquipment(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importEquipment");
         List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.importEquipment(file, response);
-        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)){
+        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)) {
-            csEquipmentDeliveryPOS.forEach(temp->{
+            csEquipmentDeliveryPOS.forEach(temp -> {
                 //查询mqtt用户名和密码是否存在
                 boolean result = mqttUserService.findMqttUser(temp.getNdid());
-                if (result){
+                if (result) {
                     //初始化装置mqtt连接信息(使用sha256加密)
                     mqttUserService.insertMqttUser(temp.getNdid());
                 }
@@ -260,18 +262,18 @@ public class EquipmentDeliveryController extends BaseController {
     @ResponseBody
     @ApiOperation("联调完成")
     @PostMapping(value = "testcompletion")
-    public HttpResult<String> testCompletion(@RequestParam("deviceId") String deviceId,@RequestParam("type") Integer type,@RequestParam("remark") String remark){
+    public HttpResult<String> testCompletion(@RequestParam("deviceId") String deviceId, @RequestParam("type") Integer type, @RequestParam("remark") String remark) {
         String methodDescribe = getMethodDescribe("testCompletion");
-        csEquipmentDeliveryService.testCompletion(deviceId,type, remark);
+        csEquipmentDeliveryService.testCompletion(deviceId, type, remark);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
     @ResponseBody
     @ApiOperation("取消联调")
     @PostMapping(value = "deleteTest")
-    public HttpResult<String> deleteTest(@RequestParam("deviceId") String deviceId,@RequestParam("type") Integer type,@RequestParam("remark") String remark){
+    public HttpResult<String> deleteTest(@RequestParam("deviceId") String deviceId, @RequestParam("type") Integer type, @RequestParam("remark") String remark) {
         String methodDescribe = getMethodDescribe("deleteTest");
-        csEquipmentDeliveryService.deleteTest(deviceId,type, remark);
+        csEquipmentDeliveryService.deleteTest(deviceId, type, remark);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -283,9 +285,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "id", value = "软件信息id", required = true)
     })
     @ApiIgnore
-    public HttpResult<String> updateSoftInfo(@RequestParam("nDid") String nDid,@RequestParam("id") String id){
+    public HttpResult<String> updateSoftInfo(@RequestParam("nDid") String nDid, @RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("updateSoftInfo");
-        csEquipmentDeliveryService.updateSoftInfo(nDid,id);
+        csEquipmentDeliveryService.updateSoftInfo(nDid, id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -297,23 +299,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "number", value = "模块个数", required = true)
     })
     @ApiIgnore
-    public HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number){
+    public HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid, @RequestParam("number") Integer number) {
         String methodDescribe = getMethodDescribe("updateModuleNumber");
-        csEquipmentDeliveryService.updateModuleNumber(nDid,number);
+        csEquipmentDeliveryService.updateModuleNumber(nDid, number);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/updateLedger")
-    @ApiOperation("更新设备预设工程和项目id")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "nDid", value = "网络设备码", required = true),
-            @ApiImplicitParam(name = "engineeringId", value = "工程id", required = true),
-            @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
-    })
-    public HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId){
-        String methodDescribe = getMethodDescribe("updateLedger");
-        csEquipmentDeliveryService.updateLedger(nDid,engineeringId,projectId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -321,7 +309,7 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/rebootDevice")
     @ApiOperation("重启设备")
     @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
-    public HttpResult<String> rebootDevice(@RequestParam("nDid") String nDid){
+    public HttpResult<String> rebootDevice(@RequestParam("nDid") String nDid) {
         String methodDescribe = getMethodDescribe("rebootDevice");
         boolean result = csEquipmentDeliveryService.rebootDevice(nDid);
         if (result) {
@@ -334,7 +322,7 @@ public class EquipmentDeliveryController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getAll")
     @ApiOperation("获取所有装置")
-    public HttpResult<List<CsEquipmentDeliveryPO>> getAll(){
+    public HttpResult<List<CsEquipmentDeliveryPO>> getAll() {
         String methodDescribe = getMethodDescribe("getAll");
         List<CsEquipmentDeliveryPO> result = csEquipmentDeliveryService.getAll();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
@@ -343,7 +331,7 @@ public class EquipmentDeliveryController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/judgeDevModel")
     @ApiOperation("判断设备型号")
-    public HttpResult<Boolean> judgeDevModel(@RequestParam("nDid") String nDid){
+    public HttpResult<Boolean> judgeDevModel(@RequestParam("nDid") String nDid) {
         String methodDescribe = getMethodDescribe("judgeDevModel");
         boolean result = csEquipmentDeliveryService.judgeDevModel(nDid);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
@@ -352,7 +340,7 @@ public class EquipmentDeliveryController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getDevByLineId")
     @ApiOperation("根据监测点id查询装置信息")
-    public HttpResult<CsEquipmentDeliveryPO> getDevByLineId(@RequestParam("lineId") String lineId){
+    public HttpResult<CsEquipmentDeliveryPO> getDevByLineId(@RequestParam("lineId") String lineId) {
         String methodDescribe = getMethodDescribe("getDevByLineId");
         CsEquipmentDeliveryPO po = csEquipmentDeliveryService.getDevByLineId(lineId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
@@ -363,7 +351,7 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiOperation("新增云前置设备")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
     @DeviceLog(operateType = DeviceOperate.ADD)
-    public HttpResult<CsEquipmentDeliveryPO> addCldDev(@RequestBody @Validated CsEquipmentDeliveryAddParm param){
+    public HttpResult<CsEquipmentDeliveryPO> addCldDev(@RequestBody @Validated CsEquipmentDeliveryAddParm param) {
         String methodDescribe = getMethodDescribe("addCldDev");
         CsEquipmentDeliveryPO po = csEquipmentDeliveryService.saveCld(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
@@ -374,7 +362,7 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiOperation("删除云前置设备")
     @ApiImplicitParam(name = "id", value = "id", required = true)
     @DeviceLog(operateType = DeviceOperate.DELETE)
-    public HttpResult<Boolean> delCldDev(@RequestParam("id") String id){
+    public HttpResult<Boolean> delCldDev(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("delCldDev");
         boolean result = csEquipmentDeliveryService.delCldDev(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
@@ -385,7 +373,7 @@ public class EquipmentDeliveryController extends BaseController {
     @ApiOperation("修改云前置设备")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
     @DeviceLog(operateType = DeviceOperate.UPDATE)
-    public HttpResult<Boolean> updateCldDev(@RequestBody @Validated CsEquipmentDeliveryAuditParm param){
+    public HttpResult<Boolean> updateCldDev(@RequestBody @Validated CsEquipmentDeliveryAuditParm param) {
         String methodDescribe = getMethodDescribe("updateCldDev");
         boolean result = csEquipmentDeliveryService.updateCldDev(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
@@ -399,9 +387,9 @@ public class EquipmentDeliveryController extends BaseController {
             @ApiImplicitParam(name = "processNo", value = "进程号", required = true)
     })
     @ApiIgnore
-    public HttpResult<Boolean> updateCldDevStatus(@RequestParam("nodeId") String nodeId, @RequestParam("processNo") Integer processNo){
+    public HttpResult<Boolean> updateCldDevStatus(@RequestParam("nodeId") String nodeId, @RequestParam("processNo") Integer processNo) {
         String methodDescribe = getMethodDescribe("updateCldDevStatus");
-        csEquipmentDeliveryService.updateCldDevStatus(nodeId,processNo);
+        csEquipmentDeliveryService.updateCldDevStatus(nodeId, processNo);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -409,14 +397,14 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/flipCldDevStatus")
     @ApiOperation("云前置设备状态翻转")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "date", value = "时间", required = true),
+            @ApiImplicitParam(name = "date", value = "时间", required = true),
-        @ApiImplicitParam(name = "devId", value = "设备id", required = true),
+            @ApiImplicitParam(name = "devId", value = "设备id", required = true),
-        @ApiImplicitParam(name = "status", value = "状态", required = true)
+            @ApiImplicitParam(name = "status", value = "状态", required = true)
     })
     @ApiIgnore
-    public HttpResult<Boolean> flipCldDevStatus(@RequestParam("date") String date, @RequestParam("devId") String devId, @RequestParam("status") Integer status){
+    public HttpResult<Boolean> flipCldDevStatus(@RequestParam("date") String date, @RequestParam("devId") String devId, @RequestParam("status") Integer status) {
         String methodDescribe = getMethodDescribe("flipCldDevStatus");
-        csEquipmentDeliveryService.flipCldDevStatus(date,devId,status);
+        csEquipmentDeliveryService.flipCldDevStatus(date, devId, status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -424,10 +412,22 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/getRunPortableDev")
     @ApiOperation("获取用户未绑定的在运的便携式设备")
     @ApiImplicitParam(name = "userId", value = "用户id", required = true)
-    public HttpResult<List<CsEquipmentDeliveryPO>> getRunPortableDev(@RequestParam("userId") String userId){
+    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);
     }
 
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/version/page")
+    @ApiOperation("查询设备版本信息")
+    @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true)
+    public HttpResult<IPage<DevVersionVO>> versionPage(@RequestBody CsEquipmentDeliveryQueryParm baseParam) {
+        String methodDescribe = getMethodDescribe("versionPage");
+
+        IPage<DevVersionVO> list = csEquipmentDeliveryService.versionPage(baseParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
 }

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

@@ -1,39 +1,23 @@
 package com.njcn.csdevice.controller.ledger;
 
 
-import cn.hutool.core.collection.CollUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 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.mapper.PqsDeviceUnitMapper;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
-import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.service.CsCommTerminalService;
-import com.njcn.csdevice.service.CsDeviceUserPOService;
-import com.njcn.csdevice.service.CsEquipmentDeliveryService;
-import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import com.njcn.user.api.UserFeignClient;
-import com.njcn.user.pojo.constant.UserType;
-import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 /**
@@ -108,11 +92,17 @@ public class CsCommTerminalController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqsDeviceUnit, methodDescribe);
     }
 
-
+    /**
-
+     * 根据监测点id集合，获取所有台账信息
-
+     */
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-
+    @PostMapping("/getLedgerByLineId")
-
+    @ApiOperation("根据监测点id集合获取所有台账信息")
+    @ApiImplicitParam(name = "list", value = "实体", required = true)
+    public HttpResult<List<DevDetailDTO>> getLedgerByLineId(@RequestBody List<String> list) {
+        String methodDescribe = getMethodDescribe("getLedgerByLineId");
+        List<DevDetailDTO> result = commTerminalService.getLedgerByLineId(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
 
 }

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

@@ -65,7 +65,7 @@ public class CsLedgerController extends BaseController {
     @PostMapping("/AppLineTree")
     @ApiOperation("app端监测点树")
     public HttpResult<List<CsLedgerVO>> appLineTree(){
-        String methodDescribe = getMethodDescribe("AppLineTree");
+        String methodDescribe = getMethodDescribe("appLineTree");
         List<CsLedgerVO> list = csLedgerService.appLineTree();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
@@ -90,14 +90,14 @@ public class CsLedgerController extends BaseController {
     }
 
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/objTree")
+//    @PostMapping("/objTree")
-    @ApiOperation("三层对象用户树")
+//    @ApiOperation("三层对象用户树")
-    public HttpResult<List<CsLedgerVO>> objTree(){
+//    public HttpResult<List<CsLedgerVO>> objTree(){
-        String methodDescribe = getMethodDescribe("getProjectTree");
+//        String methodDescribe = getMethodDescribe("getProjectTree");
-        List<CsLedgerVO> list = csLedgerService.objTree();
+//        List<CsLedgerVO> list = csLedgerService.objTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
+//    }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/add")

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

@@ -9,6 +9,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
 import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO;
@@ -295,11 +296,11 @@ public class CslineController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getLineBySensitiveUser")
+    @PostMapping("/getDevBySensitiveUser")
-    @ApiOperation("根据敏感用户查询监测点")
+    @ApiOperation("根据敏感用户查询装置")
-    public HttpResult<List<CsLinePO>> getLineBySensitiveUser(@RequestBody List<String> list) {
+    public HttpResult<List<CsEquipmentDeliveryPO>> getDevBySensitiveUser(@RequestBody List<String> list) {
-        String methodDescribe = getMethodDescribe("getLineBySensitiveUser");
+        String methodDescribe = getMethodDescribe("getDevBySensitiveUser");
-        List<CsLinePO> result = csLinePOService.getLineBySensitiveUser(list);
+        List<CsEquipmentDeliveryPO> result = csLinePOService.getDevBySensitiveUser(list);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/message/DeviceMessageController.java

@@ -0,0 +1,75 @@
+package com.njcn.csdevice.controller.message;
+
+
+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.DeviceMessageParam;
+import com.njcn.csdevice.param.LineInfoParam;
+import com.njcn.csdevice.service.DeviceMessageService;
+import com.njcn.user.pojo.po.User;
+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;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 详细数据表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-31
+ */
+@Slf4j
+@RestController
+@RequestMapping("/deviceMessage")
+@Api(tags = "App消息推送管理")
+@AllArgsConstructor
+public class DeviceMessageController extends BaseController {
+
+    private final DeviceMessageService deviceMessageService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEventUserByDeviceId")
+    @ApiOperation("根据设备获取需要推送的用户id")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "devId", value = "设备id", required = true, paramType = "query"),
+        @ApiImplicitParam(name = "isAdmin", value = "是否需要推送给普通用户", required = true, paramType = "query")
+    })
+    public HttpResult<List<String>> getEventUserByDeviceId(@RequestParam("devId") String devId, @RequestParam("isAdmin") Boolean isAdmin){
+        String methodDescribe = getMethodDescribe("getEventUserByDeviceId");
+        List<String> list = deviceMessageService.getEventUserByDeviceId(devId,isAdmin);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getSendUserByType")
+    @ApiOperation("根据事件类型和用户id查询打开推送的用户信息")
+    @ApiImplicitParam(name = "param", value = "参数", required = true, paramType = "query")
+    public HttpResult<List<User>> getSendUserByType(@RequestBody DeviceMessageParam param){
+        String methodDescribe = getMethodDescribe("getSendUserByType");
+        List<User> list = deviceMessageService.getSendUserByType(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLineInfo")
+    @ApiOperation("获取监测点信息")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> getLineInfo(@RequestBody LineInfoParam param){
+        String methodDescribe = getMethodDescribe("getLineInfo");
+        deviceMessageService.getLineInfo(param.getNDid(),param.getList());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
+}
+

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

@@ -65,12 +65,21 @@ public class AppProjectController  extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addAppProject")
     @ApiOperation("新增项目")
-    public HttpResult<AppProjectPO> addAppProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm){
+    public HttpResult<AppProjectPO> addAppProject(@Validated AppProjectAddParm appProjectAddParm){
         String methodDescribe = getMethodDescribe("addAppProject");
-
         AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addPortableProject")
+    @ApiOperation("新增便携式项目")
+    public HttpResult<AppProjectPO> addPortableProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm){
+        String methodDescribe = getMethodDescribe("addPortableProject");
+        AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/auditAppProject")
     @ApiOperation("修改/删除项目")

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

@@ -9,6 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.pojo.param.CsEdDataAddParm;
 import com.njcn.csdevice.pojo.param.CsEdDataAuditParm;
 import com.njcn.csdevice.pojo.param.CsEdDataQueryParm;
+import com.njcn.csdevice.pojo.po.CsEdDataPO;
 import com.njcn.csdevice.pojo.vo.CsEdDataVO;
 import com.njcn.csdevice.service.CsEdDataService;
 import com.njcn.web.controller.BaseController;
@@ -79,4 +80,14 @@ public class CsEdDataController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getById")
+    @ApiOperation("根据id查询")
+    @ApiImplicitParam(name = "id", value = "id", required = true)
+    public HttpResult<CsEdDataPO> getById(@Validated @RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getById");
+        CsEdDataPO dataPO = csEdDataService.getById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataPO, methodDescribe);
+    }
+
 }

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

@@ -61,7 +61,7 @@ public class CsTouristDataPOController  extends BaseController {
     @PostMapping("/queryAll")
     @ApiOperation("查询游客数据")
     public HttpResult<List<CsTouristDataParmVO>> queryAll(){
-        String methodDescribe = getMethodDescribe("query");
+        String methodDescribe = getMethodDescribe("queryAll");
 
         List<CsTouristDataParmVO> list = csTouristDataPOService.queryAll();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/handler/MqttMessageHandler.java

@@ -2,12 +2,10 @@ package com.njcn.csdevice.handler;
 
 
 import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
-
 import com.github.tocrhz.mqtt.annotation.Payload;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.utils.PubUtils;
-import com.njcn.csdevice.service.CsLogsPOService;
+import com.njcn.cssystem.api.CsLogsFeignClient;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -25,8 +23,7 @@ import java.nio.charset.StandardCharsets;
 @AllArgsConstructor
 public class MqttMessageHandler {
 
-
+    private final CsLogsFeignClient csLogsFeignClient;
-    private final CsLogsPOService csLogsPOService;
 
     /**
      * 插入devicelog
@@ -34,7 +31,7 @@ public class MqttMessageHandler {
     @MqttSubscribe(value = "/deviceLog")
     public void responseRtData(String topic, MqttMessage message, @Payload String payload) {
         DeviceLogDTO deviceLogDTO = PubUtils.json2obj(new String(message.getPayload(), StandardCharsets.UTF_8),DeviceLogDTO.class);
-        csLogsPOService.addLog(deviceLogDTO);
+        csLogsFeignClient.addUserLog(deviceLogDTO);
     }
 
 

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

@@ -2,9 +2,6 @@ package com.njcn.csdevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 
@@ -15,17 +12,4 @@ import java.util.List;
  * @version V1.0.0
  */
 public interface CsDeviceUserPOMapper extends BaseMapper<CsDeviceUserPO> {
-
-    //查询暂态事件(未读)
-    int queryTempEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
-
-    //查询稳态事件(未读)
-    int queryTempHarmonic(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
-
-    //查询告警事件(未读)
-    int queryAlarmEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
-
-    //查询运行事件(未读)
-    int queryRunEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
-
 }

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

@@ -1,10 +1,8 @@
 package com.njcn.csdevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.csdevice.pojo.po.CsEventSendMsg;
-import com.njcn.csdevice.pojo.po.CsLogsPO;
 import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO;
 import com.njcn.web.pojo.param.BaseParam;
 import org.apache.ibatis.annotations.Param;

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

@@ -0,0 +1,12 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsUpgradeLogs;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+public interface CsUpgradeLogsMapper extends BaseMapper<CsUpgradeLogs> {
+}

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

@@ -105,7 +105,6 @@
             t0.ndid = #{param.id}
             and t1.did = #{param.did}
             and t3.cl_dev = #{param.cldId}
-            and (t3.data_type = 'Stat' or t3.data_type is NULL)
             and t3.idx = #{param.idx}
             and t4.stat_method = #{param.statMethod}
         order by t4.sort

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

@@ -14,7 +14,8 @@
         where
             pid = #{modelId}
           and cl_dev = #{clDev}
-          and (data_type = 'Stat' or data_type IS NULL)
+--           and (data_type = 'Stat' or data_type IS NULL)
+          and store_flag = 1
         order by type,cl_dev
     </select>
 

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

@@ -16,72 +16,4 @@
     <!--@mbg.generated-->
     primary_user_id, sub_user_id, device_id, create_by, create_time, update_by, update_time
   </sql>
-
-
-  <select id="queryTempEvent" resultType="java.lang.Integer">
-    SELECT
-    COUNT(1)
-    FROM
-    cs_event_user t1 right join cs_event t2 on t1.event_id = t2.id
-    WHERE
-    t1.user_id = #{userId}
-    and t1.`status`= 0
-    and t2.type = 0
-    <if test="ids != null and ids.size > 0">
-      and t2.line_id in
-      <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
-        #{item}
-      </foreach>
-    </if>
-  </select>
-
-  <select id="queryAlarmEvent" resultType="java.lang.Integer">
-    SELECT
-    COUNT(1)
-    FROM
-    cs_event_user t1 right join cs_alarm t2 on t1.event_id = t2.id
-    WHERE
-    t1.user_id = #{userId}
-    and t1.`status`= 0
-    <if test="ids != null and ids.size > 0">
-      and (
-        <foreach collection="ids" item="tag" separator=" OR ">
-            FIND_IN_SET(#{tag}, t2.dev_list) > 0
-        </foreach>
-      )
-    </if>
-  </select>
-
-  <select id="queryRunEvent" resultType="java.lang.Integer">
-    SELECT
-      COUNT(1)
-    FROM
-      cs_event_user t1 right join cs_event t2 on t1.event_id = t2.id
-    WHERE
-      t1.user_id = #{userId}
-      and t1.`status`= 0
-      and t2.type = 2
-      <if test="ids != null and ids.size > 0">
-        and t2.device_id in
-        <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
-          #{item}
-        </foreach>
-      </if>
-  </select>
-
-  <select id="queryTempHarmonic" resultType="java.lang.Integer">
-    SELECT
-      COUNT(1)
-    FROM
-      cs_event_user t1 right join cs_harmonic t2 on t1.event_id = t2.id
-    WHERE
-      t1.user_id = #{userId}
-      and t1.`status`= 0
-      <if test="ids != null and ids.size > 0">
-        and t2.line_id in
-        <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
-          #{item}
-        </foreach>
-      </if>
-  </select>
 </mapper>

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

@@ -28,7 +28,7 @@
         t1.*
     from
         cs_equipment_delivery t0
-    left join cs_line t1 on
+    right join cs_line t1 on
         t0.id = t1.device_id
     where
         t0.ndid = #{id}

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

@@ -21,7 +21,7 @@
 
     <select id="getRecordAll" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo">
         <if test="wlRecordPageParam.isTrueFlag == 0">
-            select a.dev_id as id,b.name as name from  wl_record a
+            select a.dev_id as id,b.name as name,b.run_status as runStatus from  wl_record a
             left join cs_equipment_delivery b on a.dev_id = b.id
             where a.type=1 and a.state =1 and a.end_time is not null
             and
@@ -31,7 +31,7 @@
             group by a.dev_id,b.name having a.dev_id is not null and b.name is not null
         </if>
         <if test="wlRecordPageParam.isTrueFlag == 1">
-            select a.dev_id as id,b.name as name from  wl_record a
+            select a.dev_id as id,b.name as name,b.run_status as runStatus from  wl_record a
             left join cs_equipment_delivery b on a.dev_id = b.id
             where a.type=1 and a.state =1 and a.end_time is not null
             and exists

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

@@ -1,6 +1,7 @@
 package com.njcn.csdevice.service;
 
 
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 
 import java.util.List;
@@ -14,4 +15,6 @@ public interface CsCommTerminalService {
     PqsDeviceUnit lineUnitDetail(String lineId);
 
     List<String> commGetDevIds(String userId);
+
+    List<DevDetailDTO> getLedgerByLineId(List<String> id);
 }

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

@@ -55,4 +55,10 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
     void channelDevByUserId(UserDevParam param);
 
     List<CsDeviceUserPO> getList(UserDevParam param);
+
+    /**
+     * 新增用户设备关系表数据 新增主用户信息 && 新增已关联工程的用户的设备关系
+     * @return
+     */
+    Boolean addRelation(UserDevParam param);
 }

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

@@ -48,5 +48,13 @@ public interface CsEdDataService extends IService<CsEdDataPO> {
      * @author: xuyang
      */
     CsEdDataVO findByDevTypeId(String devType);
+
+    /**
+     * @Description: 根据装置型号和版本号获取装置类型
+     * @param devTypeId 装置型号
+     * @param versionNo 版本号
+     * @return
+     */
+    CsEdDataPO findByDevTypeIdAndVersionNo(String devTypeId, String versionNo);
 }
 

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

@@ -3,15 +3,12 @@ package com.njcn.csdevice.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAddParm;
+import com.njcn.csdevice.pojo.param.*;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
-import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.csdevice.pojo.vo.DevVersionVO;
 import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
 import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -122,8 +119,6 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     void updateModuleNumber(String nDid, Integer number);
 
-    void updateLedger(String nDid,String engineeringId,String projectId);
-
     boolean rebootDevice(String nDid);
 
     /**
@@ -198,4 +193,5 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
 
     List<CsEquipmentDeliveryPO> getRunPortableDev(String userId);
 
+    IPage<DevVersionVO> versionPage(CsEquipmentDeliveryQueryParm baseParam);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
 import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO;
@@ -86,7 +87,7 @@ public interface CsLinePOService extends IService<CsLinePO>{
 
     List<CsLinePO> getSimpleLine();
 
-    List<CsLinePO> getLineBySensitiveUser(List<String> list);
+    List<CsEquipmentDeliveryPO> getDevBySensitiveUser(List<String> list);
 
     Page<PqSensitiveUserLineVO> getSensitiveUserLineList(BaseParam  param);
     boolean uploadReport(MultipartFile file, String lineId);

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

@@ -0,0 +1,11 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.CsUpgradeLogs;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+public interface CsUpgradeLogsService extends IService<CsUpgradeLogs> {
+}

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

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.csdevice.param.DeviceMessageParam;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.user.pojo.po.User;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+public interface DeviceMessageService {
+
+    List<String> getEventUserByDeviceId(String devId, Boolean isAdmin);
+
+    List<User> getSendUserByType(DeviceMessageParam param);
+
+    void getLineInfo(String id,List<CsLinePO> list);
+
+}

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

@@ -3,6 +3,7 @@ package com.njcn.csdevice.service;
 
 import com.njcn.csdevice.param.LineCountEvaluateParam;
 import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
+import com.njcn.influx.pojo.po.PqsCommunicate;
 
 import java.util.List;
 
@@ -20,6 +21,13 @@ public interface ICsCommunicateService {
      */
     List<PqsCommunicateDto> getRawDataLatest(LineCountEvaluateParam lineParam);
 
+    /**
+     * 取出第一条装置数据
+     * @param lineParam
+     * @return
+     */
+    List<PqsCommunicateDto> getRawDataOne(LineCountEvaluateParam lineParam);
+
     /**
      * 获取时间范围数据
      * @param lineParam
@@ -27,6 +35,8 @@ public interface ICsCommunicateService {
      */
     List<PqsCommunicateDto> getRawData(LineCountEvaluateParam lineParam);
 
+    List<PqsCommunicateDto> getRawData2(LineCountEvaluateParam lineParam);
+
     /**
      *是否有当天最后一条数据
      * @param lineParam

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

@@ -80,7 +80,7 @@ public interface ICsLedgerService extends IService<CsLedger> {
     List<CsLedgerVO> getztProjectTree();
 
 
-    List<CsLedgerVO> objTree();
+//    List<CsLedgerVO> objTree();
 
     /**
      * 根据设备集合获取项目和工程

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

@@ -0,0 +1,17 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.influx.pojo.po.cs.PqdData;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * PqdData数据拆分服务
+ *
+ * @author system
+ * @since 2026-05-22
+ */
+public interface IPqdDataSplitService {
+
+    Map<String, Object> splitPqdData(List<PqdData> pqdDataList);
+}

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

@@ -16,6 +16,19 @@ import java.util.List;
  */
 public interface IRStatOnlineRateDService extends IService<RStatOnlineRateD> {
 
+    /**
+     * 1.查询该设备当前计算周期是否存在上下线记录
+     * 2.
+     * a.存在记录，如果只有1条数据，则根据这一条记录的状态计算在线时长；如果是多条数据，则根据上下线时间计算在线时长；
+     * b.不存在记录，则需要借助历史记录判断：
+     *    1) 先查询设备第一条记录时间
+     *       - 如果统计日期 < 第一条记录时间 → 设备未上线 → 离线
+     *    2) 再查询最新记录时间和状态
+     *       - 如果统计日期 > 最新记录时间 → 延续最新状态
+     *         * 最新是在线 → 全天在线
+     *         * 最新是离线 → 全天离线
+     * @param param
+     */
     void addData(StatisticsDataParam param);
 
     List<RStatOnlineRateD> getData(List<String> list, String startTime, String endTime);

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
-import com.njcn.csdevice.mapper.CsLedgerMapper;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
 import com.njcn.csdevice.pojo.param.LinePostionParam;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
@@ -13,11 +12,14 @@ import com.njcn.csdevice.pojo.po.CsLedger;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
 import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
-import com.njcn.csdevice.pojo.vo.CsLineTopologyTemplateVO;
 import com.njcn.csdevice.service.AppLineTopologyDiagramService;
 import com.njcn.csdevice.service.AppTopologyDiagramService;
 import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsLedgerService;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.pojo.vo.DictTreeVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,9 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
     private final CsLinePOService csLinePOService;
     private final AppTopologyDiagramService appTopologyDiagramService;
     private final ICsLedgerService iCsLedgerService;
+    private final RedisUtil redisUtil;
+    private final DictTreeFeignClient dictTreeFeignClient;
+
     @Override
     public AppTopologyDiagramVO query(String devId) {
         CsLedger one = iCsLedgerService.lambdaQuery().eq(CsLedger::getId, devId).eq(CsLedger::getState,1).one();
@@ -73,7 +78,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
     }
     public List<AppLineTopologyDiagramVO> queryByLineIds(List<String> lineIds) {
         List<AppLineTopologyDiagramVO> result = new ArrayList<>();
-        if (lineIds != null && lineIds.size() > 0) {
+        if (lineIds != null && !lineIds.isEmpty()) {
             result = this.getBaseMapper().queryByLineIds( lineIds);
         }
         return result;
@@ -83,15 +88,22 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void auditList(LinePostionParam linePostionParam) {
-
-
         linePostionParam.getPointList().forEach(temp->{
             csLinePOService.lambdaUpdate().eq(CsLinePO::getLineId,temp.getLineId()).set(CsLinePO::getName,temp.getName()).set(CsLinePO::getPosition,temp.getLinePostion()).update();
         this.lambdaUpdate().eq(AppLineTopologyDiagramPO::getId,temp.getId()).
                 eq(AppLineTopologyDiagramPO::getLineId,temp.getLineId()).set(AppLineTopologyDiagramPO::getLat,temp.getLat()).
-                set(AppLineTopologyDiagramPO::getLng,temp.getLng()).set(AppLineTopologyDiagramPO::getId,linePostionParam.getId()).update();
+                set(AppLineTopologyDiagramPO::getLng,temp.getLng()).set(AppLineTopologyDiagramPO::getId,linePostionParam.getId())
-
+                .set(AppLineTopologyDiagramPO::getTarget,temp.getTarget())
-            iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,temp.getLineId()).set(CsLedger::getName,temp.getName()).update();
+                .update();
+        iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,temp.getLineId()).set(CsLedger::getName,temp.getName()).update();
         });
+        //修改指标后，删除缓存数据
+        String deviceId = csLinePOService.getById(linePostionParam.getPointList().get(0).getLineId()).getDeviceId();
+        DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode("baseData").getData();
+        String key = deviceId + "#";
+        if (dictTreeVO != null) {
+            key = deviceId + "#" + dictTreeVO.getId();
+        }
+        redisUtil.delete(key);
     }
 }

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

@@ -8,6 +8,7 @@ import com.njcn.csdevice.mapper.PqsDeviceUnitMapper;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.po.CsLedger;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
 import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO;
@@ -21,9 +22,7 @@ import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -70,12 +69,9 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
         if (CollUtil.isEmpty(devIds)) {
             return result;
         }
-        LambdaQueryWrapper<CsLinePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        List<CsEquipmentDeliveryPO> po = csEquipmentDeliveryService.listByIds(devIds);
-        lambdaQueryWrapper.select(CsLinePO::getLineId, CsLinePO::getMonitorUser).in(CsLinePO::getDeviceId, devIds)
+        if (CollUtil.isEmpty(po)) {
-                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode());
+            result = po.stream().map(CsEquipmentDeliveryPO::getMonitorUser).distinct().collect(Collectors.toList());
-        List<CsLinePO> poList =csLinePOMapper.selectList(lambdaQueryWrapper);
-        if (CollUtil.isNotEmpty(poList)) {
-            result = poList.stream().map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
         }
         return result;
     }
@@ -93,31 +89,124 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
     @Override
     public List<String> commGetDevIds(String userId) {
         UserVO userVO = userFeignClient.getUserById(userId).getData();
-        List<String> devIds;
+        List<String> devIds = new ArrayList<>();
         if (userVO.getType().equals(UserType.SUPER_ADMINISTRATOR) || userVO.getType().equals(UserType.ADMINISTRATOR)) {
             devIds = csEquipmentDeliveryService.getAll().stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
         } else {
-            List<CsDeviceUserPO> devList = csDeviceUserPOService.lambdaQuery().select(CsDeviceUserPO::getDeviceId)
-                    .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId))
-                    .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode()).list();
-            devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
             //note 黄是在cs_market_data写入数据，是用户和工程的关系；
-            // 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系
+            // 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系。
-            List<CsMarketDataVO> list = csMarketDataService.queryByUseId(userId);
+            // 如果是营销 工程用户 没有配置相关工程，直接返回空的设备列表；如果有数据，也要判断下当前关注的工程里面是否包含主用户的设备，可能出现没有关注该工程，但是因为是设备的主用户导致数据统计错误
-            if (CollUtil.isNotEmpty(list)) {
+            String roleString = RequestUtil.getUserRole();
-                List<String> engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList());
+            if (roleString.contains(AppRoleEnum.MARKET_USER.getCode()) || roleString.contains(AppRoleEnum.ENGINEERING_USER.getCode())) {
-                List<DevDetailDTO> devs = csLedgerService.getDevInfoByEngineerIds(engineerIds);
+                List<CsMarketDataVO> list = csMarketDataService.queryByUseId(userId);
-                devIds.addAll(devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList()));
+                if (CollUtil.isNotEmpty(list)) {
+                    List<String> engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList());
+                    List<DevDetailDTO> devs = csLedgerService.getDevInfoByEngineerIds(engineerIds);
+                    devIds = devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList());
+                }
             }
             //note 如果是游客，则还需要加入系统配置的设备
-            String roleString = RequestUtil.getUserRole();
+            else if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
-            if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
                 devIds.addAll(csTouristDataPOService.queryAll().stream().map(CsTouristDataParmVO::getDeviceId).distinct().collect(Collectors.toList()));
             }
+            //note 如果是普通用户，则需要根据用户权限来获取设备列表
+            else {
+                List<CsDeviceUserPO> devList = csDeviceUserPOService.lambdaQuery().select(CsDeviceUserPO::getDeviceId)
+                        .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId))
+                        .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode()).list();
+                devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
+            }
         }
         if (!CollUtil.isEmpty(devIds)) {
             devIds = devIds.stream().distinct().collect(Collectors.toList());
         }
         return devIds;
     }
+
+    @Override
+    public List<DevDetailDTO> getLedgerByLineId(List<String> id) {
+        List<DevDetailDTO> result = new ArrayList<>();
+        List<CsLedger> lineLedgers = csLedgerService.listByIds(id);
+        Set<String> equipmentIds = new HashSet<>();
+        Set<String> projectIds = new HashSet<>();
+        Set<String> engineeringIds = new HashSet<>();
+
+        if (CollUtil.isEmpty(lineLedgers)) {
+            return result;
+        }
+        for (CsLedger item : lineLedgers) {
+            String pids = item.getPids();
+            if (pids == null) {
+                continue;
+            }
+            String[] pidArr = pids.split(",");
+            if (pidArr.length < 4) {
+                continue;
+            }
+            engineeringIds.add(pidArr[1]);
+            projectIds.add(pidArr[2]);
+            equipmentIds.add(pidArr[3]);
+        }
+
+        Map<String, CsLinePO> csLinePoMap = csLinePOMapper.selectBatchIds(id)
+                .stream().collect(Collectors.toMap(CsLinePO::getLineId, item -> item));
+        Map<String, CsLedger> equipmentLedgerMap = csLedgerService.listByIds(equipmentIds)
+                .stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
+        Map<String, CsEquipmentDeliveryPO> equipmentDeliveryMap = csEquipmentDeliveryService.listByIds(equipmentIds)
+                .stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
+        Map<String, CsLedger> projectLedgerMap = csLedgerService.listByIds(projectIds)
+                .stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
+        Map<String, CsLedger> engineeringLedgerMap = csLedgerService.listByIds(engineeringIds)
+                .stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
+
+        for (CsLedger item : lineLedgers) {
+            String pids = item.getPids();
+            if (pids == null) {
+                continue;
+            }
+            String[] pidArr = pids.split(",");
+            if (pidArr.length < 4) {
+                continue;
+            }
+
+            String engineeringId = pidArr[1];
+            String projectId = pidArr[2];
+            String equipmentId = pidArr[3];
+
+            CsLedger engineeringLedger = engineeringLedgerMap.get(engineeringId);
+            CsLedger projectLedger = projectLedgerMap.get(projectId);
+            CsLedger equipmentLedger = equipmentLedgerMap.get(equipmentId);
+            if (engineeringLedger == null || projectLedger == null || equipmentLedger == null) {
+                continue;
+            }
+            DevDetailDTO dto = new DevDetailDTO();
+            dto.setEngineeringid(engineeringId);
+            dto.setEngineeringName(engineeringLedger.getName());
+            dto.setProjectId(projectId);
+            dto.setProjectName(projectLedger.getName());
+            dto.setEquipmentId(equipmentId);
+            dto.setEquipmentName(equipmentLedger.getName());
+            dto.setLineId(item.getId());
+            dto.setLineName(item.getName());
+
+            if (Objects.isNull(csLinePoMap.get(item.getId()).getRunStatus())) {
+                CsEquipmentDeliveryPO delivery = equipmentDeliveryMap.get(equipmentId);
+                if (delivery != null) {
+                    Integer runStatus = delivery.getRunStatus();
+                    if (runStatus == 1) {
+                        dto.setRunStatus(2);
+                    } else if (runStatus == 2) {
+                        dto.setRunStatus(0);
+                    }
+                }
+            } else {
+                dto.setRunStatus(csLinePoMap.get(item.getId()).getRunStatus());
+            }
+            dto.setObjType(csLinePoMap.get(item.getId()).getMonitorObj());
+            dto.setGovernType(equipmentDeliveryMap.get(equipmentId).getGovernType());
+            result.add(dto);
+        }
+        return result;
+    }
+
 }

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

@@ -1,22 +1,26 @@
 package com.njcn.csdevice.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsDataArrayMapper;
 import com.njcn.csdevice.pojo.dto.DataArrayDTO;
 import com.njcn.csdevice.pojo.param.DataArrayParam;
 import com.njcn.csdevice.pojo.po.CsDataArray;
-import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO;
 import com.njcn.csdevice.service.ICsDataArrayService;
+import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.EpdFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -33,6 +37,7 @@ import java.util.stream.Collectors;
 public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDataArray> implements ICsDataArrayService {
 
     private final EpdFeignClient epdFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
 
     @Override
     public List<CsDataArray> getArrayBySet(String dataSet) {
@@ -52,7 +57,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
         for (Map.Entry<String, List<EleEpdPqd>> entry : map.entrySet()) {
             DeviceManagerDetailVO vo = new DeviceManagerDetailVO();
             EleEpdPqd eleEpdPqd = entry.getValue().get(0);
-            if (Objects.equals(eleEpdPqd.getPhase(),"M")){
+            if (Objects.equals(eleEpdPqd.getPhase(),"T")){
                 vo.setPhasic("/");
             } else {
                 vo.setPhasic(entry.getValue().stream().map(EleEpdPqd::getPhase).collect(Collectors.joining(",")));
@@ -104,7 +109,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                     DataArrayTreeVO vo3 = new DataArrayTreeVO();
                     vo3.setId(item.getDataSetId() + item.getDataArrayName()+item2);
                     vo3.setName(item2);
-                    if (Objects.equals(item2,"M")){
+                    if (Objects.equals(item2,"T")){
                         vo3.setShowName("无相别");
                     } else {
                         vo3.setShowName(item2);
@@ -173,7 +178,34 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
 
     @Override
     public List<CsDataArray> findListByParam(DataArrayParam param) {
-        return this.baseMapper.findListByParam(param);
+        List<CsDataArray> list = this.baseMapper.findListByParam(param);
+        if (!CollectionUtils.isEmpty(list)) {
+            DictData pqd = dicDataFeignClient.getDicDataByCode(DicDataEnum.PQD.getCode()).getData();
+            if (ObjectUtil.isNotNull(pqd) && ObjectUtil.isNotNull(pqd.getId())) {
+                List<EleEpdPqd> epdList = epdFeignClient.dictMarkByDataType(pqd.getId()).getData();
+                if (!CollectionUtils.isEmpty(epdList)) {
+                    Map<String, EleEpdPqd> epdPqdMap = epdList.stream().collect(Collectors.toMap(EleEpdPqd::getId, Function.identity()));
+                    list.forEach(item->{
+                        EleEpdPqd epdPqd = epdPqdMap.get(item.getDataId());
+                        if (!Objects.isNull(epdPqd)) {
+                            if (epdPqd.getOtherName() == null || epdPqd.getOtherName().isEmpty()) {
+                                item.setInfluxDbName(epdPqd.getName());
+                            } else {
+                                String[] parts = item.getName().split("_");
+                                String lastPart = parts[parts.length - 1];
+                                boolean isLastNumeric = lastPart.matches("\\d+");
+                                if (isLastNumeric) {
+                                    item.setInfluxDbName(epdPqd.getOtherName() + "_" + lastPart);
+                                } else {
+                                    item.setInfluxDbName(epdPqd.getOtherName());
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+        }
+        return list;
     }
 
     @Override

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

@@ -38,7 +38,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
                 .eq(CsDataSet::getPid,modelId)
                 .in(CsDataSet::getType, Arrays.asList(0,2))
                 .eq(CsDataSet::getStoreFlag,1)
-                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+//                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
                 .orderByAsc(CsDataSet::getIdx)
                 .list();
     }

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

@@ -10,14 +10,16 @@ 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.dto.DevDetailDTO;
 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.CsTouristDataParmVO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csharmonic.api.EventUserFeignClient;
-import com.njcn.cssystem.api.FeedBackFeignClient;
+import com.njcn.csharmonic.param.CsEventUserQueryParam;
 import com.njcn.harmonic.utils.PublicDataUtils;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.enums.AppRoleEnum;
@@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -51,14 +54,12 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
     private final CsDevModelRelationService csDevModelRelationService;
     private final ICsLedgerService iCsLedgerService;
     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;
 
     @Override
@@ -122,17 +123,61 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         DevCountVO vo = new DevCountVO();
         //获取app用户的台账树，包含四个层级 工程、项目、设备、监测点
         List<CsLedgerVO> appLedger = iCsLedgerService.appLineTree();
+        //判断当前用户，如果是游客，则需要筛选数据,只保留游客的数据
+        String roleString = RequestUtil.getUserRole();
+        if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
+            List<CsTouristDataParmVO> csTouristDataParmVOList = csTouristDataPOService.queryAll();
+            if (CollectionUtil.isNotEmpty(csTouristDataParmVOList)) {
+                List<String> devList = csTouristDataParmVOList.stream().map(CsTouristDataParmVO::getDeviceId).collect(Collectors.toList());
+                // 保留游客有权限的工程、项目、设备、监测点数据
+                appLedger = appLedger.stream()
+                        .filter(engineering -> {
+                            boolean hasValidProject = false;
+                            if (CollectionUtil.isNotEmpty(engineering.getChildren())) {
+                                List<CsLedgerVO> validProjects = engineering.getChildren().stream()
+                                        .filter(project -> {
+                                            boolean hasValidDevice = false;
+                                            if (CollectionUtil.isNotEmpty(project.getChildren())) {
+                                                List<CsLedgerVO> validDevices = project.getChildren().stream()
+                                                        .filter(device -> devList.contains(device.getId()))
+                                                        .collect(Collectors.toList());
+                                                project.setChildren(validDevices);
+                                                hasValidDevice = CollectionUtil.isNotEmpty(validDevices);
+                                            }
+                                            return hasValidDevice;
+                                        })
+                                        .collect(Collectors.toList());
+                                engineering.setChildren(validProjects);
+                                hasValidProject = CollectionUtil.isNotEmpty(validProjects);
+                            }
+                            return hasValidProject;
+                        })
+                        .collect(Collectors.toList());
+            } else {
+                // 如果游客没有配置任何数据权限，返回空列表
+                appLedger = new ArrayList<>();
+            }
+        }
+
         if (CollectionUtil.isNotEmpty(appLedger)) {
             //获取第一层项目层级
             List<CsLedgerVO> firstLevelList = new ArrayList<>();
             //获取第三层设备层级
             List<CsLedgerVO> thirdLevelList = new ArrayList<>();
+            //获取第四层设备层级
+            List<CsLedgerVO> forthLevelList = new ArrayList<>();
             for (CsLedgerVO firstLevel : appLedger) {
                 firstLevelList.add(firstLevel);
                 if (CollectionUtil.isNotEmpty(firstLevel.getChildren())) {
                     for (CsLedgerVO secondLevel : firstLevel.getChildren()) {
                         if (CollectionUtil.isNotEmpty(secondLevel.getChildren())) {
                             thirdLevelList.addAll(secondLevel.getChildren());
+                            for (CsLedgerVO threeLevel : secondLevel.getChildren()) {
+                                if (CollectionUtil.isNotEmpty(threeLevel.getChildren())) {
+                                    forthLevelList.addAll(threeLevel.getChildren());
+                                }
+                            }
+
                         }
                     }
                 }
@@ -159,21 +204,37 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
                     vo.setOffLineDevCount(offlineDevs.size());
                     vo.setOffLineDevs(offlineDevs);
                 }
+            } else {
+                return vo;
             }
             //获取未读事件数量
-            int eventCount = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
+            if (CollectionUtil.isNotEmpty(forthLevelList)) {
-            vo.setEventCount(eventCount);
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(forthLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
 
-            int harmonicCount = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
+                List<String> eventCount = eventUserFeignClient.queryTempEvent(param1).getData();
-            vo.setHarmonicCount(harmonicCount);
+                vo.setEventCount(CollectionUtil.isNotEmpty(eventCount)?eventCount.size():0);
+                List<String> harmonicCount = eventUserFeignClient.queryTempHarmonic(param1).getData();
+                vo.setHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount)?harmonicCount.size():0);
+            }
+            if (CollectionUtil.isNotEmpty(thirdLevelList)) {
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(thirdLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
 
-            int alarmCount = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
+                List<String> alarmCount = eventUserFeignClient.queryAlarmEvent(param1).getData();
-            vo.setAlarmCount(alarmCount);
+                vo.setAlarmCount(CollectionUtil.isNotEmpty(alarmCount)?alarmCount.size():0);
-
+                List<String> runCount = eventUserFeignClient.queryRunEvent(param1).getData();
-            int runCount = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
+                vo.setRunCount(CollectionUtil.isNotEmpty(runCount)?runCount.size():0);
-            vo.setRunCount(runCount);
+            }
 
             //note 当前工程数据
+            vo.setLineCount(0);
             //当前工程id
             vo.setCurrentId(id);
             //设备集合
@@ -226,143 +287,36 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
             }
             //获取未读事件数量
             if (CollectionUtil.isNotEmpty(currentLineIds)) {
-                int eventCount2 = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds);
+                vo.setLineCount(currentLineIds.size());
-                vo.setCurrentEventCount(eventCount2);
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(currentLineIds);
 
-                int harmonicCount2 = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds);
+                List<String> eventCount2 = eventUserFeignClient.queryTempEvent(param1).getData();
-                vo.setCurrentHarmonicCount(harmonicCount2);
+                vo.setCurrentEventCount(CollectionUtil.isNotEmpty(eventCount2)?eventCount2.size():0);
+
+                List<String> harmonicCount2 = eventUserFeignClient.queryTempHarmonic(param1).getData();
+                vo.setCurrentHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount2)?harmonicCount2.size():0);
             }
             if (CollectionUtil.isNotEmpty(currentDevIds)) {
-                int alarmCount2 = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds);
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
-                vo.setCurrentAlarmCount(alarmCount2);
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(currentDevIds);
 
-                int runCount2 = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds);
+                List<String> alarmCount2 = eventUserFeignClient.queryAlarmEvent(param1).getData();
-                vo.setCurrentRunCount(runCount2);
+                vo.setCurrentAlarmCount(CollectionUtil.isNotEmpty(alarmCount2)?alarmCount2.size():0);
+
+                List<String> runCount2 = eventUserFeignClient.queryRunEvent(param1).getData();
+                vo.setCurrentRunCount(CollectionUtil.isNotEmpty(runCount2)?runCount2.size():0);
             }
         }
         return vo;
     }
 
-//    @Override
-//    public DevCountVO devCount(String id,String time) {
-//        QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<>();
-//
-//        DevCountVO devCountVO = new DevCountVO();
-//
-//        String userRole = RequestUtil.getUserRole();
-//        List<String> strings = JSONArray.parseArray(userRole, String.class);
-//        if(CollectionUtils.isEmpty(strings)){
-//            throw new BusinessException(AlgorithmResponseEnum.UNKNOW_ROLE);
-//
-//        }
-//        userRole=strings.get(0);
-//
-//        List<String> device = roleEngineerDevService.getDevice();
-//        if(CollectionUtils.isEmpty(device)){
-//            devCountVO.setOnLineDevCount(0);
-//            devCountVO.setOnLineDevs(new ArrayList<>());
-//            devCountVO.setOffLineDevCount(0);
-//            devCountVO.setOffLineDevs(new ArrayList<>());
-//        }else {
-//            queryWrapper.clear();
-//            queryWrapper.in("id",device);
-//
-//            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
-//            List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
-//            List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
-//            devCountVO.setOnLineDevCount(collect2.size());
-//            devCountVO.setOnLineDevs(collect2);
-//            devCountVO.setOffLineDevCount(collect.size());
-//            devCountVO.setOffLineDevs(collect);
-//            List<String> roleengineer = roleEngineerDevService.getRoleengineer();
-//            devCountVO.setEningerCount(roleengineer.size());
-//        }
-//
-//        List<CsLedgerVO> deviceTree = iCsLedgerService.getDeviceTree(null);
-//        //由于多加了一程便携式设备
-//        List<String> collect1 = deviceTree.stream()
-//                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
-//                .filter(temp -> temp.getId().equals(id))
-//                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
-//                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
-//                .map(CsLedgerVO::getId).collect(Collectors.toList());
-//        //求交集
-//        device.retainAll(collect1);
-//        if(CollectionUtils.isEmpty(device)){
-//            devCountVO.setCurrentOnLineDevCount(0);
-//            devCountVO.setCurrentOnLineDevs(new ArrayList<>());
-//            devCountVO.setCurrentOffLineDevCount(0);
-//            devCountVO.setCurrentOffLineDevs(new ArrayList<>());
-//            devCountVO.setCurrentProjectCount(0);
-//
-//        }else {
-//            queryWrapper.clear();
-//            queryWrapper.in("id",device);
-//
-//            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
-//            List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
-//            List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
-//            devCountVO.setCurrentOnLineDevCount(collect2.size());
-//            devCountVO.setCurrentOnLineDevs(collect2);
-//            devCountVO.setCurrentOffLineDevCount(collect.size());
-//            devCountVO.setCurrentOffLineDevs(collect);
-//            List<CsLedger> list = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, id).eq(CsLedger::getState, 1).list();
-//            devCountVO.setCurrentProjectCount(list.size());
-//        }
-//        CsEventUserQueryParam csEventUserQueryParam = new CsEventUserQueryParam();
-//        csEventUserQueryParam.setStatus("0");
-//
-//        //查询暂态事件、运行事件还是使用之前的方法
-//        List<EventDetailVO> data = eventUserFeignClient.queryEventList(csEventUserQueryParam).getData();
-//        //查询稳态事件 先获取监测点id
-//        csLinePOService.getLinesByDevList(device);
-//
-//
-//        //查询运行告警事件
-//
-//
-//
-//
-//        List<EventDetailVO> event = data.stream().filter(temp -> temp.getType() == 0).collect(Collectors.toList());
-//        List<EventDetailVO> harmonic = data.stream().filter(temp -> temp.getType() == 1).collect(Collectors.toList());
-//        List<EventDetailVO> alarm = data.stream().filter(temp -> temp.getType() == 3).collect(Collectors.toList());
-//
-//        if(Objects.equals(userRole, AppRoleEnum.APP_VIP_USER.getCode())){
-//            alarm = alarm.stream().filter(temp -> Objects.equals("3", temp.getLevel())).collect(Collectors.toList());
-//        }
-//        List<EventDetailVO> run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList());
-//        if(Objects.equals(userRole,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(userRole,AppRoleEnum.TOURIST.getCode())
-//        ||Objects.equals(userRole,AppRoleEnum.MARKET_USER.getCode())){
-//            devCountVO.setFeedBackCount(0);
-//
-//        }else {
-//            CsFeedbackQueryParm csFeedbackQueryParm = new CsFeedbackQueryParm();
-//            csFeedbackQueryParm.setPageNum(1);
-//            csFeedbackQueryParm.setPageSize(100000);
-//            csFeedbackQueryParm.setStatus("1");
-//            Page<CsFeedbackVO> data1 = feedBackFeignClient.queryFeedBackPage(csFeedbackQueryParm).getData();
-//            List<CsFeedbackVO> collect = data1.getRecords().stream().filter(temp -> !Objects.equals(temp.getUserId(), RequestUtil.getUserIndex())).collect(Collectors.toList());
-//            devCountVO.setFeedBackCount(collect.size());
-//        }
-//
-//        //todo 后续添加警告数,事件数
-//        devCountVO.setEventCount(event.size());
-//        devCountVO.setAlarmCount(alarm.size());
-//        devCountVO.setRunCount(run.size());
-//        devCountVO.setHarmonicCount(harmonic.size());
-//        List<EventDetailVO> curEvent = event.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-//        List<EventDetailVO> curHarmonic = harmonic.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-//        List<EventDetailVO> curAlarm = alarm.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-//        List<EventDetailVO> curRun = run.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-//
-//        devCountVO.setCurrentEventCount(curEvent.size());
-//        devCountVO.setCurrentAlarmCount(curAlarm.size());
-//        devCountVO.setCurrentRunCount(curRun.size());
-//        devCountVO.setCurrentHarmonicCount(curHarmonic.size());
-//
-//
-//        return devCountVO;
-//    }
     /** 
     * @Description: 判断当前用户是否是主用户 0-否1-是
     * @Param:  
@@ -510,16 +464,16 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
 
     @Override
     public DevUserVO queryUserById(String devId) {
+        DevUserVO devUser = new DevUserVO();
         List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId, devId).eq(CsDeviceUserPO::getStatus, "1").list();
         if (CollectionUtils.isEmpty(list)) {
-            throw new BusinessException(AlgorithmResponseEnum.DATA_ARRAY_MISSING);
+            return devUser;
         }
         List<String> collect = list.stream().map(CsDeviceUserPO::getSubUserId).distinct().collect(Collectors.toList());
         List<User> data = userFeignClient.appuserByIdList(collect).getData();
         String primaryUserId = list.get(0).getPrimaryUserId();
         List<User> subUser = data.stream().filter(temp -> !Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
         List<User> primaryUser = data.stream().filter(temp -> Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
-        DevUserVO devUser = new DevUserVO();
         devUser.setDevId(devId);
         devUser.setSubUsers(subUser);
         devUser.setMasterUser(primaryUser.get(0));
@@ -533,6 +487,21 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         if (CollectionUtil.isNotEmpty(list)){
             result = list.stream().map(CsDeviceUserPO::getSubUserId).collect(Collectors.toList());
         }
+        //获取关注设备的用户(工程用户、营销用户)
+        List<DevDetailDTO> ledger = iCsLedgerService.getInfoByIds(Collections.singletonList(devId));
+        if (CollectionUtil.isNotEmpty(ledger)) {
+            DevDetailDTO item = ledger.get(0);
+            LambdaQueryWrapper<CsMarketData> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CsMarketData::getEngineerId, item.getEngineeringid());
+            List<CsMarketData> csMarketData = csMarketDataMapper.selectList(queryWrapper);
+            if (CollectionUtil.isNotEmpty(csMarketData)) {
+                List<String> collect = csMarketData.stream().map(CsMarketData::getUserId).collect(Collectors.toList());
+                result.addAll(collect);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            result = result.stream().distinct().collect(Collectors.toList());
+        }
         return result;
     }
 
@@ -578,4 +547,59 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         queryWrapper.eq(CsDeviceUserPO::getStatus, "1");
         return this.list(queryWrapper);
     }
+
+    /**
+     *
+     * @param userId 这边放设备id
+     * @param list   这边放用户id集合
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addRelation(UserDevParam param) {
+        String userIndex;
+        CsDeviceUserPO existingRecord = this.lambdaQuery()
+                .eq(CsDeviceUserPO::getDeviceId, param.getUserId())
+                .one();
+
+        if (existingRecord != null && Objects.equals(existingRecord.getPrimaryUserId(), existingRecord.getSubUserId())) {
+            userIndex = existingRecord.getPrimaryUserId();
+        } else {
+            userIndex = RequestUtil.getUserIndex();
+            if (userIndex == null) {
+                throw new IllegalArgumentException("当前用户信息获取失败");
+            }
+
+            CsDeviceUserPO mainDeviceRelation = new CsDeviceUserPO();
+            mainDeviceRelation.setDeviceId(param.getUserId());
+            mainDeviceRelation.setPrimaryUserId(userIndex);
+            mainDeviceRelation.setSubUserId(userIndex);
+            mainDeviceRelation.setStatus("1");
+            boolean mainSaveSuccess = this.save(mainDeviceRelation);
+            if (!mainSaveSuccess) {
+                return false;
+            }
+        }
+
+        if (CollectionUtil.isNotEmpty(param.getList())) {
+            List<CsDeviceUserPO> batchRecords = param.getList().stream()
+                    .filter(Objects::nonNull)
+                    .filter(item -> !Objects.equals(item, userIndex))
+                    .map(item -> {
+                        CsDeviceUserPO relation = new CsDeviceUserPO();
+                        relation.setDeviceId(param.getUserId());
+                        relation.setPrimaryUserId(userIndex);
+                        relation.setSubUserId(item);
+                        relation.setStatus("1");
+                        return relation;
+                    })
+                    .collect(Collectors.toList());
+
+            if (!batchRecords.isEmpty()) {
+                return this.saveBatch(batchRecords);
+            }
+        }
+        return true;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -40,33 +41,35 @@ public class CsEdDataServiceImpl extends ServiceImpl<CsEdDataMapper, CsEdDataPO>
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public boolean addEdData(CsEdDataAddParm csEdDataAddParm) {
-        CsEdDataPO csEdDataPO = new CsEdDataPO ();
+        CsEdDataPO csEdDataPO = new CsEdDataPO();
-        BeanUtils.copyProperties (csEdDataAddParm, csEdDataPO);
+        BeanUtils.copyProperties(csEdDataAddParm, csEdDataPO);
-        String filePath = fileStorageUtil.uploadMultipart (csEdDataAddParm.getFile (), OssPath.EDDATA);
+        String remoteDir = StrUtil.SLASH + OssPath.EDDATA + csEdDataAddParm.getDevTypeName() + StrUtil.SLASH + csEdDataAddParm.getVersionNo() + StrUtil.SLASH;
-        csEdDataPO.setFilePath (filePath);
+        String filePath = fileStorageUtil.uploadMultipart(csEdDataAddParm.getFile(), remoteDir, true);
-        csEdDataPO.setStatus ("1");
+        csEdDataPO.setCrc(csEdDataAddParm.getCrcInfo());
-        boolean save = this.save (csEdDataPO);
+        csEdDataPO.setFilePath(filePath);
+        csEdDataPO.setStatus("1");
+        boolean save = this.save(csEdDataPO);
         return save;
     }
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public Boolean auditEdData(CsEdDataAuditParm csEdDataAuditParm) {
-        CsEdDataPO csEdDataPO = new CsEdDataPO ();
+        CsEdDataPO csEdDataPO = new CsEdDataPO();
-        BeanUtils.copyProperties (csEdDataAuditParm, csEdDataPO);
+        BeanUtils.copyProperties(csEdDataAuditParm, csEdDataPO);
-        if(!Objects.isNull (csEdDataAuditParm.getFile ())){
+        if (!Objects.isNull(csEdDataAuditParm.getFile())) {
-            String filePath = fileStorageUtil.uploadMultipart (csEdDataAuditParm.getFile (), OssPath.EDDATA);
+            String filePath = fileStorageUtil.uploadMultipart(csEdDataAuditParm.getFile(), StrUtil.SLASH + OssPath.EDDATA + csEdDataAuditParm.getDevTypeName() + StrUtil.SLASH + csEdDataAuditParm.getVersionNo() + StrUtil.SLASH, true);
-            csEdDataPO.setFilePath (filePath);
+            csEdDataPO.setFilePath(filePath);
         }
-        boolean b = this.updateById (csEdDataPO);
+        boolean b = this.updateById(csEdDataPO);
         return b;
     }
 
     @Override
     public IPage<CsEdDataVO> queryEdDataPage(CsEdDataQueryParm csEdDataQueryParm) {
-        Page<CsEdDataVO> returnpage = new Page<> (csEdDataQueryParm.getPageNum ( ), csEdDataQueryParm.getPageSize ( ));
+        Page<CsEdDataVO> returnpage = new Page<>(csEdDataQueryParm.getPageNum(), csEdDataQueryParm.getPageSize());
 
-        returnpage = this.getBaseMapper ().getPage(returnpage,csEdDataQueryParm);
+        returnpage = this.getBaseMapper().getPage(returnpage, csEdDataQueryParm);
         return returnpage;
     }
 
@@ -74,15 +77,21 @@ public class CsEdDataServiceImpl extends ServiceImpl<CsEdDataMapper, CsEdDataPO>
     public CsEdDataVO findByDevTypeId(String devType) {
         CsEdDataPO csEdDataPo = new CsEdDataPO();
         LambdaQueryWrapper<CsEdDataPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(CsEdDataPO::getDevType,devType);
+        lambdaQueryWrapper.eq(CsEdDataPO::getDevType, devType);
-        lambdaQueryWrapper.eq(CsEdDataPO::getStatus,1);
+        lambdaQueryWrapper.eq(CsEdDataPO::getStatus, 1);
         List<CsEdDataPO> list = this.baseMapper.selectList(lambdaQueryWrapper);
-        if (!CollectionUtils.isEmpty(list)){
+        if (!CollectionUtils.isEmpty(list)) {
             csEdDataPo = list.get(0);
         }
         CsEdDataVO csEdDataVo = new CsEdDataVO();
-        BeanUtils.copyProperties(csEdDataPo,csEdDataVo);
+        BeanUtils.copyProperties(csEdDataPo, csEdDataVo);
         return csEdDataVo;
     }
+
+    public CsEdDataPO findByDevTypeIdAndVersionNo(String devTypeId, String versionNo) {
+        return this.lambdaQuery().eq(CsEdDataPO::getDevType, devTypeId)
+                .eq(CsEdDataPO::getVersionNo, versionNo)
+                .eq(CsEdDataPO::getStatus, 1).one();
+    }
 }
 

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

@@ -138,6 +138,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         if(StringUtils.isNotBlank(csEngineeringAuditParm.getName())){
             csLedger1.setName(csEngineeringAuditParm.getName());
         }
+        csLedger1.setSort(csEngineeringAuditParm.getSort());
         csLedgerMapper.updateById(csLedger1);
         List<CsEngineeringPO> list = this.lambdaQuery().eq(CsEngineeringPO::getName, csEngineeringAuditParm.getName()).eq(CsEngineeringPO::getStatus, "1").list();
         if(list.size()>1){
@@ -255,7 +256,9 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
                     CsEngineeringPO po = new CsEngineeringPO();
                     po.setId(item.getEngineeringid());
                     po.setName(map.get(item.getEngineeringid()).getName());
-                    result.add(po);
+                    if (!Objects.equals(po.getName(), "便携式工程")) {
+                        result.add(po);
+                    }
                 });
             }
         }

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

@@ -1,14 +1,11 @@
 package com.njcn.csdevice.service.impl;
 
-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.csdevice.mapper.CsEventSendMsgMapper;
 import com.njcn.csdevice.pojo.po.CsEventSendMsg;
-import com.njcn.csdevice.pojo.po.CsLogsPO;
 import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO;
 import com.njcn.csdevice.service.ICsEventSendMsgService;
-import com.njcn.cssystem.pojo.po.CsFeedbackChatPO;
 import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.user.api.UserFeignClient;

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

@@ -25,12 +25,14 @@ import com.njcn.csdevice.mapper.CsDataSetMapper;
 import com.njcn.csdevice.mapper.CsGroArrMapper;
 import com.njcn.csdevice.mapper.CsGroupMapper;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.EnergyBaseParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
+import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroupService;
 import com.njcn.csdevice.service.ICsLedgerService;
@@ -65,11 +67,8 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -112,6 +111,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
 
     private final String GRID_SIDE_DICT_CODE = "Grid_Side";
     private final String LOAD_SIDE_DICT_CODE = "Load_Side";
+    private final CsLinePOService csLinePOService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -316,24 +316,28 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
                 throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
             }
-            Double ct = finalCsLinePOList.get(0).getCtRatio();
+            Double ct = finalCsLinePOList.get(0).getCtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getCt2Ratio())?1.0:finalCsLinePOList.get(0).getCt2Ratio());
-            Double pt = finalCsLinePOList.get(0).getPtRatio();
+            Double pt = finalCsLinePOList.get(0).getPtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getPt2Ratio())?1.0:finalCsLinePOList.get(0).getPt2Ratio());
             if(CollectionUtil.isNotEmpty(commonStatisticalQueryParam.getList())){
                 for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){
 
-                    List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                    List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(param.getStatisticalId())).getData();
                     eleEpdPqds.forEach(epdPqd->{
                         List<CommonQueryParam> commonQueryParams = finalCsLinePOList.stream().map(temp -> {
                             CommonQueryParam commonQueryParam = new CommonQueryParam();
                             commonQueryParam.setLineId(temp.getLineId());
                             commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
-                            commonQueryParam.setColumnName(epdPqd.getName()+ (StringUtils.isEmpty(param.getFrequency()) ? "":"_"+param.getFrequency()));
+                            if (epdPqd.getName() == null || epdPqd.getName().isEmpty()) {
+                                commonQueryParam.setColumnName(epdPqd.getName()+ (StringUtils.isEmpty(param.getFrequency()) ? "":"_"+param.getFrequency()));
+                            } else {
+                                commonQueryParam.setColumnName(epdPqd.getOtherName()+ (StringUtils.isEmpty(param.getFrequency()) ? "":"_"+param.getFrequency()));
+                            }
                             commonQueryParam.setPhasic(epdPqd.getPhase());
 
                             commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(commonStatisticalQueryParam.getStartTime(),DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
                             commonQueryParam.setEndTime(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(commonStatisticalQueryParam.getEndTime(),DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN));
 
-                            commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
+                            commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType().toUpperCase());
                             commonQueryParam.setProcess(data1.get(0).getProcess()+"");
                             commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));
                             return commonQueryParam;
@@ -343,7 +347,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             String unit;
                             ThdDataVO vo = new ThdDataVO();
                             vo.setLineId(temp.getLineId());
-                            vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
+                            vo.setPhase(Objects.equals("T",temp.getPhaseType())?null:temp.getPhaseType());
                             String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                             vo.setPosition(position);
                             vo.setTime(temp.getTime());
@@ -451,21 +455,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             vo.setAnotherName(epdPqd.getShowName());
                             return vo;
                         }).collect(Collectors.toList());
-
-                        //长时闪变
-                        if (Objects.equals(epdPqd.getOtherName(), "plt")) {
-                            List<Instant> timeInstants = getTimeInstants(commonStatisticalQueryParam.getStartTime(), commonStatisticalQueryParam.getEndTime(), 2, ChronoUnit.HOURS, DEFAULT_ZONE);
-                            collect1 = collect1.stream()
-                                    .filter(vo -> timeInstants.contains(vo.getTime()))
-                                    .collect(Collectors.toList());
-                        }
-                        //短时闪变 || 电压波动
-                        else if (Objects.equals(epdPqd.getOtherName(), "pst") || Objects.equals(epdPqd.getOtherName(), "fluc")) {
-                            List<Instant> timeInstants = getTimeInstants(commonStatisticalQueryParam.getStartTime(), commonStatisticalQueryParam.getEndTime(), 10, ChronoUnit.MINUTES, DEFAULT_ZONE);
-                            collect1 = collect1.stream()
-                                    .filter(vo -> timeInstants.contains(vo.getTime()))
-                                    .collect(Collectors.toList());
-                        }
                         result.addAll(collect1);
                     });
                 }
@@ -493,8 +482,13 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                     commonQueryParam.setLineId(temp.getLineId());
                     commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
                     commonQueryParam.setColumnName(epdPqd.getName()+ finalFrequency);
+                    if (epdPqd.getName() == null || epdPqd.getName().isEmpty()) {
+                        commonQueryParam.setColumnName(epdPqd.getName()+ finalFrequency);
+                    } else {
+                        commonQueryParam.setColumnName(epdPqd.getOtherName()+ finalFrequency);
+                    }
                     commonQueryParam.setPhasic(epdPqd.getPhase());
-                    commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType() == null ? DataParam.portableDevStatisticalMethods:commonStatisticalQueryParam.getValueType());
+                    commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType() == null ? DataParam.portableDevStatisticalMethods.toUpperCase():commonStatisticalQueryParam.getValueType().toUpperCase());
                     commonQueryParam.setProcess(data1.get(0).getProcess()+"");
                     commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));
                     return commonQueryParam;
@@ -503,7 +497,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                     ThdDataVO vo = new ThdDataVO();
                     vo.setLineId(temp.getLineId());
-                    vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
+                    vo.setPhase(Objects.equals("T",temp.getPhaseType())?null:temp.getPhaseType());
                     String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                     vo.setPosition(position);
                     vo.setTime(temp.getTime());
@@ -526,9 +520,24 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             csEventUserQueryPage.setLineId(commonStatisticalQueryParam.getLineId());
             csEventUserQueryPage.setStartTime(commonStatisticalQueryParam.getStartTime());
             csEventUserQueryPage.setEndTime(commonStatisticalQueryParam.getEndTime());
+            csEventUserQueryPage.setEvtParamTmMin(commonStatisticalQueryParam.getEvtParamTmMin());
+            csEventUserQueryPage.setEvtParamTmMax(commonStatisticalQueryParam.getEvtParamTmMax());
+            csEventUserQueryPage.setFeatureAmplitudeMin(commonStatisticalQueryParam.getFeatureAmplitudeMin());
+            csEventUserQueryPage.setFeatureAmplitudeMax(commonStatisticalQueryParam.getFeatureAmplitudeMax());
+            csEventUserQueryPage.setSeverityMin(commonStatisticalQueryParam.getSeverityMin());
+            csEventUserQueryPage.setSeverityMax(commonStatisticalQueryParam.getSeverityMax());
+            csEventUserQueryPage.setTarget(commonStatisticalQueryParam.getTarget());
+            csEventUserQueryPage.setFileFlag(commonStatisticalQueryParam.getFileFlag());
             Page<DataGroupEventVO> csEventVOPage = eventFeignClient.pageQueryByLineId(csEventUserQueryPage).getData();
-
+            //获取监测点电压等级
+            List<CsLineDTO> list = csLinePOService.getAllLineDetail();
+            Map<String, CsLineDTO> map = list.stream().collect(Collectors.toMap(CsLineDTO::getLineId, temp -> temp));
             csEventVOPage.getRecords().forEach(temp->{
+                //监测点电压等级
+                Double volGrade = map.get(temp.getLineId()).getVolGrade();
+                if (!Objects.isNull(volGrade)) {
+                    temp.setLineVoltage(volGrade);
+                }
                 //事件描述、相别、暂降幅值,需要特殊处理赋值
                 //事件描述
                 CsLedger dataById = iCsLedgerService.findDataById(temp.getLineId());
@@ -579,24 +588,165 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 }
             });
             return csEventVOPage;
+        } else if ("4".equals(type)) {
+            formatQueryParamList(commonStatisticalQueryParam);
+            List<ThdDataVO> result = new ArrayList<>();
+            List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Collections.singletonList(commonStatisticalQueryParam.getLineId())).getData();
+            CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId, finalCsLinePOList.get(0).getDataSetId()));
+            if (Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())) {
+                throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
+                }
+            Double ct = finalCsLinePOList.get(0).getCtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getCt2Ratio()) ? 1.0 : finalCsLinePOList.get(0).getCt2Ratio());
+            Double pt = finalCsLinePOList.get(0).getPtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getPt2Ratio()) ? 1.0 : finalCsLinePOList.get(0).getPt2Ratio());
+            if (CollectionUtil.isNotEmpty(commonStatisticalQueryParam.getList())) {
+                for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()) {
+
+                    List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(param.getStatisticalId())).getData();
+                    eleEpdPqds.forEach(epdPqd -> {
+                        List<CommonQueryParam> commonQueryParams = finalCsLinePOList.stream().map(temp -> {
+                            CommonQueryParam commonQueryParam = new CommonQueryParam();
+                            commonQueryParam.setLineId(temp.getLineId());
+                            commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
+                            if (epdPqd.getName() == null || epdPqd.getName().isEmpty()) {
+                                commonQueryParam.setColumnName(epdPqd.getName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
+                            } else {
+                                commonQueryParam.setColumnName(epdPqd.getOtherName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
+                            }
+                            commonQueryParam.setPhasic(epdPqd.getPhase());
+
+                            commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(commonStatisticalQueryParam.getStartTime(), DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
+                            commonQueryParam.setEndTime(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(commonStatisticalQueryParam.getEndTime(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN));
+
+                            commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));
+                            return commonQueryParam;
+                        }).collect(Collectors.toList());
+                        List<StatisticalDataDTO> deviceRtData;
+                        if (commonStatisticalQueryParam.getDataModel() == 0) {
+                            deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
+                        } else {
+                            deviceRtData = commonService.getDianDuData(commonQueryParams);
+                        }
+                        List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
+                            String unit;
+                            ThdDataVO vo = new ThdDataVO();
+                            vo.setLineId(temp.getLineId());
+                            vo.setPhase(Objects.equals("T", temp.getPhaseType()) ? null : temp.getPhaseType());
+                            String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).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", commonStatisticalQueryParam.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()));
+                                            vo.setStatisticalData(re);
+                                            unit = 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;
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() * ct;
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() * pt * ct;
+                                                    unit = 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", commonStatisticalQueryParam.getDataLevel())) {
+                                    if (Objects.equals("Primary", csDataSet.getDataLevel())) {
+                                        unit = epdPqd.getUnit();
+                                    } else {
+                                        if (Objects.nonNull(epdPqd.getPrimaryFormula())) {
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    unit = 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;
         }
         return null;
     }
 
-    public static List<Instant> getTimeInstants(String startDateStr, String endDateStr, long interval, ChronoUnit unit, ZoneId zone) {
-        List<Instant> instants = new ArrayList<>();
-        LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER);
-        LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER);
-        // 转换为指定时区的 ZonedDateTime
-        ZonedDateTime current = startDate.atStartOfDay(zone);
-        ZonedDateTime endDateTime = endDate.atTime(23, 59, 59).atZone(zone);
-        while (!current.isAfter(endDateTime)) {
-            instants.add(current.toInstant());
-            current = current.plus(interval, unit);
-        }
-        return instants;
-    }
-
     private void formatQueryParamList(CommonStatisticalQueryParam commonStatisticalQueryParam){
         List<CommonStatisticalQueryParam> list = new ArrayList<>();
         if(commonStatisticalQueryParam.getList() != null && commonStatisticalQueryParam.getList().size() > 0){
@@ -659,7 +809,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                                 List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                                     ThdDataVO vo = new ThdDataVO();
                                     vo.setLineId(temp.getLineId());
-                                    vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
+                                    vo.setPhase(Objects.equals("T",temp.getPhaseType())?null:temp.getPhaseType());
                                     String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                                     vo.setPosition(position);
                                     vo.setTime(temp.getTime());
@@ -736,7 +886,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(commonStatisticalQueryParam.getLineId())).getData();
         if(commonStatisticalQueryParam.getList() != null && commonStatisticalQueryParam.getList().size() > 0){
             for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){
-                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(param.getStatisticalId())).getData();
                 ThdDataTdVO.ThdDataSpectrumVOData thdDataSpectrumVOData = new ThdDataTdVO.ThdDataSpectrumVOData();
                 List<ThdDataVO> result = new ArrayList();
                 eleEpdPqds.forEach(epdPqd->{
@@ -759,7 +909,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                                 ThdDataVO vo = new ThdDataVO();
                                 vo.setLineId(temp.getLineId());
-                                vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
+                                vo.setPhase(Objects.equals("T",temp.getPhaseType())?null:temp.getPhaseType());
                                 String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                                 vo.setPosition(position);
                                 vo.setTime(temp.getTime());
@@ -838,23 +988,25 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())) {
             throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
         }
-        Double ct = finalCsLinePO.getCtRatio();
+        Double ct = finalCsLinePO.getCtRatio() / (Objects.isNull(finalCsLinePO.getCt2Ratio())?1.0:finalCsLinePO.getCt2Ratio());
-        Double pt = finalCsLinePO.getPtRatio();
+        Double pt = finalCsLinePO.getPtRatio() / (Objects.isNull(finalCsLinePO.getPt2Ratio())?1.0:finalCsLinePO.getPt2Ratio());
         if(CollectionUtil.isNotEmpty(trendDataQueryParam.getList())) {
             for (TrendDataQueryParam param : trendDataQueryParam.getList()) {
-                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(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()));
+                    if (epdPqd.getName() == null || epdPqd.getName().isEmpty()) {
+                        commonQueryParam.setColumnName(epdPqd.getName()+ (StringUtils.isEmpty(param.getFrequency()) ? "":"_"+param.getFrequency()));
+                    } else {
+                        commonQueryParam.setColumnName(epdPqd.getOtherName()+ (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().toUpperCase());
-                    commonQueryParam.setDataType(trendDataQueryParam.getValueType());
-
                     commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(finalCsLinePO.getLineId()));
 
                     List<StatisticalDataDTO> deviceRtData = commonService.getNewDeviceRtDataByTime(Collections.singletonList(commonQueryParam));
@@ -862,7 +1014,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         String unit;
                         ThdDataVO vo = new ThdDataVO();
                         vo.setLineId(temp.getLineId());
-                        vo.setPhase(Objects.equals("M", temp.getPhaseType()) ? null : temp.getPhaseType());
+                        vo.setPhase(Objects.equals("T", temp.getPhaseType()) ? null : temp.getPhaseType());
                         String position = finalCsLinePO.getPosition();
                         vo.setPosition(position);
                         vo.setTime(temp.getTime());
@@ -970,21 +1122,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         vo.setAnotherName(epdPqd.getShowName());
                         return vo;
                     }).collect(Collectors.toList());
-
-                    //长时闪变
-                    if (Objects.equals(epdPqd.getOtherName(), "plt")) {
-                        List<Instant> timeInstants = getTimeInstants(trendDataQueryParam.getSearchBeginTime(), trendDataQueryParam.getSearchEndTime(), 2, ChronoUnit.HOURS, DEFAULT_ZONE);
-                        collect1 = collect1.stream()
-                                .filter(vo -> timeInstants.contains(vo.getTime()))
-                                .collect(Collectors.toList());
-                    }
-                    //短时闪变 || 电压波动
-                    else if (Objects.equals(epdPqd.getOtherName(), "pst") || Objects.equals(epdPqd.getOtherName(), "fluc")) {
-                        List<Instant> timeInstants = getTimeInstants(trendDataQueryParam.getSearchBeginTime(), trendDataQueryParam.getSearchEndTime(), 10, ChronoUnit.MINUTES, DEFAULT_ZONE);
-                        collect1 = collect1.stream()
-                                .filter(vo -> timeInstants.contains(vo.getTime()))
-                                .collect(Collectors.toList());
-                    }
                     result.addAll(collect1);
                 }
             }
@@ -1000,9 +1137,10 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
             throw new BusinessException("当前测点数据集主要信息缺失，请联系管理员排查(测点表里面数据集id缺失)");
         }
-        Double ct = finalCsLinePO.getCtRatio();
+        Double ct = finalCsLinePO.getCtRatio() / (Objects.isNull(finalCsLinePO.getCt2Ratio())?1.0:finalCsLinePO.getCt2Ratio());
-        Double pt = finalCsLinePO.getPtRatio();
+        Double pt = finalCsLinePO.getPtRatio() / (Objects.isNull(finalCsLinePO.getPt2Ratio())?1.0:finalCsLinePO.getPt2Ratio());
-       // String position = finalCsLinePO.getPosition();
+
+        // String position = finalCsLinePO.getPosition();
         Overlimit overlimit = overLimitWlMapper.selectById(finalCsLinePO.getLineId());
         if (Objects.isNull(overlimit)) {
             throw new BusinessException("当前测点限值信息缺失，请联系管理员排查");
@@ -1011,13 +1149,13 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         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<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(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.setColumnName(epdPqd.getOtherName() + (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));
@@ -1026,7 +1164,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                     String dataType = param.getValueType();
                     if (StrUtil.isEmpty(dataType)) {
                         // 电能质量指标，取限值计算类型，判断是否越限
-                        dataType = epdPqd.getFormula();
+                        dataType = epdPqd.getFormula().toUpperCase();
+                    } else {
+                        dataType = dataType.toUpperCase();
                     }
                     commonQueryParam.setDataType(dataType);
 
@@ -1038,7 +1178,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         ThdDataVO vo = new ThdDataVO();
                         vo.setLineId(temp.getLineId());
                        // vo.setLineName(finalCsLinePO.getName());
-                        vo.setPhase(Objects.equals("M", temp.getPhaseType()) ? null : temp.getPhaseType());
+                        vo.setPhase(Objects.equals("T", temp.getPhaseType()) ? null : temp.getPhaseType());
                        // vo.setPosition(position);
                         vo.setTime(temp.getTime());
                         vo.setStatMethod(commonQueryParam.getDataType());
@@ -1197,10 +1337,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         result.put("before", new ArrayList<>());
         result.put("after", new ArrayList<>());
         String sensitiveUserId = param.getSensitiveUserId();
-        List<CsLinePO> linePOList = csLineFeignClient.getLineBySensitiveUser(Collections.singletonList(sensitiveUserId)).getData();
+        List<CsLinePO> linePOList = csLineFeignClient.getLinesByDevList(Collections.singletonList(sensitiveUserId)).getData();
-        if (CollUtil.isEmpty(linePOList)) {
-            return result;
-        }
         DictData loadSideDictData = dicDataFeignClient.getDicDataByCode(LOAD_SIDE_DICT_CODE).getData();
         DictData gridSideDictData = dicDataFeignClient.getDicDataByCode(GRID_SIDE_DICT_CODE).getData();
         CsLinePO gridSideLine = linePOList.stream().filter(linePO -> linePO.getPosition().equals(gridSideDictData.getId())).findFirst().orElse(null);
@@ -1208,7 +1345,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         TrendDataQueryParam trendDataQueryParam = new TrendDataQueryParam();
         trendDataQueryParam.setSearchBeginTime(param.getSearchBeginTime());
         trendDataQueryParam.setSearchEndTime(param.getSearchEndTime());
-        trendDataQueryParam.setValueType(param.getValueType());
+        trendDataQueryParam.setValueType(param.getValueType().toUpperCase());
         trendDataQueryParam.setDataLevel(param.getDataLevel());
         List<SensitiveUserTrendDataQueryParam> paramList = param.getList();
         List<TrendDataQueryParam> indexList = paramList.stream().map(item -> {

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

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.csdevice.api.CsCommTerminalFeignClient;
-import com.njcn.csdevice.api.CsMarketDataFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
@@ -21,7 +20,6 @@ import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
-import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
 import com.njcn.device.biz.pojo.po.PqSensitiveUser;
@@ -72,7 +70,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     private final UserFeignClient userFeignClient;
     private final ICsUserPinsService csUserPinsService;
     private final CsCommTerminalFeignClient csCommTerminalFeignClient;
-    private final CsMarketDataFeignClient csMarketDataFeignClient;
 
 
     @Override
@@ -292,22 +289,24 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
             tree.addAll(new ArrayList<>(engineeringMap.values()));
 
-            String id = IdUtil.simpleUUID();
+            if (CollUtil.isNotEmpty(portables)) {
-            CsLedgerVO portable1 = new CsLedgerVO();
+                String id = IdUtil.simpleUUID();
-            portable1.setLevel(0);
+                CsLedgerVO portable1 = new CsLedgerVO();
-            portable1.setName("便携式工程");
+                portable1.setLevel(0);
-            portable1.setPid("0");
+                portable1.setName("便携式工程");
-            portable1.setId(id);
+                portable1.setPid("0");
+                portable1.setId(id);
 
-            CsLedgerVO portable2 = new CsLedgerVO();
+                CsLedgerVO portable2 = new CsLedgerVO();
-            portable2.setLevel(1);
+                portable2.setLevel(1);
-            portable2.setName("便携式项目");
+                portable2.setName("便携式项目");
-            portable2.setPid(id);
+                portable2.setPid(id);
-            portable2.setId(IdUtil.simpleUUID());
+                portable2.setId(IdUtil.simpleUUID());
-            portable2.setChildren(portables);
+                portable2.setChildren(portables);
 
-            portable1.setChildren(Collections.singletonList(portable2));
+                portable1.setChildren(Collections.singletonList(portable2));
-            tree.add(portable1);
+                tree.add(portable1);
+            }
 
             if (CollectionUtil.isNotEmpty(list)) {
                 csUserPinsService.channelTree(list, tree, 4);
@@ -704,24 +703,26 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
             tree.addAll(new ArrayList<>(engineeringMap.values()));
 
-            String id = IdUtil.simpleUUID();
+            if (CollUtil.isNotEmpty(portables)) {
-            CsLedgerVO portable1 = new CsLedgerVO();
+                String id = IdUtil.simpleUUID();
-            portable1.setLevel(0);
+                CsLedgerVO portable1 = new CsLedgerVO();
-            portable1.setName("便携式工程");
+                portable1.setLevel(0);
-            portable1.setPid("0");
+                portable1.setName("便携式工程");
-            portable1.setId(id);
+                portable1.setPid("0");
+                portable1.setId(id);
 
-            CsLedgerVO portable2 = new CsLedgerVO();
+                CsLedgerVO portable2 = new CsLedgerVO();
-            portable2.setLevel(1);
+                portable2.setLevel(1);
-            portable2.setName("便携式项目");
+                portable2.setName("便携式项目");
-            portable2.setPid(id);
+                portable2.setPid(id);
-            portable2.setId(IdUtil.simpleUUID());
+                portable2.setId(IdUtil.simpleUUID());
-            portable2.setChildren(portables);
+                portable2.setChildren(portables);
 
-            List<CsLedgerVO> portable2List = new ArrayList<>();
+                List<CsLedgerVO> portable2List = new ArrayList<>();
-            portable2List.add(portable2);
+                portable2List.add(portable2);
-            portable1.setChildren(portable2List);
+                portable1.setChildren(portable2List);
-            tree.add(portable1);
+                tree.add(portable1);
+            }
 
             if (CollectionUtil.isNotEmpty(list)) {
                 csUserPinsService.channelTree(list, tree, 4);
@@ -844,6 +845,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             device.setEquipmentName(dev.getName());
             device.setEquipmentId(devId);
             device.setDevMac(po.getMac());
+            device.setNDid(po.getNdid());
             device.setProjectId("/");
             device.setProjectName("/");
             device.setEngineeringid("/");
@@ -852,6 +854,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             device.setEquipmentName(dev.getName());
             device.setEquipmentId(devId);
             device.setDevMac(po.getMac());
+            device.setNDid(po.getNdid());
             CsLedger project = this.findDataById(dev.getPid());
             if (ObjectUtil.isNotNull(project)) {
                 device.setProjectId(project.getId());
@@ -1054,88 +1057,88 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     }
 
 
-    @Override
+//    @Override
-    public List<CsLedgerVO> objTree() {
+//    public List<CsLedgerVO> objTree() {
-        List<CsLedgerVO> result = new ArrayList<>();
+//        List<CsLedgerVO> result = new ArrayList<>();
-        String userId = RequestUtil.getUserIndex();
+//        String userId = RequestUtil.getUserIndex();
-        UserVO userVO = userFeignClient.getUserById(userId).getData();
+//        UserVO userVO = userFeignClient.getUserById(userId).getData();
-        List<String> devIds;
+//        List<String> devIds;
-        if (userVO.getType().equals(UserType.SUPER_ADMINISTRATOR) || userVO.getType().equals(UserType.ADMINISTRATOR)) {
+//        if (userVO.getType().equals(UserType.SUPER_ADMINISTRATOR) || userVO.getType().equals(UserType.ADMINISTRATOR)) {
-            devIds = csEquipmentDeliveryMapper.selectList(null).stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
+//            devIds = csEquipmentDeliveryMapper.selectList(null).stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
-        } else {
+//        } else {
-            LambdaQueryWrapper<CsDeviceUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//            LambdaQueryWrapper<CsDeviceUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.select(CsDeviceUserPO::getDeviceId)
+//            lambdaQueryWrapper.select(CsDeviceUserPO::getDeviceId)
-                    .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId))
+//                    .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId))
-                    .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode());
+//                    .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode());
-            List<CsDeviceUserPO> devList = csDeviceUserPOMapper.selectList(lambdaQueryWrapper);
+//            List<CsDeviceUserPO> devList = csDeviceUserPOMapper.selectList(lambdaQueryWrapper);
-            devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
+//            devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
-        }
+//        }
-        if (CollUtil.isEmpty(devIds)) {
+//        if (CollUtil.isEmpty(devIds)) {
-            return result;
+//            return result;
-        }
+//        }
-        List<CsLinePO> poList = csLinePOService.lambdaQuery().in(CsLinePO::getDeviceId, devIds)
+//        List<CsLinePO> poList = csLinePOService.lambdaQuery().in(CsLinePO::getDeviceId, devIds)
-                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode()).ne(CsLinePO::getMonitorUser,"").isNotNull(CsLinePO::getMonitorUser).list();
+//                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode()).ne(CsLinePO::getMonitorUser,"").isNotNull(CsLinePO::getMonitorUser).list();
-        if (CollUtil.isEmpty(poList)) {
+//        if (CollUtil.isEmpty(poList)) {
-            return result;
+//            return result;
-        }
+//        }
-        List<String> objIds = poList.stream().map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
+//        List<String> objIds = poList.stream().map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
-        List<String> lineIds = poList.stream().map(CsLinePO::getLineId).distinct().collect(Collectors.toList());
+//        List<String> lineIds = poList.stream().map(CsLinePO::getLineId).distinct().collect(Collectors.toList());
-
+//
-        List<PqSensitiveUser> pqSensitiveUserList = pqSensitiveUserFeignClient.getListByIds(objIds).getData();
+//        List<PqSensitiveUser> pqSensitiveUserList = pqSensitiveUserFeignClient.getListByIds(objIds).getData();
-        if (CollUtil.isEmpty(pqSensitiveUserList)) {
+//        if (CollUtil.isEmpty(pqSensitiveUserList)) {
-            return result;
+//            return result;
-        }
+//        }
-        Map<String,String> objMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
+//        Map<String,String> objMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
-
+//
-        List<CsLedger> csLineList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, lineIds));
+//        List<CsLedger> csLineList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, lineIds));
-        Map<String,List<String>> lineMap = csLineList.stream().collect(Collectors.groupingBy(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1],Collectors.mapping(CsLedger::getId,Collectors.toList())));
+//        Map<String,List<String>> lineMap = csLineList.stream().collect(Collectors.groupingBy(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1],Collectors.mapping(CsLedger::getId,Collectors.toList())));
-
+//
-        List<String> projectIds = csLineList.stream().map(it -> it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).distinct().collect(Collectors.toList());
+//        List<String> projectIds = csLineList.stream().map(it -> it.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).distinct().collect(Collectors.toList());
-        List<CsLedger> projectList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, projectIds));
+//        List<CsLedger> projectList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, projectIds));
-
+//
-       List<CsLedgerVO> realProjectList = new ArrayList<>();
+//       List<CsLedgerVO> realProjectList = new ArrayList<>();
-        projectList.forEach(pro->{
+//        projectList.forEach(pro->{
-            CsLedgerVO csLedgerVO = new CsLedgerVO();
+//            CsLedgerVO csLedgerVO = new CsLedgerVO();
-            csLedgerVO.setId(pro.getId());
+//            csLedgerVO.setId(pro.getId());
-            csLedgerVO.setPid(pro.getPid());
+//            csLedgerVO.setPid(pro.getPid());
-            csLedgerVO.setLevel(pro.getLevel());
+//            csLedgerVO.setLevel(pro.getLevel());
-            csLedgerVO.setName(pro.getName());
+//            csLedgerVO.setName(pro.getName());
-
+//
-            List<CsLedgerVO> temObjList = new ArrayList<>();
+//            List<CsLedgerVO> temObjList = new ArrayList<>();
-            if(lineMap.containsKey(pro.getId())){
+//            if(lineMap.containsKey(pro.getId())){
-                List<String> ids = lineMap.get(pro.getId());
+//                List<String> ids = lineMap.get(pro.getId());
-                List<String> objTemIds = poList.stream().filter(it->ids.contains(it.getLineId())).map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
+//                List<String> objTemIds = poList.stream().filter(it->ids.contains(it.getLineId())).map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
-                if(CollUtil.isNotEmpty(objTemIds)){
+//                if(CollUtil.isNotEmpty(objTemIds)){
-                    objTemIds.forEach(it->{
+//                    objTemIds.forEach(it->{
-                        CsLedgerVO inner = new CsLedgerVO();
+//                        CsLedgerVO inner = new CsLedgerVO();
-                        inner.setName(objMap.getOrDefault(it,"未知异常用户"));
+//                        inner.setName(objMap.getOrDefault(it,"未知异常用户"));
-                        inner.setId(it);
+//                        inner.setId(it);
-                        inner.setLevel(2);
+//                        inner.setLevel(2);
-                        temObjList.add(inner);
+//                        temObjList.add(inner);
-                    });
+//                    });
-                }
+//                }
-            }
+//            }
-            csLedgerVO.setChildren(temObjList);
+//            csLedgerVO.setChildren(temObjList);
-            realProjectList.add(csLedgerVO);
+//            realProjectList.add(csLedgerVO);
-        });
+//        });
-
+//
-        List<String> gcIds = projectList.stream().map(CsLedger::getPid).collect(Collectors.toList());
+//        List<String> gcIds = projectList.stream().map(CsLedger::getPid).collect(Collectors.toList());
-        List<CsLedger> gcList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, gcIds));
+//        List<CsLedger> gcList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, gcIds));
-
+//
-        List<CsLedgerVO> realGcList = new ArrayList<>();
+//        List<CsLedgerVO> realGcList = new ArrayList<>();
-        gcList.forEach(gc->{
+//        gcList.forEach(gc->{
-            CsLedgerVO csLedgerVO = new CsLedgerVO();
+//            CsLedgerVO csLedgerVO = new CsLedgerVO();
-            csLedgerVO.setId(gc.getId());
+//            csLedgerVO.setId(gc.getId());
-            csLedgerVO.setPid(gc.getPid());
+//            csLedgerVO.setPid(gc.getPid());
-            csLedgerVO.setLevel(gc.getLevel());
+//            csLedgerVO.setLevel(gc.getLevel());
-            csLedgerVO.setName(gc.getName());
+//            csLedgerVO.setName(gc.getName());
-
+//
-            List<CsLedgerVO> proList = realProjectList.stream().filter(it->gc.getId().equals(it.getPid())).collect(Collectors.toList());
+//            List<CsLedgerVO> proList = realProjectList.stream().filter(it->gc.getId().equals(it.getPid())).collect(Collectors.toList());
-            csLedgerVO.setChildren(proList);
+//            csLedgerVO.setChildren(proList);
-            realGcList.add(csLedgerVO);
+//            realGcList.add(csLedgerVO);
-        });
+//        });
-        return realGcList;
+//        return realGcList;
-    }
+//    }
 
     @Override
     public List<CsLedgerVO> getProAndEngineer(List<String> id) {
@@ -1167,60 +1170,33 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     public CsLedgerVO cldTree() {
         List<CsLedgerVO> allList = this.baseMapper.getAll();
         if (CollectionUtil.isEmpty(allList)) {
-            CsLedgerVO government = new CsLedgerVO();
+            return buildTreeRootNode(new ArrayList<>());
-            government.setLevel(-1);
-            government.setName("台账树");
-            government.setPid("0");
-            government.setId(IdUtil.simpleUUID());
-            government.setChildren(new ArrayList<>());
-            return government;
         }
 
-        List<CsLedgerVO> engineeringList = allList.stream()
+        Map<Integer, List<CsLedgerVO>> levelMap = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode()))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
+                .collect(Collectors.groupingBy(CsLedgerVO::getLevel));
 
-        List<CsLedgerVO> projectList = allList.stream()
+        List<CsLedgerVO> engineeringList = levelMap.getOrDefault(LineBaseEnum.ENGINEERING_LEVEL.getCode(), new ArrayList<>());
-                .filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()))
+        List<CsLedgerVO> projectList = levelMap.getOrDefault(LineBaseEnum.PROJECT_LEVEL.getCode(), new ArrayList<>());
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+        List<CsLedgerVO> deviceList = levelMap.getOrDefault(LineBaseEnum.DEVICE_LEVEL.getCode(), new ArrayList<>());
-                .collect(Collectors.toList());
+        List<CsLedgerVO> lineList = levelMap.getOrDefault(LineBaseEnum.LINE_LEVEL.getCode(), new ArrayList<>());
-
-        List<CsLedgerVO> deviceList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode()))
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
-
-        List<CsLedgerVO> lineList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
 
         if (CollectionUtil.isEmpty(deviceList)) {
-            CsLedgerVO government = new CsLedgerVO();
+            Map<String, List<CsLedgerVO>> projectByPidMap = projectList.stream()
-            government.setLevel(-1);
+                    .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-            government.setName("台账树");
+            engineeringList.forEach(eng -> eng.setChildren(projectByPidMap.getOrDefault(eng.getId(), new ArrayList<>())));
-            government.setPid("0");
+            return buildTreeRootNode(engineeringList);
-            government.setId(IdUtil.simpleUUID());
-            government.setChildren(engineeringList);
-            return government;
         }
 
+        // 批量查询设备交付信息
         List<String> devIds = deviceList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
         List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
-        Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
+        Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream()
-        Map<String, String> lineDevMap = lineList.stream().collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
+                .collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
-
+        Set<String> cldDevIds = devs.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toSet());
-        Set<String> cldDevIds = devs.stream()
-                .map(CsEquipmentDeliveryPO::getId)
-                .collect(Collectors.toSet());
-
-        Map<String, List<CsLedgerVO>> projectToDeviceMap = deviceList.stream()
-                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-
-        Map<String, List<CsLedgerVO>> deviceToLineMap = lineList.stream()
-                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
 
+        // 填充设备状态信息
         deviceList.forEach(device -> {
             CsEquipmentDeliveryPO dev = devsMap.get(device.getId());
             if (dev != null) {
@@ -1229,6 +1205,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             }
         });
 
+        // 填充监测点状态信息
+        Map<String, String> lineDevMap = lineList.stream()
+                .collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
         lineList.forEach(line -> {
             String devId = lineDevMap.get(line.getId());
             if (devId != null) {
@@ -1239,39 +1218,48 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             }
         });
 
-        engineeringList.forEach(engineering -> {
+        // 预构建pid映射
-            List<CsLedgerVO> sortedProjects = projectList.stream()
+        Map<String, List<CsLedgerVO>> projectByEngineeringMap = projectList.stream()
-                    .filter(project -> project.getPid().equals(engineering.getId()))
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-                    .peek(project -> {
+        Map<String, List<CsLedgerVO>> deviceByProjectMap = deviceList.stream()
-                        List<CsLedgerVO> projectDevices = projectToDeviceMap.getOrDefault(project.getId(), new ArrayList<>());
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-                        if (CollectionUtil.isNotEmpty(projectDevices)) {
+        Map<String, List<CsLedgerVO>> lineByDeviceMap = lineList.stream()
-                            List<CsLedgerVO> sortedDevices = projectDevices.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-                                    .filter(device -> cldDevIds.contains(device.getId()))
+
-                                    .peek(device -> {
+        // 逐层构建树：设备 -> 监测点
-                                        List<CsLedgerVO> sortedLines = deviceToLineMap.getOrDefault(device.getId(), new ArrayList<>())
+        deviceList.forEach(device -> {
-                                                .stream()
+            if (cldDevIds.contains(device.getId())) {
-                                                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                device.setChildren(lineByDeviceMap.getOrDefault(device.getId(), new ArrayList<>()));
-                                                .collect(Collectors.toList());
+            }
-                                        device.setChildren(sortedLines);
-                                    })
-                                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                                    .collect(Collectors.toList());
-                            project.setChildren(sortedDevices);
-                        }
-                    })
-                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                    .collect(Collectors.toList());
-            engineering.setChildren(sortedProjects);
         });
 
-        CsLedgerVO government = new CsLedgerVO();
+        // 项目 -> 设备（仅包含有交付记录的设备）
-        government.setLevel(-1);
+        projectList.forEach(project -> {
-        government.setName("台账树");
+            List<CsLedgerVO> projectDevices = deviceByProjectMap.getOrDefault(project.getId(), new ArrayList<>());
-        government.setPid("0");
+            if (CollectionUtil.isNotEmpty(projectDevices)) {
-        government.setId(IdUtil.simpleUUID());
+                List<CsLedgerVO> validDevices = projectDevices.stream()
-        government.setChildren(engineeringList);
+                        .filter(device -> cldDevIds.contains(device.getId()))
+                        .collect(Collectors.toList());
+                project.setChildren(validDevices);
+            }
+        });
 
-        return government;
+        // 工程 -> 项目
+        engineeringList.forEach(eng ->
+                eng.setChildren(projectByEngineeringMap.getOrDefault(eng.getId(), new ArrayList<>()))
+        );
+
+        return buildTreeRootNode(engineeringList);
+    }
+
+    private CsLedgerVO buildTreeRootNode(List<CsLedgerVO> children) {
+        CsLedgerVO root = new CsLedgerVO();
+        root.setLevel(-1);
+        root.setName("台账树");
+        root.setPid("0");
+        root.setId(IdUtil.simpleUUID());
+        root.setChildren(children);
+        return root;
     }
 
     @Override
@@ -1296,9 +1284,19 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         if (CollectionUtil.isNotEmpty(enginingeringIds)) {
             List<CsLedger> engineer = this.listByIds(enginingeringIds);
             engineer.forEach(item -> {
+                List<String> devNames = new ArrayList<>();
+                List<String> devIds = new ArrayList<>();
                 DevDetailDTO detail = new DevDetailDTO();
                 detail.setEngineeringid(item.getId());
                 detail.setEngineeringName(item.getName());
+                ledgers.forEach(item2->{
+                    if (item2.getPids().contains(item.getId())) {
+                        devIds.add(item2.getId());
+                        devNames.add(item2.getName());
+                    }
+                });
+                detail.setEquipmentId(String.join(",", devIds));
+                detail.setEquipmentName(String.join(",", devNames));
                 details.add(detail);
             });
         }
@@ -1341,11 +1339,25 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
             if (CollUtil.isNotEmpty(dev)) {
                 List<String> devIds = dev.stream().map(CsLedger::getId).collect(Collectors.toList());
+
+                //监测点
+                LambdaQueryWrapper<CsLedger> queryWrapper3 = new LambdaQueryWrapper<>();
+                queryWrapper3.in(CsLedger::getPid, devIds);
+                List<CsLedger> line = this.list(queryWrapper3);
+                Map<String,List<CsLedger>> lineMap = line.stream().collect(Collectors.groupingBy(CsLedger::getPid));
+
+
                 List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
                 Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
 
                 dev.forEach(item -> {
                     DevDetailDTO detail = new DevDetailDTO();
+                    //监测点
+                    List<CsLedger> lines = lineMap.get(item.getId());
+                    if (CollUtil.isNotEmpty(lines)) {
+                        detail.setLineList(lines.stream().map(CsLedger::getId).collect(Collectors.toList()));
+                    }
+
                     detail.setEquipmentName(item.getName());
                     detail.setEquipmentId(item.getId());
 
@@ -1381,15 +1393,17 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsLedger::getPid, item);
             List<CsLedger> project = this.list(queryWrapper);
-            //工程id
+            if (CollectionUtil.isNotEmpty(project)) {
-            List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
+                //项目id
-            LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+                List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
-            queryWrapper2.in(CsLedger::getPid, projectIds);
+                LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
-            List<CsLedger> dev = this.list(queryWrapper2);
+                queryWrapper2.in(CsLedger::getPid, projectIds);
-            if (CollectionUtil.isNotEmpty(dev)) {
+                List<CsLedger> dev = this.list(queryWrapper2);
-                DevDetailDTO dto = new DevDetailDTO();
+                if (CollectionUtil.isNotEmpty(dev)) {
-                dto.setEngineeringid(item);
+                    DevDetailDTO dto = new DevDetailDTO();
-                result.add(dto);
+                    dto.setEngineeringid(item);
+                    result.add(dto);
+                }
             }
         });
         return result;

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

@@ -11,12 +11,15 @@ 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.access.api.CsLineLatestDataFeignClient;
+import com.njcn.access.pojo.po.CsLineLatestData;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
+import com.njcn.csdevice.api.CsCommTerminalFeignClient;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
 import com.njcn.csdevice.pojo.dto.CsLineDTO;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -24,7 +27,11 @@ import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO;
 import com.njcn.csdevice.service.CsDevModelService;
 import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsDataSetService;
+import com.njcn.csharmonic.api.CsHarmonicPlanFeignClient;
+import com.njcn.csharmonic.api.CsHarmonicPlanLineFeignClient;
 import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
+import com.njcn.csharmonic.param.CsHarmonicPlanLineParam;
+import com.njcn.csharmonic.pojo.po.CsHarmonicPlan;
 import com.njcn.device.biz.pojo.po.PqSensitiveUser;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
@@ -64,7 +71,6 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
     private final ICsDataSetService csDataSetService;
     private final DicDataFeignClient dicDataFeignClient;
     private final CsTerminalLogsMapper csTerminalLogsMapper;
-    private final CsLineLatestDataFeignClient csLineLatestDataFeignClient;
     private final PqSensitiveUserFeignClient pqSensitiveUserFeignClient;
 
     private final FileStorageUtil fileStorageUtil;
@@ -72,6 +78,10 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
     private final CsDeviceUserPOMapper csDeviceUserPOMapper;
     private final DictTreeFeignClient dictTreeFeignClient;
+    private final CsHarmonicPlanFeignClient csHarmonicPlanFeignClient;
+    private final CsHarmonicPlanLineFeignClient csHarmonicPlanLineFeignClient;
+    private final CsLineLatestDataFeignClient csLineLatestDataFeignClient;
+    private final CsCommTerminalFeignClient csCommTerminal;
 
 
     @Override
@@ -158,7 +168,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         po.setClDid(param.getLineNo());
         //监测位置
         //DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.GRID_SIDE.getCode()).getData();
-        po.setPosition(param.getPosition());
+        po.setPosition(param.getPosition().isEmpty()?null:param.getPosition());
         this.save(po);
 
         //2.新增台账树信息
@@ -171,6 +181,17 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         csLedger.setState(1);
         csLedger.setSort(0);
         csLedgerMapper.insert(csLedger);
+
+        //3.新增稳态事件指标配置
+        csHarmonicPlanLineFeignClient.deleteByLineIds(Collections.singletonList(lineId));
+        List<CsHarmonicPlan> planList = csHarmonicPlanFeignClient.getByName("通用方案").getData();
+        if (CollectionUtil.isNotEmpty(planList)) {
+            CsHarmonicPlan plan = planList.get(0);
+            CsHarmonicPlanLineParam param1 = new CsHarmonicPlanLineParam();
+            param1.setId(plan.getId());
+            param1.setLineIds(Collections.singletonList(lineId));
+            csHarmonicPlanLineFeignClient.savePlanLines(param1);
+        }
         return po;
     }
 
@@ -205,9 +226,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                 .set(CsLinePO::getShortCircuitCapacity,param.getShortCircuitCapacity())
                 .set(CsLinePO::getMonitorObj,param.getMonitorObj())
                 .set(CsLinePO::getMonitorObj,param.getMonitorObj())
-                .set(CsLinePO::getGovern,param.getGovern())
                 .set(CsLinePO::getPosition,param.getPosition())
-                .set(CsLinePO::getMonitorUser,param.getMonitorUser())
                 .set(CsLinePO::getLineLogLevel,param.getLineLogLevel())
                 .set(CsLinePO::getIsImportant,param.getIsImportant());
         this.update(lambdaUpdateWrapper);
@@ -234,6 +253,8 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
 
         this.removeById(id);
         csLedgerMapper.deleteById(id);
+        //删除稳态事件指标配置
+        csHarmonicPlanLineFeignClient.deleteByLineIds(Collections.singletonList(id));
 
         //新增台账日志
         CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
@@ -305,11 +326,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
     }
 
     @Override
-    public List<CsLinePO> getLineBySensitiveUser(List<String> list) {
+    public List<CsEquipmentDeliveryPO> getDevBySensitiveUser(List<String> list) {
-        return this.lambdaQuery()
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                .in(CsLinePO::getMonitorUser,list)
+        lambdaQueryWrapper.in(CsEquipmentDeliveryPO::getMonitorUser,list)
-                .eq(CsLinePO::getStatus, 1)
+                .ne(CsEquipmentDeliveryPO::getRunStatus, DataStateEnum.DELETED.getCode());
-                .list();
+        return csEquipmentDeliveryMapper.selectList(lambdaQueryWrapper);
     }
 
     @Override
@@ -322,10 +343,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         List<CsLinePO> poList = getSimpleLine();
         // 构建基础查询条件
         LambdaQueryWrapper<CsLinePO> lambdaQueryWrapper = new LambdaQueryWrapper<CsLinePO>()
-                .eq(CsLinePO::getStatus, 1)
+                .eq(CsLinePO::getStatus, 1);
-                // 关联敏感用户
-                //.isNotNull(CsLinePO::getMonitorUser)
-                .orderByAsc(CsLinePO::getMonitorUser);
         // 只有当lineList不为空时才添加in条件
         if (CollUtil.isNotEmpty(poList)) {
             List<String> lineList = poList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
@@ -340,6 +358,9 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         if (CollUtil.isEmpty(records)) {
             return result;
         }
+        List<String> devIds = records.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
+        List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryMapper.selectBatchIds(devIds);
+        Map<String, CsEquipmentDeliveryPO> devMap = devList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
 
         List<PqSensitiveUserLineVO> list = new ArrayList<>();
         List<String> sensitiveUserIds = list.stream().map(PqSensitiveUserLineVO::getSensitiveUser).distinct().collect(Collectors.toList());
@@ -349,23 +370,32 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         if (CollUtil.isNotEmpty(pqSensitiveUserList)) {
             sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
         }
+        // 最新数据时间
+        List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData();
+        Map<String,CsLineLatestData> lineLatestDataMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(lineLatestDataList)) {
+            lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item));
+        }
+
         PqSensitiveUserLineVO sensitiveUserLineVO;
+
+        List<String> lineIds = records.stream().map(CsLinePO::getLineId).distinct().collect(Collectors.toList());
+        List<DevDetailDTO> devDetailDTOList = csCommTerminal.getLedgerByLineId(lineIds).getData();
+        Map<String, DevDetailDTO> devDetailDTOMap = devDetailDTOList.stream().collect(Collectors.toMap(DevDetailDTO::getLineId, item -> item));
+
         for (CsLinePO record : records) {
             sensitiveUserLineVO = new PqSensitiveUserLineVO();
+            sensitiveUserLineVO.setEngineeringName(devDetailDTOMap.get(record.getLineId()).getEngineeringName());
+            sensitiveUserLineVO.setProjectName(devDetailDTOMap.get(record.getLineId()).getProjectName());
+            sensitiveUserLineVO.setDevName(devDetailDTOMap.get(record.getLineId()).getEquipmentName());
             // 治理对象
-            sensitiveUserLineVO.setSensitiveUser(sensitiveUserNameMap.getOrDefault(record.getMonitorUser(), null));
+            sensitiveUserLineVO.setSensitiveUser(sensitiveUserNameMap.getOrDefault(devMap.get(record.getDeviceId()).getMonitorUser(), null));
             // 测点名称
             sensitiveUserLineVO.setLineId(record.getLineId());
             sensitiveUserLineVO.setLineName(record.getName());
             // 是否治理
-            if (ObjectUtil.isNotEmpty(record.getGovern())) {
+            String governMethod = devMap.get(record.getDeviceId()).getGovernMethod();
-                if (record.getGovern().equals(0)) {
+            sensitiveUserLineVO.setGovern(Objects.isNull(governMethod) ? "未治理" : governMethod);
-                    sensitiveUserLineVO.setGovern("未治理");
-                }
-                if (record.getGovern().equals(1)) {
-                    sensitiveUserLineVO.setGovern("已治理");
-                }
-            }
             // 监测类型
             if (ObjectUtil.isNotNull(record.getPosition())) {
                 sensitiveUserLineVO.setPosition(record.getPosition());
@@ -379,22 +409,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                 sensitiveUserLineVO.setVolGrade(record.getVolGrade());
             }
             // 运行状态
-            if (ObjectUtil.isNotNull(record.getRunStatus())) {
+            sensitiveUserLineVO.setRunStatus(String.valueOf(devDetailDTOMap.get(record.getLineId()).getRunStatus()));
-                //获取设备状态
-                int devRunStatus = csEquipmentDeliveryMapper.selectById(record.getDeviceId()).getRunStatus();
-                sensitiveUserLineVO.setRunStatus(getRunStatusDescription(devRunStatus));
-            }
             // 报告文件
             sensitiveUserLineVO.setReportFilePath(record.getReportFilePath());
-            // 最新数据时间
+            //最新数据时间
-//            List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData();
+            sensitiveUserLineVO.setLatestTime(Objects.isNull(lineLatestDataMap.get(record.getLineId()))? null : lineLatestDataMap.get(record.getLineId()).getTimeId());
-//            if (CollUtil.isNotEmpty(lineLatestDataList)) {
-//                sensitiveUserLineVO.setLatestTime(lineLatestDataList.stream()
-//                        .filter(item -> item.getLineId().equals(record.getLineId()))
-//                        .map(CsLineLatestData::getTimeId)
-//                        .max(LocalDateTime::compareTo)
-//                        .orElse(null));
-//            }
             list.add(sensitiveUserLineVO);
         }
         result.setRecords(list);
@@ -442,15 +461,6 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                 lineDetailDataVO.setBdName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).getName());
             }
             lineDetailDataVO.setLineName(csLinePO.getName());
-            //Device device = deviceMapper.selectById(devId);
-            //lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag()));
-            //lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag()));
-            //lineDetailDataVO.setIp(device.getIp());
-            //lineDetailDataVO.setLoginTime(device.getLoginTime());
-            //lineDetailDataVO.setDevId(device.getId());
-            //lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName());
-            //lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
-            lineDetailDataVO.setObjName(csLinePO.getMonitorUser());
             lineDetailDataVO.setLineId(csLinePO.getLineId());
             lineDetailDataVO.setPtType(PubUtils.ptType(csLinePO.getConType()));
             lineDetailDataVO.setPt(csLinePO.getPtRatio() + "/" + (Objects.isNull(csLinePO.getPt2Ratio())?1.0:csLinePO.getPt2Ratio()));
@@ -473,8 +483,10 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
     public List<CsLinePO> getLineList(CsLinePO param) {
         List<String> keywordsLineIds = new ArrayList<>();
         List<CsLinePO> poList = getSimpleLine();
-        if (CollUtil.isNotEmpty(poList)) {
+        if (CollUtil.isNotEmpty(poList) && !poList.isEmpty()) {
             keywordsLineIds = poList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        } else {
+            return poList;
         }
         List<CsLinePO> result = this.list(new LambdaQueryWrapper<CsLinePO>()
                 .eq(CsLinePO::getStatus, 1)

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

@@ -66,6 +66,8 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
         wrapper.eq(CsTerminalLogs::getIsPush, 0);
         List<CsTerminalLogs> list = this.list(wrapper);
         if (CollectionUtil.isNotEmpty(list)) {
+            //先清空缓存
+            redisUtil.delete(RequestUtil.getUserIndex()+"reply");
             //新增台账集合
             List<String> addList = new ArrayList<>();
             //修改台账集合
@@ -97,42 +99,44 @@ public class CsTerminalLogsServiceImpl extends ServiceImpl<CsTerminalLogsMapper,
             });
             //整合后 所有设备的id
             List<String> devList = Stream.of(addList, updateList, deleteList).flatMap(List::stream).collect(Collectors.toList());
-            //获取设备集合
+            if (CollectionUtil.isNotEmpty(devList)) {
-            List<CsEquipmentDeliveryPO> deviceList = csEquipmentDeliveryService.listByIds(devList);
+                //获取设备集合
-            //按照前置机id分组
+                List<CsEquipmentDeliveryPO> deviceList = csEquipmentDeliveryService.listByIds(devList);
-            Map<String,List<CsEquipmentDeliveryPO>> nodeMap = deviceList.stream().collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeId));
+                //按照前置机id分组
-            nodeMap.forEach((k,v)->{
+                Map<String,List<CsEquipmentDeliveryPO>> nodeMap = deviceList.stream().collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeId));
-                int maxProcessNum = nodeService.getNodeById(k).getMaxProcessNum();
+                nodeMap.forEach((k,v)->{
-                //按照进程号分组
+                    int maxProcessNum = nodeService.getNodeById(k).getMaxProcessNum();
-                Map<Integer,List<CsEquipmentDeliveryPO>> nodeProcessMap = v.stream().collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeProcess));
+                    //按照进程号分组
-                nodeProcessMap.forEach((k1,v1)->{
+                    Map<Integer,List<CsEquipmentDeliveryPO>> nodeProcessMap = v.stream().collect(Collectors.groupingBy(CsEquipmentDeliveryPO::getNodeProcess));
-                    if (v1.size() > 10) {
+                    nodeProcessMap.forEach((k1,v1)->{
-                        //一个进程下修改的设备数量超过10台，重启该进程号下的前置
+                        if (v1.size() > 10) {
-                        CldControlMessage cldControlMessage = new CldControlMessage();
+                            //一个进程下修改的设备数量超过10台，重启该进程号下的前置
-                        cldControlMessage.setGuid(IdUtil.simpleUUID());
+                            CldControlMessage cldControlMessage = new CldControlMessage();
-                        cldControlMessage.setCode("set_process");
+                            cldControlMessage.setGuid(IdUtil.simpleUUID());
-                        cldControlMessage.setProcessNo(k1);
+                            cldControlMessage.setCode("set_process");
-                        cldControlMessage.setFun("delete");
+                            cldControlMessage.setProcessNo(k1);
-                        cldControlMessage.setProcessNum(maxProcessNum);
+                            cldControlMessage.setFun("delete");
-                        controlMessageTemplate.sendMember(cldControlMessage,k);
+                            cldControlMessage.setProcessNum(maxProcessNum);
-                    }
+                            controlMessageTemplate.sendMember(cldControlMessage,k);
+                        }
+                    });
                 });
-            });
 
-            if (CollectionUtil.isNotEmpty(addList)) {
+                if (CollectionUtil.isNotEmpty(addList)) {
-                sendMessage(addList, deviceList, "add_terminal");
+                    sendMessage(addList, deviceList, "add_terminal");
-            }
+                }
-            if (CollectionUtil.isNotEmpty(updateList)) {
+                if (CollectionUtil.isNotEmpty(updateList)) {
-                sendMessage(updateList, deviceList, "ledger_modify");
+                    sendMessage(updateList, deviceList, "ledger_modify");
-            }
+                }
-            if (CollectionUtil.isNotEmpty(deleteList)) {
+                if (CollectionUtil.isNotEmpty(deleteList)) {
-                sendDeleteMessage(deleteList, list, "delete_terminal");
+                    sendDeleteMessage(deleteList, list, "delete_terminal");
-            }
+                }
 
-            //推送完将数据改成推送
+                //推送完将数据改成推送
-            LambdaUpdateWrapper<CsTerminalLogs> wrapper2 = new LambdaUpdateWrapper<>();
+                LambdaUpdateWrapper<CsTerminalLogs> wrapper2 = new LambdaUpdateWrapper<>();
-            wrapper2.set(CsTerminalLogs::getIsPush, 1);
+                wrapper2.set(CsTerminalLogs::getIsPush, 1);
-            this.update(wrapper2);
+                this.update(wrapper2);
+            }
         } else {
             return "暂无需要推送的数据";
         }

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

@@ -1,6 +1,7 @@
 package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -57,53 +58,98 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
             List<String> redisList = Stream.of(object.toString().split(",")).collect(Collectors.toList());
             List<CsTerminalReply> list = this.lambdaQuery().in(CsTerminalReply::getReplyId,redisList).orderByAsc(CsTerminalReply::getCreateTime).list();
             if (CollectionUtil.isNotEmpty(list)) {
-                Map<Integer,List<CsTerminalReply>> map = list.stream().collect(Collectors.groupingBy(CsTerminalReply::getIsReceived));
+                list.forEach(item->{
-                List<CsTerminalReply> list1 = map.get(1);
+                    String key;
-                if (CollectionUtil.isEmpty(list1)) {
+                    String code = "";
-                    String key = "更新失败,未收到前置应答,请查看应答报文是否发送";
+                    if (Objects.equals(item.getCode(), "add_terminal")) {
-                    result.add(key);
+                        code = "新增";
-                    //将cs_terminal_logs数据置为未发送
+                    } else if (Objects.equals(item.getCode(), "ledger_modify")) {
-                    list.forEach(item->{
+                        code = "修改";
+                    } 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;
+                    if (CollectionUtil.isNotEmpty(devNameList)) {
+                        devNameListString = devNameList.toString();
+                    } else {
+                        devNameListString = "[" + item.getDeviceName() + "]";
+                    }
+                    if (item.getIsReceived() == 0) {
+                        key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备未收到应答";
+                        //将cs_terminal_logs数据置为未发送
                         csTerminalLogsService.updateLaterData(item.getDeviceId(),item.getCode());
-                    });
+                    } else if (item.getIsReceived() == 1){
-                } else {
+                        key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备" + code + "数据成功";
-                    list.forEach(item->{
+                    } else {
-                        String key;
+                        key = nodeName + item.getProcessNo() + "号进程下," + devNameListString + "设备" + code + "数据失败";
-                        String code = "";
+                    }
-                        if (Objects.equals(item.getCode(), "add_terminal")) {
+                    result.add(key);
-                            code = "新增";
+                });
-                        } else if (Objects.equals(item.getCode(), "ledger_modify")) {
-                            code = "修改";
-                        } 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;
-                        if (CollectionUtil.isNotEmpty(devNameList)) {
-                            devNameListString = devNameList.toString();
-                        } else {
-                            devNameListString = "[" + item.getDeviceName() + "]";
-                        }
-                        if (item.getIsReceived() == 0) {
-                            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 + "数据失败";
-                        }
-                        result.add(key);
-                    });
-                }
             }
+
         }
         return result;
     }
 
+//    @Override
+//    public List<String> queryReplyData() {
+//        List<String> result = new ArrayList<>();
+//        Object object = redisUtil.getObjectByKey(RequestUtil.getUserIndex()+"reply");
+//        if (object != null) {
+//            List<String> redisList = Stream.of(object.toString().split(",")).collect(Collectors.toList());
+//            List<CsTerminalReply> list = this.lambdaQuery().in(CsTerminalReply::getReplyId,redisList).orderByAsc(CsTerminalReply::getCreateTime).list();
+//            if (CollectionUtil.isNotEmpty(list)) {
+//                Map<Integer,List<CsTerminalReply>> map = list.stream().collect(Collectors.groupingBy(CsTerminalReply::getIsReceived));
+//                List<CsTerminalReply> list1 = map.get(1);
+//                if (CollectionUtil.isEmpty(list1)) {
+//                    String key = "更新失败,未收到前置应答,请查看应答报文是否发送";
+//                    result.add(key);
+//                    //将cs_terminal_logs数据置为未发送
+//                    list.forEach(item->{
+//                        csTerminalLogsService.updateLaterData(item.getDeviceId(),item.getCode());
+//                    });
+//                } else {
+//                    list.forEach(item->{
+//                        String key;
+//                        String code = "";
+//                        if (Objects.equals(item.getCode(), "add_terminal")) {
+//                            code = "新增";
+//                        } else if (Objects.equals(item.getCode(), "ledger_modify")) {
+//                            code = "修改";
+//                        } 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;
+//                        if (CollectionUtil.isNotEmpty(devNameList)) {
+//                            devNameListString = devNameList.toString();
+//                        } else {
+//                            devNameListString = "[" + item.getDeviceName() + "]";
+//                        }
+//                        if (item.getIsReceived() == 0) {
+//                            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 + "数据失败";
+//                        }
+//                        result.add(key);
+//                    });
+//                }
+//            }
+//        }
+//        return result;
+//    }
+
     @Override
     public void updateReplyData(IcdBzReplyParam param) {
         LambdaUpdateWrapper<CsTerminalReply> wrapper = new LambdaUpdateWrapper<>();
@@ -118,7 +164,7 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
     @Override
     public List<CsTerminalReply> getBzReplyData(String lineId) {
         LambdaQueryWrapper<CsTerminalReply> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(CsTerminalReply::getCode,Arrays.asList("allFile","allEvent","oneFile"))
+        wrapper.in(CsTerminalReply::getCode,Arrays.asList("allFile","allEvent","oneFile","harmonic"))
                 .orderByDesc(CsTerminalReply::getCreateTime);
         if (!Objects.isNull(lineId) && StringUtils.isNotBlank(lineId)) {
             wrapper.like(CsTerminalReply::getLineId,lineId);
@@ -132,30 +178,13 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
         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.between("cs_terminal_reply.Create_Time"
+                , DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))
+                , DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
         //排序
         queryWrapper.orderBy(true, false, "cs_terminal_reply.create_time");
-        queryWrapper.in("cs_terminal_reply.code", Arrays.asList("allFile", "allEvent", "oneFile"));
+        queryWrapper.in("cs_terminal_reply.code", Arrays.asList("allFile", "allEvent", "oneFile","harmonic"));
         Page<CsTerminalReply> csTerminalReplyPage = this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
 
         List<CsTerminalReply> records = csTerminalReplyPage.getRecords();
@@ -164,6 +193,9 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
             Map<String, CsLedgerVO> ledgerMap = data.stream().collect(Collectors.toMap(CsLedgerVO::getId, Function.identity()));
             List<CldLogsVo> cldLogsVos = new ArrayList<>();
             records.forEach(item->{
+                if (Objects.isNull(ledgerMap.get(item.getDeviceId()))) {
+                    return;
+                }
                 String pids = ledgerMap.get(item.getDeviceId()).getPids();
                 String[] split = pids.split(",");
                 CldLogsVo cldLogsVo = new CldLogsVo();
@@ -233,6 +265,9 @@ public class CsTerminalReplyServiceImpl extends ServiceImpl<CsTerminalReplyMappe
             case "oneFile":
                 result = "补召单事件波形";
                 break;
+            case "harmonic":
+                result = "稳态数据";
+                break;
             default:
                 result = "未知";
         }

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

@@ -0,0 +1,15 @@
+package com.njcn.csdevice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.mapper.CsUpgradeLogsMapper;
+import com.njcn.csdevice.pojo.po.CsUpgradeLogs;
+import com.njcn.csdevice.service.CsUpgradeLogsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author caozehui
+ * @data 2026-04-23
+ */
+@Service
+public class CsUpgradeLogsServiceImpl extends ServiceImpl<CsUpgradeLogsMapper, CsUpgradeLogs> implements CsUpgradeLogsService {
+}

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

@@ -37,7 +37,6 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
     private final ChannelObjectUtil channelObjectUtil;
-    private final FileStorageUtil fileStorageUtil;
     private final MqttUtil mqttUtil;
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
@@ -51,11 +50,14 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
             }
             redisUtil.delete(AppRedisKey.DEVICE_ROOT_PATH + nDid);
             askDeviceDataFeignClient.askDeviceRootPath(nDid);
-            Thread.sleep(3000);
+            for (int i = 0; i <= 3; i++) {
-            Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_ROOT_PATH + nDid);
+                Thread.sleep(1000);
-            if (Objects.nonNull(object)) {
+                Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_ROOT_PATH + nDid);
-                makeUpVo.setPrjDataPath(object.toString());
+                if (Objects.nonNull(object)) {
-                makeUpVo.setType("dir");
+                    makeUpVo.setPrjDataPath(object.toString());
+                    makeUpVo.setType("dir");
+                    break;
+                }
             }
         } catch (Exception e) {
             throw new BusinessException(e.getMessage());
@@ -75,12 +77,15 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
             redisUtil.delete(AppRedisKey.PROJECT_INFO + nDid);
             // 请求设备文件或目录信息
             askDeviceDataFeignClient.askDeviceFileOrDir(nDid, name);
-            Thread.sleep(10000);
+            for (int i = 0; i <= 10; i++) {
-            // 从 Redis 获取对象
+                Thread.sleep(1000);
-            Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
+                // 从 Redis 获取对象
-            if (object != null) {
+                Object object = redisUtil.getObjectByKey(AppRedisKey.PROJECT_INFO + nDid);
-                // 根据类型处理不同的数据
+                if (object != null) {
-                processObject(result, object, type);
+                    // 根据类型处理不同的数据
+                    processObject(result, object, type);
+                    break;
+                }
             }
         } catch (Exception e) {
             // 捕获特定异常并抛出运行时异常
@@ -99,6 +104,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
         if (!mqttClient) {
             throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
         }
+        //判断文件如果过大，不给下载
+        if (size > 15728640) {
+            throw new BusinessException("文件过大(超过15M),暂不支持下载!");
+        }
         Object task = redisUtil.getObjectByKey("fileDowning:"+nDid);
         if (Objects.nonNull(task)) {
             throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);