feat(notification): 添加异步通知服务并重构事件处理逻辑

- 新增 AppNotificationService 处理应用内事件通知
- 新增 SmsNotificationService 处理短信通知功能
- 配置 AsyncConfig 异步执行器支持事件通知处理
- 重构 CsEventPOServiceImpl 事件处理逻辑，分离通知功能
- 添加 @EnableAsync 注解启用异步处理
- 优化 CsDeviceUserPOServiceImpl 用户查询返回空对象
- 修复 WlUserServiceImpl 中的空指针检查逻辑

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

@@ -3,9 +3,12 @@ package com.njcn.csdevice.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.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;
 
 import java.util.List;
@@ -19,4 +22,11 @@ public interface AppProjectFeignClient {
 
     @PostMapping("/queryProjectById")
     HttpResult<List<AppProjectPO>> queryProjectById(@RequestParam("ids") List<String> ids);
+
+    @PostMapping("/getProjectByName")
+    HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name);
+
+    @PostMapping("/addPortableProject")
+    HttpResult<AppProjectPO> addPortableProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm);
+
 }

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

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.CsDeviceUserClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
+import com.njcn.csdevice.pojo.vo.DevUserVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,4 +30,13 @@ public interface CsDeviceUserFeignClient {
 
     @PostMapping("/channelDevByUserId")
     HttpResult<List<String>> channelDevByUserId(@RequestBody UserDevParam param);
+
+    @PostMapping("/queryUserById")
+    HttpResult<DevUserVO> queryUserById(@RequestParam("devId") String devId);
+
+    @PostMapping("/getList")
+    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/CsLedgerFeignClient.java

@@ -35,6 +35,10 @@ public interface CsLedgerFeignClient {
     @PostMapping("/queryDevDetail")
     HttpResult<DevDetailDTO> queryDevDetail(@RequestParam("devId")  String devId);
 
+    @PostMapping("/lineTree")
+    @ApiOperation("五层设备树(监测点层,根节点为治理设备和便携式设备)")
+    HttpResult<List<CsLedgerVO>> lineTree();
+
     @PostMapping("/deviceTree")
     @ApiOperation("三层设备树(装置层)")
     HttpResult<List<CsLedgerVO>> getDeviceTree();

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

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -68,6 +69,9 @@ public interface CsLineFeignClient {
     @PostMapping("/getAllLine")
     HttpResult<List<String>> getAllLine();
 
+    @PostMapping("/getAllLineDetail")
+    HttpResult<List<CsLineDTO>> getAllLineDetail();
+
     @PostMapping("/getOverLimitDataByIds")
     HttpResult<List<Overlimit>> getOverLimitData(@RequestBody List<String> ids);
 

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

@@ -0,0 +1,25 @@
+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.CsMarketDataClientFallbackFactory;
+import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csMarketData", fallbackFactory = CsMarketDataClientFallbackFactory.class,contextId = "csMarketData")
+public interface CsMarketDataFeignClient {
+
+    @PostMapping("/insert")
+    HttpResult<Boolean> insertData(@RequestParam("userId")String userId, @RequestParam("engineeringId")String engineeringId);
+
+    @PostMapping("/queryByUseId")
+    HttpResult<List<CsMarketDataVO>> queryByUseId(@RequestParam("userId")String userId);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsUserPinsFeignClient.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.ProcessFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsUserPins;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csUserPins", fallbackFactory = ProcessFeignClientFallbackFactory.class,contextId = "csUserPins")
+
+public interface CsUserPinsFeignClient {
+
+    @PostMapping("/getPinToTopList")
+    HttpResult<List<CsUserPins>> getPinToTopList();
+
+}

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

@@ -0,0 +1,34 @@
+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.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(@RequestParam("id") String id);
+
+}

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

@@ -0,0 +1,38 @@
+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.AppProjectClientFallbackFactory;
+import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
+import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
+import io.swagger.annotations.ApiImplicitParam;
+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 = "/engineering", fallbackFactory = AppProjectClientFallbackFactory.class,contextId = "engineering")
+public interface EngineeringFeignClient {
+
+    @PostMapping("/queryEngineering")
+    HttpResult<List<CsEngineeringVO>> queryEngineering(@Validated @RequestBody CsEngineeringQueryParm csEngineeringQueryParm);
+
+    @PostMapping("/getEngineeringByName")
+    HttpResult<CsEngineeringPO> getEngineeringByName(@RequestParam("name") String name);
+
+    @PostMapping("/addEngineering")
+    HttpResult<CsEngineeringPO> addEngineering(@Validated @RequestBody CsEngineeringAddParm csEngineeringAddParm);
+}

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

@@ -1,22 +1,14 @@
 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.EquipmentFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -72,5 +64,5 @@ public interface EquipmentFeignClient {
     HttpResult<Boolean> updateCldDevStatus(@RequestParam("nodeId") String nodeId, @RequestParam("processNo") Integer processNo);
 
     @PostMapping("/flipCldDevStatus")
-    HttpResult<Boolean> flipCldDevStatus(@RequestParam("devId") String devId, @RequestParam("status") Integer status);
+    HttpResult<Boolean> flipCldDevStatus(@RequestParam("date") String date, @RequestParam("devId") String devId, @RequestParam("status") Integer status);
 }

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

@@ -3,11 +3,12 @@ package com.njcn.csdevice.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.IntegrityClientFallbackFactory;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -18,6 +19,6 @@ import java.util.List;
 public interface IntegrityFeignClient {
 
     @PostMapping("/list")
-    HttpResult<List<RStatIntegrityD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime);
+    HttpResult<List<RStatIntegrityD>> list(@RequestBody @Validated IcdBzParam param);
 
 }

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

@@ -3,11 +3,12 @@ package com.njcn.csdevice.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.onlineRateClientFallbackFactory;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -18,6 +19,6 @@ import java.util.List;
 public interface OnlineRateFeignClient {
 
     @PostMapping("/list")
-    HttpResult<List<RStatOnlineRateD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime);
+    HttpResult<List<RStatOnlineRateD>> list(@RequestBody @Validated IcdBzParam param);
 
 }

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

