feat(api): 添加批量插入通信数据功能

- 在CsCommunicateFeignClient中增加insertionList接口方法
- 实现批量插入的fallback处理逻辑
- 在ICsCommunicateService中添加insertionList服务接口
- 完成InfluxdbCsCommunicateServiceImpl中的批量插入实现
- 优化数据处理逻辑，支持运行状态转换和CT/PT计算
- 添加数据排序功能，按项目名、设备名、测点名排序
- 在控制器中增加批量插入数据的REST接口

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")
-    HttpResult<AppProjectPO> addAppProject(@RequestBody AppProjectAddParm appProjectAddParm);
+    @PostMapping("/addPortableProject")
+    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.po.CsDeviceUserPO;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 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/CsCommunicateFeignClient.java

@@ -8,6 +8,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @author xy
  */
@@ -17,4 +19,7 @@ public interface CsCommunicateFeignClient {
 
     @PostMapping("/insertion")
     HttpResult<String> insertion(@RequestBody PqsCommunicateDto pqsCommunicateDto);
+
+    @PostMapping("/insertionList")
+    HttpResult<String> insertionList(@RequestBody List<PqsCommunicateDto> list);
 }

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

@@ -0,0 +1,46 @@
+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.CsDeviceRegistryFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsDeviceRegistry;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csDeviceRegistry", fallbackFactory = CsDeviceRegistryFallbackFactory.class,contextId = "csDeviceRegistry")
+public interface CsDeviceRegistryFeignClient {
+
+    @PostMapping("/add")
+    @ApiOperation("批量新增设备注册记录")
+    HttpResult<Boolean> add(@RequestBody @Validated List<CsDeviceRegistry> list);
+
+    @PostMapping("/update")
+    @ApiOperation("修改设备注册记录")
+    HttpResult<Boolean> update(@RequestBody @Validated CsDeviceRegistry csDeviceRegistry);
+
+    @PostMapping("/delete")
+    @ApiOperation("删除设备注册记录")
+    HttpResult<Boolean> delete(@RequestParam("id") String id);
+
+    @PostMapping("/queryByCurrentNdid")
+    @ApiOperation("根据currentNdid查询设备注册记录")
+    HttpResult<List<CsDeviceRegistry>> queryByCurrentNdid(@RequestParam("currentNdid") String currentNdid);
+
+    @PostMapping("/queryByCurrentNdidAndClDid")
+    @ApiOperation("根据currentNdid和clDid查询设备注册记录")
+    HttpResult<CsDeviceRegistry> queryByCurrentNdidAndClDid(@RequestParam("currentNdid") String currentNdid, @RequestParam("clDid") Integer clDid);
+
+    @PostMapping("/updateIsAccessByCurrentNdid")
+    @ApiOperation("根据currentNdid修改isAccess")
+    HttpResult<Boolean> updateIsAccessByCurrentNdid(@RequestParam("currentNdid") String currentNdid, @RequestParam("isAccess") Integer isAccess);
+
+}

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")
-    @ApiOperation("根据敏感用户查询监测点")
-    HttpResult<List<CsLinePO>> getLineBySensitiveUser(@RequestBody List<String> list);
+    @PostMapping("/getDevBySensitiveUser")
+    @ApiOperation("根据敏感用户查询装置")
+    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) {
-                log.error("{}异常，降级处理，异常为：{}","新增项目异常",cause.toString());
+            public HttpResult<AppProjectPO> addPortableProject(AppProjectAddParm appProjectAddParm) {
+                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/CsCommunicateFeignClientFallbackFactory.java

@@ -10,6 +10,8 @@ import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 类的介绍：
  *
@@ -35,6 +37,12 @@ public class CsCommunicateFeignClientFallbackFactory implements FallbackFactory<
                 log.error("{}异常，降级处理，异常为：{}","新增记录",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<String> insertionList(List<PqsCommunicateDto> list) {
+                log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -0,0 +1,67 @@
+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.CsDeviceRegistryFeignClient;
+import com.njcn.csdevice.pojo.po.CsDeviceRegistry;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsDeviceRegistryFallbackFactory implements FallbackFactory<CsDeviceRegistryFeignClient> {
+    @Override
+    public CsDeviceRegistryFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsDeviceRegistryFeignClient() {
+
+            @Override
+            public HttpResult<Boolean> add(List<CsDeviceRegistry> list) {
+                log.error("{}异常，降级处理，异常为：{}","批量新增设备注册记录异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Boolean> update(CsDeviceRegistry csDeviceRegistry) {
+                log.error("{}异常，降级处理，异常为：{}","修改设备注册记录异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Boolean> delete(String id) {
+                log.error("{}异常，降级处理，异常为：{}","删除设备注册记录异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsDeviceRegistry>> queryByCurrentNdid(String currentNdid) {
+                log.error("{}异常，降级处理，异常为：{}","根据currentNdid查询设备注册记录异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsDeviceRegistry> queryByCurrentNdidAndClDid(String currentNdid, Integer clDid) {
+                log.error("{}异常，降级处理，异常为：{}","根据currentNdid和clDid查询设备注册记录数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Boolean> updateIsAccessByCurrentNdid(String currentNdid, Integer isAccess) {
+                log.error("{}异常，降级处理，异常为：{}","根据currentNdid修改isAccess异常",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

@@ -1,14 +1,8 @@
 package com.njcn.csdevice.pojo.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
 /**
  * 
  * Description:
@@ -76,8 +70,6 @@ public class CsEquipmentDeliveryDTO  {
      */
     private String debugPerson;
 
-
-
     /**
      * 合同号
      */
@@ -115,4 +107,10 @@ public class CsEquipmentDeliveryDTO  {
      * 日志等级(NORMAL、DEBUG、WARN、ERROR)
      */
     private String devLogLevel;
+
+    /**
+     * 设备软件信息id
+     */
+    private String softinfoId;
+
 }

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

@@ -19,7 +19,12 @@ public class CsLineDTO implements Serializable {
     private String deviceId;
 
     /**
-     * 装置id
+     * 装置名称
+     */
+    private String deviceName;
+
+    /**
+     * 装置类型
      */
     private String deviceType;
 

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/CsDeviceRegistry.java

@@ -0,0 +1,54 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2026-06-17
+ */
+@Data
+@TableName("cs_device_registry")
+public class CsDeviceRegistry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点id
+     */
+    private String id;
+
+    /**
+     * 当前设备NDID
+     */
+    private String currentNdid;
+
+    /**
+     * 老的设备NDID
+     */
+    private String oldNdid;
+
+    /**
+     * 逻辑子设备编号
+     */
+    private Integer clDid;
+
+    /**
+     * 首次接入时间
+     */
+    private LocalDateTime firstSeenTime;
+
+    /**
+     * 修改完mac是否完成首次接入(0:未接入 1:已接入)
+     */
+    private Integer isAccess;
+
+
+}

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,14 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "associated_project")
     private String associatedProject;
 
+    /**
+     * icd模型
+     */
+    @TableField(value = "icd")
+    private String icd;
+
+    /**
+     * 是否支持升级(0:否 1:是)
+     */
+    private Integer upgrade;
 }

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 com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 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,7 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="所属项目名称")
     private String associatedProjectName;
 
+    @ApiModelProperty(value="修改完mac是否完成首次接入(0:未接入 1:已接入)")
+    private Integer isAccess;
+
 }

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

@@ -75,6 +75,18 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "devConType",value = "设备连接方式 MQTT || CLD")
     private String devConType;
 
+    @ApiModelProperty(name = "监测点关联用户id")
+    private String sensitiveUserId;
+
+    @ApiModelProperty(name = "监测点关联用户名称")
+    private String sensitiveUserName;
+
+    @ApiModelProperty(name = "治理方案名称")
+    private String governPlanName;
+
+    @ApiModelProperty(name = "监测点线路号")
+    private Integer lineNo;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

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

@@ -75,4 +75,13 @@ public class PqsCommunicateController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/insertionList")
+    @ApiOperation("批量插入数据")
+    public HttpResult<String> insertionList(@RequestBody List<PqsCommunicateDto> list) {
+        String methodDescribe = getMethodDescribe("insertionList");
+        pqsCommunicateCvtQuery.insertionList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 }

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/CsDeviceRegistryController.java

@@ -0,0 +1,148 @@
+package com.njcn.csdevice.controller.equipment;
+
+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.pojo.po.CsDeviceRegistry;
+import com.njcn.csdevice.service.ICsDeviceRegistryService;
+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 org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+@RestController
+@RequestMapping("/csDeviceRegistry")
+@Api(tags = "设备注册台账记录表")
+@AllArgsConstructor
+public class CsDeviceRegistryController extends BaseController {
+
+    private final ICsDeviceRegistryService csDeviceRegistryService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("批量新增设备注册记录")
+    @ApiImplicitParam(name = "list", value = "设备注册信息列表", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated List<CsDeviceRegistry> list) {
+        String methodDescribe = getMethodDescribe("add");
+        boolean result = csDeviceRegistryService.add(list);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/update")
+    @ApiOperation("修改设备注册记录")
+    @ApiImplicitParam(name = "csDeviceRegistry", value = "设备注册信息", required = true)
+    public HttpResult<Boolean> update(@RequestBody @Validated CsDeviceRegistry csDeviceRegistry) {
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = csDeviceRegistryService.update(csDeviceRegistry);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateBatch")
+    @ApiOperation("批量修改设备注册记录")
+    @ApiImplicitParam(name = "list", value = "设备注册信息列表", required = true)
+    public HttpResult<Boolean> updateBatch(@RequestBody @Validated List<CsDeviceRegistry> list) {
+        String methodDescribe = getMethodDescribe("updateBatch");
+        boolean result = csDeviceRegistryService.updateBatch(list);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/delete")
+    @ApiOperation("删除设备注册记录")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<Boolean> delete(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = csDeviceRegistryService.delete(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateIsAccessByCurrentNdid")
+    @ApiOperation("根据currentNdid修改isAccess")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "currentNdid", value = "当前设备NDID", required = true),
+            @ApiImplicitParam(name = "isAccess", value = "接入状态(0:未接入 1:已接入)", required = true)
+    })
+    public HttpResult<Boolean> updateIsAccessByCurrentNdid(
+            @RequestParam("currentNdid") String currentNdid,
+            @RequestParam("isAccess") Integer isAccess) {
+        String methodDescribe = getMethodDescribe("updateIsAccessByCurrentNdid");
+        boolean result = csDeviceRegistryService.updateIsAccessByCurrentNdid(currentNdid, isAccess);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deleteByCurrentNdid")
+    @ApiOperation("根据currentNdid删除设备注册记录")
+    @ApiImplicitParam(name = "currentNdid", value = "当前设备NDID", required = true)
+    public HttpResult<List<CsDeviceRegistry>> deleteByCurrentNdid(@RequestParam("currentNdid") String currentNdid) {
+        String methodDescribe = getMethodDescribe("deleteByCurrentNdid");
+        csDeviceRegistryService.deleteByCurrentNdid(currentNdid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryByCurrentNdid")
+    @ApiOperation("根据currentNdid查询设备注册记录")
+    @ApiImplicitParam(name = "currentNdid", value = "当前设备NDID", required = true)
+    public HttpResult<List<CsDeviceRegistry>> queryByCurrentNdid(@RequestParam("currentNdid") String currentNdid) {
+        String methodDescribe = getMethodDescribe("queryByCurrentNdid");
+        List<CsDeviceRegistry> list = csDeviceRegistryService.queryByCurrentNdid(currentNdid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getById")
+    @ApiOperation("根据id查询设备注册记录")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<CsDeviceRegistry> getById(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getById");
+        CsDeviceRegistry csDeviceRegistry = csDeviceRegistryService.getById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDeviceRegistry, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryByCurrentNdidAndClDid")
+    @ApiOperation("根据currentNdid和clDid查询设备注册记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "currentNdid", value = "当前设备NDID", required = true),
+            @ApiImplicitParam(name = "clDid", value = "逻辑子设备编号", required = true)
+    })
+    public HttpResult<CsDeviceRegistry> queryByCurrentNdidAndClDid(
+            @RequestParam("currentNdid") String currentNdid,
+            @RequestParam("clDid") Integer clDid) {
+        String methodDescribe = getMethodDescribe("queryByCurrentNdidAndClDid");
+        CsDeviceRegistry pojo = csDeviceRegistryService.queryByCurrentNdidAndClDid(currentNdid, clDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pojo, methodDescribe);
+    }
+
+}

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/CsGroupController.java

@@ -179,9 +179,5 @@ public class CsGroupController extends BaseController {
         Map<String,List<ThdDataVO>> result = csGroupService.sensitiveUserTrendData(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-
-
-
 }
 

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,56 @@
+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.*;
+
+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)
+    @GetMapping("/getByDevId")
+    @ApiOperation("查询指定devId的所有升级日志")
+    @ApiImplicitParam(name = "devId", value = "装置Id", required = true)
+    public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestParam("devId") 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 = "version", value = "版本", required = true),
-        @ApiImplicitParam(name = "time", value = "时间", required = true)
+            @ApiImplicitParam(name = "devType", value = "装置类型", required = true),
+            @ApiImplicitParam(name = "version", 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)){
-            csEquipmentDeliveryPOS.forEach(temp->{
+        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)) {
+            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);
-        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);
+        csEquipmentDeliveryService.updateModuleNumber(nDid, number);
         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 = "devId", value = "设备id", required = true),
-        @ApiImplicitParam(name = "status", value = "状态", required = true)
+            @ApiImplicitParam(name = "date", value = "时间", required = true),
+            @ApiImplicitParam(name = "devId", value = "设备id", 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.po.CsDeviceUserPO;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 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)
-    @PostMapping("/objTree")
-    @ApiOperation("三层对象用户树")
-    public HttpResult<List<CsLedgerVO>> objTree(){
-        String methodDescribe = getMethodDescribe("getProjectTree");
-        List<CsLedgerVO> list = csLedgerService.objTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @PostMapping("/objTree")
+//    @ApiOperation("三层对象用户树")
+//    public HttpResult<List<CsLedgerVO>> objTree(){
+//        String methodDescribe = getMethodDescribe("getProjectTree");
+//        List<CsLedgerVO> list = csLedgerService.objTree();
+//        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;
@@ -29,6 +30,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Description:
@@ -147,6 +149,9 @@ public class CslineController extends BaseController {
         LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CsLinePO::getLineId,lineId).eq(CsLinePO::getStatus,1);
         CsLinePO po = csLinePOService.getOne(queryWrapper);
+        if (Objects.isNull(po.getLineNo())) {
+            po.setLineNo(po.getClDid());
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
 
@@ -295,11 +300,11 @@ public class CslineController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getLineBySensitiveUser")
-    @ApiOperation("根据敏感用户查询监测点")
-    public HttpResult<List<CsLinePO>> getLineBySensitiveUser(@RequestBody List<String> list) {
-        String methodDescribe = getMethodDescribe("getLineBySensitiveUser");
-        List<CsLinePO> result = csLinePOService.getLineBySensitiveUser(list);
+    @PostMapping("/getDevBySensitiveUser")
+    @ApiOperation("根据敏感用户查询装置")
+    public HttpResult<List<CsEquipmentDeliveryPO>> getDevBySensitiveUser(@RequestBody List<String> list) {
+        String methodDescribe = getMethodDescribe("getDevBySensitiveUser");
+        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 CsLogsPOService csLogsPOService;
+    private final CsLogsFeignClient csLogsFeignClient;
 
     /**
      * 插入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/CsDeviceRegistryMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsDeviceRegistry;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2026-06-17
+ */
+public interface CsDeviceRegistryMapper extends BaseMapper<CsDeviceRegistry> {
+
+}

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/CsDeviceRegistryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.csdevice.mapper.CsDeviceRegistryMapper">
+
+</mapper>

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}
@@ -57,7 +57,8 @@
   <select id="findLineList" resultType="com.njcn.csdevice.pojo.dto.CsLineDTO">
     SELECT
       t1.*,
-      t2.dev_type deviceType
+      t2.dev_type deviceType,
+      t2.name deviceName
     FROM
       cs_line t1
         LEFT JOIN cs_equipment_delivery t2 ON t1.device_id = t2.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.CsEquipmentDeliveryAuditParm;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
-import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
+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 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
@@ -35,4 +45,6 @@ public interface ICsCommunicateService {
     List<PqsCommunicateDto> getRawDataEnd(LineCountEvaluateParam lineParam);
 
     void insertion(PqsCommunicateDto pqsCommunicateDto);
+
+    void insertionList(List<PqsCommunicateDto> list);
 }

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

@@ -0,0 +1,33 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.CsDeviceRegistry;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2026-06-17
+ */
+public interface ICsDeviceRegistryService extends IService<CsDeviceRegistry> {
+
+    boolean add(List<CsDeviceRegistry> list);
+
+    boolean update(CsDeviceRegistry csDeviceRegistry);
+
+    boolean updateBatch(List<CsDeviceRegistry> list);
+
+    boolean delete(String id);
+
+    boolean updateIsAccessByCurrentNdid(String currentNdid, Integer isAccess);
+
+    void deleteByCurrentNdid(String currentNdid);
+
+    List<CsDeviceRegistry> queryByCurrentNdid(String currentNdid);
+
+    CsDeviceRegistry queryByCurrentNdidAndClDid(String currentNdid, Integer clDid);
+}

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();
 
     /**
      * 根据设备集合获取项目和工程
@@ -97,4 +97,6 @@ public interface ICsLedgerService extends IService<CsLedger> {
 
     List<DevDetailDTO> getEngineeringHaveDevs(List<String> list);
 
+    List<CsLedger> queryByPid(String pid);
+
 }

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();
-
-            iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,temp.getLineId()).set(CsLedger::getName,temp.getName()).update();
+                set(AppLineTopologyDiagramPO::getLng,temp.getLng()).set(AppLineTopologyDiagramPO::getId,linePostionParam.getId())
+                .set(AppLineTopologyDiagramPO::getTarget,temp.getTarget())
+                .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,10 +8,13 @@ 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;
 import com.njcn.csdevice.service.*;
+import com.njcn.csharmonic.api.PqGovernPlanFeignClient;
+import com.njcn.csharmonic.pojo.po.PqGovernPlan;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.enums.AppRoleEnum;
@@ -21,9 +24,7 @@ import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +44,7 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
     private final CsMarketDataService csMarketDataService;
     private final ICsLedgerService csLedgerService;
     private final CsTouristDataPOService csTouristDataPOService;
+    private final PqGovernPlanFeignClient pqGovernPlanFeignClient;
 
 
     @Override
@@ -66,18 +68,15 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
     @Override
     public List<String> getPqUserIdsByUser(String userId) {
         List<String> result = new ArrayList<>();
-        List<String> devIds = commGetDevIds(userId);
-        if (CollUtil.isEmpty(devIds)) {
+        List<String> lineIds = getLineIdsByUser(userId);
+        if (CollUtil.isEmpty(lineIds)) {
             return result;
         }
-        LambdaQueryWrapper<CsLinePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.select(CsLinePO::getLineId, CsLinePO::getMonitorUser).in(CsLinePO::getDeviceId, devIds)
-                .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode());
-        List<CsLinePO> poList =csLinePOMapper.selectList(lambdaQueryWrapper);
-        if (CollUtil.isNotEmpty(poList)) {
-            result = poList.stream().map(CsLinePO::getMonitorUser).distinct().collect(Collectors.toList());
+        List<PqGovernPlan> governPlans = pqGovernPlanFeignClient.getListByMonitorPoint(lineIds).getData();
+        if (CollUtil.isEmpty(governPlans)) {
+            return result;
         }
-        return result;
+        return governPlans.stream().map(PqGovernPlan::getPid).distinct().collect(Collectors.toList());
     }
 
     @Override
@@ -93,31 +92,123 @@ 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)) {
-                List<String> engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList());
-                List<DevDetailDTO> devs = csLedgerService.getDevInfoByEngineerIds(engineerIds);
-                devIds.addAll(devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList()));
+            // 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系。
+            // 如果是营销 工程用户 没有配置相关工程，直接返回空的设备列表；如果有数据，也要判断下当前关注的工程里面是否包含主用户的设备，可能出现没有关注该工程，但是因为是设备的主用户导致数据统计错误
+            String roleString = RequestUtil.getUserRole();
+            if (roleString.contains(AppRoleEnum.MARKET_USER.getCode()) || roleString.contains(AppRoleEnum.ENGINEERING_USER.getCode())) {
+                List<CsMarketDataVO> list = csMarketDataService.queryByUseId(userId);
+                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();
-            if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
+            else 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());
+            dto.setObjType(csLinePoMap.get(item.getId()).getMonitorObj());
+
+            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());
+            }
+            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,10 +57,13 @@ 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(",")));
+                vo.setPhasic(entry.getValue().stream()
+                        .map(EleEpdPqd::getPhase)
+                        .map(phase -> "T".equals(phase) ? "总" : phase)
+                        .collect(Collectors.joining(",")));
             }
             vo.setName(entry.getKey());
             vo.setType(eleEpdPqd.getType());
@@ -104,7 +112,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 +181,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