@@ -0,0 +1,23 @@
+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.SmsSendClientFallbackFactory;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/sms", fallbackFactory = SmsSendClientFallbackFactory.class,contextId = "sms")
+public interface SmsSendFeignClient {
+
+    @PostMapping("/send/simple")
+    @ApiOperation("发送短信（简化参数）")
+    HttpResult<String> sendSmsSimple(@RequestParam("receiver") String receiver
+            , @RequestParam("content") String content
+            , @RequestParam("messageType") String messageType);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.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.AppProjectFeignClient;
+import com.njcn.csdevice.pojo.param.AppProjectAddParm;
 import com.njcn.csdevice.pojo.po.AppProjectPO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,18 @@ public class AppProjectClientFallbackFactory implements FallbackFactory<AppProje
                 log.error("{}异常，降级处理，异常为：{}","获取项目详情接口异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<AppProjectPO> getProjectByName(String name) {
+                log.error("{}异常，降级处理，异常为：{}","根据项目名称获取项目信息异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            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/CsDeviceUserClientFallbackFactory.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
 import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
+import com.njcn.csdevice.pojo.vo.DevUserVO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -51,6 +52,24 @@ public class CsDeviceUserClientFallbackFactory implements FallbackFactory<CsDevi
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<DevUserVO> queryUserById(String devId) {
+                log.error("{}异常，降级处理，异常为：{}","获取设备主/子用户数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsDeviceUserPO>> getList(UserDevParam param) {
+                log.error("{}异常，降级处理，异常为：{}","根据设备集合获取数据异常",cause.toString());
+                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/CsLedgerFeignClientFallbackFactory.java

@@ -57,6 +57,12 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory<CsLed
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<CsLedgerVO>> lineTree() {
+                log.error("{}异常，降级处理，异常为：{}","查询监测点数数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<CsLedgerVO>> getDeviceTree() {
                 log.error("{}异常，降级处理，异常为：{}","查询设备树",cause.toString());

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.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.CsLineFeignClient;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -103,6 +104,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<CsLineDTO>> getAllLineDetail() {
+                log.error("{}异常，降级处理，异常为：{}","获取系统中所有监测点id详情异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<Overlimit>> getOverLimitData(List<String> ids) {
                 log.error("{}异常，降级处理，异常为：{}","根据监测点id集合获取国标限值异常",cause.toString());

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

@@ -0,0 +1,44 @@
+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.CsMarketDataFeignClient;
+import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsMarketDataClientFallbackFactory implements FallbackFactory<CsMarketDataFeignClient> {
+    @Override
+    public CsMarketDataFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsMarketDataFeignClient() {
+
+            @Override
+            public HttpResult<Boolean> insertData(String userId, String engineeringId) {
+                log.error("{}异常，降级处理，异常为：{}","根据用户、工程新增数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsMarketDataVO>> queryByUseId(String userId) {
+                log.error("{}异常，降级处理，异常为：{}","查询营销,工程数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+        };
+    }
+}

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

@@ -0,0 +1,43 @@
+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.CsUserPinsFeignClient;
+import com.njcn.csdevice.pojo.po.CsUserPins;
+import com.njcn.csdevice.utils.CsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/4/10 20:09
+ */
+@Slf4j
+@Component
+public class CsUserPinsFeignClientFallbackFactory implements FallbackFactory<CsUserPinsFeignClient> {
+    @Override
+    public CsUserPinsFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+            exceptionEnum = CsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsUserPinsFeignClient() {
+
+            @Override
+            public HttpResult<List<CsUserPins>> getPinToTopList() {
+                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,50 @@
+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.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(String id) {
+                log.error("{}异常，降级处理，异常为：{}","获取监测点信息数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,52 @@
+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.EngineeringFeignClient;
+import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
+import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class EngineeringClientFallbackFactory implements FallbackFactory<EngineeringFeignClient> {
+    @Override
+    public EngineeringFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new EngineeringFeignClient() {
+
+            @Override
+            public HttpResult<List<CsEngineeringVO>> queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm) {
+                log.error("{}异常，降级处理，异常为：{}","查询工程列表接口异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsEngineeringPO> getEngineeringByName(String name) {
+                log.error("{}异常，降级处理，异常为：{}","根据工程名称获取工程信息异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsEngineeringPO> addEngineering(CsEngineeringAddParm csEngineeringAddParm) {
+                log.error("{}异常，降级处理，异常为：{}","新增工程异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -97,7 +97,7 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
             }
 
             @Override
-            public HttpResult<Boolean> flipCldDevStatus(String devId, Integer status) {
+            public HttpResult<Boolean> flipCldDevStatus(String date, String devId, Integer status) {
                 log.error("{}异常，降级处理，异常为：{}","云前置设备状态翻转",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/IntegrityClientFallbackFactory.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.IntegrityFeignClient;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -26,9 +27,8 @@ public class IntegrityClientFallbackFactory implements FallbackFactory<Integrity
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new IntegrityFeignClient() {
-
             @Override
-            public HttpResult<List<RStatIntegrityD>> list(List<String> list, String startTime, String endTime) {
+            public HttpResult<List<RStatIntegrityD>> list(IcdBzParam param) {
                 log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -0,0 +1,34 @@
+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.SmsSendFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class SmsSendClientFallbackFactory implements FallbackFactory<SmsSendFeignClient> {
+    @Override
+    public SmsSendFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new SmsSendFeignClient() {
+
+            @Override
+            public HttpResult<String> sendSmsSimple(String receiver, String content, String messageType) {
+                log.error("{}异常，降级处理，异常为：{}","发送短信（简化参数）数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/onlineRateClientFallbackFactory.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.OnlineRateFeignClient;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +29,7 @@ public class onlineRateClientFallbackFactory implements FallbackFactory<OnlineRa
         return new OnlineRateFeignClient() {
 
             @Override
-            public HttpResult<List<RStatOnlineRateD>> list(List<String> list, String startTime, String endTime) {
+            public HttpResult<List<RStatOnlineRateD>> list(IcdBzParam param) {
                 log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -0,0 +1,28 @@
+package com.njcn.csdevice.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class CsUserPinsParam implements Serializable {
+
+    @ApiModelProperty("用户id")
+    @NotBlank(message = "用户id")
+    private String userId;
+
+    @ApiModelProperty("目标类型：1-设备，2-工程")
+    @NotNull(message = "目标类型：1-设备，2-工程")
+    private Integer targetType;
+
+    @ApiModelProperty("目标ID（设备ID或工程ID）")
+    @NotBlank(message = "目标ID（设备ID或工程ID）不能为空")
+    private String targetId;
+
+}

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/pojo/dto/CredentialReqDTO.java

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.pojo.dto;
+
+/**
+ * @author caozehui
+ * @data 2026-03-31
+ */
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * 系统凭证请求 DTO
+ *
+ * @author msgpush
+ */
+@Data
+public class CredentialReqDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上游系统名称
+     */
+    @NotEmpty(message = "上游系统名称不能为空")
+    private String systemName;
+
+    /**
+     * 密钥（用于生成凭证）
+     */
+    @NotEmpty(message = "密钥不能为空")
+    private String secretKey;
+
+}

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

@@ -100,4 +100,19 @@ public class CsEquipmentDeliveryDTO  {
 
     private Integer moduleNumber;
     private Integer process;
+
+    /**
+     * 前置服务器IP
+     */
+    private String nodeId;
+
+    /**
+     * 前置进程号
+     */
+    private Integer nodeProcess;
+
+    /**
+     * 日志等级(NORMAL、DEBUG、WARN、ERROR)
+     */
+    private String devLogLevel;
 }

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

@@ -0,0 +1,148 @@
+package com.njcn.csdevice.pojo.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+public class CsLineDTO implements Serializable {
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
+    /**
+     * 装置id
+     */
+    private String deviceId;
+
+    /**
+     * 装置id
+     */
+    private String deviceType;
+
+
+    /**
+     * 监测点名称
+     */
+    private String name;
+
+    /**
+     * 字典表：安装位置（负载侧,电网侧, 输出侧）
+     */
+    private String position;
+
+    /**
+     * 数据集id
+     */
+    private String dataSetId;
+
+    /**
+     * 模板id
+     */
+    private String dataModelId;
+
+    /**
+     * 电压等级
+     */
+    private Double volGrade;
+
+    /**
+     * PT变比
+     */
+    private Double ptRatio;
+
+    /**
+     * PT2次变比
+     */
+    private Double pt2Ratio;
+
+    /**
+     * CT变比
+     */
+    private Double ctRatio;
+
+    /**
+     * CT2变比
+     */
+    private Double ct2Ratio;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    private Integer status;
+
+    /**
+     * 接线方式(0-星型 1-角型 2-V型)
+     */
+    private Integer conType;
+
+    /**
+     * 逻辑子设备id(与模板对应)
+     */
+    private Integer clDid;
+
+
+    /**
+     * 监测点统计间隔
+     */
+    private Integer lineInterval;
+
+    /**
+     * 运行状态
+     */
+    private Integer runStatus;
+
+    /**
+     * 监测点线路号
+     */
+    private Integer lineNo;
+    /**
+     * 监测对象类型
+     */
+    private String monitorObj;
+    /**
+     * 是否治理(0:未治理 1:已治理)
+     */
+    private Integer govern;
+
+    private String monitorUser;
+
+    /**
+     * 短路容量
+     */
+    private Double shortCircuitCapacity;
+
+    /**
+     * 设备容量
+     */
+    private Double devCapacity;
+
+    /**
+     * 基准容量
+     */
+    private Double basicCapacity;
+
+    /**
+     * 协议容量
+     */
+    private Double protocolCapacity;
+
+    /**
+     * 治理报告文件路径
+     */
+    private String reportFilePath;
+
+    /**
+     * 日志等级(NORMAL、DEBUG、WARN、ERROR)
+     */
+    private String lineLogLevel;
+
+    /**
+     * 是否是主要监测点(0: 不是 1:是)
+     */
+
+    private Integer isImportant;
+}

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【需求编号】
@@ -31,4 +33,13 @@ public class DevDetailDTO {
 
     @ApiModelProperty(value = "设备名称")
     private String equipmentName;
+
+    @ApiModelProperty(value = "设备通讯状态")
+    private Integer runStatus;
+
+    @ApiModelProperty(value = "设备MAC地址")
+    private String devMac;
+
+    @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,12 @@
 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;
+
 /**
  * Description:
  * Date: 2023/8/1  15:25【需求编号】
@@ -11,7 +15,7 @@ import lombok.Data;
  * @version V1.0.0
  */
 @Data
-public class LineParamDTO {
+public class LineParamDTO extends BaseParam implements Serializable {
     @ApiModelProperty(value = "工程id")
     private String engineerId;
 
@@ -26,4 +30,29 @@ public class LineParamDTO {
 
     @ApiModelProperty(value = "监测点id")
     private String lineId;
+
+    @ApiModelProperty(value = "时间类型 0:日报 1:月报")
+    private Integer timeType;
+
+    @ApiModelProperty(value = "时间")
+    private String time;
+
+    @ApiModelProperty(value = "起始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "集合")
+    private List<String> list;
+
+    @Data
+    public static class DevParamDTO {
+
+        @ApiModelProperty(value = "时间")
+        private String time;
+
+        @ApiModelProperty(value = "设备id集合")
+        private List<String> devList;
+    }
 }

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/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

@@ -97,4 +97,13 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
     @ApiModelProperty(value="项目id")
     private String projectId;
 
+    @ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
+    private String devLogLevel;
+
+    @ApiModelProperty(value="所属工程")
+    private String associatedEngineering;
+
+    @ApiModelProperty(value="所属项目")
+    private String associatedProject;
+
 }

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

@@ -101,4 +101,13 @@ public class CsEquipmentDeliveryAuditParm {
 
     @ApiModelProperty(value="前置机进程号")
     private Integer nodeProcess;
+
+    @ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
+    private String devLogLevel;
+
+    @ApiModelProperty(value="所属工程")
+    private String associatedEngineering;
+
+    @ApiModelProperty(value="所属项目")
+    private String associatedProject;
 }

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

@@ -56,6 +56,8 @@ public class CsLedgerParam extends BaseEntity {
         @NotBlank(message = "台账表Id不能为空")
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
         private String id;
+
+        private String pids;
     }
 
 

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

@@ -145,6 +145,14 @@ public class CsLineParam extends BaseEntity {
      */
     private String position;
 
+    /**
+     * 日志等级(NORMAL、DEBUG、WARN、ERROR)
+     */
+    private String lineLogLevel;
 
+    /**
+     * 是否是主要监测点(0: 不是 1:是)
+     */
+    private Integer isImportant;
 
 }

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

@@ -28,26 +28,18 @@ public class AppProjectPO  extends BaseEntity {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-
     /**
      * 项目名称
      */
     @TableField(value = "name")
     private String name;
 
-//    @TableField(value = "engineering_id")
-//    private String engineeringId;
-
-
-
     /**
      * 地市Id
      */
     @TableField(value = "area")
     private String area;
 
-
-
     /**
      * 0：删除 1：正常
      */

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

@@ -88,6 +88,12 @@ 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

@@ -130,4 +130,22 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "node_process")
     private Integer nodeProcess;
 
+    /**
+     * 日志等级(NORMAL、DEBUG、WARN、ERROR)
+     */
+    @TableField(value = "dev_log_level")
+    private String devLogLevel;
+
+    /**
+     * 所属工程
+     */
+    @TableField(value = "associated_engineering")
+    private String associatedEngineering;
+
+    /**
+     * 所属项目
+     */
+    @TableField(value = "associated_project")
+    private String associatedProject;
+
 }

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

@@ -165,4 +165,16 @@ public class CsLinePO  extends BaseEntity {
      */
     @TableField(value = "report_file_path")
     private String reportFilePath;
+
+    /**
+     * 日志等级(NORMAL、DEBUG、WARN、ERROR)
+     */
+    @TableField(value = "line_log_level")
+    private String lineLogLevel;
+
+    /**
+     * 是否是主要监测点(0: 不是 1:是)
+     */
+    @TableField(value = "is_important")
+    private Integer isImportant;
 }

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

@@ -0,0 +1,45 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ */
+@Data
+@TableName("cs_sms_send_record")
+public class CsSmsSendRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    private String receiver;
+
+    private String content;
+
+    private String messageType;
+
+    private String credentialToken;
+
+    private Integer sendStatus;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String failReason;
+
+    private Integer retryCount;
+
+    private Integer maxRetry;
+
+    private Long responseTime;
+
+    private LocalDateTime sendTime;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

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

@@ -0,0 +1,44 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户置顶表
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-04
+ */
+@Getter
+@Setter
+@TableName("cs_user_pins")
+public class CsUserPins extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 目标类型：1-设备，2-工程
+     */
+    private Integer targetType;
+
+    /**
+     * 目标ID（设备ID或工程ID）
+     */
+    private String targetId;
+}

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

@@ -31,7 +31,7 @@ public class CldLedgerVo implements Serializable {
     private String engineeringDescription;
 
     @ApiModelProperty(value = "项目信息")
-    private List<AppProjectPO> projectInfoList;
+    private List<ProjectVO> projectInfoList;
 
     @ApiModelProperty(value = "设备信息")
     private List<CsEquipmentDeliveryPO> deviceInfoList;
@@ -39,4 +39,7 @@ public class CldLedgerVo implements Serializable {
     @ApiModelProperty(value = "监测点信息")
     private List<CsLinePO> lineInfoList;
 
+    @ApiModelProperty("工程排序")
+    private Integer sort;
+
 }

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

@@ -67,5 +67,6 @@ public class CsEngineeringVO extends BaseEntity {
     @ApiModelProperty(value = "状态")
     private String status;
 
-
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 }

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

@@ -94,4 +94,16 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="前置服务器id")
     private String nodeId ;
 
+    @ApiModelProperty(value="所属工程id")
+    private String associatedEngineering;
+
+    @ApiModelProperty(value="所属工程名称")
+    private String associatedEngineeringName;
+
+    @ApiModelProperty(value="所属项目id")
+    private String associatedProject;
+
+    @ApiModelProperty(value="所属项目名称")
+    private String associatedProjectName;
+
 }

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

@@ -69,6 +69,12 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "process",value = "流程状态")
     private Integer process;
 
+    @ApiModelProperty(name = "isTop",value = "是否置顶,默认不置顶")
+    private Integer isTop = 0;
+
+    @ApiModelProperty(name = "devConType",value = "设备连接方式 MQTT || CLD")
+    private String devConType;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

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

@@ -4,6 +4,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,54 +16,59 @@ import java.util.List;
  */
 
 @Data
-public class  DevCountVO {
+public class  DevCountVO implements Serializable {
-    //
+
-    @ApiModelProperty(value = "设备在线总数")
+    /** 所有工程相关数据 **/
-    private Integer onLineDevCount;
+    @ApiModelProperty(value = "所有工程设备在线总数")
+    private Integer onLineDevCount = 0;
     private List<CsEquipmentDeliveryPO> onLineDevs;
 
-    @ApiModelProperty(value = "设备离线总数")
+    @ApiModelProperty(value = "所有工程设备离线总数")
-    private Integer offLineDevCount;
+    private Integer offLineDevCount  = 0;
     private List<CsEquipmentDeliveryPO> offLineDevs;
-    @ApiModelProperty(value = "警告数")
+
-    private Integer alarmCount;
+    @ApiModelProperty(value = "所有工程暂态事件数量(未读)")
-    @ApiModelProperty(value = "事件数")
+    private Integer eventCount = 0;
-    private Integer eventCount;
+
+    @ApiModelProperty(value = "所有工程稳态事件数量(未读)")
+    private Integer harmonicCount = 0;
+
+    @ApiModelProperty(value = "所有工程运行告警数量(未读)")
+    private Integer alarmCount = 0;
+
+    @ApiModelProperty(value = "所有工程运行事件数量(未读)")
+    private Integer runCount = 0;
+
     @ApiModelProperty(value = "工程个数")
-    private Integer eningerCount;
+    private Integer eningerCount = 0;
-
-    @ApiModelProperty(value = "运行事件数")
-    private Integer runCount;
-    @ApiModelProperty(value = "稳态件数")
-    private Integer harmonicCount;
 
+    /** 当前工程相关数据 **/
     @ApiModelProperty(value = "当前工程id")
     private String currentId;
+
     @ApiModelProperty(value = "当前工程设备在线总数")
-    private Integer currentOnLineDevCount;
+    private Integer currentOnLineDevCount = 0;
     private List<CsEquipmentDeliveryPO> currentOnLineDevs;
 
     @ApiModelProperty(value = "当前工程设备离线总数")
-    private Integer currentOffLineDevCount;
+    private Integer currentOffLineDevCount = 0;
     private List<CsEquipmentDeliveryPO> currentOffLineDevs;
 
-    @ApiModelProperty(value = "设备警告数")
+    @ApiModelProperty(value = "当前工程暂态事件数量(未读)")
-    private Integer currentAlarmCount;
+    private Integer currentEventCount = 0;
-    @ApiModelProperty(value = "暂态事件数")
+
-    private Integer currentEventCount;
+    @ApiModelProperty(value = "当前工程稳态事件数量(未读)")
-    @ApiModelProperty(value = "运行事件数")
+    private Integer currentHarmonicCount = 0;
-    private Integer currentRunCount;
+
-    @ApiModelProperty(value = "稳态件数")
+    @ApiModelProperty(value = "当前工程运行告警数量(未读)")
-    private Integer currentHarmonicCount;
+    private Integer currentAlarmCount = 0;
+
+    @ApiModelProperty(value = "当前工程运行事件数量(未读)")
+    private Integer currentRunCount = 0;
 
     @ApiModelProperty(value = "当前项目数")
-    private Integer currentProjectCount;
+    private Integer currentProjectCount = 0;
 
     @ApiModelProperty(value = "反馈数")
-    private Integer feedBackCount;
+    private Integer feedBackCount = 0;
-
-
-
-
-
 }

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

@@ -6,7 +6,9 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.List;
 
-//台账信息
+/**
+ * @author xy
+ */ //台账信息
 @Data
 public class DeviceInfo implements Serializable {
 
@@ -31,6 +33,9 @@ public class DeviceInfo implements Serializable {
     @ApiModelProperty("对时启动标志")
     private boolean rightTime;
 
+    @ApiModelProperty("终端日志等级")
+    private String devLogLevel;
+
     @ApiModelProperty("监测点集合")
     private List<MonitorInfo> monitorData;
 
@@ -70,6 +75,9 @@ public class DeviceInfo implements Serializable {
 
         @ApiModelProperty("ct2")
         private Double ct2;
+
+        @ApiModelProperty("监测点日志等级")
+        private String lineLogLevel;
     }
 
 }

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

@@ -0,0 +1,41 @@
+package com.njcn.csdevice.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2026/3/5
+ */
+@Data
+public class EngineeringHomePageVO implements Serializable {
+
+    @ApiModelProperty(name = "engineeringId",value = "工程id")
+    private String engineeringId;
+
+    @ApiModelProperty(name = "engineeringName",value = "工程名称")
+    private String engineeringName;
+
+    @ApiModelProperty(name = "devTotal",value = "设备总数")
+    private Integer devTotal = 0;
+
+    @ApiModelProperty(name = "onlineDevTotal",value = "在线设备数")
+    private Integer onlineDevTotal = 0;
+
+    @ApiModelProperty(name = "offlineDevTotal",value = "离线设备数")
+    private Integer offlineDevTotal = 0;
+
+    @ApiModelProperty(name = "alarmTotal",value = "告警数量(未读)")
+    private Integer alarmTotal = 0;
+
+    @ApiModelProperty(name = "isTop",value = "是否置顶 0:未置顶 1:已置顶")
+    private Integer isTop = 0;
+
+    @ApiModelProperty(name = "sort",value = "排序")
+    private Integer sort;
+}

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

@@ -20,8 +20,14 @@ public class EngineeringProjectRelationVo implements Serializable {
     @ApiModelProperty("工程名称")
     private String engineeringName;
 
-    @ApiModelProperty("区域")
+    @ApiModelProperty("省ID")
-    private String engineeringArea;
+    private String provinceId;
+
+    @ApiModelProperty("市ID")
+    private String cityId;
+
+    @ApiModelProperty("区域名称")
+    private String engineeringAreaName;
 
     @ApiModelProperty("工程备注")
     private String engineeringRemark;
@@ -51,6 +57,9 @@ public class EngineeringProjectRelationVo implements Serializable {
         @ApiModelProperty("项目排序")
         private Integer projectSort;
 
+        @ApiModelProperty("拓扑图id")
+        private String topologyInfoId;
+
         @ApiModelProperty("拓扑图信息")
         private String topologyInfo;
 

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

@@ -132,4 +132,7 @@ public class LineDetailDataVO {
 
     @ApiModelProperty(name = "对象类型大类")
     private String bigObjType;
+
+    @ApiModelProperty(name = "监测点数据类型 一次值:Primary  二次值:Secondary")
+    private String dataLevel;
 }

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

@@ -0,0 +1,40 @@
+package com.njcn.csdevice.pojo.vo;
+
+import cn.hutool.core.lang.RegexPool;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author caozehui
+ * @data 2026-02-27
+ */
+@Data
+@Schema(description = "管理后台 - 消息记录发送 Request VO")
+public class MessageRecordReqVO {
+
+    private String channel;
+
+    @Schema(description = "消息类型", example = "verify_code/order_notify/marketing/system_notify")
+    @NotBlank(message = "消息类型不能为空")
+    private String messageType;
+
+    @Schema(description = "接收者")
+    @NotBlank(message = "接收者不能为空")
+    @Pattern(regexp = RegexPool.EMAIL + "|" + RegexPool.MOBILE, message = "必须是有效的邮箱或手机号格式")
+    private String receiver;
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "消息内容")
+    private String content;
+
+    @Schema(description = "模板编码")
+    private String templateCode;
+
+    @Schema(description = "模板参数")
+    private String templateParams;
+}

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

@@ -1,8 +1,11 @@
 package com.njcn.csdevice.pojo.vo;
 
+import com.njcn.csdevice.pojo.po.CsLinePO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 
  * Description:
@@ -54,4 +57,19 @@ public class ProjectEquipmentVO  {
     @ApiModelProperty(value = "设备nDid")
     private String nDid;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否置顶(0:未置顶 1:置顶),默认是0")
+    private Integer isTop = 0;
+
+    @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/ProjectVO.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @author 徐扬
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProjectVO extends AppProjectPO {
+
+    private String topoId;
+}

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

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

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

@@ -21,6 +21,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.github.tocrhz</groupId>
+      <artifactId>mqtt-spring-boot-starter</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.njcn</groupId>
       <artifactId>common-web</artifactId>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/RStatIntegrityDController.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatIntegrityD;
 import com.njcn.csdevice.service.IRStatIntegrityDService;
 import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
@@ -50,9 +51,9 @@ public class RStatIntegrityDController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/list")
     @ApiOperation("获取数据")
-    public HttpResult<List<RStatIntegrityD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime){
+    public HttpResult<List<RStatIntegrityD>> list(@RequestBody @Validated IcdBzParam param){
         String methodDescribe = getMethodDescribe("list");
-        List<RStatIntegrityD> result = irStatIntegrityDService.getData(list,startTime,endTime);
+        List<RStatIntegrityD> result = irStatIntegrityDService.getData(param.getLineList(),param.getStartTime(),param.getEndTime());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/RStatOnlineRateDController.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.param.IcdBzParam;
 import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
 import com.njcn.csdevice.service.IRStatOnlineRateDService;
 import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
@@ -16,7 +17,10 @@ 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 org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -50,9 +54,9 @@ public class RStatOnlineRateDController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/list")
     @ApiOperation("获取数据")
-    public HttpResult<List<RStatOnlineRateD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime){
+    public HttpResult<List<RStatOnlineRateD>> list(@RequestBody @Validated IcdBzParam param){
         String methodDescribe = getMethodDescribe("list");
-        List<RStatOnlineRateD> result = rStatOnlineRateDService.getData(list,startTime,endTime);
+        List<RStatOnlineRateD> result = rStatOnlineRateDService.getData(param.getLineList(),param.getStartTime(),param.getEndTime());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

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

@@ -11,16 +11,22 @@ 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;
 import io.swagger.annotations.ApiOperation;
 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;
 
 
 /**
@@ -36,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("新增设备扫码设备用户绑定")
@@ -77,11 +85,13 @@ public class DeviceUserController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/devCount")
     @ApiOperation("设备统计")
-    @ApiImplicitParam(name = "id", value = "工程id", required = true)
+    @ApiImplicitParams({
-    public HttpResult<DevCountVO> devCount(@RequestParam("id") String id){
+            @ApiImplicitParam(name = "id", value = "工程id"),
+            @ApiImplicitParam(name = "time", value = "时间")
+    })
+    public HttpResult<DevCountVO> devCount(@RequestParam("id") String id,@RequestParam("time") String time){
         String methodDescribe = getMethodDescribe("devCount");
-
+        DevCountVO result = csDeviceUserPOService.devCount(id,time);
-        DevCountVO result = csDeviceUserPOService.devCount (id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -161,4 +171,35 @@ public class DeviceUserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getList")
+    @ApiOperation("根据设备集合获取数据")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<CsDeviceUserPO>> getList(@RequestBody UserDevParam param){
+        String methodDescribe = getMethodDescribe("getList");
+        List<CsDeviceUserPO> list = csDeviceUserPOService.getList(param);
+        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

@@ -395,13 +395,14 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping("/flipCldDevStatus")
     @ApiOperation("云前置设备状态翻转")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "devId", value = "设备id", required = true),
+        @ApiImplicitParam(name = "date", value = "时间", required = true),
-            @ApiImplicitParam(name = "status", value = "状态", required = true)
+        @ApiImplicitParam(name = "devId", value = "设备id", required = true),
+        @ApiImplicitParam(name = "status", value = "状态", required = true)
     })
     @ApiIgnore
-    public HttpResult<Boolean> flipCldDevStatus(@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(devId,status);
+        csEquipmentDeliveryService.flipCldDevStatus(date,devId,status);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

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

@@ -54,18 +54,29 @@ public class CsLedgerController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/lineTree")
     @ApiOperation("五层设备树(监测点层,根节点为治理设备和便携式设备)")
-    public HttpResult<List<CsLedgerVO>> lineTree(){
+    @ApiImplicitParam(name = "type", value = "台账树类型")
+    public HttpResult<List<CsLedgerVO>> lineTree(@RequestParam(required = false) @Validated String type){
         String methodDescribe = getMethodDescribe("lineTree");
-        List<CsLedgerVO> list = csLedgerService.getLineTree();
+        List<CsLedgerVO> list = csLedgerService.getLineTree(type);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AppLineTree")
+    @ApiOperation("app端监测点树")
+    public HttpResult<List<CsLedgerVO>> appLineTree(){
+        String methodDescribe = getMethodDescribe("AppLineTree");
+        List<CsLedgerVO> list = csLedgerService.appLineTree();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/deviceTree")
     @ApiOperation("四层设备树(装置层,根节点为治理设备和便携式设备)")
-    public HttpResult<List<CsLedgerVO>> getDeviceTree(){
+    @ApiImplicitParam(name = "type", value = "台账树类型")
+    public HttpResult<List<CsLedgerVO>> getDeviceTree(@RequestParam(required = false) @Validated String type){
         String methodDescribe = getMethodDescribe("getDeviceTree");
-        List<CsLedgerVO> list = csLedgerService.getDeviceTree();
+        List<CsLedgerVO> list = csLedgerService.getDeviceTree(type);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 

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

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -254,6 +255,15 @@ public class CslineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllLineDetail")
+    @ApiOperation("获取所有监测点id详情")
+    public HttpResult<List<CsLineDTO>> getAllLineDetail(){
+        String methodDescribe = getMethodDescribe("getAllLineDetail");
+        List<CsLineDTO> list = csLinePOService.getAllLineDetail();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/getSimpleLine")
     @ApiOperation("查询登录用户拥有的监测点台账")

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

@@ -0,0 +1,80 @@
+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.pojo.param.DataArrayParam;
+import com.njcn.csdevice.pojo.po.CsDataArray;
+import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
+import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO;
+import com.njcn.csdevice.service.DeviceMessageService;
+import com.njcn.csdevice.service.ICsDataArrayService;
+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 springfox.documentation.annotations.ApiIgnore;
+
+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 = "id", value = "参数", required = true, paramType = "query")
+    public HttpResult<String> getLineInfo(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getLineInfo");
+        deviceMessageService.getLineInfo(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,77 @@
+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.pojo.vo.MessageRecordReqVO;
+import com.njcn.csdevice.service.ISmsSendService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sms")
+@Api(tags = "短信发送管理")
+@AllArgsConstructor
+public class SmsSendController extends BaseController {
+
+    private final ISmsSendService smsSendService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/send")
+    @ApiOperation("发送短信（同步，包含重试）")
+    public HttpResult<String> sendSms(@RequestBody MessageRecordReqVO vo) {
+        String methodDescribe = getMethodDescribe("sendSms");
+
+        try {
+            smsSendService.sendSmsWithRetry(vo);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.SUCCESS,
+                    "短信发送成功",
+                    methodDescribe
+            );
+        } catch (Exception e) {
+            log.error("短信发送失败", e);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.FAIL,
+                    e.getMessage(),
+                    methodDescribe
+            );
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/send/simple")
+    @ApiOperation("发送短信（简化参数）")
+    public HttpResult<String> sendSmsSimple(
+            @RequestParam String receiver,
+            @RequestParam String content,
+            @RequestParam(defaultValue = "verify_code") String messageType) {
+        String methodDescribe = getMethodDescribe("sendSmsSimple");
+
+        try {
+            smsSendService.sendSmsWithRetry(receiver, content, messageType);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.SUCCESS,
+                    "短信发送成功",
+                    methodDescribe
+            );
+        } catch (Exception e) {
+            log.error("短信发送失败", e);
+            return HttpResultUtil.assembleCommonResponseResult(
+                    CommonResponseEnum.FAIL,
+                    e.getMessage(),
+                    methodDescribe
+            );
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.njcn.csdevice.controller.project;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -66,12 +65,21 @@ public class AppProjectController  extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addAppProject")
     @ApiOperation("新增项目")
-    public HttpResult<Boolean> addAppProject(@Validated  AppProjectAddParm appProjectAddParm){
+    public HttpResult<AppProjectPO> addAppProject(@Validated AppProjectAddParm appProjectAddParm){
         String methodDescribe = getMethodDescribe("addAppProject");
-
         AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, ObjectUtil.isNotNull(po), methodDescribe);
+        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("修改/删除项目")
@@ -91,4 +99,14 @@ public class AppProjectController  extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getProjectByName")
+    @ApiOperation("根据项目名称获取项目信息")
+    @ApiImplicitParam(name = "name", value = "项目名称", required = true)
+    public HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name){
+        String methodDescribe = getMethodDescribe("getProjectByName");
+        AppProjectPO po = appProjectService.getProjectByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
 }

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

@@ -99,4 +99,13 @@ public class CsMarketDataController extends BaseController {
         List<CsMarketDataVO> list = csMarketDataService.queryAllEnginner(userId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/insert")
+    @ApiOperation("根据用户、工程新增数据")
+    public HttpResult<Boolean> insertData(@RequestParam("userId")String userId, @RequestParam("engineeringId")String engineeringId){
+        String methodDescribe = getMethodDescribe("insertData");
+        Boolean result = csMarketDataService.insertData(userId,engineeringId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, 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/controller/project/CsUserPinsController.java

@@ -0,0 +1,61 @@
+package com.njcn.csdevice.controller.project;
+
+
+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.CsUserPinsParam;
+import com.njcn.csdevice.pojo.po.CsUserPins;
+import com.njcn.csdevice.service.ICsUserPinsService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户置顶表 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-04
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csUserPins")
+@Api(tags = "置顶设备(工程)")
+@AllArgsConstructor
+public class CsUserPinsController extends BaseController {
+
+    private final ICsUserPinsService csUserPinsService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/engineeringPinToTop")
+    @ApiOperation("用户置顶工程(取消置顶)")
+    public HttpResult<Boolean> engineeringPinToTop(@Validated @RequestBody CsUserPinsParam param){
+        String methodDescribe = getMethodDescribe("engineeringPinToTop");
+        Boolean result = csUserPinsService.engineeringPinToTop(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPinToTopList")
+    @ApiOperation("获取用户置顶设备(工程)")
+    public HttpResult<List<CsUserPins>> getPinToTopList(){
+        String methodDescribe = getMethodDescribe("getPinToTopList");
+        List<CsUserPins> result = csUserPinsService.getPinToTopList();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+

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

@@ -103,4 +103,15 @@ public class EngineeringController extends BaseController {
         List<CsEngineeringPO> result = csEngineeringService.getUnlinkedEngineering(userId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEngineeringByName")
+    @ApiOperation("根据工程名称获取工程信息")
+    @ApiImplicitParam(name = "name", value = "工程名称", required = true)
+    public HttpResult<CsEngineeringPO> getEngineeringByName(@RequestParam("name") String name){
+        String methodDescribe = getMethodDescribe("getEngineeringByName");
+        CsEngineeringPO po = csEngineeringService.getEngineeringByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.njcn.csdevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +22,6 @@ public interface CsLinePOMapper extends BaseMapper<CsLinePO> {
 
 
     Map<String,String> getCustomDetailByLineId(@Param("lineId")String lineId);
+
+    List<CsLineDTO> findLineList();
 }

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

@@ -0,0 +1,7 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsSmsSendRecord;
+
+public interface CsSmsSendRecordMapper extends BaseMapper<CsSmsSendRecord> {
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsUserPins;
+
+/**
+ * <p>
+ * 用户置顶表 Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-04
+ */
+public interface CsUserPinsMapper extends BaseMapper<CsUserPins> {
+
+}

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

@@ -45,6 +45,7 @@
       <if test="temp!=null and temp.searchValue != null and temp.searchValue !=''">
           AND a.`name` like concat('%',#{temp.searchValue},'%')
       </if>
+          AND a.`name` != '便携式项目'
          order by a.create_time desc
   </select>
 </mapper>

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

@@ -41,7 +41,9 @@
         c.create_time createTime,
         c.run_status,
         c.mac mac,
-        c.process process
+        c.process process,
+        c.sort sort,
+        c.dev_type devType
         FROM
         (select * from cs_ledger where LEVEL = 0       and State =1
         ) a,
@@ -97,9 +99,14 @@
             <if test="queryParam.process != null and queryParam.process !=''">
                 and process = #{queryParam.process}
             </if>
-            <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
+            <choose>
-                and run_status = #{queryParam.runStatus}
+                <when test="queryParam.runStatus != null and queryParam.runStatus != ''">
-            </if>
+                    AND run_status = #{queryParam.runStatus}
+                </when>
+                <otherwise>
+                    AND run_status IN (1,2)
+                </otherwise>
+            </choose>
             <if test="queryParam.searchValue != null and queryParam.searchValue !=''">
                 and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
             </if>

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

@@ -53,4 +53,15 @@
     WHERE
       line.line_id = #{lineId}
   </select>
+
+  <select id="findLineList" resultType="com.njcn.csdevice.pojo.dto.CsLineDTO">
+    SELECT
+      t1.*,
+      t2.dev_type deviceType
+    FROM
+      cs_line t1
+        LEFT JOIN cs_equipment_delivery t2 ON t1.device_id = t2.id
+    WHERE
+      t1.`status` = 1
+  </select>
 </mapper>

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

@@ -62,4 +62,7 @@ public interface AppProjectService extends IService<AppProjectPO> {
         AppProjectPO updateData(AppProjectAuditParm param);
 
         boolean delete(String id);
+
+        AppProjectPO getProjectByName(String name);
+
     }

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

@@ -56,4 +56,6 @@ public interface AppTopologyDiagramService extends IService<AppTopologyDiagramPO
     IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm);
 
         Boolean checkCanDelete(String id);
+
+    AppTopologyDiagramPO getByProjectId(String projectId);
 }

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

@@ -1,25 +1,17 @@
 package com.njcn.csdevice.service;
 
 
-
-import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 public interface CsCommTerminalService {
 
-
     List<String> getLineIdsByUser(String userId);
 
-
-
     List<String> getPqUserIdsByUser(String userId);
 
-
     PqsDeviceUnit lineUnitDetail(String lineId);
 
-
     List<String> commGetDevIds(String userId);
 }

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

@@ -23,7 +23,7 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
 
     Boolean share(List<String> ids);
 
-    DevCountVO devCount(String id);
+    DevCountVO devCount(String id,String time);
 
     String isPrimaryUser(String deviceId);
 
@@ -53,4 +53,6 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
     List<String> findDevByUserId(String userId);
 
     void channelDevByUserId(UserDevParam param);
+
+    List<CsDeviceUserPO> getList(UserDevParam param);
 }

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

@@ -66,4 +66,6 @@ public interface CsEngineeringService extends IService<CsEngineeringPO>{
 
     boolean deleteData(String id);
 
+    CsEngineeringPO getEngineeringByName(String name);
+
 }

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

@@ -11,7 +11,6 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 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;
@@ -179,10 +178,11 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
 
     /**
      * 根据设备id和状态来修改设备运行状态；同时修改设备下的监测点的状态
+     * @param date
      * @param devId
      * @param status
      */
-    void flipCldDevStatus(String devId, Integer status);
+    void flipCldDevStatus(String date, String devId, Integer status);
 
     /**
      * 根据项目id获取设备列表

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

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service;
 
 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.CsLinePO;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -81,6 +82,8 @@ public interface CsLinePOService extends IService<CsLinePO>{
 
     List<String> getAllLine();
 
+    List<CsLineDTO> getAllLineDetail();
+
     List<CsLinePO> getSimpleLine();
 
     List<CsLinePO> getLineBySensitiveUser(List<String> list);

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

@@ -30,4 +30,6 @@ public interface CsMarketDataService extends IService<CsMarketData> {
         List<CsMarketDataVO> queryAllEnginner(String userId);
 
         Boolean follow(EngineerIdParam engineerIdParams);
+
+        Boolean insertData(String userId,String engineeringId);
 }

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

@@ -18,7 +18,7 @@ import java.util.List;
 public interface CsTouristDataPOService extends IService<CsTouristDataPO>{
 
 
-        Boolean add(List<CsTouristDataParm> csTouristDataParms);
+    Boolean add(List<CsTouristDataParm> csTouristDataParms);
 
     List<CsTouristDataParmVO> queryAll();
 

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

@@ -0,0 +1,19 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.csdevice.param.DeviceMessageParam;
+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);
+
+}

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

@@ -29,13 +29,15 @@ public interface ICsLedgerService extends IService<CsLedger> {
      * 获取终端台账树
      * @return
      */
-    List<CsLedgerVO> getLineTree();
+    List<CsLedgerVO> getLineTree(String type);
+
+    List<CsLedgerVO> appLineTree();
 
     /**
      * 终端三层树 
      * @return
      */
-    List<CsLedgerVO> getDeviceTree();
+    List<CsLedgerVO> getDeviceTree(String type);
 
     /**
      * 新增台账数据

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

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.param.CsUserPinsParam;
+import com.njcn.csdevice.pojo.po.CsUserPins;
+import com.njcn.csdevice.pojo.vo.CsLedgerVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户置顶表 服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-04
+ */
+public interface ICsUserPinsService extends IService<CsUserPins> {
+
+    boolean engineeringPinToTop(CsUserPinsParam param);
+
+    List<CsUserPins> getPinToTopList();
+
+    /**
+     * 针对台账树中存在置顶的数据进行排序
+     *
+     * @param list 置顶数据
+     * @param tree 台账树
+     * @param level 树的层级
+     * 如果第一层不是工程，并且是5层树，level = 5 ，5层树层级必须是 0:设备类型 1:工程 2:项目 3:设备 4:监测点
+     * 如果第一层是工程，level = 4 ，4层树层级必须是 0:工程 1:项目 2:设备 3:监测点，其余层级的树也可以使用level = 4，只要是工程、项目、设备、监测点这样的结构就行
+     */
+    void channelTree(List<CsUserPins> list, List<CsLedgerVO> tree, Integer level);
+
+}

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

@@ -0,0 +1,12 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.CsSmsSendRecord;
+import com.njcn.csdevice.pojo.vo.MessageRecordReqVO;
+
+public interface ISmsSendService extends IService<CsSmsSendRecord> {
+
+    void sendSmsWithRetry(String receiver, String content, String messageType);
+
+    void sendSmsWithRetry(MessageRecordReqVO messageRecordReqVO);
+}

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

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -57,10 +58,6 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
     @Transactional(rollbackFor = Exception.class)
     public AppProjectPO addAppProject(AppProjectAddParm appProjectAddOrAuditParm) {
         AppProjectPO appProjectPO = new AppProjectPO ( );
-//        Boolean result = checkName (appProjectAddOrAuditParm.getUserId ( ), appProjectAddOrAuditParm.getName ( ));
-//        if (result) {
-//            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-//        }
 
         if(checkName(appProjectAddOrAuditParm.getName(),"",appProjectAddOrAuditParm.getEngineeringId())){
             throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
@@ -81,22 +78,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
                 appTopologyDiagramPO.setStatus ("1");
                 appTopologyDiagramPO.setTopoId(temp);
                 appTopologyDiagramService.save(appTopologyDiagramPO);
-
-                //如何使用拓扑图模板生成监测点模版
-//                List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyDiagramTemplateService.queryByTopoId(temp);
-//                List<CsLineTopologyTemplate> collect = csLineTopologyTemplateVOS.stream().map(temp1 -> {
-//                    CsLineTopologyTemplate csLineTopologyTemplate = new CsLineTopologyTemplate();
-//                    BeanUtils.copyProperties(temp1, csLineTopologyTemplate);
-//                    csLineTopologyTemplate.setId(null);
-//                    csLineTopologyTemplate.setStatus("1");
-//                    csLineTopologyTemplate.setTopoId(appTopologyDiagramPO.getId());
-//                    return csLineTopologyTemplate;
-//                }).collect(Collectors.toList());
-//                csLineTopologyTemplates.addAll(collect);
             });
             csLineTopologyDiagramTemplateService.saveBatch(csLineTopologyTemplates);
-
-
         }
         if(Objects.nonNull( appProjectAddOrAuditParm.getFiles ( ))){
             for (int i = 0; i < appProjectAddOrAuditParm.getFiles ( ).length; i++) {
@@ -157,13 +140,6 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
         QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( );
         queryWrapper.eq ("id", appProjectAuditParm.getId ( ));
         AppProjectPO appProjectPO1 = appProjectMapper.selectOne (queryWrapper);
-//        if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) {
-//            Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ),
-//                    appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( ));
-//            if (result) {
-//                throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-//            }
-//        }
         //删除项目
         if(Objects.equals("0",appProjectAuditParm.getStatus())){
             QueryWrapper<CsLedger> queryWrapper1 = new QueryWrapper<>();
@@ -175,38 +151,26 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
             this.lambdaUpdate().eq(AppProjectPO::getId,appProjectAuditParm.getId()).set(AppProjectPO::getStatus,"0").update();
             appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).set(AppTopologyDiagramPO::getStatus,"0").update();
             CsLedger csLedger1 = new CsLedger();
-
             csLedger1.setId(appProjectAuditParm.getId());
-
             csLedger1.setState(0);
             csLedger1.setState(0);
             csLedgerMapper.updateById(csLedger1);
-
-
         }
 
         if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId(),appProjectAuditParm.getEngineeringId())){
             throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
         }
 
-
-
         BeanUtils.copyProperties (appProjectAuditParm, appProjectPO);
         UpdateWrapper<AppProjectPO> updateWrapper = new UpdateWrapper ( );
         updateWrapper.eq ("id", appProjectAuditParm.getId ( ));
 
         int i = appProjectMapper.update (appProjectPO, updateWrapper);
-//        Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( ));
-//        if (result) {
-//            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-//        }
         //删除拓扑图
         if(CollectionUtils.isEmpty(appProjectAuditParm.getNewTopoIds())){
             appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).set(AppTopologyDiagramPO::getStatus,"0").update();
-
         }else {
             appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).notIn(AppTopologyDiagramPO::getId,appProjectAuditParm.getNewTopoIds()).set(AppTopologyDiagramPO::getStatus,"0").update();
-
         }
 
         //如何使用拓扑图模板则将拓扑图模板复制绑定
@@ -227,26 +191,11 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
                 appTopologyDiagramPO.setStatus ("1");
                 appTopologyDiagramPO.setTopoId(temp);
                 appTopologyDiagramService.save(appTopologyDiagramPO);
-
-                //如何使用拓扑图模板生成监测点模版
-//                List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyDiagramTemplateService.queryByTopoId(temp);
-//                List<CsLineTopologyTemplate> collect = csLineTopologyTemplateVOS.stream().map(temp1 -> {
-//                    CsLineTopologyTemplate csLineTopologyTemplate = new CsLineTopologyTemplate();
-//                    BeanUtils.copyProperties(temp1, csLineTopologyTemplate);
-//                    csLineTopologyTemplate.setId(null);
-//                    csLineTopologyTemplate.setStatus("1");
-//                    csLineTopologyTemplate.setTopoId(appTopologyDiagramPO.getId());
-//                    return csLineTopologyTemplate;
-//                }).collect(Collectors.toList());
-//                csLineTopologyTemplates.addAll(collect);
             });
             csLineTopologyDiagramTemplateService.saveBatch(csLineTopologyTemplates);
-
-
         }
         if(Objects.nonNull( appProjectAuditParm.getFiles ( ))){
             for (int k = 0; k < appProjectAuditParm.getFiles ( ).length; k++) {
-
                 AppTopologyDiagramAddParm appTopologyDiagramAddParm = new AppTopologyDiagramAddParm ( );
                 appTopologyDiagramAddParm.setProjectId (appProjectPO.getId ( ));
                 appTopologyDiagramAddParm.setTopologyDiagramName (appProjectAuditParm.getFiles ( )[k].getOriginalFilename ( ));
@@ -255,10 +204,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
             }
         }
 
-
         CsLedger csLedger2 = new CsLedger();
         csLedger2.setId(appProjectAuditParm.getId());
-
         if(StringUtils.isNotBlank(appProjectAuditParm.getName())){
             csLedger2.setName(appProjectAuditParm.getName());
         }
@@ -403,5 +350,12 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
         return this.update(queryWrapper);
     }
 
+    @Override
+    public AppProjectPO getProjectByName(String name) {
+        LambdaQueryWrapper<AppProjectPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppProjectPO::getName,name).eq(AppProjectPO::getStatus,1);
+        return this.getOne(queryWrapper);
+    }
+
 
 }

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

@@ -1,6 +1,6 @@
 package com.njcn.csdevice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.Query;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,15 +10,18 @@ import com.google.common.base.Objects;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
-import com.njcn.csdevice.mapper.*;
+import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
+import com.njcn.csdevice.mapper.AppProjectMapper;
+import com.njcn.csdevice.mapper.AppTopologyDiagramMapper;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramAddParm;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramAuditParm;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryPageParm;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
-import com.njcn.csdevice.pojo.po.*;
+import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO;
 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.CsLineTopologyTemplateService;
 import com.njcn.oss.constant.OssPath;
@@ -178,4 +181,11 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
         }
         return true;
     }
+
+    @Override
+    public AppTopologyDiagramPO getByProjectId(String projectId) {
+        LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppTopologyDiagramPO::getProjectId,projectId).eq(AppTopologyDiagramPO::getStatus,"1");
+        return this.getOne(queryWrapper);
+    }
 }

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

@@ -5,21 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.csdevice.mapper.CsLinePOMapper;
 import com.njcn.csdevice.mapper.PqsDeviceUnitMapper;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
-import com.njcn.csdevice.service.CsCommTerminalService;
+import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
-import com.njcn.csdevice.service.CsDeviceUserPOService;
+import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO;
-import com.njcn.csdevice.service.CsEquipmentDeliveryService;
+import com.njcn.csdevice.service.*;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.enums.AppRoleEnum;
 import com.njcn.user.pojo.constant.UserType;
 import com.njcn.user.pojo.vo.UserVO;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -38,6 +40,9 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
     private final CsLinePOMapper csLinePOMapper;
     private final UserFeignClient userFeignClient;
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
+    private final CsMarketDataService csMarketDataService;
+    private final ICsLedgerService csLedgerService;
+    private final CsTouristDataPOService csTouristDataPOService;
 
 
     @Override
@@ -88,14 +93,36 @@ 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)
+            //note 黄是在cs_market_data写入数据，是用户和工程的关系；
-                    .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());
+            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 如果是游客，则还需要加入系统配置的设备
+            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;
     }

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

@@ -4,36 +4,35 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsDeviceUserPOMapper;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
 import com.njcn.csdevice.mapper.CsMarketDataMapper;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.param.UserDevParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
+import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
 import com.njcn.csdevice.pojo.vo.DevUserVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csharmonic.api.EventUserFeignClient;
 import com.njcn.csharmonic.param.CsEventUserQueryParam;
-import com.njcn.csharmonic.pojo.vo.EventDetailVO;
+import com.njcn.harmonic.utils.PublicDataUtils;
-import com.njcn.cssystem.api.FeedBackFeignClient;
-import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
-import com.njcn.cssystem.pojo.vo.CsFeedbackVO;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.enums.AppRoleEnum;
 import com.njcn.user.pojo.po.User;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -55,14 +54,12 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
     private final CsDevModelRelationService csDevModelRelationService;
     private final ICsLedgerService iCsLedgerService;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
-    private final RoleEngineerDevService roleEngineerDevService;
     private final AppLineTopologyDiagramService appLineTopologyDiagramService;
     private final CsTouristDataPOService csTouristDataPOService;
     private final CsLinePOService csLinePOService;
     private final CsMarketDataMapper csMarketDataMapper;
     private final EventUserFeignClient eventUserFeignClient;
     private final UserFeignClient userFeignClient;
-    private final FeedBackFeignClient feedBackFeignClient;
     private final IMqttUserService mqttUserService;
 
     @Override
@@ -122,114 +119,202 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
     }
 
     @Override
-    public DevCountVO devCount(String id) {
+    public DevCountVO devCount(String id,String time) {
-        QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<>();
+        DevCountVO vo = new DevCountVO();
-
+        //获取app用户的台账树，包含四个层级 工程、项目、设备、监测点
-        DevCountVO devCountVO = new DevCountVO();
+        List<CsLedgerVO> appLedger = iCsLedgerService.appLineTree();
-
+        //判断当前用户，如果是游客，则需要筛选数据,只保留游客的数据
-        String userRole = RequestUtil.getUserRole();
+        String roleString = RequestUtil.getUserRole();
-        List<String> strings = JSONArray.parseArray(userRole, String.class);
+        if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
-        if(CollectionUtils.isEmpty(strings)){
+            List<CsTouristDataParmVO> csTouristDataParmVOList = csTouristDataPOService.queryAll();
-            throw new BusinessException(AlgorithmResponseEnum.UNKNOW_ROLE);
+            if (CollectionUtil.isNotEmpty(csTouristDataParmVOList)) {
-
+                List<String> devList = csTouristDataParmVOList.stream().map(CsTouristDataParmVO::getDeviceId).collect(Collectors.toList());
-        }
+                // 保留游客有权限的工程、项目、设备、监测点数据
-        userRole=strings.get(0);
+                appLedger = appLedger.stream()
-
+                        .filter(engineering -> {
-        List<String> device = roleEngineerDevService.getDevice();
+                            boolean hasValidProject = false;
-        if(CollectionUtils.isEmpty(device)){
+                            if (CollectionUtil.isNotEmpty(engineering.getChildren())) {
-            devCountVO.setOnLineDevCount(0);
+                                List<CsLedgerVO> validProjects = engineering.getChildren().stream()
-            devCountVO.setOnLineDevs(new ArrayList<>());
+                                        .filter(project -> {
-            devCountVO.setOffLineDevCount(0);
+                                            boolean hasValidDevice = false;
-            devCountVO.setOffLineDevs(new ArrayList<>());
+                                            if (CollectionUtil.isNotEmpty(project.getChildren())) {
-        }else {
+                                                List<CsLedgerVO> validDevices = project.getChildren().stream()
-            queryWrapper.clear();
+                                                        .filter(device -> devList.contains(device.getId()))
-            queryWrapper.in("id",device);
+                                                        .collect(Collectors.toList());
-
+                                                project.setChildren(validDevices);
-            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
+                                                hasValidDevice = CollectionUtil.isNotEmpty(validDevices);
-            List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
+                                            }
-            List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
+                                            return hasValidDevice;
-            devCountVO.setOnLineDevCount(collect2.size());
+                                        })
-            devCountVO.setOnLineDevs(collect2);
+                                        .collect(Collectors.toList());
-            devCountVO.setOffLineDevCount(collect.size());
+                                engineering.setChildren(validProjects);
-            devCountVO.setOffLineDevs(collect);
+                                hasValidProject = CollectionUtil.isNotEmpty(validProjects);
-            List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+                            }
-            devCountVO.setEningerCount(roleengineer.size());
+                            return hasValidProject;
+                        })
+                        .collect(Collectors.toList());
+            } else {
+                // 如果游客没有配置任何数据权限，返回空列表
+                appLedger = new ArrayList<>();
+            }
         }
 
-        List<CsLedgerVO> deviceTree = iCsLedgerService.getDeviceTree();
+        if (CollectionUtil.isNotEmpty(appLedger)) {
-        //由于多加了一程便携式设备
+            //获取第一层项目层级
-        List<String> collect1 = deviceTree.stream()
+            List<CsLedgerVO> firstLevelList = new ArrayList<>();
-                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+            //获取第三层设备层级
-                .filter(temp -> temp.getId().equals(id))
+            List<CsLedgerVO> thirdLevelList = new ArrayList<>();
-                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+            //获取第四层设备层级
-                .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
+            List<CsLedgerVO> forthLevelList = new ArrayList<>();
-                .map(CsLedgerVO::getId).collect(Collectors.toList());
+            for (CsLedgerVO firstLevel : appLedger) {
-        //求交集
+                firstLevelList.add(firstLevel);
-        device.retainAll(collect1);
+                if (CollectionUtil.isNotEmpty(firstLevel.getChildren())) {
-        if(CollectionUtils.isEmpty(device)){
+                    for (CsLedgerVO secondLevel : firstLevel.getChildren()) {
-            devCountVO.setCurrentOnLineDevCount(0);
+                        if (CollectionUtil.isNotEmpty(secondLevel.getChildren())) {
-            devCountVO.setCurrentOnLineDevs(new ArrayList<>());
+                            thirdLevelList.addAll(secondLevel.getChildren());
-            devCountVO.setCurrentOffLineDevCount(0);
+                            for (CsLedgerVO threeLevel : secondLevel.getChildren()) {
-            devCountVO.setCurrentOffLineDevs(new ArrayList<>());
+                                if (CollectionUtil.isNotEmpty(threeLevel.getChildren())) {
-            devCountVO.setCurrentProjectCount(0);
+                                    forthLevelList.addAll(threeLevel.getChildren());
+                                }
+                            }
 
-        }else {
+                        }
-            queryWrapper.clear();
+                    }
-            queryWrapper.in("id",device);
+                }
+            }
+            //note 所有工程数据
+            //获取工程数量
+            if (CollectionUtil.isNotEmpty(firstLevelList)) {
+                vo.setEningerCount(firstLevelList.size());
+            }
 
-            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
+            //获取设备总数、在线设备、离线设备
-            List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(thirdLevelList)) {
-            List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
+                List<String> devIds = thirdLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
-            devCountVO.setCurrentOnLineDevCount(collect2.size());
+                List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryMapper.selectBatchIds(devIds);
-            devCountVO.setCurrentOnLineDevs(collect2);
+                //在线设备
-            devCountVO.setCurrentOffLineDevCount(collect.size());
+                List<CsEquipmentDeliveryPO> onlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 2)).collect(Collectors.toList());
-            devCountVO.setCurrentOffLineDevs(collect);
+                if (CollectionUtil.isNotEmpty(onlineDevs)) {
-            List<CsLedger> list = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, id).eq(CsLedger::getState, 1).list();
+                    vo.setOnLineDevCount(onlineDevs.size());
-            devCountVO.setCurrentProjectCount(list.size());
+                    vo.setOnLineDevs(onlineDevs);
+                }
+                //离线设备
+                List<CsEquipmentDeliveryPO> offlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 1)).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(offlineDevs)) {
+                    vo.setOffLineDevCount(offlineDevs.size());
+                    vo.setOffLineDevs(offlineDevs);
+                }
+            } else {
+                return vo;
+            }
+            //获取未读事件数量
+            if (CollectionUtil.isNotEmpty(forthLevelList)) {
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(forthLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
+
+                List<String> eventCount = eventUserFeignClient.queryTempEvent(param1).getData();
+                vo.setEventCount(CollectionUtil.isNotEmpty(eventCount)?eventCount.size():0);
+                List<String> harmonicCount = eventUserFeignClient.queryTempHarmonic(param1).getData();
+                vo.setHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount)?harmonicCount.size():0);
+            }
+            if (CollectionUtil.isNotEmpty(thirdLevelList)) {
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(thirdLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
+
+                List<String> alarmCount = eventUserFeignClient.queryAlarmEvent(param1).getData();
+                vo.setAlarmCount(CollectionUtil.isNotEmpty(alarmCount)?alarmCount.size():0);
+                List<String> runCount = eventUserFeignClient.queryRunEvent(param1).getData();
+                vo.setRunCount(CollectionUtil.isNotEmpty(runCount)?runCount.size():0);
+            }
+
+            //note 当前工程数据
+            //当前工程id
+            vo.setCurrentId(id);
+            //设备集合
+            List<String> currentDevIds = new ArrayList<>();
+            //监测点集合
+            List<String> currentLineIds = new ArrayList<>();
+            //获取第一层项目层级
+            List<CsLedgerVO> currentProjectIds = new ArrayList<>();
+            // 遍历树结构，找到匹配的工程节点
+            for (CsLedgerVO engineering : appLedger) {
+                if (id.equals(engineering.getId())) {
+                    // 找到工程节点，获取其子节点（项目层级）
+                    if (CollectionUtil.isNotEmpty(engineering.getChildren())) {
+                        for (CsLedgerVO project : engineering.getChildren()) {
+                            currentProjectIds.add(project);
+                            // 获取项目下的设备层级
+                            if (CollectionUtil.isNotEmpty(project.getChildren())) {
+                                currentDevIds.addAll(project.getChildren().stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
+                                // 获取设备下的监测点层级
+                                for (CsLedgerVO device : project.getChildren()) {
+                                    if (CollectionUtil.isNotEmpty(device.getChildren())) {
+                                        currentLineIds.addAll(device.getChildren().stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+            //获取项目数量
+            if (CollectionUtil.isNotEmpty(currentProjectIds)) {
+                vo.setCurrentProjectCount(currentProjectIds.size());
+            }
+            //获取设备总数、在线设备、离线设备
+            if (CollectionUtil.isNotEmpty(currentDevIds)) {
+                List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryMapper.selectBatchIds(currentDevIds);
+                //在线设备
+                List<CsEquipmentDeliveryPO> onlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 2)).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(onlineDevs)) {
+                    vo.setCurrentOnLineDevCount(onlineDevs.size());
+                    vo.setCurrentOnLineDevs(onlineDevs);
+                }
+                //离线设备
+                List<CsEquipmentDeliveryPO> offlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 1)).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(offlineDevs)) {
+                    vo.setCurrentOffLineDevCount(offlineDevs.size());
+                    vo.setCurrentOffLineDevs(offlineDevs);
+                }
+            }
+            //获取未读事件数量
+            if (CollectionUtil.isNotEmpty(currentLineIds)) {
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(currentLineIds);
+
+                List<String> eventCount2 = eventUserFeignClient.queryTempEvent(param1).getData();
+                vo.setCurrentEventCount(CollectionUtil.isNotEmpty(eventCount2)?eventCount2.size():0);
+
+                List<String> harmonicCount2 = eventUserFeignClient.queryTempHarmonic(param1).getData();
+                vo.setCurrentHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount2)?harmonicCount2.size():0);
+            }
+            if (CollectionUtil.isNotEmpty(currentDevIds)) {
+                CsEventUserQueryParam param1 = new CsEventUserQueryParam();
+                param1.setUserId(RequestUtil.getUserIndex());
+                param1.setStartTime(PublicDataUtils.calculateMonthStart(time));
+                param1.setEndTime(PublicDataUtils.calculateMonthEnd(time));
+                param1.setEventIds(currentDevIds);
+
+                List<String> alarmCount2 = eventUserFeignClient.queryAlarmEvent(param1).getData();
+                vo.setCurrentAlarmCount(CollectionUtil.isNotEmpty(alarmCount2)?alarmCount2.size():0);
+
+                List<String> runCount2 = eventUserFeignClient.queryRunEvent(param1).getData();
+                vo.setCurrentRunCount(CollectionUtil.isNotEmpty(runCount2)?runCount2.size():0);
+            }
         }
-        CsEventUserQueryParam csEventUserQueryParam = new CsEventUserQueryParam();
+        return vo;
-        csEventUserQueryParam.setStatus("0");
-        List<EventDetailVO> data = eventUserFeignClient.queryEventList(csEventUserQueryParam).getData();
-        List<EventDetailVO> event = data.stream().filter(temp -> temp.getType() == 0).collect(Collectors.toList());
-        List<EventDetailVO> harmonic = data.stream().filter(temp -> temp.getType() == 1).collect(Collectors.toList());
-        List<EventDetailVO> alarm = data.stream().filter(temp -> temp.getType() == 3).collect(Collectors.toList());
-
-        if(Objects.equals(userRole, AppRoleEnum.APP_VIP_USER.getCode())){
-            alarm = alarm.stream().filter(temp -> Objects.equals("3", temp.getLevel())).collect(Collectors.toList());
-        }
-        List<EventDetailVO> run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList());
-        if(Objects.equals(userRole,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(userRole,AppRoleEnum.TOURIST.getCode())
-        ||Objects.equals(userRole,AppRoleEnum.MARKET_USER.getCode())){
-            devCountVO.setFeedBackCount(0);
-
-        }else {
-            CsFeedbackQueryParm csFeedbackQueryParm = new CsFeedbackQueryParm();
-            csFeedbackQueryParm.setPageNum(1);
-            csFeedbackQueryParm.setPageSize(100000);
-            csFeedbackQueryParm.setStatus("1");
-            Page<CsFeedbackVO> data1 = feedBackFeignClient.queryFeedBackPage(csFeedbackQueryParm).getData();
-            List<CsFeedbackVO> collect = data1.getRecords().stream().filter(temp -> !Objects.equals(temp.getUserId(), RequestUtil.getUserIndex())).collect(Collectors.toList());
-            devCountVO.setFeedBackCount(collect.size());
-        }
-
-        //todo 后续添加警告数,事件数
-        devCountVO.setEventCount(event.size());
-        devCountVO.setAlarmCount(alarm.size());
-        devCountVO.setRunCount(run.size());
-        devCountVO.setHarmonicCount(harmonic.size());
-        List<EventDetailVO> curEvent = event.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-        List<EventDetailVO> curHarmonic = harmonic.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-        List<EventDetailVO> curAlarm = alarm.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-        List<EventDetailVO> curRun = run.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
-
-        devCountVO.setCurrentEventCount(curEvent.size());
-        devCountVO.setCurrentAlarmCount(curAlarm.size());
-        devCountVO.setCurrentRunCount(curRun.size());
-        devCountVO.setCurrentHarmonicCount(curHarmonic.size());
-
-
-        return devCountVO;
     }
+
     /** 
     * @Description: 判断当前用户是否是主用户 0-否1-是
     * @Param:  
@@ -377,16 +462,16 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
 
     @Override
     public DevUserVO queryUserById(String devId) {
+        DevUserVO devUser = new DevUserVO();
         List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId, devId).eq(CsDeviceUserPO::getStatus, "1").list();
         if (CollectionUtils.isEmpty(list)) {
-            throw new BusinessException(AlgorithmResponseEnum.DATA_ARRAY_MISSING);
+            return devUser;
         }
         List<String> collect = list.stream().map(CsDeviceUserPO::getSubUserId).distinct().collect(Collectors.toList());
         List<User> data = userFeignClient.appuserByIdList(collect).getData();
         String primaryUserId = list.get(0).getPrimaryUserId();
         List<User> subUser = data.stream().filter(temp -> !Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
         List<User> primaryUser = data.stream().filter(temp -> Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
-        DevUserVO devUser = new DevUserVO();
         devUser.setDevId(devId);
         devUser.setSubUsers(subUser);
         devUser.setMasterUser(primaryUser.get(0));
@@ -400,13 +485,33 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         if (CollectionUtil.isNotEmpty(list)){
             result = list.stream().map(CsDeviceUserPO::getSubUserId).collect(Collectors.toList());
         }
+        //获取关注设备的用户(工程用户、营销用户)
+        List<DevDetailDTO> ledger = iCsLedgerService.getInfoByIds(Collections.singletonList(devId));
+        if (CollectionUtil.isNotEmpty(ledger)) {
+            DevDetailDTO item = ledger.get(0);
+            LambdaQueryWrapper<CsMarketData> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CsMarketData::getEngineerId, item.getEngineeringid());
+            List<CsMarketData> csMarketData = csMarketDataMapper.selectList(queryWrapper);
+            if (CollectionUtil.isNotEmpty(csMarketData)) {
+                List<String> collect = csMarketData.stream().map(CsMarketData::getUserId).collect(Collectors.toList());
+                result.addAll(collect);
+            }
+        }
+        if (CollectionUtil.isNotEmpty(result)) {
+            result = result.stream().distinct().collect(Collectors.toList());
+        }
         return result;
     }
 
     @Override
     public List<String> findDevByUserId(String userId) {
         List<String> result = new ArrayList<>();
-        List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getPrimaryUserId,userId).list();
+        LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.and(wrapper ->
+                wrapper.eq(CsDeviceUserPO::getPrimaryUserId, userId)
+                        .or()
+                        .eq(CsDeviceUserPO::getSubUserId, userId));
+        List<CsDeviceUserPO> list = this.list(queryWrapper);
         if (CollectionUtil.isNotEmpty(list)){
             result = list.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
         }
@@ -416,8 +521,28 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
     @Override
     public void channelDevByUserId(UserDevParam param) {
         LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId,param.getUserId())
+        queryWrapper.and(wrapper ->
-                .in(CsDeviceUserPO::getDeviceId,param.getList());
+                wrapper.eq(CsDeviceUserPO::getPrimaryUserId, param.getUserId())
+                        .or()
+                        .eq(CsDeviceUserPO::getSubUserId, param.getUserId())
+        ).in(CsDeviceUserPO::getDeviceId, param.getList());
         this.remove(queryWrapper);
     }
+
+    @Override
+    public List<CsDeviceUserPO> getList(UserDevParam param) {
+        LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(param.getUserId())) {
+            queryWrapper.and(wrapper ->
+                    wrapper.eq(CsDeviceUserPO::getPrimaryUserId, param.getUserId())
+                            .or()
+                            .eq(CsDeviceUserPO::getSubUserId, param.getUserId())
+            );
+        }
+        if (CollectionUtil.isNotEmpty(param.getList())) {
+            queryWrapper.in(CsDeviceUserPO::getDeviceId, param.getList());
+        }
+        queryWrapper.eq(CsDeviceUserPO::getStatus, "1");
+        return this.list(queryWrapper);
+    }
 }

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

@@ -84,7 +84,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         csLedger1.setLevel(0);
         csLedger1.setName(csEngineeringPO.getName());
         csLedger1.setState(1);
-        csLedger1.setSort(0);
+        csLedger1.setSort(csEngineeringAddParm.getSort());
         csLedgerMapper.insert(csLedger1);
         //绑定用户
         CsEngineeringUserPO po = new CsEngineeringUserPO();
@@ -164,8 +164,9 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
 
         queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryParm.getProvince ()),"province",csEngineeringQueryParm.getProvince ()).
                 eq (StringUtils.isNotBlank (csEngineeringQueryParm.getCity ()),"city",csEngineeringQueryParm.getCity ()).
-                eq ("status","1" ).
+                eq ("status","1" )
-                like (StringUtils.isNotBlank (csEngineeringQueryParm.getName ()),"name",csEngineeringQueryParm.getName ()).orderByDesc("create_time");
+                .ne("name","便携式工程").
+                like (StringUtils.isNotBlank (csEngineeringQueryParm.getName ()),"name",csEngineeringQueryParm.getName ()).orderByAsc("sort");
         List<CsEngineeringPO> csEngineeringPOS = this.getBaseMapper ( ).selectList (queryWrapper);
         csEngineeringVOList = csEngineeringPOS.stream ().map (temp->{
             CsEngineeringVO vo = new CsEngineeringVO();
@@ -196,6 +197,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getProvince ()),"province",csEngineeringQueryPageParm.getProvince ()).
                 eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getCity ()),"city",csEngineeringQueryPageParm.getCity ()).
                 eq ("status","1" ).
+                ne("name","便携式工程").
                 like (StringUtils.isNotBlank (csEngineeringQueryPageParm.getName ()),"name",csEngineeringQueryPageParm.getName ()).orderByDesc("create_time");
         Page<CsEngineeringPO> csEngineeringPOPage = this.getBaseMapper ( ).selectPage (tempPage, queryWrapper);
         List<CsEngineeringVO> collect = csEngineeringPOPage.getRecords ( ).stream ( ).map (temp -> {
@@ -253,7 +255,9 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
                     CsEngineeringPO po = new CsEngineeringPO();
                     po.setId(item.getEngineeringid());
                     po.setName(map.get(item.getEngineeringid()).getName());
-                    result.add(po);
+                    if (!Objects.equals(po.getName(), "便携式工程")) {
+                        result.add(po);
+                    }
                 });
             }
         }
@@ -297,6 +301,12 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         return this.update(queryWrapper);
     }
 
+    @Override
+    public CsEngineeringPO getEngineeringByName(String name) {
+        LambdaQueryWrapper<CsEngineeringPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CsEngineeringPO::getName,name).eq(CsEngineeringPO::getStatus,1);
+        return this.getOne(queryWrapper);
+    }
 
     public String getAreaById(String id){
 

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

@@ -7,7 +7,9 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.text.StrPool;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -29,6 +31,7 @@ import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
 import com.njcn.csdevice.mapper.CsLedgerMapper;
 import com.njcn.csdevice.mapper.CsSoftInfoMapper;
 import com.njcn.csdevice.mapper.CsTerminalLogsMapper;
+import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
 import com.njcn.csdevice.pojo.param.*;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
@@ -38,6 +41,9 @@ import com.njcn.csdevice.service.*;
 import com.njcn.csdevice.util.QRCodeUtil;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.csdevice.utils.StringUtil;
+import com.njcn.csharmonic.api.EventUserFeignClient;
+import com.njcn.csharmonic.param.CsEventUserQueryParam;
+import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -46,7 +52,6 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.enums.DicTreeEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
 import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.user.enums.AppRoleEnum;
@@ -66,7 +71,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 /**
@@ -96,14 +103,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
     private final CsSoftInfoMapper csSoftInfoMapper;
-    private final IMqttUserService mqttUserService;
     private final MqttUtil mqttUtil;
     private final CsLogsFeignClient csLogsFeignClient;
     private final INodeService nodeService;
     private final CsDevModelService csDevModelService;
     private final CsLedgerMapper csLedgerMapper;
     private final CsTerminalLogsMapper csTerminalLogsMapper;
-
+    private final ICsCommunicateService csCommunicateService;
+    private final ICsUserPinsService csUserPinsService;
+    private final EventUserFeignClient eventUserFeignClient;
 
     @Override
     public void refreshDeviceDataCache() {
@@ -135,12 +143,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csEquipmentDeliveryPo.setStatus (1);
         csEquipmentDeliveryPo.setRunStatus(1);
         csEquipmentDeliveryPo.setUsageStatus(1);
-        String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
+//        String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
-        if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
+//        if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
-            csEquipmentDeliveryPo.setProcess(4);
+//            csEquipmentDeliveryPo.setProcess(4);
-        } else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
+//        } else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
-            csEquipmentDeliveryPo.setProcess(2);
+//            csEquipmentDeliveryPo.setProcess(2);
-        }
+//        }
+        csEquipmentDeliveryPo.setProcess(4);
         //生成二维码文件
         String qr = this.createQr(csEquipmentDeliveryAddParm.getNdid());
         csEquipmentDeliveryPo.setQrPath(qr);
@@ -151,24 +160,40 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csEquipmentProcess.setDevId(csEquipmentDeliveryAddParm.getNdid());
         csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
         csEquipmentProcess.setStartTime(LocalDateTime.now());
-        csEquipmentProcess.setProcess(1);
+        csEquipmentProcess.setProcess(4);
         csEquipmentProcess.setStatus (1);
         csEquipmentProcessPOService.save(csEquipmentProcess);
         result = this.save (csEquipmentDeliveryPo);
-        if (result) {
+
-            refreshDeviceDataCache();
+        String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
+        if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),code) && Objects.equals(csEquipmentDeliveryAddParm.getDevAccessMethod(),"CLD")) {
+            //谁新建的设备，则认为是该设备的主用户，新建用户设备关系表数据
+            boolean addUser = csDeviceUserPOService.add(csEquipmentDeliveryPo.getId());
+            if (result && addUser) {
+                refreshDeviceDataCache();
+            }
+        } else {
+            if (result) {
+                refreshDeviceDataCache();
+            }
         }
+
         return csEquipmentDeliveryPo;
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public Boolean AuditEquipmentDelivery(String id) {
-        CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, id).one();
         //物理删除
-        QueryWrapper<CsEquipmentDeliveryPO> wrapper = new QueryWrapper();
+        boolean update = false;
-        wrapper.eq ("id", id);
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> wrapper = new LambdaQueryWrapper<>();
-        boolean update = this.remove (wrapper);
+        wrapper.eq(CsEquipmentDeliveryPO::getId,id);
-        //删除deviceuser表里的设备，游客数据设备,删除监测点相关数据
+        CsEquipmentDeliveryPO po = this.getOne(wrapper);
+        if (po != null) {
+            update = this.remove(wrapper);
+            redisUtil.deleteKeysByString(AppRedisKey.LINE_POSITION+po.getNdid());
+        }
+        //删除监测点表、监测点拓扑图关系
         List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list();
         if(!CollectionUtils.isEmpty(list)){
             List<String> collect = list.stream().map(CsLedger::getId).collect(Collectors.toList());
@@ -179,8 +204,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             appLineTopologyDiagramPOQueryWrapper.clear();
             appLineTopologyDiagramPOQueryWrapper.in("line_id",collect);
             appLineTopologyDiagramService.remove(appLineTopologyDiagramPOQueryWrapper);
-//            appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update();
         }
+        //清空关系表
         LambdaQueryWrapper<CsLedger>  csLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         csLedgerLambdaQueryWrapper.clear();
         csLedgerLambdaQueryWrapper.eq(CsLedger::getId,id);
@@ -188,14 +213,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csLedgerLambdaQueryWrapper.clear();
         csLedgerLambdaQueryWrapper.eq(CsLedger::getPid,id);
         csLedgerService.remove(csLedgerLambdaQueryWrapper);
-        csDeviceUserPOService.lambdaUpdate().eq(CsDeviceUserPO::getDeviceId,id).set(CsDeviceUserPO::getStatus,0).update();
+        //删除设备和模板的关系
+        LambdaQueryWrapper<CsDevModelRelationPO> csDevModelRelationPOQueryWrapper = new LambdaQueryWrapper<>();
+        csDevModelRelationPOQueryWrapper.clear();
+        csDevModelRelationPOQueryWrapper.eq(CsDevModelRelationPO::getDevId,id);
+        csDevModelRelationService.remove(csDevModelRelationPOQueryWrapper);
+        //删除设备/用户关系
+        QueryWrapper<CsDeviceUserPO> csDeviceUserPOQueryWrapper = new QueryWrapper<>();
+        csDeviceUserPOQueryWrapper.clear();
+        csDeviceUserPOQueryWrapper.eq("device_id",id);
+        csDeviceUserPOService.remove(csDeviceUserPOQueryWrapper);
+        //删除游客
         QueryWrapper<CsTouristDataPO> queryWrap = new QueryWrapper<>();
         queryWrap.eq("device_id",id);
         csTouristDataPOService.getBaseMapper().delete(queryWrap);
-        /*后续徐那边做处理*/
-//        CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.getBaseMapper().selectById(id);
-//        mqttUserService.deleteUser(csEquipmentDeliveryPO.getNdid());
-        csDevModelRelationService.lambdaUpdate().eq(CsDevModelRelationPO::getDevId,id).set(CsDevModelRelationPO::getStatus,0).update();
         if (update) {
             refreshDeviceDataCache();
         }
@@ -210,6 +241,12 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             return result;
         }
         BeanUtils.copyProperties (csEquipmentDeliveryPO,result);
+        if(!Objects.isNull (csEquipmentDeliveryPO.getAssociatedEngineering()) && !Objects.equals(csEquipmentDeliveryPO.getAssociatedEngineering(),"")) {
+            result.setAssociatedEngineeringName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedEngineering()).getName());
+        }
+        if(!Objects.isNull (csEquipmentDeliveryPO.getAssociatedProject()) && !Objects.equals(csEquipmentDeliveryPO.getAssociatedProject(),"")) {
+            result.setAssociatedProjectName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedProject()).getName());
+        }
         return result;
     }
 
@@ -229,9 +266,61 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             return returnpage;
         }
         Page<ProjectEquipmentVO> list = this.baseMapper.queryProjectEquipmentVO(returnpage,projectEquipmentQueryParm,device);
-        list.getRecords().stream().forEach(temp->{
+        //根据设备id获取监测点id集合
+        List<CsLinePO> lineIds = csLinePOService.getLineByDev(device);
+        //根据设备获取当日是否存在未读取的暂态事件
+        CsEventUserQueryParam param = new CsEventUserQueryParam();
+        param.setUserId(RequestUtil.getUserIndex());
+        param.setStartTime(LocalDate.now().atStartOfDay().format(DatePattern.NORM_DATETIME_FORMATTER));
+        param.setEndTime(LocalDateTime.now().format(DatePattern.NORM_DATETIME_FORMATTER));
+        param.setEventIds(lineIds.stream().map(CsLinePO::getLineId).collect(Collectors.toList()));
+        List<CsEventPO> eventList = eventUserFeignClient.queryTempEventDetail(param).getData();
+        Map<String, List<CsEventPO>> eventMap = Optional.ofNullable(eventList)
+                .orElse(Collections.emptyList())
+                .stream()
+                .collect(Collectors.groupingBy(CsEventPO::getDeviceId));
+
+        List<ProjectEquipmentVO> recordList = new ArrayList<>();
+        list.getRecords().forEach(temp->{
             temp.setIsPrimaryUser(csDeviceUserPOService.isPrimaryUser(temp.getEquipmentId()));
+            //获取设备类型
+            SysDicTreePO po = dictTreeFeignClient.queryById(temp.getDevType()).getData();
+            temp.setDevType(po.getCode());
+            temp.setLineList(lineIds.stream().filter(line -> line.getDevId().equals(temp.getEquipmentId())).sorted(Comparator.comparing(CsLinePO::getLineId)).collect(Collectors.toList()));
+            if (!Objects.equals(DicDataEnum.PORTABLE.getCode(),temp.getDevType())) {
+                recordList.add(temp);
+            }
+            //判断设备是否存在告警
+            temp.setIsAlarm(CollectionUtil.isNotEmpty(eventMap.get(temp.getEquipmentId())));
         });
+
+        //获取用户置顶的设备
+        List<CsUserPins> topList = csUserPinsService.getPinToTopList();
+        List<String> targetIdList = topList.stream()
+                .filter(item -> Objects.equals(item.getTargetType(), 1))
+                .map(CsUserPins::getTargetId)
+                .collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(targetIdList)) {
+            List<ProjectEquipmentVO> matchedList = new ArrayList<>();
+            List<ProjectEquipmentVO> unmatchedList = new ArrayList<>();
+            for (ProjectEquipmentVO node : recordList) {
+                if (targetIdList.contains(node.getEquipmentId())) {
+                    node.setIsTop(1);
+                    matchedList.add(node);
+                } else {
+                    unmatchedList.add(node);
+                }
+            }
+            // 根据 targetIdList 的顺序对匹配的节点进行排序
+            matchedList.sort(Comparator.comparingInt(node -> targetIdList.indexOf(node.getEquipmentId())));
+            // 未匹配的节点按照原有的 sort 字段排序，处理 null 值情况
+            unmatchedList.sort(Comparator.comparing(node -> node.getSort() != null ? node.getSort() : Integer.MAX_VALUE));
+            // 清空原列表并添加排序后的数据
+            recordList.clear();
+            recordList.addAll(matchedList);
+            recordList.addAll(unmatchedList);
+            list.setRecords(recordList);
+        }
         return list;
     }
 
@@ -305,11 +394,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         int total = this.baseMapper.getCounts(queryParam);
         if (total > 0) {
             List<CsEquipmentDeliveryVO> recordList = this.baseMapper.getList(queryParam);
-            //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+            //新增逻辑(针对便携式设备、监测设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
             for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : recordList){
-                if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                String code = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData().getCode();
+                if((Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && csEquipmentDeliveryVO.getStatus() == 1)
+                        || (Objects.equals(code, DicDataEnum.DEV_CLD.getCode()) && csEquipmentDeliveryVO.getStatus() == 1)){
                     csEquipmentDeliveryVO.setStatus(5);
-                } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                } else if((Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && csEquipmentDeliveryVO.getStatus() == 2)
+                        || (Objects.equals(code, DicDataEnum.DEV_CLD.getCode()) && csEquipmentDeliveryVO.getStatus() == 2)){
                     csEquipmentDeliveryVO.setStatus(6);
                 }
                 //判断装置是否已经连接上mqtt服务器
@@ -382,7 +474,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     dataSet = csDataSetService.findDataSetByModelId(modelId,2);
                 }
                 setDataSetValues(csEquipmentDeliveryPo, dataSet, dataSetList, type, deviceManagerVo);
-            } else if(Objects.equals(devTypeCode, DicDataEnum.PORTABLE.getCode()) || Objects.equals(devTypeCode, DicDataEnum.DEV_CLD.getCode())){
+            } else if(Objects.equals(devTypeCode, DicDataEnum.PORTABLE.getCode())){
                 List<CsDataSet> dataSet = new ArrayList<>();
                 List<CsDevModelRelationPO> modelId = csDevModelRelationService.findModelByDevId(deviceId);
                 if (CollUtil.isNotEmpty(modelId)){
@@ -391,6 +483,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     }
                     setDataSetValues(csEquipmentDeliveryPo, dataSet, dataSetList, type, deviceManagerVo);
                 }
+            } else if(Objects.equals(devTypeCode, DicDataEnum.DEV_CLD.getCode())){
+                List<CsDataSet> dataSet = new ArrayList<>();
+                List<CsDevModelRelationPO> modelId = csDevModelRelationService.findModelByDevId(deviceId);
+                if (CollUtil.isNotEmpty(modelId)){
+                    for (CsDevModelRelationPO item : modelId) {
+                        dataSet.addAll(csDataSetService.findDataSetByModelId(item.getModelId(),1));
+                    }
+                    setDataSetValues(csEquipmentDeliveryPo, dataSet, dataSetList, type, deviceManagerVo);
+                }
             }
         }
         return deviceManagerVo;
@@ -437,6 +538,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     addDataSet(dataSetList, item, "实时数据", "realtimedata");
                     addDataSet(dataSetList, item, "暂态事件", "event");
                 }
+                addDataSet(dataSetList, item, "运行趋势", "devRunTrend");
                 deviceManagerVo.setDataLevel(item.getDataLevel());
             }
             deviceManagerVo.setDataSetList(dataSetList);
@@ -553,13 +655,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     csEquipmentDeliveryPO.setMac(path);
                     csEquipmentDeliveryPO.setRunStatus(1);
                     csEquipmentDeliveryPO.setStatus(1);
-                    csEquipmentDeliveryPO.setProcess(2);
+//                    csEquipmentDeliveryPO.setProcess(2);
+                    csEquipmentDeliveryPO.setProcess(4);
                     csEquipmentDeliveryPO.setSort(100);
                     CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
                     csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid());
                     csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
                     csEquipmentProcess.setStartTime(LocalDateTime.now());
-                    csEquipmentProcess.setProcess(1);
+//                    csEquipmentProcess.setProcess(1);
+                    csEquipmentProcess.setProcess(4);
                     csEquipmentProcess.setStatus(1);
                     collect1.add(csEquipmentProcess);
                     return csEquipmentDeliveryPO;
@@ -729,9 +833,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         boolean result = false;
         //获取装置id
         CsEquipmentDeliveryPO po = findDevByNDid(nDid);
-        //设备型号
+        //设备类型
-        String code = dictTreeFeignClient.queryById(po.getDevModel()).getData().getCode();
+        String code = dictTreeFeignClient.queryById(po.getDevType()).getData().getCode();
-        if (Objects.equals(DicTreeEnum.PQ_COM.getCode(),code)) {
+        if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),code) || Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
             result = true;
         }
         return result;
@@ -747,10 +851,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     @Transactional(rollbackFor = Exception.class)
     public CsEquipmentDeliveryPO saveCld(CsEquipmentDeliveryAddParm param) {
         boolean result;
-        CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getName, param.getName()).ne(CsEquipmentDeliveryPO::getRunStatus, 0).one();
-        if(Objects.nonNull (one)){
-            throw new BusinessException ("设备名称不能重复");
-        }
         StringUtil.containsSpecialCharacters(param.getNdid());
         CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (param.getNdid());
         if(!Objects.isNull (po)){
@@ -796,7 +896,10 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csLedger.setSort(0);
         int addLedger = csLedgerMapper.insert(csLedger);
 
-        if (result && ObjectUtil.isNotNull(relation) && addLedger > 0) {
+        //谁新建的设备，则认为是该设备的主用户，新建用户设备关系表数据
+        boolean addUser = csDeviceUserPOService.add(csEquipmentDeliveryPo.getId());
+
+        if (result && ObjectUtil.isNotNull(relation) && addLedger > 0 && addUser) {
             refreshDeviceDataCache();
         }
         return csEquipmentDeliveryPo;
@@ -829,6 +932,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
         //新增操作日志
         CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
+        csTerminalLogs.setId(IdUtil.simpleUUID());
         csTerminalLogs.setDeviceId(id);
         csTerminalLogs.setOperateType(2);
         csTerminalLogs.setIsPush(0);
@@ -923,7 +1027,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getNodeId,id)
-                .in(ObjectUtil.isNotEmpty(state),CsEquipmentDeliveryPO::getUsageStatus,state);
+                .in(ObjectUtil.isNotEmpty(state),CsEquipmentDeliveryPO::getUsageStatus,state)
+                .eq(CsEquipmentDeliveryPO::getDevAccessMethod,"CLD");
         return this.list(lambdaQueryWrapper);
     }
 
@@ -939,17 +1044,17 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         List<CsEquipmentDeliveryPO> devList = this.list(lambdaQueryWrapper);
         if (CollectionUtil.isNotEmpty(devList)) {
             //修改设备运行状态
-            devList.forEach(item->{item.setRunStatus(1);});
+            devList.forEach(item->{
+                item.setRunStatus(1);
+                insertPqsCommunicateRecord(LocalDateTime.now().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)), item.getNdid(), 0);
+            });
             this.updateBatchById(devList);
-            //修改监测点运行状态
-            //List<String> devIdList = devList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
-            //List<CsLinePO> lineList = csLinePOService.getLinesByDevList(devIdList);
-            //csLinePOService.updateCldLineStatus(lineList,2);
         }
     }
 
     @Override
-    public void flipCldDevStatus(String devId, Integer status) {
+    @Transactional(rollbackFor = Exception.class)
+    public void flipCldDevStatus(String time, String devId, Integer status) {
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getId,devId)
                 .eq(CsEquipmentDeliveryPO::getUsageStatus,1)
@@ -958,13 +1063,22 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         if (ObjectUtil.isNotNull(po)) {
             po.setRunStatus(status);
             this.updateById(po);
-            //这边是监测点的运行状态 不是通讯状态，所以不要修改，通讯状态跟着设备的通讯状态来
+            //修改设备的运行状态，则录入influxdb表数据
-            //修改监测点运行状态
+            int communicateType = status == 2 ? 1 : 0;
-            //List<CsLinePO> lineList = csLinePOService.getLinesByDevList(Collections.singletonList(po.getId()));
+            insertPqsCommunicateRecord(time, po.getNdid(), communicateType);
-            //csLinePOService.updateCldLineStatus(lineList,status==1?2:0);
         }
     }
 
+    // 时序数据库写入数据
+    private void insertPqsCommunicateRecord(String time, String devId, Integer status) {
+        PqsCommunicateDto pqsCommunicateDto = new PqsCommunicateDto();
+        pqsCommunicateDto.setTime(time);
+        pqsCommunicateDto.setDevId(devId);
+        pqsCommunicateDto.setType(status);
+        pqsCommunicateDto.setDescription(status == 0 ? "通讯中断" : "通讯正常");
+        csCommunicateService.insertion(pqsCommunicateDto);
+    }
+
     @Override
     public List<CsEquipmentDeliveryPO> getDevListByProjectId(String projectId) {
         QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper();
@@ -1024,6 +1138,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 return result.stream()
                         .filter(data -> idSet.contains(data.getId()))
                         .collect(Collectors.toList());
+            } else {
+                result.clear();
+                return result;
             }
         }
         return result;

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

@@ -65,6 +65,11 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -102,6 +107,8 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     private final InfluxDbParamUtil influxDbParamUtil;
     private final DictTreeFeignClient dictTreeFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static final ZoneId DEFAULT_ZONE = ZoneId.systemDefault();
 
     private final String GRID_SIDE_DICT_CODE = "Grid_Side";
     private final String LOAD_SIDE_DICT_CODE = "Load_Side";
@@ -302,9 +309,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         //传1 则是趋势数据tab页面
         if("1".equals(type)){
             formatQueryParamList(commonStatisticalQueryParam);
-            List<ThdDataVO> result = new ArrayList();
+            List<ThdDataVO> result = new ArrayList<>();
             List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(commonStatisticalQueryParam.getDevId()).collect(Collectors.toList())).getData();
-            List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(commonStatisticalQueryParam.getLineId())).getData();
+            List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Collections.singletonList(commonStatisticalQueryParam.getLineId())).getData();
             CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
             if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
                 throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
@@ -444,6 +451,21 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             vo.setAnotherName(epdPqd.getShowName());
                             return vo;
                         }).collect(Collectors.toList());
+
+                        //长时闪变
+                        if (Objects.equals(epdPqd.getOtherName(), "plt")) {
+                            List<Instant> timeInstants = getTimeInstants(commonStatisticalQueryParam.getStartTime(), commonStatisticalQueryParam.getEndTime(), 2, ChronoUnit.HOURS, DEFAULT_ZONE);
+                            collect1 = collect1.stream()
+                                    .filter(vo -> timeInstants.contains(vo.getTime()))
+                                    .collect(Collectors.toList());
+                        }
+                        //短时闪变 || 电压波动
+                        else if (Objects.equals(epdPqd.getOtherName(), "pst") || Objects.equals(epdPqd.getOtherName(), "fluc")) {
+                            List<Instant> timeInstants = getTimeInstants(commonStatisticalQueryParam.getStartTime(), commonStatisticalQueryParam.getEndTime(), 10, ChronoUnit.MINUTES, DEFAULT_ZONE);
+                            collect1 = collect1.stream()
+                                    .filter(vo -> timeInstants.contains(vo.getTime()))
+                                    .collect(Collectors.toList());
+                        }
                         result.addAll(collect1);
                     });
                 }
@@ -561,6 +583,20 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         return null;
     }
 
+    public static List<Instant> getTimeInstants(String startDateStr, String endDateStr, long interval, ChronoUnit unit, ZoneId zone) {
+        List<Instant> instants = new ArrayList<>();
+        LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER);
+        LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER);
+        // 转换为指定时区的 ZonedDateTime
+        ZonedDateTime current = startDate.atStartOfDay(zone);
+        ZonedDateTime endDateTime = endDate.atTime(23, 59, 59).atZone(zone);
+        while (!current.isAfter(endDateTime)) {
+            instants.add(current.toInstant());
+            current = current.plus(interval, unit);
+        }
+        return instants;
+    }
+
     private void formatQueryParamList(CommonStatisticalQueryParam commonStatisticalQueryParam){
         List<CommonStatisticalQueryParam> list = new ArrayList<>();
         if(commonStatisticalQueryParam.getList() != null && commonStatisticalQueryParam.getList().size() > 0){
@@ -934,6 +970,21 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         vo.setAnotherName(epdPqd.getShowName());
                         return vo;
                     }).collect(Collectors.toList());
+
+                    //长时闪变
+                    if (Objects.equals(epdPqd.getOtherName(), "plt")) {
+                        List<Instant> timeInstants = getTimeInstants(trendDataQueryParam.getSearchBeginTime(), trendDataQueryParam.getSearchEndTime(), 2, ChronoUnit.HOURS, DEFAULT_ZONE);
+                        collect1 = collect1.stream()
+                                .filter(vo -> timeInstants.contains(vo.getTime()))
+                                .collect(Collectors.toList());
+                    }
+                    //短时闪变 || 电压波动
+                    else if (Objects.equals(epdPqd.getOtherName(), "pst") || Objects.equals(epdPqd.getOtherName(), "fluc")) {
+                        List<Instant> timeInstants = getTimeInstants(trendDataQueryParam.getSearchBeginTime(), trendDataQueryParam.getSearchEndTime(), 10, ChronoUnit.MINUTES, DEFAULT_ZONE);
+                        collect1 = collect1.stream()
+                                .filter(vo -> timeInstants.contains(vo.getTime()))
+                                .collect(Collectors.toList());
+                    }
                     result.addAll(collect1);
                 }
             }

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

@@ -4,12 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.csdevice.api.CsCommTerminalFeignClient;
+import com.njcn.csdevice.api.CsMarketDataFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
@@ -20,7 +23,7 @@ import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
-import com.njcn.csharmonic.pojo.po.PqSensitiveUser;
+import com.njcn.device.biz.pojo.po.PqSensitiveUser;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
@@ -66,12 +69,15 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     private final CsDeviceUserPOMapper csDeviceUserPOMapper;
     private final PqSensitiveUserFeignClient pqSensitiveUserFeignClient;
     private final UserFeignClient userFeignClient;
+    private final ICsUserPinsService csUserPinsService;
+    private final CsCommTerminalFeignClient csCommTerminalFeignClient;
+    private final CsMarketDataFeignClient csMarketDataFeignClient;
 
 
     @Override
     public List<CsLedgerVO> getLedgerTree() {
         List<CsLedgerVO> list = new ArrayList<>();
-        List<CsLedgerVO> engineeringList = getLineTree();
+        List<CsLedgerVO> engineeringList = getLineTree(null);
         CsLedgerVO vo = new CsLedgerVO();
         vo.setId("9999999");
         vo.setLevel(0);
@@ -84,7 +90,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     }
 
     @Override
-    public List<CsLedgerVO> getLineTree() {
+    public List<CsLedgerVO> getLineTree(String type) {
         List<CsLedgerVO> engineeringList;
         List<CsLedgerVO> allList = this.baseMapper.getAll();
         /*获取用户工程，设备信息过滤*/
@@ -92,6 +98,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> device = roleEngineerDevService.getDevice();
         //区分治理装置和云前置装置
         List<String> zhiLianDevice = new ArrayList<>();
+        List<String> portableDevice = new ArrayList<>();
         List<String> cldDevice = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(device)) {
             List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
@@ -111,6 +118,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                             .map(CsEquipmentDeliveryPO::getId)
                             .forEach(zhiLianDevice::add)
                     );
+            DictTreeVO vo3 = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData();
+            Optional.ofNullable(vo3)
+                    .map(DictTreeVO::getId)
+                    .ifPresent(id -> csEquipmentDeliveryPOS.stream()
+                            .filter(item -> Objects.equals(item.getDevType(), id))
+                            .map(CsEquipmentDeliveryPO::getId)
+                            .forEach(portableDevice::add)
+                    );
         }
         engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
@@ -132,6 +147,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -145,6 +161,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -205,28 +222,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
 
-        //根据当前用户获取便携式设备
+        List<CsLedgerVO> ledger = allList.stream().filter(obj -> portableDevice.contains(obj.getId())).collect(Collectors.toList());
-        List<CsLedgerVO> ledger;
-        String role = RequestUtil.getUserRole();
-        List<String> roles = JSONArray.parseArray(role, String.class);
-        if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){
-            ledger = allList.stream()
-                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-                    .collect(Collectors.toList());
-        } else {
-            LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId, RequestUtil.getUserIndex());
-            List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
-            List<String> result = new ArrayList<>();
-            if (CollectionUtil.isNotEmpty(list1)) {
-                result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
-            }
-            //针对未启用的装置判断
-            List<String> finalResult = result;
-            ledger = allList.stream()
-                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
-                    .collect(Collectors.toList());
-        }
         Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
                 .collect(Collectors.toMap(
                         CsLedgerVO::getId,
@@ -242,6 +238,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     c.setType("device");
                     c.setName(po.getName());
                     c.setSort(po.getSort());
+                    c.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
                 .collect(Collectors.toList());
@@ -266,18 +263,237 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         cld.setChildren(engineeringList2);
 
         List<CsLedgerVO> tree = new ArrayList<>();
-        if (CollUtil.isNotEmpty(portables)) {
+        //获取置顶的工程
-            tree.add(portable);
+        List<CsUserPins> list = csUserPinsService.getPinToTopList();
-        }
+        if (Objects.equals(type,"engineering")) {
-        if (CollUtil.isNotEmpty(deviceList)) {
+
-            tree.add(government);
+            Map<String, CsLedgerVO> engineeringMap = new HashMap<>();
-        }
+
-        if (CollUtil.isNotEmpty(cldDeviceList)) {
+            engineeringList1.forEach(eng -> {
-            tree.add(cld);
+                CsLedgerVO existingEng = engineeringMap.get(eng.getId());
+                if (existingEng == null) {
+                    engineeringMap.put(eng.getId(), eng);
+                } else {
+                    List<CsLedgerVO> mergedChildren = mergeProjectList(existingEng.getChildren(), eng.getChildren());
+                    existingEng.setChildren(mergedChildren);
+                }
+            });
+
+            engineeringList2.forEach(eng -> {
+                CsLedgerVO existingEng = engineeringMap.get(eng.getId());
+                if (existingEng == null) {
+                    engineeringMap.put(eng.getId(), eng);
+                } else {
+                    List<CsLedgerVO> mergedChildren = mergeProjectList(existingEng.getChildren(), eng.getChildren());
+                    existingEng.setChildren(mergedChildren);
+                }
+            });
+
+            tree.addAll(new ArrayList<>(engineeringMap.values()));
+
+            String id = IdUtil.simpleUUID();
+            CsLedgerVO portable1 = new CsLedgerVO();
+            portable1.setLevel(0);
+            portable1.setName("便携式工程");
+            portable1.setPid("0");
+            portable1.setId(id);
+
+            CsLedgerVO portable2 = new CsLedgerVO();
+            portable2.setLevel(1);
+            portable2.setName("便携式项目");
+            portable2.setPid(id);
+            portable2.setId(IdUtil.simpleUUID());
+            portable2.setChildren(portables);
+
+            portable1.setChildren(Collections.singletonList(portable2));
+            tree.add(portable1);
+
+            if (CollectionUtil.isNotEmpty(list)) {
+                csUserPinsService.channelTree(list, tree, 4);
+            }
+        } else {
+            //按设备类型统计
+            if (CollUtil.isNotEmpty(portables)) {
+                tree.add(portable);
+            }
+            if (CollUtil.isNotEmpty(deviceList)) {
+                tree.add(government);
+            }
+            if (CollUtil.isNotEmpty(cldDeviceList)) {
+                tree.add(cld);
+            }
+
+            if (CollectionUtil.isNotEmpty(list)) {
+                csUserPinsService.channelTree(list, tree, 5);
+            }
         }
         return tree;
     }
 
+    @Override
+    public List<CsLedgerVO> appLineTree() {
+        //根据用户获取监测点
+        List<String> lineIds = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
+        List<String> engineeringIds = roleEngineerDevService.getRoleengineer();
+
+        if (CollectionUtil.isEmpty(lineIds) && CollectionUtil.isEmpty(engineeringIds)) {
+            return Collections.emptyList();
+        }
+
+        //获取所有台账数据
+        List<CsLedgerVO> allList = this.baseMapper.getAll();
+        if (CollectionUtil.isEmpty(allList)) {
+            return Collections.emptyList();
+        }
+
+        Set<String> resultEngineeringIds = new HashSet<>();
+
+        //1. 反推：从监测点向上找到所有相关的工程
+        if (CollectionUtil.isNotEmpty(lineIds)) {
+            //过滤出监测点数据 (level=3)
+            List<CsLedgerVO> lineList = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.LINE_LEVEL.getCode()))
+                    .filter(item -> lineIds.contains(item.getId()))
+                    .collect(Collectors.toList());
+
+            //从监测点向上追溯到工程
+            lineList.forEach(line -> {
+                String[] pids = line.getPids().split(",");
+                //根据层级结构，工程 ID 在 pids 的第一个位置（索引为 1，因为索引 0 是"0"）
+                if (pids.length > LineBaseEnum.ENGINEERING_LEVEL.getCode() + 1) {
+                    String engineeringId = pids[LineBaseEnum.ENGINEERING_LEVEL.getCode() + 1];
+                    resultEngineeringIds.add(engineeringId);
+                }
+            });
+        }
+
+        //2. 正推：添加用户已有的工程 ID
+        if (CollectionUtil.isNotEmpty(engineeringIds)) {
+            resultEngineeringIds.addAll(engineeringIds);
+        }
+
+        if (CollectionUtil.isEmpty(resultEngineeringIds)) {
+            return Collections.emptyList();
+        }
+
+        //获取所有层级数据并排序
+        //监测点数据
+        List<CsLedgerVO> lineList = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.LINE_LEVEL.getCode()))
+                .filter(item -> lineIds.contains(item.getId()))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        //设备数据
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.DEVICE_LEVEL.getCode()))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        //项目数据
+        List<CsLedgerVO> projectList = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.PROJECT_LEVEL.getCode()))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        //工程数据，过滤掉名字是"便携式工程"的数据
+        List<CsLedgerVO> engineeringList = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.ENGINEERING_LEVEL.getCode()))
+                .filter(item -> resultEngineeringIds.contains(item.getId()))
+                .filter(item -> !Objects.equals(item.getName(), "便携式工程"))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        //构建设备与监测点的关系
+        deviceList.forEach(device -> {
+            List<CsLedgerVO> children = lineList.stream()
+                    .filter(line -> Objects.equals(line.getPid(), device.getId()))
+                    .collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(children)) {
+                device.setChildren(children);
+            }
+        });
+
+        //构建项目与设备的关系
+        projectList.forEach(project -> {
+            List<CsLedgerVO> children = deviceList.stream()
+                    .filter(device -> Objects.equals(device.getPid(), project.getId()))
+                    .collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(children)) {
+                project.setChildren(children);
+            }
+        });
+
+        //构建工程与项目的关系
+        engineeringList.forEach(engineering -> {
+            List<CsLedgerVO> children = projectList.stream()
+                    .filter(project -> Objects.equals(project.getPid(), engineering.getId()))
+                    .collect(Collectors.toList());
+            //工程下面可以没有项目，所以即使 children 为空也要保留
+            engineering.setChildren(children);
+        });
+
+        return engineeringList;
+    }
+
+    /**
+     * 合并两个项目列表，根据项目 ID 去重并合并子节点
+     */
+    private List<CsLedgerVO> mergeProjectList(List<CsLedgerVO> list1, List<CsLedgerVO> list2) {
+        if (CollectionUtil.isEmpty(list1)) {
+            return list2 != null ? new ArrayList<>(list2) : new ArrayList<>();
+        }
+        if (CollectionUtil.isEmpty(list2)) {
+            return new ArrayList<>(list1);
+        }
+
+        Map<String, CsLedgerVO> projectMap = new HashMap<>();
+
+        list1.forEach(project -> {
+            projectMap.put(project.getId(), cloneProject(project));
+        });
+
+        list2.forEach(project -> {
+            CsLedgerVO existingProject = projectMap.get(project.getId());
+            if (existingProject == null) {
+                projectMap.put(project.getId(), cloneProject(project));
+            } else {
+                List<CsLedgerVO> mergedDevices = new ArrayList<>();
+                if (existingProject.getChildren() != null) {
+                    mergedDevices.addAll(existingProject.getChildren());
+                }
+                if (project.getChildren() != null) {
+                    mergedDevices.addAll(project.getChildren());
+                }
+                existingProject.setChildren(mergedDevices);
+            }
+        });
+
+        return new ArrayList<>(projectMap.values());
+    }
+
+    /**
+     * 克隆项目对象，避免引用问题
+     */
+    private CsLedgerVO cloneProject(CsLedgerVO project) {
+        CsLedgerVO cloned = new CsLedgerVO();
+        cloned.setId(project.getId());
+        cloned.setPid(project.getPid());
+        cloned.setLevel(project.getLevel());
+        cloned.setName(project.getName());
+        cloned.setType(project.getType());
+        cloned.setComFlag(project.getComFlag());
+        cloned.setNDId(project.getNDId());
+        cloned.setProcess(project.getProcess());
+        cloned.setLineType(project.getLineType());
+        cloned.setConType(project.getConType());
+        cloned.setSort(project.getSort());
+        if (project.getChildren() != null) {
+            cloned.setChildren(new ArrayList<>(project.getChildren()));
+        }
+        return cloned;
+    }
+
     //剔除未接入的设备(根据status判断不太稳,所有这里直接判断该设备有没有对应的模板指标)
     private void checkDevSetData(List<CsLedgerVO> ledgerVOS) {
         Iterator<CsLedgerVO> iterator = ledgerVOS.iterator();
@@ -308,7 +524,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
 
     @Override
-    public List<CsLedgerVO> getDeviceTree() {
+    public List<CsLedgerVO> getDeviceTree(String type) {
         List<CsLedgerVO> engineeringList;
         List<CsLedgerVO> allList = this.baseMapper.getAll();
         /*获取用户工程，设备信息过滤*/
@@ -316,6 +532,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> device = roleEngineerDevService.getDevice();
 
         List<String> zhiLianDevice = new ArrayList<>();
+        List<String> portableDevice = new ArrayList<>();
         List<String> cldDevice = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(device)) {
             List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
@@ -335,6 +552,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                             .map(CsEquipmentDeliveryPO::getId)
                             .forEach(zhiLianDevice::add)
                     );
+            DictTreeVO vo3 = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData();
+            Optional.ofNullable(vo3)
+                    .map(DictTreeVO::getId)
+                    .ifPresent(id -> csEquipmentDeliveryPOS.stream()
+                            .filter(item -> Objects.equals(item.getDevType(), id))
+                            .map(CsEquipmentDeliveryPO::getId)
+                            .forEach(portableDevice::add)
+                    );
         }
 
         engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
@@ -358,6 +583,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -385,6 +611,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -410,28 +637,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
 
-        List<CsLedgerVO> ledger;
+        List<CsLedgerVO> ledger = allList.stream().filter(obj -> portableDevice.contains(obj.getId())).collect(Collectors.toList());
-        String role = RequestUtil.getUserRole();
-        List<String> roles = JSONArray.parseArray(role, String.class);
-        if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){
-            ledger = allList.stream()
-                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-                    .collect(Collectors.toList());
-        } else {
-            LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId, RequestUtil.getUserIndex());
-            List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
-            List<String> result = new ArrayList<>();
-            if (CollectionUtil.isNotEmpty(list1)) {
-                result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
-            }
-            //针对未启用的装置判断
-            List<String> finalResult = result;
-            ledger = allList.stream()
-                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
-                    .collect(Collectors.toList());
-        }
-
         Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
                 .collect(Collectors.toMap(
                         CsLedgerVO::getId,
@@ -470,14 +676,69 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         cld.setChildren(engineeringList2);
 
         List<CsLedgerVO> tree = new ArrayList<>();
-        if (CollUtil.isNotEmpty(portables)) {
+        List<CsUserPins> list = csUserPinsService.getPinToTopList();
-            tree.add(portable);
+        if (Objects.equals(type,"engineering")) {
+
+            Map<String, CsLedgerVO> engineeringMap = new HashMap<>();
+
+            engineeringList1.forEach(eng -> {
+                CsLedgerVO existingEng = engineeringMap.get(eng.getId());
+                if (existingEng == null) {
+                    engineeringMap.put(eng.getId(), eng);
+                } else {
+                    List<CsLedgerVO> mergedChildren = mergeProjectList(existingEng.getChildren(), eng.getChildren());
+                    existingEng.setChildren(mergedChildren);
+                }
+            });
+
+            engineeringList2.forEach(eng -> {
+                CsLedgerVO existingEng = engineeringMap.get(eng.getId());
+                if (existingEng == null) {
+                    engineeringMap.put(eng.getId(), eng);
+                } else {
+                    List<CsLedgerVO> mergedChildren = mergeProjectList(existingEng.getChildren(), eng.getChildren());
+                    existingEng.setChildren(mergedChildren);
+                }
+            });
+
+            tree.addAll(new ArrayList<>(engineeringMap.values()));
+
+            String id = IdUtil.simpleUUID();
+            CsLedgerVO portable1 = new CsLedgerVO();
+            portable1.setLevel(0);
+            portable1.setName("便携式工程");
+            portable1.setPid("0");
+            portable1.setId(id);
+
+            CsLedgerVO portable2 = new CsLedgerVO();
+            portable2.setLevel(1);
+            portable2.setName("便携式项目");
+            portable2.setPid(id);
+            portable2.setId(IdUtil.simpleUUID());
+            portable2.setChildren(portables);
+
+            List<CsLedgerVO> portable2List = new ArrayList<>();
+            portable2List.add(portable2);
+            portable1.setChildren(portable2List);
+            tree.add(portable1);
+
+            if (CollectionUtil.isNotEmpty(list)) {
+                csUserPinsService.channelTree(list, tree, 4);
+            }
+        } else {
+            //按设备类型统计
+            if (CollUtil.isNotEmpty(portables)) {
+                tree.add(portable);
+            }
+            if (CollUtil.isNotEmpty(deviceList)) {
+                tree.add(government);
+            }
+            if (CollUtil.isNotEmpty(cldDevList)) {
+                tree.add(cld);
+            }
         }
-        if (CollUtil.isNotEmpty(deviceList)) {
+        if (CollectionUtil.isNotEmpty(list)) {
-            tree.add(government);
+            csUserPinsService.channelTree(list, tree, 5);
-        }
-        if (CollUtil.isNotEmpty(cldDevList)) {
-            tree.add(cld);
         }
         return tree;
     }
@@ -574,10 +835,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     public DevDetailDTO queryDevDetail(String devId) {
         DevDetailDTO device = new DevDetailDTO();
         CsLedger dev = this.findDataById(devId);
+        //获取设备mac
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(devId);
+
         //如果是便携式设备，pid为0,项目，工程都设置为/
         if (Objects.equals(dev.getPid(), "0")) {
             device.setEquipmentName(dev.getName());
             device.setEquipmentId(devId);
+            device.setDevMac(po.getMac());
             device.setProjectId("/");
             device.setProjectName("/");
             device.setEngineeringid("/");
@@ -585,15 +850,18 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         } else {
             device.setEquipmentName(dev.getName());
             device.setEquipmentId(devId);
+            device.setDevMac(po.getMac());
             CsLedger project = this.findDataById(dev.getPid());
-            device.setProjectId(project.getId());
+            if (ObjectUtil.isNotNull(project)) {
-            device.setProjectName(project.getName());
+                device.setProjectId(project.getId());
-            CsLedger engineer = this.findDataById(project.getPid());
+                device.setProjectName(project.getName());
-            device.setEngineeringid(engineer.getId());
+                CsLedger engineer = this.findDataById(project.getPid());
-            device.setEngineeringName(engineer.getName());
+                if (ObjectUtil.isNotNull(engineer)) {
+                    device.setEngineeringid(engineer.getId());
+                    device.setEngineeringName(engineer.getName());
+                }
+            }
         }
-
-
         return device;
     }
     @Override
@@ -784,78 +1052,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         return tree;
     }
 
-//    @Override
-//    public List<CsLedgerVO> getztProjectTree() {
-//        List<CsLedgerVO> engineeringList;
-//        List<CsLedgerVO> allList = this.baseMapper.getAll();
-//        /*获取用户工程，设备信息过滤*/
-//        List<String> roleengineer = roleEngineerDevService.getRoleengineer();
-//        List<String> device = roleEngineerDevService.getDevice();
-//        engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
-//        List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//
-//        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0")).
-//                peek(
-//                        temp -> {
-//                            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
-//                            temp.setComFlag(po.getRunStatus());
-//                            temp.setNDId(po.getNdid());
-//                            temp.setType("device");
-//                        }
-//                ).
-//                sorted(Comparator.comparing(CsLedgerVO::getSort))
-//                .collect(Collectors.toList());
-//        checkDevSetData(deviceList);
-//        projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
-//        engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
-//
-//        //获取便携式项目数
-//        CsLedgerVO portable = new CsLedgerVO();
-//        portable.setLevel(0);
-//        portable.setName(DataParam.PORTABLE_SYSTEM);
-//        portable.setPid("0");
-//        portable.setId(IdUtil.simpleUUID());
-//
-//        CsLedgerVO project = new CsLedgerVO();
-//        project.setLevel(1);
-//        project.setName(DataParam.WIRELESS_PROJECT);
-//        project.setPid("0");
-//        project.setId(DataParam.WIRELESS_PROJECT_ID);
-//
-//        List<CsLedgerVO> portables = allList.stream().filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")).collect(Collectors.toList());
-//        checkDevSetData(portables);
-//        for (CsLedgerVO c : portables) {
-//            c.setPid(project.getId());
-//            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
-//            c.setComFlag(po.getRunStatus());
-//            c.setNDId(po.getNdid());
-//            c.setType("device");
-//        }
-//        project.setChildren(portables);
-//
-//        List<CsLedgerVO> wxProjectList = new ArrayList<>();
-//        wxProjectList.add(project);
-//
-//        portable.setChildren(wxProjectList);
-//
-//
-//        CsLedgerVO government = new CsLedgerVO();
-//        government.setLevel(0);
-//        government.setName(DataParam.GOVERNANCE_SYSTEM);
-//        government.setPid("0");
-//        government.setId(IdUtil.simpleUUID());
-//        government.setChildren(engineeringList);
-//        List<CsLedgerVO> tree = new ArrayList<>();
-//
-//        if (CollUtil.isNotEmpty(portables)) {
-//            tree.add(portable);
-//        }
-//        if (CollUtil.isNotEmpty(deviceList)) {
-//            tree.add(government);
-//        }
-//
-//        return tree;
-//    }
 
     @Override
     public List<CsLedgerVO> objTree() {
@@ -968,96 +1164,111 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
     @Override
     public CsLedgerVO cldTree() {
-
-        List<CsLedgerVO> engineerTree = new ArrayList<>();
-        List<CsLedgerVO> projectTree = new ArrayList<>();
-        List<CsLedgerVO> deviceTree = new ArrayList<>();
-        List<CsLedgerVO> lineTree = new ArrayList<>();
-
         List<CsLedgerVO> allList = this.baseMapper.getAll();
-        if (CollectionUtil.isNotEmpty(allList)) {
+        if (CollectionUtil.isEmpty(allList)) {
-            //工程集合
+            CsLedgerVO government = new CsLedgerVO();
-            List<CsLedgerVO> tree1 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).collect(Collectors.toList());
+            government.setLevel(-1);
-            //项目集合
+            government.setName("台账树");
-            List<CsLedgerVO> tree2 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
+            government.setPid("0");
-            //设备集合
+            government.setId(IdUtil.simpleUUID());
-            List<CsLedgerVO> tree3 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).collect(Collectors.toList());
+            government.setChildren(new ArrayList<>());
-            //监测点集合
+            return government;
-            List<CsLedgerVO> tree4 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).collect(Collectors.toList());
+        }
 
-            //筛选出云前置设备
+        List<CsLedgerVO> engineeringList = allList.stream()
-            if (CollectionUtil.isNotEmpty(tree3)) {
+                .filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode()))
-                Set<String> list1 = new HashSet<>();
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                List<String> devList = tree3.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
+                .collect(Collectors.toList());
-                List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devList);
-                Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
-                DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
 
-                //list1是 cld设备
+        List<CsLedgerVO> projectList = allList.stream()
-                devs.forEach(item -> {
+                .filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()))
-                    if (item.getDevType().equals(vo1.getId())) {
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                        list1.add(item.getId());
+                .collect(Collectors.toList());
-                    }
-                });
-                //list2是 非cld设备
-                Set<String> list2 = devList.stream().filter(item -> !list1.contains(item)).collect(Collectors.toSet());
-                List<CsLedgerVO> tree5 = tree3.stream().filter(vo -> list2.contains(vo.getId())).collect(Collectors.toList());
-                Set<String> list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
-                projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList());
 
-                List<CsLedgerVO> tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList());
+        List<CsLedgerVO> deviceList = allList.stream()
-                Set<String> proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
+                .filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode()))
-                engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList());
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
 
-                if (CollectionUtil.isNotEmpty(list1)) {
+        List<CsLedgerVO> lineList = allList.stream()
-                    deviceTree = tree3.stream()
+                .filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
-                            .filter(vo -> list1.contains(vo.getId()))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                            .peek(item -> {
+                .collect(Collectors.toList());
-                                CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
-                                if (dev != null) {
-                                    item.setComFlag(dev.getRunStatus());
-                                }
-                            })
-                            .collect(Collectors.toList());
 
-                    lineTree = tree4.stream()
+        if (CollectionUtil.isEmpty(deviceList)) {
-                            .filter(vo -> list1.contains(vo.getPid()))
+            CsLedgerVO government = new CsLedgerVO();
-                            .peek(item -> {
+            government.setLevel(-1);
-                                CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
+            government.setName("台账树");
-                                if (dev != null) {
+            government.setPid("0");
-                                    item.setComFlag(dev.getRunStatus());
+            government.setId(IdUtil.simpleUUID());
-                                }
+            government.setChildren(engineeringList);
-                            })
+            return government;
-                            .collect(Collectors.toList());
+        }
+
+        List<String> devIds = deviceList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
+        List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
+        Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
+        Map<String, String> lineDevMap = lineList.stream().collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
+
+        Set<String> cldDevIds = devs.stream()
+                .map(CsEquipmentDeliveryPO::getId)
+                .collect(Collectors.toSet());
+
+        Map<String, List<CsLedgerVO>> projectToDeviceMap = deviceList.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+
+        Map<String, List<CsLedgerVO>> deviceToLineMap = lineList.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+
+        deviceList.forEach(device -> {
+            CsEquipmentDeliveryPO dev = devsMap.get(device.getId());
+            if (dev != null) {
+                device.setComFlag(dev.getRunStatus());
+                device.setDevConType(dev.getDevAccessMethod());
+            }
+        });
+
+        lineList.forEach(line -> {
+            String devId = lineDevMap.get(line.getId());
+            if (devId != null) {
+                CsEquipmentDeliveryPO dev = devsMap.get(devId);
+                if (dev != null) {
+                    line.setComFlag(dev.getRunStatus());
                 }
             }
-        }
+        });
 
-        if (CollectionUtil.isNotEmpty(deviceTree)) {
+        engineeringList.forEach(engineering -> {
-            List<CsLedgerVO> finalLineTree = lineTree;
+            List<CsLedgerVO> sortedProjects = projectList.stream()
-            deviceTree.forEach(item -> {
+                    .filter(project -> project.getPid().equals(engineering.getId()))
-                item.setChildren(getChildren(item, finalLineTree));
+                    .peek(project -> {
-            });
+                        List<CsLedgerVO> projectDevices = projectToDeviceMap.getOrDefault(project.getId(), new ArrayList<>());
-        }
+                        if (CollectionUtil.isNotEmpty(projectDevices)) {
-        if (CollectionUtil.isNotEmpty(projectTree)) {
+                            List<CsLedgerVO> sortedDevices = projectDevices.stream()
-            List<CsLedgerVO> finalDeviceTree = deviceTree;
+                                    .filter(device -> cldDevIds.contains(device.getId()))
-            projectTree.forEach(item -> {
+                                    .peek(device -> {
-                item.setChildren(getChildren(item, finalDeviceTree));
+                                        List<CsLedgerVO> sortedLines = deviceToLineMap.getOrDefault(device.getId(), new ArrayList<>())
-            });
+                                                .stream()
-        }
+                                                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-        if (CollectionUtil.isNotEmpty(engineerTree)) {
+                                                .collect(Collectors.toList());
-            List<CsLedgerVO> finalProjectTree = projectTree;
+                                        device.setChildren(sortedLines);
-            engineerTree.forEach(item -> {
+                                    })
-                item.setChildren(getChildren(item, finalProjectTree));
+                                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
-            });
+                                    .collect(Collectors.toList());
-        }
+                            project.setChildren(sortedDevices);
+                        }
+                    })
+                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                    .collect(Collectors.toList());
+            engineering.setChildren(sortedProjects);
+        });
 
         CsLedgerVO government = new CsLedgerVO();
-        government.setLevel(0);
+        government.setLevel(-1);
-        government.setName(DataParam.cldDev);
+        government.setName("台账树");
         government.setPid("0");
         government.setId(IdUtil.simpleUUID());
-        government.setChildren(engineerTree);
+        government.setChildren(engineeringList);
 
         return government;
     }
@@ -1084,9 +1295,19 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         if (CollectionUtil.isNotEmpty(enginingeringIds)) {
             List<CsLedger> engineer = this.listByIds(enginingeringIds);
             engineer.forEach(item -> {
+                List<String> devNames = new ArrayList<>();
+                List<String> devIds = new ArrayList<>();
                 DevDetailDTO detail = new DevDetailDTO();
                 detail.setEngineeringid(item.getId());
                 detail.setEngineeringName(item.getName());
+                ledgers.forEach(item2->{
+                    if (item2.getPids().contains(item.getId())) {
+                        devIds.add(item2.getId());
+                        devNames.add(item2.getName());
+                    }
+                });
+                detail.setEquipmentId(String.join(",", devIds));
+                detail.setEquipmentName(String.join(",", devNames));
                 details.add(detail);
             });
         }
@@ -1095,24 +1316,87 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
     @Override
     public List<DevDetailDTO> getDevInfoByEngineerIds(List<String> list) {
+        // 参数校验，确保 list 不为空
+        if (CollUtil.isEmpty(list)) {
+            return new ArrayList<>();
+        }
+
         List<DevDetailDTO> details = new ArrayList<>();
+
+        // 工程
+        LambdaQueryWrapper<CsLedger> queryWrapper0 = new LambdaQueryWrapper<>();
+        queryWrapper0.in(CsLedger::getId, list);
+        List<CsLedger> engineering = this.list(queryWrapper0);
+        if (CollUtil.isEmpty(engineering)) {
+            return details;
+        }
+        Map<String, CsLedger> engineeringMap = engineering.stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
+
+        // 项目
         LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(CsLedger::getPid, list);
         List<CsLedger> project = this.list(queryWrapper);
-        //工程id
+        if (CollUtil.isEmpty(project)) {
+            return details;
+        }
+        Map<String, CsLedger> projectMap = project.stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
+
+        // 设备
         List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
-        LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+        if (CollUtil.isNotEmpty(projectIds)) {
-        queryWrapper2.in(CsLedger::getPid, projectIds);
+            LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
-        List<CsLedger> dev = this.list(queryWrapper2);
+            queryWrapper2.in(CsLedger::getPid, projectIds);
-        dev.forEach(item -> {
+            List<CsLedger> dev = this.list(queryWrapper2);
-            DevDetailDTO detail = new DevDetailDTO();
+
-            detail.setEquipmentName(item.getName());
+            if (CollUtil.isNotEmpty(dev)) {
-            detail.setEquipmentId(item.getId());
+                List<String> devIds = dev.stream().map(CsLedger::getId).collect(Collectors.toList());
-            details.add(detail);
+
-        });
+                //监测点
+                LambdaQueryWrapper<CsLedger> queryWrapper3 = new LambdaQueryWrapper<>();
+                queryWrapper3.in(CsLedger::getPid, devIds);
+                List<CsLedger> line = this.list(queryWrapper3);
+                Map<String,List<CsLedger>> lineMap = line.stream().collect(Collectors.groupingBy(CsLedger::getPid));
+
+
+                List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
+                Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
+
+                dev.forEach(item -> {
+                    DevDetailDTO detail = new DevDetailDTO();
+                    //监测点
+                    List<CsLedger> lines = lineMap.get(item.getId());
+                    if (CollUtil.isNotEmpty(lines)) {
+                        detail.setLineList(lines.stream().map(CsLedger::getId).collect(Collectors.toList()));
+                    }
+
+                    detail.setEquipmentName(item.getName());
+                    detail.setEquipmentId(item.getId());
+
+                    CsLedger csLedger = projectMap.get(item.getPid());
+                    if (csLedger != null) {
+                        detail.setProjectId(csLedger.getId());
+                        detail.setProjectName(csLedger.getName());
+
+                        CsLedger csLedger1 = engineeringMap.get(csLedger.getPid());
+                        if (csLedger1 != null) {
+                            detail.setEngineeringid(csLedger1.getId());
+                            detail.setEngineeringName(csLedger1.getName());
+                        }
+                    }
+
+                    CsEquipmentDeliveryPO devInfo = devsMap.get(item.getId());
+                    if (devInfo != null) {
+                        detail.setRunStatus(devInfo.getRunStatus());
+                    }
+
+                    details.add(detail);
+                });
+            }
+        }
         return details;
     }
 
+
     @Override
     public List<DevDetailDTO> getEngineeringHaveDevs(List<String> list) {
         List<DevDetailDTO> result = new ArrayList<>();
@@ -1120,15 +1404,17 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsLedger::getPid, item);
             List<CsLedger> project = this.list(queryWrapper);
-            //工程id
+            if (CollectionUtil.isNotEmpty(project)) {
-            List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
+                //项目id
-            LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
+                List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
-            queryWrapper2.in(CsLedger::getPid, projectIds);
+                LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
-            List<CsLedger> dev = this.list(queryWrapper2);
+                queryWrapper2.in(CsLedger::getPid, projectIds);
-            if (CollectionUtil.isNotEmpty(dev)) {
+                List<CsLedger> dev = this.list(queryWrapper2);
-                DevDetailDTO dto = new DevDetailDTO();
+                if (CollectionUtil.isNotEmpty(dev)) {
-                dto.setEngineeringid(item);
+                    DevDetailDTO dto = new DevDetailDTO();
-                result.add(dto);
+                    dto.setEngineeringid(item);
+                    result.add(dto);
+                }
             }
         });
         return result;

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

@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.api.CsLineLatestDataFeignClient;
-import com.njcn.access.pojo.po.CsLineLatestData;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -25,7 +25,7 @@ import com.njcn.csdevice.service.CsDevModelService;
 import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsDataSetService;
 import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
-import com.njcn.csharmonic.pojo.po.PqSensitiveUser;
+import com.njcn.device.biz.pojo.po.PqSensitiveUser;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.DicDataFeignClient;
@@ -44,7 +44,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -155,8 +154,8 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         List<CsDataSet> list = csDataSetService.findDataSetByModelId(po1.getId());
         if (CollectionUtil.isNotEmpty(list)) {
             po.setDataSetId(list.get(0).getId());
-            po.setClDid(list.get(0).getClDev());
         }
+        po.setClDid(param.getLineNo());
         //监测位置
         //DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.GRID_SIDE.getCode()).getData();
         po.setPosition(param.getPosition());
@@ -208,7 +207,9 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                 .set(CsLinePO::getMonitorObj,param.getMonitorObj())
                 .set(CsLinePO::getGovern,param.getGovern())
                 .set(CsLinePO::getPosition,param.getPosition())
-                .set(CsLinePO::getMonitorUser,param.getMonitorUser());
+                .set(CsLinePO::getMonitorUser,param.getMonitorUser())
+                .set(CsLinePO::getLineLogLevel,param.getLineLogLevel())
+                .set(CsLinePO::getIsImportant,param.getIsImportant());
         this.update(lambdaUpdateWrapper);
 
         //修改台账树中监测点的名称
@@ -270,11 +271,16 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public List<CsLineDTO> getAllLineDetail() {
+        return this.baseMapper.findLineList();
+    }
+
     @Override
     public List<CsLinePO> getSimpleLine() {
         List<String> devIds = commGetDevIds(RequestUtil.getUserIndex());
         if(CollUtil.isNotEmpty(devIds)){
-            List<CsLinePO> poList = this.lambdaQuery().select(CsLinePO::getLineId,CsLinePO::getName,CsLinePO::getMonitorUser).in(CsLinePO::getDeviceId,devIds)
+            List<CsLinePO> poList = this.lambdaQuery().in(CsLinePO::getDeviceId,devIds)
                     .eq(CsLinePO::getStatus, DataStateEnum.ENABLE.getCode()).list();
             return poList;
         }else {
@@ -325,6 +331,9 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             List<String> lineList = poList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
             lambdaQueryWrapper.in(CsLinePO::getLineId, lineList);
         }
+        if (ObjectUtil.isNotNull(param.getSearchValue())) {
+            lambdaQueryWrapper.and(par -> par.like(CsLinePO::getName, param.getSearchValue()));
+        }
         Page<CsLinePO> linePage = this.page(new Page<>(param.getPageNum(), param.getPageSize()), lambdaQueryWrapper);
         BeanUtil.copyProperties(linePage, result);
         List<CsLinePO> records = linePage.getRecords();
@@ -451,7 +460,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             lineDetailDataVO.setShortCapacity(Objects.isNull(csLinePO.getShortCircuitCapacity())?0.0f:csLinePO.getShortCircuitCapacity().floatValue());
             lineDetailDataVO.setStandardCapacity(Objects.isNull(csLinePO.getBasicCapacity())?0.0f:csLinePO.getBasicCapacity().floatValue());
             lineDetailDataVO.setTimeInterval(csLinePO.getLineInterval());
-
+            //获取监测点数据类型
+            CsDataSet dataSet = csDataSetService.getById(csLinePO.getDataSetId());
+            if (ObjectUtil.isNotNull(dataSet)) {
+                lineDetailDataVO.setDataLevel(dataSet.getDataLevel());
+            }
             return lineDetailDataVO;
         }
     }

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

@@ -1,11 +1,15 @@
 package com.njcn.csdevice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.mapper.CsEngineeringMapper;
+import com.njcn.csdevice.mapper.CsMarketDataMapper;
 import com.njcn.csdevice.pojo.param.CsMarketDataParam;
 import com.njcn.csdevice.pojo.param.EngineerIdParam;
 import com.njcn.csdevice.pojo.po.CsEngineeringPO;
 import com.njcn.csdevice.pojo.po.CsLedger;
+import com.njcn.csdevice.pojo.po.CsMarketData;
 import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
 import com.njcn.csdevice.service.CsMarketDataService;
 import com.njcn.csdevice.service.ICsLedgerService;
@@ -13,16 +17,12 @@ import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.csdevice.pojo.po.CsMarketData;
-import com.njcn.csdevice.mapper.CsMarketDataMapper;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * 
  * Description:
@@ -79,7 +79,11 @@ public class CsMarketDataServiceImpl extends ServiceImpl<CsMarketDataMapper, CsM
     @Override
     public List<CsMarketDataVO> queryAllEnginner(String userId) {
         List<CsMarketDataVO> result = new ArrayList<>();
-        List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getState, 1).eq(CsLedger::getLevel, 0).list();
+        List<CsLedger> list = csLedgerService.lambdaQuery()
+                .eq(CsLedger::getState, 1)
+                .eq(CsLedger::getLevel, 0)
+                .ne(CsLedger::getName, "便携式工程")
+                .list();
         List<CsMarketDataVO> csMarketDataVOS = this.queryByUseId(userId);
         List<String> collect = csMarketDataVOS.stream().map(CsMarketDataVO::getEngineerId).collect(Collectors.toList());
         List<CsLedger> collect1 = list.stream().filter(temp -> !collect.contains(temp.getId())).collect(Collectors.toList());
@@ -115,4 +119,19 @@ public class CsMarketDataServiceImpl extends ServiceImpl<CsMarketDataMapper, CsM
         this.saveBatch(csMarketData,20);
         return true;
     }
+
+    @Override
+    public Boolean insertData(String userId, String engineeringId) {
+        LambdaQueryWrapper<CsMarketData> queryWrap = new LambdaQueryWrapper<>();
+        queryWrap.eq(CsMarketData::getUserId,userId);
+        queryWrap.eq(CsMarketData::getEngineerId,engineeringId);
+        CsMarketData csMarketData = this.getOne(queryWrap);
+        if (csMarketData == null) {
+            csMarketData = new CsMarketData();
+            csMarketData.setUserId(userId);
+            csMarketData.setEngineerId(engineeringId);
+            this.save(csMarketData);
+        }
+        return true;
+    }
 }

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

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