模块新增温度数据

1.优化界面描述显示;
2.新增测试项暂态事件

app-cloud/app-cloud-boot/pom.xml

@@ -112,7 +112,7 @@
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pqs-influx</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -0,0 +1,20 @@
+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.CsCommunicateFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/pqsCommunicate", fallbackFactory = CsCommunicateFeignClientFallbackFactory.class,contextId = "pqsCommunicate")
+
+public interface CsCommunicateFeignClient {
+
+    @PostMapping("/insertion")
+    HttpResult<String> insertion(@RequestBody PqsCommunicateDto pqsCommunicateDto);
+}

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

@@ -1,7 +1,11 @@
 package com.njcn.csdevice.api;
 
+import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.api.fallback.CsLedgerFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
@@ -39,4 +43,9 @@ public interface CsLedgerFeignClient {
     @PostMapping("/deviceTree")
     @ApiOperation("三层设备树(装置层)")
     HttpResult<List<CsLedgerVO>> getDeviceTree();
-    }
+
+    @PostMapping("/getAllLedger")
+    HttpResult<List<CsLedgerVO>> getAllLedger();
+
+
+}

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

@@ -6,6 +6,7 @@ import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 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;
@@ -18,7 +19,6 @@ import java.util.List;
 @FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csline", fallbackFactory = CsLineClientFallbackFactory.class,contextId = "csline")
 public interface CsLineFeignClient {
 
-
     @PostMapping("/queryLineById")
      HttpResult<List<CsLinePO>> queryLineById(@RequestParam("ids") List<String> ids );
 
@@ -36,4 +36,13 @@ public interface CsLineFeignClient {
 
     @PostMapping("/updateLine")
     HttpResult<String> updateLine(@RequestBody CsLineParam csLineParam);
+
+    @PostMapping("/updateIds")
+    HttpResult<Boolean> updateIds(@RequestBody @Validated CsLineParam csLineParam);
+
+    @PostMapping("/getById")
+    HttpResult<CsLinePO> getById(@RequestParam("lineId") String lineId);
+
+    @PostMapping("/getLinesByDevList")
+    HttpResult<List<CsLinePO>> getLinesByDevList(@RequestParam("ids") List<String> ids);
 }

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

@@ -5,7 +5,6 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.DataArrayFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.DataArrayParam;
 import com.njcn.csdevice.pojo.po.CsDataArray;
-import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,13 +21,14 @@ import java.util.List;
 public interface DataArrayFeignClient {
 
     @PostMapping("/getArrayBySet")
-    HttpResult<List<CsDataArray>> getArrayBySet(@RequestBody List<CsDataSet> setList);
+    HttpResult<List<CsDataArray>> getArrayBySet(@RequestParam("dataSet") String dataSet);
 
     @PostMapping("/getDataArray")
     HttpResult<List<DataArrayTreeVO>> getDataArray(@RequestBody List<String> dataSetList);
 
     @PostMapping("/getDataArrayById")
     HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name);
+
     @PostMapping("/getDataArrayByIds")
     HttpResult<List<CsDataArray>> getDataArrayByIds(@RequestParam("ids") List<String> ids);
 

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

@@ -1,10 +1,17 @@
 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.DataSetFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.vo.LineTargetVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,5 +38,13 @@ public interface DataSetFeignClient {
     @PostMapping("/getDataSetBySetIds")
     HttpResult<List<CsDataSet>> getDataSetBySetIds(@RequestBody List<String> lineIds);
 
+    @PostMapping("/getBaseDataSet")
+    HttpResult<CsDataSet> getBaseDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev);
+
+    @PostMapping("/getHarmonicDataSet")
+    HttpResult<CsDataSet> getHarmonicDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev,@RequestParam("target") Integer target);
+
+    @PostMapping("/getDataSetByIdx")
+    HttpResult<CsDataSet> getDataSetByIdx(@RequestParam("modelId") String modelId,@RequestParam("idx") Integer idx);
 
 }

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

@@ -58,4 +58,10 @@ public interface EquipmentFeignClient {
 
     @PostMapping("/getAll")
     HttpResult<List<CsEquipmentDeliveryPO>> getAll();
+
+    @PostMapping("/judgeDevModel")
+    HttpResult<Boolean> judgeDevModel(@RequestParam("nDid") String nDid);
+
+    @PostMapping("/getDevByLineId")
+    HttpResult<CsEquipmentDeliveryPO> getDevByLineId(@RequestParam("lineId") String lineId);
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/IntegrityFeignClient.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.IntegrityClientFallbackFactory;
+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 java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/rStatIntegrityD", fallbackFactory = IntegrityClientFallbackFactory.class,contextId = "rStatIntegrityD")
+public interface IntegrityFeignClient {
+
+    @PostMapping("/list")
+    HttpResult<List<RStatIntegrityD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/OnlineRateFeignClient.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.onlineRateClientFallbackFactory;
+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 java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/rStatOnlineRateD", fallbackFactory = onlineRateClientFallbackFactory.class,contextId = "rStatOnlineRateD")
+public interface OnlineRateFeignClient {
+
+    @PostMapping("/list")
+    HttpResult<List<RStatOnlineRateD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime")  String startTime, @RequestParam("endTime") String endTime);
+
+}

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

@@ -5,10 +5,13 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.WlRecordClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.RecordVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -41,4 +44,14 @@ public interface WlRecordFeignClient {
 
     @PostMapping("/updateTestRecord")
     HttpResult<Boolean> updateTestRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record);
+
+
+    @PostMapping("/dayDealNoEndTimeEvent")
+    void dayDealNoEndTimeEvent(@RequestParam("date") String date);
+
+    @GetMapping("/getWlAssByWlId")
+    HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId")String wlId);
+
+    @PostMapping("/findDevBaseDataByLineId")
+    HttpResult<List<RecordVo>> findDevBaseDataByLineId(@RequestBody @Validated WlRecordParam.lineRecord param);
 }

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

@@ -0,0 +1,40 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.CsCommunicateFeignClient;
+import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
+import com.njcn.csdevice.utils.CsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/4/10 20:09
+ */
+@Slf4j
+@Component
+public class CsCommunicateFeignClientFallbackFactory implements FallbackFactory<CsCommunicateFeignClient> {
+    @Override
+    public CsCommunicateFeignClient 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 CsCommunicateFeignClient() {
+            @Override
+            public HttpResult<String> insertion(PqsCommunicateDto pqsCommunicateDto) {
+                log.error("{}异常，降级处理，异常为：{}","新增记录",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -62,6 +62,12 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory<CsLed
                 log.error("{}异常，降级处理，异常为：{}","查询设备树",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<CsLedgerVO>> getAllLedger() {
+                log.error("{}异常，降级处理，异常为：{}","获取台账树所有数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -28,7 +28,6 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new CsLineFeignClient() {
 
-
             @Override
             public HttpResult<List<CsLinePO>> queryLineById(List<String> ids) {
                 log.error("{}异常，降级处理，异常为：{}","查询监测点详情异常",cause.toString());
@@ -63,6 +62,24 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
                 log.error("{}异常，降级处理，异常为：{}","更新监测点信息",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<Boolean> updateIds(CsLineParam csLineParam) {
+                log.error("{}异常，降级处理，异常为：{}","修改监测点模板id和数据集id",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsLinePO> getById(String lineId) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id获取监测点详情",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsLinePO>> getLinesByDevList(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","根据装置id集合获取监测点id集合",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -6,7 +6,6 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.DataArrayFeignClient;
 import com.njcn.csdevice.pojo.param.DataArrayParam;
 import com.njcn.csdevice.pojo.po.CsDataArray;
-import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.utils.CsDeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
@@ -36,7 +35,7 @@ public class DataArrayFeignClientFallbackFactory implements FallbackFactory<Data
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new DataArrayFeignClient() {
             @Override
-            public HttpResult<List<CsDataArray>> getArrayBySet(List<CsDataSet> setList) {
+            public HttpResult<List<CsDataArray>> getArrayBySet(String dataSet) {
                 log.error("{}异常，降级处理，异常为：{}","根据数据集获取详细数据失败",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -56,6 +56,24 @@ public class DataSetFeignClientFallbackFactory implements FallbackFactory<DataSe
                 log.error("{}异常，降级处理，异常为：{}","根据数据集ids获取数据集",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<CsDataSet> getBaseDataSet(String modelId, Integer clDev) {
+                log.error("{}异常，降级处理，异常为：{}","获取实时数据-基础数据集",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsDataSet> getHarmonicDataSet(String modelId, Integer clDev, Integer target) {
+                log.error("{}异常，降级处理，异常为：{}","获取实时数据-谐波数据集",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsDataSet> getDataSetByIdx(String modelId, Integer idx) {
+                log.error("{}异常，降级处理，异常为：{}","根据idx获取数据集数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -77,6 +77,18 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
                 log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<Boolean> judgeDevModel(String nDid) {
+                log.error("{}异常，降级处理，异常为：{}","判断设备型号",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsEquipmentDeliveryPO> getDevByLineId(String lineId) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id查询装置信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -0,0 +1,37 @@
+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.IntegrityFeignClient;
+import com.njcn.csdevice.pojo.po.RStatIntegrityD;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class IntegrityClientFallbackFactory implements FallbackFactory<IntegrityFeignClient> {
+    @Override
+    public IntegrityFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new IntegrityFeignClient() {
+
+            @Override
+            public HttpResult<List<RStatIntegrityD>> list(List<String> list, String startTime, String endTime) {
+                log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.WlRecordFeignClient;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.RecordVo;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -51,6 +52,24 @@ public class WlRecordClientFallbackFactory implements FallbackFactory<WlRecordFe
                 log.error("{}异常，降级处理，异常为：{}","修改测试项",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public void dayDealNoEndTimeEvent(String date) {
+                log.error("{}异常，降级处理，异常为：{}","每日处理没有结束时间的测试基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<WlRecord>> getWlAssByWlId(String wlId) {
+                log.error("{}异常，降级处理，异常为：{}","根据测试项id获取测试项详细条目",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<RecordVo>> findDevBaseDataByLineId(WlRecordParam.lineRecord param) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id查询装置基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

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

@@ -0,0 +1,37 @@
+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.OnlineRateFeignClient;
+import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class onlineRateClientFallbackFactory implements FallbackFactory<OnlineRateFeignClient> {
+    @Override
+    public OnlineRateFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new OnlineRateFeignClient() {
+
+            @Override
+            public HttpResult<List<RStatOnlineRateD>> list(List<String> list, String startTime, String endTime) {
+                log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -48,8 +48,16 @@ public interface DataParam {
 
     String portableDev = "便携式设备";
 
+    String PORTABLE_SYSTEM = "便携式系统";
+
+    String WIRELESS_PROJECT = "无线项目";
+
+    String WIRELESS_PROJECT_ID = "WIRELESS_PROJECT_ID";
+
     String governmentDev = "治理设备";
 
+    String GOVERNANCE_SYSTEM = "治理系统";
+
     String EvtParamPhase = "Evt_Param_Phase";
 
     String EvtParamDepth = "Evt_Param_VVaDepth";

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

@@ -47,6 +47,7 @@ public enum AlgorithmResponseEnum {
     FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"),
     RECORD_FILE_LOST("A00516","record.bin文件缺失，请检查上传文件夹"),
     LINE_NUM_MISMATCH("A00516","上传文件的监测点序号和选择的监测点不匹配，请检查"),
+    DEV_OFFLINE("A00516","装置未连接MQTT服务器"),
     ;
 
 

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

@@ -0,0 +1,70 @@
+package com.njcn.csdevice.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 监测点有效数值统计数据评估入参
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/6 20:36
+ */
+@Data
+public class LineCountEvaluateParam implements Serializable {
+
+    /**
+     * 监测点编号集合
+     */
+    private List<String> lineId;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 相别集合
+     */
+    private List<String> phasicType;
+
+    /**
+     * 值类型
+     */
+    private List<String> valueType;
+
+    /**
+     * 异常数据时间集合
+     * Map<String,List<String>> key:监测点id value:异常时间集合
+     */
+    private Map<String, List<String>> abnormalTime;
+
+    /**
+     * 列名
+     */
+    private String columnName;
+
+    /**
+     * 最小值 >=
+     */
+    private String ge;
+
+    /**
+     * 最大值 <=
+     */
+    private String lt;
+
+    /**
+     * 数据类型 判断获取数据是否排除暂态异常数据
+     */
+    private Boolean dataType = true;
+
+    private String startTime;
+
+    private String endTime;
+
+
+}

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

@@ -0,0 +1,118 @@
+package com.njcn.csdevice.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 初始化模板实体
+ * @author xy
+ */
+@Data
+public class CsDevModelDto implements Serializable {
+
+    @ApiModelProperty("模板id")
+    private String id;
+
+    @ApiModelProperty("版本号")
+    private String versionNo;
+
+    @TableField("版本日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date versionDate;
+
+    @ApiModelProperty("模板名称")
+    private String name;
+
+    @ApiModelProperty("设备类型名称")
+    private String devTypeName;
+
+    @ApiModelProperty("模板存储路径")
+    private String filePath;
+
+    @ApiModelProperty("模板类型(0:治理类型 1:电能质量类型)")
+    private Integer type;
+
+    @ApiModelProperty("数据集")
+    private List<CsDataSet> dataSets;
+
+    @Data
+    public static class CsDataSet implements Serializable {
+
+        @ApiModelProperty("数据集id")
+        private String id;
+
+        @ApiModelProperty("模板id")
+        private String pid;
+
+        @ApiModelProperty("数据集名称")
+        private String name;
+
+        @ApiModelProperty("数据集别名")
+        private String anotherName;
+
+        @ApiModelProperty("数据集编号")
+        private Integer idx;
+
+        @ApiModelProperty("数据集类型")
+        private String dataType;
+
+        @ApiModelProperty("统计周期")
+        private Integer period;
+
+        @ApiModelProperty("是否存储 0:不存储 1:存储")
+        private Integer storeFlag;
+
+        @ApiModelProperty("逻辑子设备")
+        private Integer clDev;
+
+        @ApiModelProperty("数据集类型(0:主设备 1:子模块 2:监测设备)")
+        private Integer type;
+
+        @ApiModelProperty("数据类型(Primary:一次值  Secondary:二次值)")
+        private String dataLevel;
+
+        @ApiModelProperty("数据类型")
+        private List<CsDataArray> dataArrays;
+    }
+
+    @Data
+    public static class CsDataArray implements Serializable {
+
+        @ApiModelProperty("指标id")
+        private String id;
+
+        @ApiModelProperty("数据集id")
+        private String pid;
+
+        @ApiModelProperty("字典表id")
+        private String dataId;
+
+        @ApiModelProperty("数据集名称")
+        private String name;
+
+        @ApiModelProperty("数据集别名")
+        private String anotherName;
+
+        @ApiModelProperty("数据集编号")
+        private Integer idx;
+
+        @ApiModelProperty("数据统计方法(max、min、avg、cp95)")
+        private String statMethod;
+
+        @ApiModelProperty("数据类型")
+        private String dataType;
+
+        @ApiModelProperty("相别")
+        private String phase;
+
+        @ApiModelProperty("排序")
+        private Integer sort;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.njcn.csdevice.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/10 10:01
+ */
+@Data
+public class PqsCommunicateDto implements Serializable {
+
+    private String time;
+
+    private String devId;
+
+    private String description;
+
+    private Integer type;
+
+}

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

@@ -1,9 +1,12 @@
 package com.njcn.csdevice.pojo.param;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 /**
  * 
@@ -36,8 +39,9 @@ public class CsDevModelAddParm  {
     /**
      * 版本日期
      */
-    @ApiModelProperty(value = "版本日期")
-    private String time;
+    @TableField(value = "version_date")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date versionDate;
 
     /**
      * 装置模板文件路径

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

@@ -47,7 +47,8 @@ public class CsDevModelQueryParm {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String versionEndDate;
-
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
 
 
 

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

@@ -1,12 +1,10 @@
 package com.njcn.csdevice.pojo.param;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
+import javax.validation.constraints.Pattern;
 
 /**
  * 
@@ -34,6 +32,7 @@ public class CsEquipmentDeliveryAddParm{
      */
     @ApiModelProperty(value="网络设备ID")
     @NotBlank(message="网络设备ID不能为空！")
+    @Pattern(regexp = "^[A-Za-z0-9]{6,32}$", message = "网络设备ID只可为数字或字母,长度至少为6位")
     private String ndid;
 
     /**
@@ -125,4 +124,7 @@ public class CsEquipmentDeliveryAddParm{
     @ApiModelProperty(value="模块个数")
     private Integer modelNumber;
 
+    @ApiModelProperty(value="排序")
+    private Integer sort;
+
 }

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

@@ -1,12 +1,11 @@
 package com.njcn.csdevice.pojo.param;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
+import javax.validation.constraints.Pattern;
 
 /**
  * 
@@ -34,6 +33,7 @@ public class CsEquipmentDeliveryAuditParm {
      * 网关识别码
      */
     @ApiModelProperty(value="网关识别码")
+    @Pattern(regexp = "^[A-Za-z0-9]{1,32}$", message = "网络设备ID只可为(数字,字母)")
     private String ndid;
 
     /**
@@ -60,51 +60,12 @@ public class CsEquipmentDeliveryAuditParm {
     @ApiModelProperty(value="装置接入方式")
     private String devAccessMethod;
 
-//    /**
-//     * 装置程序版本
-//     */
-//    @ApiModelProperty(value="装置程序版本")
-//    private String programVersion;
-
-//    /**
-//     * 调试人员
-//     */
-//    @ApiModelProperty(value="调试人员")
-//    private String debugPerson;
-//
-//    /**
-//     * 出厂日期
-//     */
-//    @ApiModelProperty(value="出厂日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date producteTime;
-//
-//    /**
-//     * 检修日期
-//     */
-//    @ApiModelProperty(value="检修日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date checkTime;
-//
-//    /**
-//     * 调试日期
-//     */
-//    @ApiModelProperty(value="调试日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date debugTime;
-
     /**
      * 合同号
      */
     @ApiModelProperty(value="合同号")
     private String cntractNo;
 
-//    /**
-//     * 营销经理
-//     */
-//    @ApiModelProperty(value="营销经理")
-//    private String salesManager;
-
     /**
      * 状态
      */
@@ -128,4 +89,10 @@ public class CsEquipmentDeliveryAuditParm {
      */
     @ApiModelProperty(value="模块个数")
     private Integer modelNumber;
+
+    @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
+    private Integer usageStatus;
+
+    @ApiModelProperty(value="排序")
+    private Integer sort;
 }

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

@@ -34,4 +34,10 @@ public class CsEquipmentDeliveryQueryParm extends BaseParam {
     @ApiModelProperty("运行状态 1:离线 2:在线")
     private Integer runStatus;
 
+    @ApiModelProperty("流程步骤")
+    private Integer process;
+
+    @ApiModelProperty("物联通讯状态 0:未连接 1:已连接")
+    private Integer connectStatus;
+
 }

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

@@ -38,4 +38,19 @@ public class CsLineParam extends BaseEntity {
      */
     private Integer conType;
 
+    /**
+     * 模板id
+     */
+    private String modelId;
+
+    /**
+     * 数据集id
+     */
+    private String dataSetId;
+
+    /**
+     * 统计间隔
+     */
+    private Integer lineInterval;
+
 }

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

@@ -24,4 +24,7 @@ public class DataArrayParam {
 
     @ApiModelProperty("数据类型")
     private String statMethod;
+
+    @ApiModelProperty("数据集编号")
+    private Integer idx;
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.pojo.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,9 +35,11 @@ public class WlRecordParam {
         private String lineId;
 
         @ApiModelProperty("项目起始时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime proStartTime;
 
         @ApiModelProperty("项目结束时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime proEndTime;
 
         @ApiModelProperty("测试项名称")
@@ -99,4 +102,23 @@ public class WlRecordParam {
         private String id;
     }
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class lineRecord extends WlRecordParam {
+
+        @ApiModelProperty("监测点id")
+        private String lineId;
+
+        @ApiModelProperty("测试项起始时间")
+        private String itemStartTime;
+
+        @ApiModelProperty("测试项结束时间")
+        private String itemEndTime;
+
+        @ApiModelProperty("数据来源 0:补召 1:在线监测 ")
+        private Integer dataSource;
+
+
+    }
+
 }

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

@@ -80,4 +80,8 @@ public class CsDataSet extends BaseEntity {
      */
     private String dataLevel;
 
+    /**
+     * 接线方式
+     */
+    private Integer conType;
 }

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

@@ -108,4 +108,16 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "process")
     private Integer process;
 
+    /**
+     * 装置使用状态(0:停用 1:启用)
+     */
+    @TableField(value = "usage_status")
+    private Integer usageStatus;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "sort")
+    private Integer sort;
+
 }

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

@@ -95,4 +95,10 @@ public class CsLinePO  extends BaseEntity {
 
     @TableField(value = "device_id")
     private String deviceId;
+
+    /**
+     * 监测点统计间隔
+     */
+    @TableField(value = "line_interval")
+    private Integer lineInterval;
 }

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

@@ -0,0 +1,72 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/10/15  10:43【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@NoArgsConstructor
+@TableName(value = "portable_off_main_log")
+public class PortableOffMainLog extends BaseEntity {
+    /**
+     * 批次id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 导入开始时间
+     */
+    @TableField(value = "start_time")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private LocalDateTime startTime;
+
+    /**
+     * 工程名称
+     */
+    @TableField(value = "project_name")
+    private String projectName;
+
+    /**
+     * 导入结束时间
+     */
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @TableField(value = "end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 成功解析数
+     */
+    @TableField(value = "success_count")
+    private Integer successCount;
+
+    /**
+        * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+    @TableField(exist = false)
+    private List<PortableOfflLog> portableOfflLogList;
+
+}

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

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Getter;
@@ -21,6 +22,8 @@ public class PortableOfflLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     private String logsIndex;
+    @TableField( value = "log_main_id")
+    private String logMainId;
 
     /**
      * 文件名称
@@ -38,7 +41,7 @@ public class PortableOfflLog extends BaseEntity {
     private String dataPath;
 
     /**
-     * 0-未解析 1-解析成功 2-解析失败 3-文件不存在
+     * 0-无需解析解析 1-解析成功 2-解析失败 3-文件不存在
      */
     private Integer state;
 

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

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 数据完整性日表
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Data
+@TableName("r_stat_integrity_d")
+public class RStatIntegrityD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @MppMultiId
+    private LocalDate timeId;
+
+    @MppMultiId
+    private String lineIndex;
+
+    private Integer dueTime;
+
+    private Integer realTime;
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 在线率日表
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Data
+@TableName("r_stat_onlinerate_d")
+public class RStatOnlineRateD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @MppMultiId
+    private LocalDate timeId;
+
+    @MppMultiId
+    private String devIndex;
+
+    private Integer onlineMin;
+
+    private Integer offlineMin;
+
+
+}

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

@@ -150,4 +150,10 @@ public class WlRecord extends BaseEntity {
      */
     private String gcDataPath;
 
+    /**
+     * 数据类型(Primary:一次值  Secondary:二次值)
+     */
+    @TableField(exist = false)
+    private String dataLevel;
+
 }

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

@@ -83,4 +83,12 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="设备当前流程状态")
     private Integer process ;
 
+    @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
+    private Integer usageStatus ;
+
+    @ApiModelProperty(value="装置与MQTT服务器连接状态")
+    private String connectStatus ;
+
+    private Integer sort;
+
 }

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

@@ -28,8 +28,17 @@ public class CsLedgerVO implements Serializable {
 
     @ApiModelProperty(name = "path",value = "拓扑图路径")
     private String path;
+
+    @ApiModelProperty(name = "provinceId",value = "省Id")
+    private String provinceId;
+
+
+    @ApiModelProperty(name = "cityId",value = "市Id")
+    private String cityId;
+
     @ApiModelProperty(name = "area",value = "区域")
     private String area;
+
     @ApiModelProperty(name = "remark",value = "备注")
     private String remark;
 
@@ -45,6 +54,18 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "nDid",value = "nDid")
     private String nDId;
 
+    @ApiModelProperty(name = "type",value = "类型 项目 工程 装置 监测点")
+    private String type;
+
+    @ApiModelProperty(name = "lineType",value = "监测点类型 0:治理监测点 1:电能质量监测点")
+    private Integer lineType;
+
+    @ApiModelProperty(name = "conType",value = "接线方式 0-星型 1-角型 2-V型")
+    private Integer conType;
+
+    @ApiModelProperty(name = "process",value = "流程状态")
+    private Integer process;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 /**
@@ -12,7 +13,7 @@ import java.time.LocalDateTime;
  * @date 2023/6/19
  */
 @Data
-public class DataGroupEventVO {
+public class    DataGroupEventVO {
 
     @ApiModelProperty("id")
     private String id;
@@ -26,6 +27,12 @@ public class DataGroupEventVO {
     @ApiModelProperty("监测点名称")
     private String lineName;
 
+    @ApiModelProperty("装置ID")
+    private String deviceId;
+
+    @ApiModelProperty("装置名称")
+    private String devName;
+
     @ApiModelProperty("项目名称")
     private String projectName;
 
@@ -53,4 +60,7 @@ public class DataGroupEventVO {
     @ApiModelProperty("暂降幅值")
     private Float featureAmplitude;
 
+    @ApiModelProperty("波形路径")
+    private String wavePath;
+
 }

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

@@ -0,0 +1,68 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class EachModuleVO implements Serializable {
+
+    @ApiModelProperty("模块名称")
+    private String moduleName;
+
+    @ApiModelProperty("模块状态")
+    private String moduleState;
+
+    @ApiModelProperty("模块运行状态数据")
+    List<HarmonicVo> dataList;
+
+    @ApiModelProperty("负载电流数据")
+    List<DataVo> loadList;
+
+    @ApiModelProperty("模块输出电流")
+    List<DataVo> modOutList;
+
+    @ApiModelProperty("模块温度")
+    List<DataVo> temperatureList;
+
+    @Data
+    public static class HarmonicVo implements Serializable {
+
+        @ApiModelProperty("稳态数据时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime time;
+
+        @ApiModelProperty("模块状态 0-离线，1-运行，2-停止，3-故障")
+        private String stateDesc;
+
+        @ApiModelProperty("数据类型 0-稳态数据 1-事件数据 2-主动触发")
+        private Integer dataType;
+
+        @ApiModelProperty("事件code")
+        private String eventCode;
+
+        @ApiModelProperty("事件名称")
+        private String eventName;
+    }
+
+    @Data
+    public static class DataVo implements Serializable {
+
+        @ApiModelProperty("稳态数据时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime time;
+
+        @ApiModelProperty("相别")
+        private String phasicType;
+
+        @ApiModelProperty("数据")
+        private Double data;
+    }
+}

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

@@ -22,6 +22,9 @@ public class RecordVo {
     @ApiModelProperty("名称")
     private String itemName;
 
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
     @ApiModelProperty("数据起始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
@@ -30,6 +33,9 @@ public class RecordVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
+    @ApiModelProperty("持续时间")
+    private String lastTime;
+
     @ApiModelProperty("测试位置")
     private String location;
 
@@ -66,6 +72,9 @@ public class RecordVo {
     @ApiModelProperty("电压接线方式")
     private String volConType;
 
+    @ApiModelProperty("基础数据集合ID")
+    private List<String> list;
+
     @Data
     public static class RecordItemVo{
 

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

@@ -0,0 +1,30 @@
+package com.njcn.csdevice.utils;
+
+import com.njcn.common.pojo.exception.BusinessException;
+
+import java.util.regex.Pattern;
+
+/**
+ * Description:
+ * Date: 2024/12/17  14:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public class StringUtil {
+    public static void containsSpecialCharacters(String str) {
+        // 定义包含特殊字符的正则表达式
+        String specialChars = "[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html";
+        // 创建Pattern对象
+        Pattern pattern = Pattern.compile(specialChars);
+        // 使用Pattern对象的matcher方法检查字符串
+        if(pattern.matcher(str).find()){
+            throw new BusinessException("存在特殊字符[<>\"'%;()&+//\\-———|@*_?#$!,.html]");
+        }
+
+    }
+
+    public static void main(String[] args) {
+        StringUtil.containsSpecialCharacters("*");
+    }
+}

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

@@ -76,8 +76,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>user-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>com.baomidou</groupId>
@@ -92,8 +91,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>cs-warn-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
+        <version>${project.version}</version>
       </dependency>
 
       <!-- zxing生成二维码 -->
@@ -107,9 +105,6 @@
       <groupId>com.njcn</groupId>
       <version>1.0.0</version>
     </dependency>
-
-
-
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -139,8 +134,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>cs-harmonic-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
+        <version>${project.version}</version>
         <exclusions>
           <exclusion>
             <groupId>com.njcn</groupId>
@@ -151,20 +145,14 @@
     <dependency>
       <groupId>com.njcn</groupId>
       <artifactId>cs-system-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
+      <version>${project.version}</version>
     </dependency>
 
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>access-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
+          <version>${project.version}</version>
       </dependency>
-
-
-
-
   </dependencies>
 
   <build>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/annotation/InsertBean.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.controller.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * 动态注解类
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/7 11:00
+ */
+@Target({ElementType.TYPE,ElementType.METHOD,ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface InsertBean {
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/annotation/QueryBean.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.controller.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * 动态注解类
+ *
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/7 11:00
+ */
+@Target({ElementType.TYPE,ElementType.METHOD,ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface QueryBean {
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/bean/DynamicBeanProcessor.java

@@ -0,0 +1,78 @@
+package com.njcn.csdevice.controller.bean;
+
+
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.controller.annotation.InsertBean;
+import com.njcn.csdevice.controller.annotation.QueryBean;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/7 11:31
+ */
+@Component
+public class DynamicBeanProcessor implements BeanPostProcessor {
+
+    @Autowired
+    private ApplicationContext context;
+
+    /**
+     * 查询配置
+     */
+    @Value("${data.source.query:Influxdb}")
+    private String queryParam;
+
+    /**
+     * 插入配置
+     */
+    @Value("${data.source.insert:Relation}")
+    private String insertParam;
+
+    @Override
+    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+        if (bean.getClass().isAnnotationPresent(Controller.class) || bean.getClass().isAnnotationPresent(RestController.class) || bean.getClass().isAnnotationPresent(Service.class)) {
+            processFields(bean);
+        }
+        return bean;
+    }
+
+    private void processFields(Object bean) {
+        Field[] fields = bean.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            String beanId;
+            Class<?> type = field.getType();
+            // 判断是否是接口类型，并且是否是注解指定类库
+            if (type.isInterface() && (field.isAnnotationPresent(QueryBean.class) || field.isAnnotationPresent(InsertBean.class))) {
+                String name = type.getName();
+                beanId = name.substring(name.lastIndexOf(".") + 2);
+                if (field.isAnnotationPresent(QueryBean.class)) {
+                    beanId = queryParam + beanId + "Impl";
+                } else if (field.isAnnotationPresent(InsertBean.class)) {
+                    beanId = insertParam + beanId + "Impl";
+                }
+                try {
+                    field.setAccessible(true);
+                    field.set(bean, context.getBean(beanId));
+                } catch (IllegalAccessException e) {
+                    throw new BusinessException("获取动态实现类失败");
+                }
+            }
+        }
+    }
+
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        return bean;
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.njcn.csdevice.controller.data;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.controller.annotation.QueryBean;
+import com.njcn.csdevice.param.LineCountEvaluateParam;
+import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
+import com.njcn.csdevice.service.ICsCommunicateService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0
+ * @data 2024/11/6 19:48
+ */
+@Validated
+@Slf4j
+@Controller
+@RestController
+@RequestMapping("/pqsCommunicate")
+@Api(tags = "获取装置上下线记录")
+public class PqsCommunicateController extends BaseController {
+
+    @QueryBean
+    private ICsCommunicateService pqsCommunicateCvtQuery;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRawDataLatest")
+    @ApiOperation("获取取出最新装置数据")
+    public HttpResult<List<PqsCommunicateDto>> getRawDataLatest(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawDataLatest");
+        List<PqsCommunicateDto> rawData = pqsCommunicateCvtQuery.getRawDataLatest(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<PqsCommunicateDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<PqsCommunicateDto> rawData = pqsCommunicateCvtQuery.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRawDataEnd")
+    @ApiOperation("获取是否有当天最后一条数据")
+    public HttpResult<List<PqsCommunicateDto>> getRawDataEnd(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<PqsCommunicateDto> rawData = pqsCommunicateCvtQuery.getRawDataEnd(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/insertion")
+    @ApiOperation("插入数据")
+    public HttpResult<String> insertion(@RequestBody PqsCommunicateDto pqsCommunicateDto) {
+        String methodDescribe = getMethodDescribe("insertion");
+        pqsCommunicateCvtQuery.insertion(pqsCommunicateDto);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}

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

@@ -0,0 +1,60 @@
+package com.njcn.csdevice.controller.data;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.po.RStatIntegrityD;
+import com.njcn.csdevice.service.IRStatIntegrityDService;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据完整性日表 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Slf4j
+@RestController
+@RequestMapping("/rStatIntegrityD")
+@Api(tags = "数据完整性接口")
+@AllArgsConstructor
+public class RStatIntegrityDController extends BaseController {
+
+    private final IRStatIntegrityDService irStatIntegrityDService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增数据完整性(可根据时间段进行补召)")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> addData(@RequestBody @Validated StatisticsDataParam param){
+        String methodDescribe = getMethodDescribe("addData");
+        irStatIntegrityDService.addData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @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){
+        String methodDescribe = getMethodDescribe("list");
+        List<RStatIntegrityD> result = irStatIntegrityDService.getData(list,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,60 @@
+package com.njcn.csdevice.controller.data;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import com.njcn.csdevice.service.IRStatOnlineRateDService;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 在线率日表 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Slf4j
+@RestController
+@RequestMapping("/rStatOnlineRateD")
+@Api(tags = "终端在线率接口")
+@AllArgsConstructor
+public class RStatOnlineRateDController extends BaseController {
+
+    private final IRStatOnlineRateDService rStatOnlineRateDService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增终端在线率(可根据时间段进行补召)")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<String> addData(@RequestBody @Validated StatisticsDataParam param){
+        String methodDescribe = getMethodDescribe("addData");
+        rStatOnlineRateDService.addData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @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){
+        String methodDescribe = getMethodDescribe("list");
+        List<RStatOnlineRateD> result = rStatOnlineRateDService.getData(list,startTime,endTime);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
+

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

@@ -83,5 +83,45 @@ public class CsDataSetController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getBaseDataSet")
+    @ApiOperation("获取实时数据-基础数据集")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelId", value = "模板id", required = true),
+            @ApiImplicitParam(name = "clDev", value = "逻辑子设备标识", required = true)
+    })
+    public HttpResult<CsDataSet> getBaseDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev){
+        String methodDescribe = getMethodDescribe("getBaseDataSet");
+        CsDataSet dataSet = csDataSetService.getBaseDataSet(modelId,clDev);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataSet, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getHarmonicDataSet")
+    @ApiOperation("获取实时数据-谐波数据集")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelId", value = "模板id", required = true),
+            @ApiImplicitParam(name = "clDev", value = "逻辑子设备标识", required = true),
+            @ApiImplicitParam(name = "target", value = "指标序号", required = true),
+    })
+    public HttpResult<CsDataSet> getHarmonicDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev,@RequestParam("target") Integer target){
+        String methodDescribe = getMethodDescribe("getHarmonicDataSet");
+        CsDataSet dataSet = csDataSetService.getHarmonicDataSet(modelId,clDev,target);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataSet, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDataSetByIdx")
+    @ApiOperation("根据idx获取数据集数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelId", value = "模板id", required = true),
+            @ApiImplicitParam(name = "idx", value = "数据集序号", required = true)
+    })
+    public HttpResult<CsDataSet> getDataSetByIdx(@RequestParam("modelId") String modelId,@RequestParam("idx") Integer idx){
+        String methodDescribe = getMethodDescribe("getDataSetByIdx");
+        CsDataSet csDataSet = csDataSetService.getDataSetByIdx(modelId,idx);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDataSet, methodDescribe);
+    }
+
 }
 

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

@@ -56,9 +56,10 @@ public class CsLogController extends BaseController {
     @ApiOperation("查询日志")
     @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true)
     public HttpResult<IPage<CsLogsPO>> queryLog(@RequestBody BaseParam baseParam){
-        IPage<CsLogsPO> list = csLogsPOService.queryPage(baseParam);
         String methodDescribe = getMethodDescribe("queryLog");
 
+        IPage<CsLogsPO> list = csLogsPOService.queryPage(baseParam);
+
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 

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

@@ -1,17 +1,16 @@
 package com.njcn.csdevice.controller.equipment;
 
-import cn.hutool.core.collection.CollectionUtil;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 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.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.service.DeviceFtpService;
 import com.njcn.csharmonic.pojo.vo.MakeUpVo;
 import com.njcn.redis.utils.RedisUtil;
 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;
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author xy
@@ -38,6 +36,7 @@ public class DeviceFtpController extends BaseController {
 
     private final DeviceFtpService deviceFtpService;
     private final RedisUtil redisUtil;
+    private final MqttPublisher publisher;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/askDeviceRootPath")
@@ -61,9 +60,6 @@ public class DeviceFtpController extends BaseController {
     public HttpResult<List<MakeUpVo>> askDeviceFileOrDir(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("type") String type){
         String methodDescribe = getMethodDescribe("askDeviceFileOrDir");
         List<MakeUpVo> list = deviceFtpService.askDeviceFileOrDir(nDid,name,type);
-        if (CollectionUtil.isEmpty(list) && Objects.equals(type,"file")) {
-            throw new BusinessException(AlgorithmResponseEnum.ASK_DEVICE_DIR_ERROR);
-        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
@@ -77,16 +73,22 @@ public class DeviceFtpController extends BaseController {
             @ApiImplicitParam(name = "fileCheck", value = "文件校验码", required = true)
     })
     public HttpResult<String> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){
-        String methodDescribe = getMethodDescribe("downloadFile");
-        String result = deviceFtpService.downloadFile(nDid,name,size,fileCheck);
-        redisUtil.delete("downloadFilePath:"+name);
-        redisUtil.delete("fileCheck"+name);
-        redisUtil.delete("fileDowning:"+nDid);
-        if (Objects.isNull(result)) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-        }
+        redisUtil.saveByKeyWithExpire("fileDownUserId"+nDid+name,RequestUtil.getUserIndex(),600L);
+        deviceFtpService.downloadFile(nDid,name,size,fileCheck);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "文件下载中,请稍等");
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDownloadFilePath")
+    @ApiOperation("获取文件下载路径")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+            @ApiImplicitParam(name = "name", value = "文件路径名", required = true)
+    })
+    public HttpResult<String> getDownloadFilePath(@RequestParam("nDid") String nDid, @RequestParam("name") String name){
+        String methodDescribe = getMethodDescribe("getDownloadFilePath");
+        String result = deviceFtpService.getDownloadFilePath(nDid,name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

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

@@ -9,7 +9,6 @@ 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.constant.DataParam;
 import com.njcn.csdevice.enums.DeviceOperate;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.param.*;
@@ -23,6 +22,9 @@ import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
+import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.SysDicTreePO;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
@@ -30,6 +32,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,7 +40,9 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -57,19 +62,19 @@ import java.util.stream.Stream;
 public class EquipmentDeliveryController extends BaseController {
 
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final IMqttUserService mqttUserService;
     private final CsDevModelRelationService csDevModelRelationService;
+    private  final DictTreeFeignClient dictTreeFeignClient;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addEquipmentDelivery")
     @ApiOperation("新增出厂设备")
     @ApiImplicitParam(name = "csEquipmentDeliveryAddParm", value = "新增项目参数", required = true)
     @DeviceLog(operateType = DeviceOperate.ADD)
-    public HttpResult<Boolean> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
+    public HttpResult<CsEquipmentDeliveryPO> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
         String methodDescribe = getMethodDescribe("addEquipmentDelivery");
-        Boolean flag = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
-        if (flag){
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
+        if (Objects.nonNull(po)){
             //查询mqtt用户名和密码是否存在
             boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAddParm.getNdid());
             if (result){
@@ -77,7 +82,7 @@ public class EquipmentDeliveryController extends BaseController {
                 mqttUserService.insertMqttUser(csEquipmentDeliveryAddParm.getNdid());
             }
         }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
 
 
@@ -99,6 +104,14 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<Boolean> updateEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm ){
         String methodDescribe = getMethodDescribe("updateEquipmentDelivery");
         Boolean flag = csEquipmentDeliveryService.updateEquipmentDelivery(csEquipmentDeliveryAuditParm);
+        if (flag){
+            //查询mqtt用户名和密码是否存在
+            boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAuditParm.getNdid());
+            if (result){
+                //初始化装置mqtt连接信息(使用sha256加密)
+                mqttUserService.insertMqttUser(csEquipmentDeliveryAuditParm.getNdid());
+            }
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
@@ -162,12 +175,6 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param){
         String methodDescribe = getMethodDescribe("list");
         Page<CsEquipmentDeliveryVO> page = csEquipmentDeliveryService.list(param);
-        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
-        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
-            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
-                csEquipmentDeliveryVO.setStatus(5);
-            }
-        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 
@@ -220,7 +227,13 @@ public class EquipmentDeliveryController extends BaseController {
         ExportParams exportParams = new ExportParams("批量导入模板（请严格按照模板标准填入数据）", "终端入网检测录入信息");
         exportParams.setStyle(ExcelStyleUtil.class);
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DeviceExcelTemplete.class, new ArrayList<DeviceExcelTemplete>());
-        ExcelUtil.selectList(workbook, 2, 2, Stream.of("直连设备","网关设备").collect(Collectors.toList()).toArray(new String[]{}));
+        List<SysDicTreePO> deviceType = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.DEVICE_TYPE.getCode()).getData();
+        if(!CollectionUtils.isEmpty(deviceType)){
+            List<String> collect = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getName).collect(Collectors.toList());
+            ExcelUtil.selectList(workbook, 2, 2, collect.toArray(new String[]{}));
+            List<String> collect2 = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getChildren).flatMap(Collection::stream).map(SysDicTreePO::getName).collect(Collectors.toList());
+            ExcelUtil.selectList(workbook, 3, 3, collect2.toArray(new String[]{}));
+        }
         ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT","CLD").collect(Collectors.toList()).toArray(new String[]{}));
         String fileName = "设备模板.xlsx";
         ExportParams exportExcel = new ExportParams("设备模板", "设备模板");
@@ -233,7 +246,18 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping(value = "importEquipment")
     public HttpResult<String> importEquipment(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importEquipment");
-        csEquipmentDeliveryService.importEquipment(file, response);
+        List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.importEquipment(file, response);
+        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)){
+            csEquipmentDeliveryPOS.forEach(temp->{
+                //查询mqtt用户名和密码是否存在
+                boolean result = mqttUserService.findMqttUser(temp.getNdid());
+                if (result){
+                    //初始化装置mqtt连接信息(使用sha256加密)
+                    mqttUserService.insertMqttUser(temp.getNdid());
+                }
+            });
+
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
     @ResponseBody
@@ -306,4 +330,22 @@ public class EquipmentDeliveryController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/judgeDevModel")
+    @ApiOperation("判断设备型号")
+    public HttpResult<Boolean> judgeDevModel(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("judgeDevModel");
+        boolean result = csEquipmentDeliveryService.judgeDevModel(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDevByLineId")
+    @ApiOperation("根据监测点id查询装置信息")
+    public HttpResult<CsEquipmentDeliveryPO> getDevByLineId(@RequestParam("lineId") String lineId){
+        String methodDescribe = getMethodDescribe("getDevByLineId");
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryService.getDevByLineId(lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
 }

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

@@ -9,10 +9,12 @@ 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.param.WlRecordTemplete;
+import com.njcn.csdevice.pojo.po.PortableOffMainLog;
 import com.njcn.csdevice.pojo.po.PortableOfflLog;
 import com.njcn.csdevice.service.IPortableOfflLogService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.csdevice.param.UploadDataParam;
+import com.njcn.minioss.config.MinIossProperties;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
@@ -55,7 +57,7 @@ public class PortableOfflLogController extends BaseController {
     private final DicDataFeignClient dicDataFeignClient;
 
     private final FileStorageUtil fileStorageUtil;
-
+    private final MinIossProperties minIossProperties;
     @ResponseBody
     @ApiOperation("导出设备基础数据模板")
     @GetMapping(value = "getExcelTemplate")
@@ -80,6 +82,15 @@ public class PortableOfflLogController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryMainLogPage")
+    @ApiOperation("便携式设备解析日志")
+    public HttpResult<Page<PortableOffMainLog>> queryMainLogPage(@RequestBody BaseParam baseParam){
+        String methodDescribe = getMethodDescribe("queryMainLogPage");
+        Page<PortableOffMainLog> list = iPortableOfflLogService.queryMainLogPage(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("离线数据导入")
     @PostMapping(value = "importEquipment")
@@ -110,7 +121,7 @@ public class PortableOfflLogController extends BaseController {
 
         List<MultipartFile> excelreport = null;
         try {
-            excelreport = fileStorageUtil.getAllFile("excelreport", path);
+            excelreport = fileStorageUtil.getAllFile(minIossProperties.getBucket(), path);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.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.mapper.CsLedgerMapper;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
@@ -39,6 +40,7 @@ import java.util.List;
 public class CsLedgerController extends BaseController {
 
     private final ICsLedgerService csLedgerService;
+    private final CsLedgerMapper csLedgerMapper;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/tree")
@@ -67,6 +69,15 @@ public class CsLedgerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getztProjectTree")
+    @ApiOperation("三层设备树(项目层根节点为治理系统和便携式系统组态)")
+    public HttpResult<List<CsLedgerVO>> getztProjectTree(){
+        String methodDescribe = getMethodDescribe("getProjectTree");
+        List<CsLedgerVO> list = csLedgerService.getztProjectTree();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/add")
     @ApiOperation("新增台账信息")
@@ -136,5 +147,14 @@ public class CsLedgerController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, details, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllLedger")
+    @ApiOperation("获取台账树所有数据")
+    public HttpResult<List<CsLedgerVO>> getAllLedger(){
+        String methodDescribe = getMethodDescribe("getAllLedger");
+        List<CsLedgerVO> allList = csLedgerMapper.getAll();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, allList, methodDescribe);
+    }
+
 }
 

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

@@ -1,10 +1,12 @@
 package com.njcn.csdevice.controller.line;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.mapper.CsLinePOMapper;
 import com.njcn.csdevice.mapper.OverlimitMapper;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
@@ -41,6 +43,7 @@ public class CslineController extends BaseController {
     private final CsLinePOService csLinePOService;
 
     private final OverlimitMapper overlimitMapper;
+    private final CsLinePOMapper csLinePOMapper;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryLineById")
@@ -121,4 +124,47 @@ public class CslineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateIds")
+    @ApiOperation("修改监测点模板id和数据集id")
+    @ApiImplicitParam(name = "csLineParam", value = "监测点信息", required = true)
+    @ApiIgnore
+    public HttpResult<Boolean> updateIds(@RequestBody @Validated CsLineParam csLineParam) {
+        String methodDescribe = getMethodDescribe("updateIds");
+        csLinePOService.updateIds(csLineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getById")
+    @ApiOperation("根据监测点id获取监测点详情")
+    @ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
+    public HttpResult<CsLinePO> getById(@RequestParam String lineId) {
+        String methodDescribe = getMethodDescribe("getById");
+        LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CsLinePO::getLineId,lineId).eq(CsLinePO::getStatus,1);
+        CsLinePO po = csLinePOService.getOne(queryWrapper);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getOverLimitData")
+    @ApiOperation("根据监测点id获取国标限值")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getOverLimitData");
+        Overlimit result = overlimitMapper.selectById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLinesByDevList")
+    @ApiOperation("根据装置id集合获取监测点id集合")
+    @ApiImplicitParam(name = "ids", value = "装置id集合", required = true)
+    public HttpResult<List<CsLinePO>> getLinesByDevList(@RequestParam("ids") List<String> ids) {
+        String methodDescribe = getMethodDescribe("getLinesByDevList");
+        List<CsLinePO> list = csLinePOService.getLinesByDevList(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

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

@@ -80,4 +80,14 @@ public class AppProjectController  extends BaseController {
         Boolean flag = appProjectService.AuditAppProject(appProjectAuditParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateProject")
+    @ApiOperation("web修改项目信息")
+    public HttpResult<Boolean> updateProject(@RequestBody @Validated AppProjectAuditParm appProjectAuditParm){
+        String methodDescribe = getMethodDescribe("updateProject");
+        Boolean flag = appProjectService.updateProject(appProjectAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java

@@ -127,6 +127,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 修改测试项日志
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/updateRecordData")
+    @ApiOperation("修改测试项日志")
+    @ApiImplicitParam(name = "record", value = "测试项日志信息", required = true)
+    public HttpResult<Boolean> updateRecordData(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
+        String methodDescribe = getMethodDescribe("updateRecordData");
+        LogUtil.njcnDebug(log, "{}，修改的测试项日志信息：{}", methodDescribe, record);
+        wlRecordService.updateRecordData(record);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 新增或修改方案
      */
@@ -168,6 +182,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 删除装置测试项
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/deleteItem")
+    @ApiOperation("删除装置测试项")
+    @ApiImplicitParam(name = "id", value = "装置测试项Id", required = true)
+    public HttpResult<Boolean> deleteItem(@RequestParam @Validated String id) {
+        String methodDescribe = getMethodDescribe("deleteItem");
+        LogUtil.njcnDebug(log, "{}，装置测试项Id为：{}", methodDescribe, id);
+        wlRecordService.deleteItem(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 查询测试项时间段实时数据
      */
@@ -195,6 +223,19 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, record, methodDescribe);
     }
 
+    /**
+     * 根据监测点id查询装置基础数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/findDevBaseDataByLineId")
+    @ApiOperation("根据监测点id查询装置基础数据")
+    @ApiImplicitParam(name = "param", value = "查询条件", required = true)
+    public HttpResult<List<RecordVo>> findDevBaseDataByLineId(@RequestBody @Validated WlRecordParam.lineRecord param) {
+        String methodDescribe = getMethodDescribe("findDevBaseDataByLineId");
+        LogUtil.njcnDebug(log, "{}，查询对象为：{}", methodDescribe, param);
+        List<RecordVo> record = wlRecordService.findDevBaseDataByLineId(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, record, methodDescribe);
+    }
 
 
     /**
@@ -203,9 +244,21 @@ public class WlRecordController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @PostMapping("/dayDealNoEndTimeEvent")
     @ApiOperation("每日处理没有结束时间的测试基础数据")
-    public void dayDealNoEndTimeEvent() {
+    public void dayDealNoEndTimeEvent(@RequestParam("date") String date) {
         String methodDescribe = getMethodDescribe("dayDealNoEndTimeEvent");
-        wlRecordService.dayDealNoEndTimeEvent();
+        wlRecordService.dayDealNoEndTimeEvent(date);
+    }
+
+    /**
+     * 根据测试项获取测试项绑定测点数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getWlAssByWlId")
+    @ApiOperation("根据测试项获取测试项绑定测点数据")
+    public HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId") String wlId) {
+        String methodDescribe = getMethodDescribe("getWlAssByWlId");
+        List<WlRecord> result = wlRecordService.getWlAssByWlId(wlId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/init/InitData.java

@@ -0,0 +1,28 @@
+package com.njcn.csdevice.init;
+
+import com.njcn.csdevice.service.CsDevModelService;
+import com.njcn.csdevice.service.CsEquipmentDeliveryService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目初始化缓存设备池，后续从缓存中获取设备数据
+ * @author xy
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class InitData implements CommandLineRunner {
+
+    private final CsEquipmentDeliveryService csEquipmentDeliveryService;
+    private final CsDevModelService csDevModelService;
+
+    @Override
+    public void run(String... args) {
+        csEquipmentDeliveryService.refreshDeviceDataCache();
+        csDevModelService.refreshDevModelCache();
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/job/DayDataJob.java

@@ -0,0 +1,62 @@
+package com.njcn.csdevice.job;
+
+import cn.hutool.core.date.DatePattern;
+import com.njcn.csdevice.service.IRStatIntegrityDService;
+import com.njcn.csdevice.service.IRStatOnlineRateDService;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author xy
+ */
+@Component
+@EnableScheduling
+@RequiredArgsConstructor
+@Slf4j
+public class DayDataJob {
+
+    private final IRStatIntegrityDService statIntegrityDService;
+    private final IRStatOnlineRateDService statOnlineRateDService;
+
+    /**
+     * 每天1点计算治理设备的完整性
+     *
+     * @date 2025/7/1
+     */
+    @Scheduled(cron = "0 0 1 * * ?")
+    public void lineIntegrityJob() {
+        StatisticsDataParam param = new StatisticsDataParam();
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDateTime start = yesterday.atStartOfDay();
+        LocalDateTime end = yesterday.atTime(23, 59, 59);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN);
+        param.setStartTime(start.format(formatter));
+        param.setEndTime(end.format(formatter));
+        statIntegrityDService.addData(param);
+    }
+
+    /**
+     * 每天2点计算治理设备的在线率
+     *
+     * @date 2025/7/1
+     */
+    @Scheduled(cron = "0 30 1 * * ?")
+    public void devOnlineRateJob() {
+        StatisticsDataParam param = new StatisticsDataParam();
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDateTime start = yesterday.atStartOfDay();
+        LocalDateTime end = yesterday.atTime(23, 59, 59);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN);
+        param.setStartTime(start.format(formatter));
+        param.setEndTime(end.format(formatter));
+        statOnlineRateDService.addData(param);
+    }
+}

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

@@ -3,6 +3,7 @@ package com.njcn.csdevice.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
 import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
@@ -25,5 +26,10 @@ public interface CsEquipmentDeliveryMapper extends BaseMapper<CsEquipmentDeliver
 
     Page<CsEquipmentDeliveryVO> page(Page<CsEquipmentDeliveryPO> returnpage, @Param("ew") QueryWrapper<CsEquipmentDeliveryPO> queryWrapper);
 
+    //获取符合条件的设备列表
+    List<CsEquipmentDeliveryVO> getList(@Param("queryParam") CsEquipmentDeliveryQueryParm queryParam);
+
+    //获取符合条件的设备数量
+    int getCounts(@Param("queryParam") CsEquipmentDeliveryQueryParm queryParam);
 
 }

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

@@ -1,8 +1,10 @@
 package com.njcn.csdevice.mapper;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.biz.pojo.po.Overlimit;
+import org.apache.ibatis.annotations.Mapper;
 
 
 /**
@@ -13,6 +15,8 @@ import com.njcn.device.biz.pojo.po.Overlimit;
  * @author cdf
  * @since 2022-01-04
  */
+@DS("sjzx")
+@Mapper
 public interface OverlimitMapper extends BaseMapper<Overlimit> {
 
 }

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

@@ -0,0 +1,15 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.PortableOffMainLog;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/10/15  10:43【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface PortableOffMainLogMapper extends BaseMapper<PortableOffMainLog> {
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.csdevice.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.csdevice.pojo.po.RStatIntegrityD;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 数据完整性日表 Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Mapper
+public interface RStatIntegrityDMapper extends MppBaseMapper<RStatIntegrityD> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.csdevice.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 在线率日表 Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+@Mapper
+public interface RStatOnlineRateDMapper extends MppBaseMapper<RStatOnlineRateD> {
+
+}

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

@@ -48,4 +48,6 @@ public interface WlRecordMapper extends BaseMapper<WlRecord> {
     List<CsLedgerVO> getAll();
 
     List<CsLedgerVO> getAllLine(@Param("devId") String devId);
+
+    List<WlRecord> getWlAssByWlId(@Param("wlId") String wlId);
 }

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

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

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

@@ -12,7 +12,9 @@
         from
             cs_data_set
         where
-            pid = #{modelId} and cl_dev = #{clDev}
+            pid = #{modelId}
+          and cl_dev = #{clDev}
+          and (data_type = 'Stat' or data_type IS NULL)
         order by type,cl_dev
     </select>
 

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

@@ -19,28 +19,28 @@
     <!--@mbg.generated-->
     id, dev_type, version_no, version_date, file_path, create_by, create_time, update_by, 
     update_time, `status`
-  </sql><select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
-   SELECT a.*
-        FROM cs_dev_model a
-                WHERE
-                1 = 1 And a.`status`='1'
-        <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
-            AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
-        </if>
-        <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
-            AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
-        </if>
+  </sql>
+    <select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
+       SELECT a.*
+            FROM cs_dev_model a
+                    WHERE
+                    1 = 1 And a.`status`='1'
+            <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
+                AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
+            </if>
+            <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
+                AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
+            </if>
 
-        <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
-            AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%')
-        </if>
-<!--        <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
-<!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
-<!--        </if>-->
-         <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
-            AND a.name = #{csDevModelQueryParm.name}
-        </if>
-  </select><select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
+            <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
+                AND a.dev_type_name = #{csDevModelQueryParm.devName}
+            </if>
+             <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
+                AND a.name LIKE concat('%',#{csDevModelQueryParm.name},'%')
+            </if>
+       order by a.version_date desc
+  </select>
+    <select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
    SELECT a.*
         FROM cs_dev_model a
                 WHERE

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

@@ -87,5 +87,41 @@
         </where>
     </select>
 
+    <select id="getList" resultType="CsEquipmentDeliveryVO">
+        select
+            *
+        from
+            cs_equipment_delivery
+        <where>
+            1=1
+            <if test="queryParam.process != null and queryParam.process !=''">
+                and process = #{queryParam.process}
+            </if>
+            <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
+                and run_status = #{queryParam.runStatus}
+            </if>
+            <if test="queryParam.searchValue != null and queryParam.searchValue !=''">
+                and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
+            </if>
+        </where>
+    </select>
 
+    <select id="getCounts" resultType="int">
+        select
+            count(1)
+        from
+            cs_equipment_delivery
+        <where>
+            1=1
+            <if test="queryParam.process != null and queryParam.process !=''">
+                and process = #{queryParam.process}
+            </if>
+            <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
+                and run_status = #{queryParam.runStatus}
+            </if>
+            <if test="queryParam.searchValue != null and queryParam.searchValue !=''">
+                and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.csdevice.mapper.PortableOffMainLogMapper">
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, start_time, project_name, end_time, success_count, create_by, create_time, update_by, 
+    update_time
+  </sql>
+</mapper>

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

@@ -64,6 +64,7 @@
         </if>
          exists
         (select 1 from wl_record_test_data wd where wd.test_item_id = #{wlRecordPageParam.id} and wd.data_id = a.id)
+        order by a.start_time desc
     </select>
 
     <select id="getAll" resultType="com.njcn.csdevice.pojo.vo.CsLedgerVO">
@@ -92,4 +93,55 @@
         )
         order by start_time
     </select>
+
+    <select id="getWlAssByWlId" resultType="com.njcn.csdevice.pojo.po.WlRecord">
+        SELECT
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            c.data_level AS dataLevel,
+            b.ct_ratio AS ct,
+            b.pt_ratio AS pt,
+            NULL AS itemName,
+            NULL AS voltageLevel,
+            NULL AS capacitySscb,
+            NULL AS capacitySscmin,
+            NULL AS capacitySt,
+            NULL AS capacitySi
+        FROM
+            wl_record a
+                INNER JOIN cs_line b ON a.line_id = b.line_id
+                INNER JOIN cs_data_set c ON b.data_set_id = c.id
+        WHERE
+            a.type = 1
+          AND a.id IN (
+            SELECT
+                data_id
+            FROM
+                wl_record_test_data
+            WHERE
+                test_item_id = #{wlId} )
+        UNION
+        SELECT
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            NULL AS dataLevel,
+            (a.ct / a.ct1) AS ct,
+            (a.pt / a.pt1) AS pt,
+            a.item_name,
+            a.voltage_level,
+            a.capacity_sscb,
+            a.capacity_sscmin,
+            a.capacity_st,
+            a.capacity_si
+        FROM
+            wl_record a
+        WHERE
+            a.id = #{wlId}
+    </select>
 </mapper>

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

@@ -37,6 +37,9 @@ public interface AppProjectService extends IService<AppProjectPO> {
         * @Date: 2023/3/27 
         */ 
         Boolean AuditAppProject(AppProjectAuditParm appProjectAuditParm);
+
+        Boolean updateProject(AppProjectAuditParm appProjectAuditParm);
+
         /** 
         * @Description: queryProject 
         * @Param: [appProjectQueryParm] 

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

@@ -20,6 +20,12 @@ import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
  */
 public interface CsDevModelService extends IService<CsDevModelPO>{
 
+    /**
+     * 初始化缓存模板信息
+     * 想缓存模板，发现数据量太大，先按照之前的逻辑处理
+     */
+    void refreshDevModelCache();
+
         /** 
         * @Description: addDevModel 
         * @Param: [csDevModelAddParm] 

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

@@ -27,6 +27,11 @@ import java.util.List;
  */
 public interface CsEquipmentDeliveryService extends IService<CsEquipmentDeliveryPO>{
 
+    /**
+     * 初始化缓存设备池
+     */
+    void refreshDeviceDataCache();
+
         /**
         * @Description: save
         * @Param: [csEquipmentDeliveryAddParm]
@@ -34,7 +39,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
         * @Author: clam
         * @Date: 2023/3/31
         */
-        Boolean save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm);
+        CsEquipmentDeliveryPO save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm);
         /** 
         * @Description: AuditEquipmentDelivery
         * @Param: [id] 
@@ -94,7 +99,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     CsEquipmentDeliveryPO findDevByNDid(String nDid);
 
-    void importEquipment(MultipartFile file, HttpServletResponse response);
+    List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response);
 
     void delete(String devId);
 
@@ -123,4 +128,11 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      * @return
      */
     List<CsEquipmentDeliveryPO> getAll();
+
+    /**
+     * 判断设备型号
+     */
+    boolean judgeDevModel(String nDid);
+
+    CsEquipmentDeliveryPO getDevByLineId(String lineId);
 }

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

@@ -40,4 +40,11 @@ public interface CsLinePOService extends IService<CsLinePO>{
      */
     void updateLine(CsLineParam csLineParam);
 
+    /**
+     * 修改监测点的数据集id和模板id
+     * @param csLineParam
+     */
+    void updateIds(CsLineParam csLineParam);
+
+    List<CsLinePO> getLinesByDevList(List<String> list);
 }

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

@@ -10,7 +10,9 @@ public interface DeviceFtpService {
 
     List<MakeUpVo> askDeviceFileOrDir(String nDid, String name, String type);
 
-    String downloadFile(String nDid, String name, Integer size, String fileCheck);
+    void downloadFile(String nDid, String name, Integer size, String fileCheck);
+
+    String getDownloadFilePath(String nDid, String name);
 
     boolean createFile(String nDid, String path);
 

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

@@ -0,0 +1,38 @@
+package com.njcn.csdevice.service;
+
+
+import com.njcn.csdevice.param.LineCountEvaluateParam;
+import com.njcn.csdevice.pojo.dto.PqsCommunicateDto;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+public interface ICsCommunicateService {
+
+    /**
+     * 取出最新装置数据
+     * @param lineParam
+     * @return
+     */
+    List<PqsCommunicateDto> getRawDataLatest(LineCountEvaluateParam lineParam);
+
+    /**
+     * 获取时间范围数据
+     * @param lineParam
+     * @return
+     */
+    List<PqsCommunicateDto> getRawData(LineCountEvaluateParam lineParam);
+
+    /**
+     *是否有当天最后一条数据
+     * @param lineParam
+     * @return
+     */
+    List<PqsCommunicateDto> getRawDataEnd(LineCountEvaluateParam lineParam);
+
+    void insertion(PqsCommunicateDto pqsCommunicateDto);
+}

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

@@ -50,4 +50,9 @@ public interface ICsDataArrayService extends IService<CsDataArray> {
      * @return
      */
     List<CsDataArray> findListByParam(DataArrayParam param);
+
+    /**
+     * 根据数据集id获取指标数据
+     */
+    List<CsDataArray> getDataArrayByDataSetIds(List<String> dataSetIds);
 }

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

@@ -52,4 +52,21 @@ public interface ICsDataSetService extends IService<CsDataSet> {
      * @return
      */
     List<CsDataSet> getDataSetBySetIds(List<String> setIds);
+
+    CsDataSet getBaseDataSet(String modelId,Integer clDev);
+
+    CsDataSet getHarmonicDataSet(String modelId,Integer clDev,Integer target);
+
+    /**
+     * 根据模板和idx获取数据集数据
+     * @param modelId
+     * @param idx
+     * @return
+     */
+    CsDataSet getDataSetByIdx(String modelId, Integer idx);
+
+    /**
+     * 根据模板id获取所有数据集
+     */
+    List<CsDataSet> getDataSetByModelId(List<String> modelList);
 }

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

@@ -74,4 +74,6 @@ public interface ICsLedgerService extends IService<CsLedger> {
     List<CsLedger> queryLine(LineParamDTO lineParamdto);
 
     DevDetailDTO queryDevDetail(String devId);
+
+    List<CsLedgerVO> getztProjectTree();
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IPortableOfflLogService.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.po.PortableOffMainLog;
 import com.njcn.csdevice.pojo.po.PortableOfflLog;
 import com.njcn.csdevice.param.UploadDataParam;
 import com.njcn.web.pojo.param.BaseParam;
@@ -19,4 +20,6 @@ public interface IPortableOfflLogService extends IService<PortableOfflLog> {
     Page<PortableOfflLog> queryPage(BaseParam baseParam);
 
     void importEquipment(UploadDataParam uploadDataParam);
+
+    Page<PortableOffMainLog> queryMainLogPage(BaseParam baseParam);
 }

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

@@ -0,0 +1,23 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.RStatIntegrityD;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据完整性日表 服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+public interface IRStatIntegrityDService extends IService<RStatIntegrityD> {
+
+    void addData(StatisticsDataParam param);
+
+    List<RStatIntegrityD> getData(List<String> list, String startTime, String endTime);
+
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 在线率日表 服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2025-06-23
+ */
+public interface IRStatOnlineRateDService extends IService<RStatOnlineRateD> {
+
+    void addData(StatisticsDataParam param);
+
+    List<RStatOnlineRateD> getData(List<String> list, String startTime, String endTime);
+
+}

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

@@ -63,6 +63,8 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     void updateTestRecord(WlRecordParam.UpdateRecord record);
 
+    void updateRecordData(WlRecordParam.UpdateRecord record);
+
     /**
      * 新增或修改方案
      * @param record
@@ -102,10 +104,14 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     WlRecord findDevBaseData(WlRecordParam.Record param);
 
+    List<RecordVo> findDevBaseDataByLineId(WlRecordParam.lineRecord param);
 
     /**
      * 每日处理没有结束时间的测试基础数据
      */
-    void dayDealNoEndTimeEvent();
+    void dayDealNoEndTimeEvent(String date);
 
+    List<WlRecord> getWlAssByWlId(String wlId);
+
+    void deleteItem(String id);
 }

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

@@ -0,0 +1,21 @@
+package com.njcn.csdevice.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.mapper.OverlimitMapper;
+import com.njcn.csdevice.service.impl.OverlimitService;
+/**
+ * 
+ * Description:
+ * Date: 2024/10/22  14:14【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@DS("sjzx")
+public class OverlimitServiceImpl extends ServiceImpl<OverlimitMapper, Overlimit> implements OverlimitService{
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.csdevice.pojo.po.PortableOffMainLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * Date: 2024/10/15  10:43【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface PortableOffMainLogService extends IService<PortableOffMainLog>{
+
+
+}

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

@@ -132,7 +132,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //                eq ("user_id", userId).
                 eq ("name", name);
         Integer integer = csLedgerMapper.selectCount (queryWrapper);
-        return integer > 0 ? true : false;
+        return integer > 0;
     }
 
     @Override
@@ -249,7 +249,25 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
             csLedger2.setName(appProjectAuditParm.getName());
         }
         csLedgerMapper.updateById(csLedger2);
-        return i == 1 ? true : false;
+        return i == 1;
+    }
+
+    @Override
+    @Transactional(rollbackFor = BusinessException.class)
+    public Boolean updateProject(AppProjectAuditParm appProjectAuditParm) {
+        //修改项目表
+        this.lambdaUpdate().set(AppProjectPO::getName,appProjectAuditParm.getName())
+                .set(AppProjectPO::getArea,appProjectAuditParm.getArea())
+                .set(AppProjectPO::getDescription,appProjectAuditParm.getDescription())
+                .eq(AppProjectPO::getId,appProjectAuditParm.getId())
+                .eq(AppProjectPO::getStatus,"1")
+                .update();
+        //修改台账表
+        CsLedger csLedger = new CsLedger();
+        csLedger.setId(appProjectAuditParm.getId());
+        csLedger.setName(appProjectAuditParm.getName());
+        csLedgerMapper.updateById(csLedger);
+        return true;
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.njcn.csdevice.mapper.CsDataArrayMapper;
 import com.njcn.csdevice.pojo.dto.DataArrayDTO;
 import com.njcn.csdevice.pojo.param.DataArrayParam;
 import com.njcn.csdevice.pojo.po.CsDataArray;
+import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO;
 import com.njcn.csdevice.service.ICsDataArrayService;
@@ -174,4 +175,11 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
     public List<CsDataArray> findListByParam(DataArrayParam param) {
         return this.baseMapper.findListByParam(param);
     }
+
+    @Override
+    public List<CsDataArray> getDataArrayByDataSetIds(List<String> dataSetIds) {
+        return this.lambdaQuery()
+                .in(CsDataArray::getPid,dataSetIds)
+                .list();
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.mapper.CsDataSetMapper;
 import com.njcn.csdevice.pojo.po.CsDataSet;
@@ -8,7 +9,7 @@ import com.njcn.csdevice.service.ICsDataSetService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -24,12 +25,22 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
 
     @Override
     public List<CsDataSet> findDataSetByModelId(String modelId, Integer clDev) {
-        return this.lambdaQuery().eq(CsDataSet::getPid,modelId).eq(CsDataSet::getClDev,clDev).list();
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .eq(CsDataSet::getClDev,clDev)
+                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+                .list();
     }
 
     @Override
     public List<CsDataSet> findDataSetByModelId(String modelId) {
-        return this.lambdaQuery().eq(CsDataSet::getPid,modelId).in(CsDataSet::getType, Arrays.asList(0,2)).orderByAsc(CsDataSet::getType,CsDataSet::getClDev).list();
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .in(CsDataSet::getType, Arrays.asList(0,2))
+                .eq(CsDataSet::getStoreFlag,1)
+                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+                .orderByAsc(CsDataSet::getIdx)
+                .list();
     }
 
     @Override
@@ -47,4 +58,46 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
         return this.lambdaQuery().in(CsDataSet::getId,setIds).list();
     }
 
+    @Override
+    public CsDataSet getBaseDataSet(String modelId, Integer clDev) {
+        List<CsDataSet> list = this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .eq(CsDataSet::getClDev,clDev)
+                .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType))
+                .list();
+        return list.stream().min(Comparator.comparingInt(CsDataSet::getIdx)).get();
+    }
+
+    @Override
+    public CsDataSet getHarmonicDataSet(String modelId, Integer clDev,Integer target) {
+        LambdaQueryWrapper<CsDataSet> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CsDataSet::getPid,modelId)
+                .eq(CsDataSet::getClDev,clDev)
+                .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType));
+        //谐波电压含有率
+        if (target == 0) {
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$0".concat(clDev.toString()));
+        } else if (target == 1) {
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmI$0".concat(clDev.toString()));
+        } else if (target == 2) {
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$InHarmV$0".concat(clDev.toString()));
+        }
+        return this.baseMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public CsDataSet getDataSetByIdx(String modelId, Integer idx) {
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid,modelId)
+                .in(CsDataSet::getIdx, idx)
+                .one();
+    }
+
+    @Override
+    public List<CsDataSet> getDataSetByModelId(List<String> modelList) {
+        return this.lambdaQuery()
+                .in(CsDataSet::getPid,modelList)
+                .list();
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.mapper.CsDevModelMapper;
 import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
 import com.njcn.csdevice.pojo.param.CsDevModelAuditParm;
@@ -12,11 +13,20 @@ import com.njcn.csdevice.pojo.param.CsDevModelQueryParm;
 import com.njcn.csdevice.pojo.po.CsDevModelPO;
 import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
 import com.njcn.csdevice.service.CsDevModelService;
+import com.njcn.csdevice.service.ICsDataArrayService;
+import com.njcn.csdevice.service.ICsDataSetService;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.pojo.po.SysDicTreePO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Date;
+import java.util.Objects;
 
 /**
  * 
@@ -27,16 +37,78 @@ import java.sql.Date;
  * @author clam
  * @version V1.0.0
  */
+@Slf4j
 @Service
+@RequiredArgsConstructor
 public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevModelPO> implements CsDevModelService{
 
+    private final ICsDataSetService csDataSetService;
+    private final ICsDataArrayService csDataArrayService;
+    private final RedisUtil redisUtil;
+    private final DictTreeFeignClient dictTreeFeignClient;
+
+    @Override
+    public void refreshDevModelCache() {
+//        List<CsDevModelDto> csDevModelDtoList = new ArrayList<>();
+//        List<CsDevModelDto.CsDataSet> csDataSetList = new ArrayList<>();
+//        List<CsDevModelDto.CsDataArray> csDataArrayList = new ArrayList<>();
+//        //获取系统所有模板
+//        LambdaQueryWrapper<CsDevModelPO> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper.eq(CsDevModelPO::getStatus,1);
+//        List<CsDevModelPO> list = this.list(queryWrapper);
+//        //根据模板ids获取数据集
+//        if (CollUtil.isNotEmpty(list)) {
+//            List<String> modelIds = list.stream().map(CsDevModelPO::getId).collect(Collectors.toList());
+//            List<CsDataSet> csDataSets = csDataSetService.getDataSetByModelId(modelIds);
+//            //根据数据集获取具体指标
+//            List<String> dataSetList = csDataSets.stream().map(CsDataSet::getId).collect(Collectors.toList());
+//            List<CsDataArray> csDataArrays = csDataArrayService.getDataArrayByDataSetIds(dataSetList);
+//
+//            list.forEach(item->{
+//                CsDevModelDto dto = new CsDevModelDto();
+//                BeanUtils.copyProperties(item,dto);
+//                csDevModelDtoList.add(dto);
+//            });
+//            csDataSets.forEach(item->{
+//                CsDevModelDto.CsDataSet dto = new CsDevModelDto.CsDataSet();
+//                BeanUtils.copyProperties(item,dto);
+//                csDataSetList.add(dto);
+//            });
+//            csDataArrays.forEach(item->{
+//                CsDevModelDto.CsDataArray dto = new CsDevModelDto.CsDataArray();
+//                BeanUtils.copyProperties(item,dto);
+//                csDataArrayList.add(dto);
+//            });
+//
+//            for (CsDevModelDto.CsDataSet item1 : csDataSetList) {
+//                List<CsDevModelDto.CsDataArray> list1 = new ArrayList<>();
+//                for (CsDevModelDto.CsDataArray item2 : csDataArrayList) {
+//                    if (Objects.equals(item1.getId(),item2.getPid())) {
+//                        list1.add(item2);
+//                    }
+//                }
+//                item1.setDataArrays(list1);
+//            }
+//
+//            for (CsDevModelDto item1 : csDevModelDtoList) {
+//                List<CsDevModelDto.CsDataSet> list1 = new ArrayList<>();
+//                for (CsDevModelDto.CsDataSet item2 : csDataSetList) {
+//                    if (Objects.equals(item1.getId(),item2.getPid())) {
+//                        list1.add(item2);
+//                    }
+//                }
+//                item1.setDataSets(list1);
+//                redisUtil.saveByKey(AppRedisKey.DEV_MODEL.concat(item1.getId()),item1);
+//            }
+//        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CsDevModelPO addDevModel(CsDevModelAddParm csDevModelAddParm) {
         CsDevModelPO csDevModelPO = new CsDevModelPO ();
         BeanUtils.copyProperties (csDevModelAddParm, csDevModelPO);
         csDevModelPO.setStatus ("1");
-        csDevModelPO.setVersionDate(Date.valueOf(csDevModelAddParm.getTime()));
         this.save (csDevModelPO);
         return csDevModelPO;
     }
@@ -46,14 +118,20 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
     public Boolean AuditDevModel(CsDevModelAuditParm csDevModelAuditParm) {
         CsDevModelPO csDevModelPO = new CsDevModelPO ();
         BeanUtils.copyProperties (csDevModelAuditParm, csDevModelPO);
-        boolean b = this.updateById (csDevModelPO);
-        return b;
+        return this.updateById (csDevModelPO);
     }
 
     @Override
     public IPage<CsDevModelPageVO> queryPage(CsDevModelQueryParm csDevModelQueryParm) {
         Page<CsDevModelPageVO> returnpage = new Page<> (csDevModelQueryParm.getPageNum ( ), csDevModelQueryParm.getPageSize ( ));
-
+        if (Objects.nonNull (csDevModelQueryParm.getDevType()) && StringUtils.isNotBlank(csDevModelQueryParm.getDevType())) {
+            SysDicTreePO po = dictTreeFeignClient.queryById(csDevModelQueryParm.getDevType()).getData();
+            if (Objects.isNull (po)) {
+                throw new BusinessException("装置型号字典缺失");
+            } else {
+                csDevModelQueryParm.setDevName(po.getName());
+            }
+        }
         returnpage = this.getBaseMapper ().getPage(returnpage,csDevModelQueryParm);
         return returnpage;
     }
@@ -61,8 +139,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
     @Override
     public CsDevModelPageVO queryDevModelOne(CsDevModelQueryListParm csDevModelQueryListParm) {
 
-        CsDevModelPageVO result = this.getBaseMapper ().queryOne(csDevModelQueryListParm);
-        return result;
+        return this.getBaseMapper ().queryOne(csDevModelQueryListParm);
     }
 
     @Override

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

@@ -6,9 +6,10 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 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.text.StrPool;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,7 +19,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.access.utils.MqttUtil;
+import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.api.CsLogsFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
@@ -31,7 +35,7 @@ import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csdevice.util.QRCodeUtil;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
-import com.njcn.db.constant.DbConstant;
+import com.njcn.csdevice.utils.StringUtil;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -39,8 +43,10 @@ import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.pojo.vo.DictTreeVO;
-import com.njcn.web.factory.PageFactory;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.enums.DicTreeEnum;
+import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.user.enums.AppRoleEnum;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -89,10 +95,27 @@ 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;
+
+    @Override
+    public void refreshDeviceDataCache() {
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(CsEquipmentDeliveryPO::getRunStatus,0);
+        List<CsEquipmentDeliveryPO> deliveryPOS = this.list(queryWrapper);
+        redisUtil.saveByKey(AppRedisKey.DEVICE_LIST,deliveryPOS);
+    }
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public Boolean  save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) {
+    public CsEquipmentDeliveryPO save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) {
+        boolean result;
+        CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getName, csEquipmentDeliveryAddParm.getName()).ne(CsEquipmentDeliveryPO::getRunStatus, 0).one();
+        if(Objects.nonNull (one)){
+            throw new BusinessException ("设备名称不能重复");
+        }
+        StringUtil.containsSpecialCharacters(csEquipmentDeliveryAddParm.getNdid());
         CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (csEquipmentDeliveryAddParm.getNdid());
         if(!Objects.isNull (po)){
             throw new BusinessException (AlgorithmResponseEnum.NDID_ERROR);
@@ -101,6 +124,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
         csEquipmentDeliveryPo.setStatus (1);
         csEquipmentDeliveryPo.setRunStatus(1);
+        csEquipmentDeliveryPo.setUsageStatus(1);
         String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
         if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
             csEquipmentDeliveryPo.setProcess(4);
@@ -121,7 +145,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         csEquipmentProcess.setStatus (1);
 
         csEquipmentProcessPOService.save(csEquipmentProcess);
-        return this.save (csEquipmentDeliveryPo);
+        result = this.save (csEquipmentDeliveryPo);
+        if (result) {
+            refreshDeviceDataCache();
+        }
+        return csEquipmentDeliveryPo;
     }
 
     @Override
@@ -161,6 +189,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
 
         csDevModelRelationService.lambdaUpdate().eq(CsDevModelRelationPO::getDevId,id).set(CsDevModelRelationPO::getStatus,0).update();
+        if (update) {
+            refreshDeviceDataCache();
+        }
         return update;
     }
 
@@ -198,7 +229,10 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateEquipmentDelivery(CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm) {
+        StringUtil.containsSpecialCharacters(csEquipmentDeliveryAuditParm.getNdid());
+        boolean result;
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getNdid,csEquipmentDeliveryAuditParm.getNdid())
                                     .in(CsEquipmentDeliveryPO::getStatus,Arrays.asList(1,2,3))
@@ -208,66 +242,159 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         if (countByAccount >= 1) {
             throw new BusinessException(AlgorithmResponseEnum.NDID_ERROR);
         }
+
+        LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(CsEquipmentDeliveryPO::getId, csEquipmentDeliveryAuditParm.getId());
+        CsEquipmentDeliveryPO po = this.baseMapper.selectOne(lambdaQueryWrapper2);
+
+        List<CsEquipmentDeliveryPO> list = this.lambdaQuery()
+                .ne(CsEquipmentDeliveryPO::getId, csEquipmentDeliveryAuditParm.getId())
+                .ne(CsEquipmentDeliveryPO::getNdid, csEquipmentDeliveryAuditParm.getNdid())
+                .eq(CsEquipmentDeliveryPO::getName, csEquipmentDeliveryAuditParm.getName())
+                .ne(CsEquipmentDeliveryPO::getRunStatus, 0).list();
+        if(!CollectionUtils.isEmpty (list)){
+            throw new BusinessException ("设备名称不能重复");
+        }
         CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO();
         BeanUtils.copyProperties (csEquipmentDeliveryAuditParm, csEquipmentDeliveryPo);
-        return this.updateById (csEquipmentDeliveryPo);
+        result = this.updateById(csEquipmentDeliveryPo);
+        //修改台账树中的设备名称
+        CsLedger csLedger = csLedgerService.findDataById(csEquipmentDeliveryAuditParm.getId());
+        CsLedgerParam.Update csLedgerParam = new CsLedgerParam.Update();
+        BeanUtils.copyProperties (csLedger, csLedgerParam);
+        csLedgerParam.setName(csEquipmentDeliveryAuditParm.getName());
+        csLedgerService.updateLedgerTree(csLedgerParam);
+
+        if (result) {
+            refreshDeviceDataCache();
+            if (!Objects.equals(po.getUsageStatus(),csEquipmentDeliveryAuditParm.getUsageStatus())) {
+                DeviceLogDTO dto = new DeviceLogDTO();
+                dto.setUserName(RequestUtil.getUsername());
+                dto.setOperate("设备使用状态被修改");
+                dto.setResult(1);
+                dto.setLoginName(RequestUtil.getLoginName());
+                csLogsFeignClient.addUserLog(dto);
+            }
+        }
+        return result;
     }
 
     @Override
     public void updateStatusBynDid(String nDId,Integer status) {
+        boolean result;
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDId);
-        this.update(lambdaUpdateWrapper);
+        result = this.update(lambdaUpdateWrapper);
+        if (result) {
+            refreshDeviceDataCache();
+        }
     }
 
     @Override
     public Page<CsEquipmentDeliveryVO> list(CsEquipmentDeliveryQueryParm queryParam) {
-        QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<CsEquipmentDeliveryPO>();
-        if (ObjectUtil.isNotNull(queryParam)) {
-            //查询参数不为空，进行条件填充
-            if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
-                //部门根据名称模糊查询
-                queryWrapper
-                        .and(param -> param.like("cs_equipment_delivery.name", queryParam.getSearchValue())
-                                .or().like("cs_equipment_delivery.ndid", queryParam.getSearchValue())
-                                .or().like("cs_equipment_delivery.mac", queryParam.getSearchValue()));
+        Page<CsEquipmentDeliveryVO> page = new Page<> ();
+        page.setCurrent(queryParam.getPageNum());
+        page.setSize(queryParam.getPageSize());
+        queryParam.setPageNum((queryParam.getPageNum()-1)*queryParam.getPageSize());
+        int total = this.baseMapper.getCounts(queryParam);
+        if (total > 0) {
+            List<CsEquipmentDeliveryVO> recordList = this.baseMapper.getList(queryParam);
+            //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+            for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : recordList){
+                if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                    csEquipmentDeliveryVO.setStatus(5);
+                } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                    csEquipmentDeliveryVO.setStatus(6);
+                }
+                //判断装置是否已经连接上mqtt服务器
+                String clientName = "NJCN-" + csEquipmentDeliveryVO.getNdid().substring(csEquipmentDeliveryVO.getNdid().length() - 6);
+                boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+                if (mqttClient) {
+                    csEquipmentDeliveryVO.setConnectStatus("已连接");
+                } else {
+                    csEquipmentDeliveryVO.setConnectStatus("未连接");
+                }
             }
-            //排序
-            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
-                queryWrapper.orderBy(true, queryParam.getOrderBy().equalsIgnoreCase(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
-            } else {
-                //默认根据创建时间排序
-                queryWrapper.orderBy(true, false, "create_time");
+            if (ObjectUtil.isNotNull(queryParam.getConnectStatus())) {
+                recordList = recordList.stream()
+                        .filter(item -> queryParam.getConnectStatus() == 0
+                                ? "未连接".equals(item.getConnectStatus())
+                                : "已连接".equals(item.getConnectStatus()))
+                        .collect(Collectors.toList());
             }
+            page.setTotal(CollectionUtil.isEmpty(recordList) ? 0 : recordList.size());
+            page.setRecords(recordList);
         }
-        if (StrUtil.isNotBlank(queryParam.getDevType()) && !Objects.isNull(queryParam.getDevType())){
-            queryWrapper.eq("cs_equipment_delivery.dev_type", queryParam.getDevType());
-        }
-        if (StrUtil.isNotBlank(queryParam.getDevModel()) && !Objects.isNull(queryParam.getDevModel())){
-            queryWrapper.eq("cs_equipment_delivery.dev_model", queryParam.getDevModel());
-        }
-        if (StrUtil.isNotBlank(queryParam.getDevAccessMethod()) && !Objects.isNull(queryParam.getDevAccessMethod())){
-            queryWrapper.eq("cs_equipment_delivery.dev_access_method", queryParam.getDevAccessMethod());
-        }
-        if (!Objects.isNull(queryParam.getStatus())){
-            queryWrapper.eq("cs_equipment_delivery.status", queryParam.getStatus());
-        } else {
-            queryWrapper.in("cs_equipment_delivery.status", Arrays.asList(1,2,3));
-        }
-        if (!Objects.isNull(queryParam.getRunStatus())){
-            queryWrapper.eq("cs_equipment_delivery.run_status", queryParam.getRunStatus());
-        } else {
-            queryWrapper.in("cs_equipment_delivery.run_status", Arrays.asList(1,2));
-        }
-        Page<CsEquipmentDeliveryVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
-        page.getRecords().forEach(item->{
-            if (!Objects.isNull(item.getQrPath())){
-                item.setQrPath(item.getQrPath());
-            }
-        });
         return page;
     }
 
+//    @Override
+//    public Page<CsEquipmentDeliveryVO> list(CsEquipmentDeliveryQueryParm queryParam) {
+//        QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<CsEquipmentDeliveryPO>();
+//        if (ObjectUtil.isNotNull(queryParam)) {
+//            //查询参数不为空，进行条件填充
+//            if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
+//                //部门根据名称模糊查询
+//                queryWrapper
+//                        .and(param -> param.like("cs_equipment_delivery.name", queryParam.getSearchValue())
+//                                .or().like("cs_equipment_delivery.ndid", queryParam.getSearchValue())
+//                                .or().like("cs_equipment_delivery.mac", queryParam.getSearchValue()));
+//            }
+//            //排序
+//            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
+//                queryWrapper.orderBy(true, queryParam.getOrderBy().equalsIgnoreCase(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
+//            } else {
+//                //默认根据创建时间排序
+//                queryWrapper.orderBy(true, false, "create_time");
+//            }
+//        }
+//        if (StrUtil.isNotBlank(queryParam.getDevType()) && !Objects.isNull(queryParam.getDevType())){
+//            queryWrapper.eq("cs_equipment_delivery.dev_type", queryParam.getDevType());
+//        }
+//        if (StrUtil.isNotBlank(queryParam.getDevModel()) && !Objects.isNull(queryParam.getDevModel())){
+//            queryWrapper.eq("cs_equipment_delivery.dev_model", queryParam.getDevModel());
+//        }
+//        if (StrUtil.isNotBlank(queryParam.getDevAccessMethod()) && !Objects.isNull(queryParam.getDevAccessMethod())){
+//            queryWrapper.eq("cs_equipment_delivery.dev_access_method", queryParam.getDevAccessMethod());
+//        }
+//        if (!Objects.isNull(queryParam.getStatus())){
+//            queryWrapper.eq("cs_equipment_delivery.status", queryParam.getStatus());
+//        } else {
+//            queryWrapper.in("cs_equipment_delivery.status", Arrays.asList(1,2,3));
+//        }
+//        if (!Objects.isNull(queryParam.getRunStatus())){
+//            queryWrapper.eq("cs_equipment_delivery.run_status", queryParam.getRunStatus());
+//        } else {
+//            queryWrapper.in("cs_equipment_delivery.run_status", Arrays.asList(1,2));
+//        }
+//        if (!Objects.isNull(queryParam.getProcess())){
+//            queryWrapper.eq("cs_equipment_delivery.process", queryParam.getProcess());
+//        }
+//        Page<CsEquipmentDeliveryVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+//        page.getRecords().forEach(item->{
+//            if (!Objects.isNull(item.getQrPath())){
+//                item.setQrPath(item.getQrPath());
+//            }
+//        });
+//        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+//        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
+//            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+//                csEquipmentDeliveryVO.setStatus(5);
+//            } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+//                csEquipmentDeliveryVO.setStatus(6);
+//            }
+//            //判断装置是否已经连接上mqtt服务器
+//            String clientName = "NJCN-" + csEquipmentDeliveryVO.getNdid().substring(csEquipmentDeliveryVO.getNdid().length() - 6);
+//            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+//            if (mqttClient) {
+//                csEquipmentDeliveryVO.setConnectStatus("已连接");
+//            } else {
+//                csEquipmentDeliveryVO.setConnectStatus("未连接");
+//            }
+//        }
+//        return page;
+//    }
+
     @Override
     public DeviceManagerVO getDeviceData(String deviceId, String type, String lineId) {
         DeviceManagerVO deviceManagerVo = new DeviceManagerVO();
@@ -302,17 +429,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 List<CsDataSet> dataSet = new ArrayList<>();
                 //治理监测点
                 if (Objects.equals(code, DicDataEnum.OUTPUT_SIDE.getCode())){
-                    //    select
-                    //        t1.id
-                    //    from
-                    //        cs_dev_model_relation t0
-                    //    left join cs_dev_model t1 on
-                    //        t0.model_id = t1.id
-                    //    where
-                    //    t0.status="1" and
-                    //        t0.dev_id = #{devId} and t1.`type` = #{type}
                     modelId = csDevModelRelationService.getModelByType(deviceId,0);
-                    //select * from cs_data_set where pid = modelId and clDev = 0
                     dataSet = csDataSetService.findDataSetByModelId(modelId,0);
                 }
                 //电网侧监测点
@@ -343,43 +460,38 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) {
         BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo);
         if (CollUtil.isNotEmpty(dataSet)) {
-            for (CsDataSet item : dataSet) {
-                DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
-                dataSetVO.setId(item.getId());
-                dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName());
-                dataSetVO.setType("rt");
-                dataSetList.add(dataSetVO);
-                deviceManagerVo.setDataLevel(item.getDataLevel());
-                if (Objects.equals(type, "history")) {
-                    //历史数据tab
-                    DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
-                    dataSetVo2.setId(item.getId());
-                    dataSetVo2.setName("历史统计数据");
-                    dataSetVo2.setType("history");
-                    dataSetList.add(dataSetVo2);
+            if (Objects.equals(type, "rt")) {
+                for (CsDataSet item : dataSet) {
+                    DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
+                    dataSetVO.setId(item.getId());
+                    dataSetVO.setName(item.getAnotherName());
+                    dataSetVO.setType("rt");
+                    dataSetList.add(dataSetVO);
                     deviceManagerVo.setDataLevel(item.getDataLevel());
-                    //下面这些tab仅仅只限于设备监控的便携式设备才会有
-                    if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
-                        //趋势数据tab
-                        DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo3.setId(item.getId());
-                        dataSetVo3.setName("历史趋势数据");
-                        dataSetVo3.setType("trenddata");
-                        dataSetList.add(dataSetVo3);
-                        //实时数据tab
-                        DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo4.setId(item.getId());
-                        dataSetVo4.setName("实时数据");
-                        dataSetVo4.setType("realtimedata");
-                        dataSetList.add(dataSetVo4);
-                        //暂态事件tab
-                        DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo5.setId(item.getId());
-                        dataSetVo5.setName("暂态事件");
-                        dataSetVo5.setType("event");
-                        dataSetList.add(dataSetVo5);
+                }
+            } else {
+                CsDataSet item = dataSet.get(0);
+                boolean isPortableDevice = DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType());
+                addDataSet(dataSetList, item, "最新数据", "rt");
+                addDataSet(dataSetList, item, "历史统计数据", "history");
+                addDataSet(dataSetList, item, "历史趋势", "trenddata");
+                if (item.getClDev() == 0 && item.getType() == 0) {
+                    //限制角色展示
+                    String role = RequestUtil.getUserRole();
+                    List<String> strings = JSONArray.parseArray(role, String.class);
+                    if (strings.contains(AppRoleEnum.ENGINEERING_USER.getCode())
+                            || strings.contains(AppRoleEnum.OPERATION_MANAGER.getCode())
+                            || strings.contains(AppRoleEnum.ROOT.getCode())) {
+                        addDataSet(dataSetList, item, "模块数据", "moduleData");
                     }
                 }
+                if (isPortableDevice) {
+                    // 便携式设备特有的数据集
+                    addDataSet(dataSetList, item, "实时数据", "realtimedata");
+                    addDataSet(dataSetList, item, "暂态事件", "event");
+                    addDataSet(dataSetList, item, "测试项日志", "items");
+                }
+                deviceManagerVo.setDataLevel(item.getDataLevel());
             }
             deviceManagerVo.setDataSetList(dataSetList);
             List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid());
@@ -389,11 +501,23 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
     }
 
+    private void addDataSet(List<DeviceManagerVO.DataSetVO> dataSetList, CsDataSet item, String name, String type) {
+        DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
+        dataSetVO.setId(item.getId());
+        dataSetVO.setName(name);
+        dataSetVO.setType(type);
+        dataSetList.add(dataSetVO);
+    }
+
     @Override
     public void updateSoftInfoBynDid(String nDid, String id, Integer module) {
+        boolean result;
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getSoftinfoId,id).set(CsEquipmentDeliveryPO::getModuleNumber,module).eq(CsEquipmentDeliveryPO::getNdid,nDid);
-        this.update(lambdaUpdateWrapper);
+        result = this.update(lambdaUpdateWrapper);
+        if (result) {
+            refreshDeviceDataCache();
+        }
     }
 
     @Override
@@ -403,13 +527,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importEquipment(MultipartFile file, HttpServletResponse response) {
+    public List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams ( );
         params.setHeadRows(1);
         params.setTitleRows(1);
         //第一个sheet为台账信息
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
+        String regex = "^[A-Za-z0-9]{6,32}$";
         try {
             ExcelImportResult<DeviceExcelTemplete> terminalBaseList = ExcelImportUtil.importExcelMore (file.getInputStream ( ), DeviceExcelTemplete.class, params);
             //如果存在非法数据，将不合格的数据导出
@@ -418,6 +543,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
             for (int i = 0; i < terminalBaseList.getList ( ).size ( ); i++) {
                 DeviceExcelTemplete deviceExcelTemplete = terminalBaseList.getList ( ).get (i);
+
+                if(!deviceExcelTemplete.getNdid().matches(regex)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("网络设备ID只可为数字或字母,长度至少为6位");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }
+
                 CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (deviceExcelTemplete.getNdid ( ));
                 if(!Objects.isNull (po)){
                     DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
@@ -426,39 +560,47 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     falseCollect.add(idlegalityDeviceException);
                     continue;
                 }
-                if(Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.GATEWAY_DEV.getName())){
-                    DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.GATEWAY_DEV.getCode()).getData();
-                    deviceExcelTemplete.setDevType(data.getId());
-                    List<DictTreeVO> data1 = dictTreeFeignClient.query(data.getId()).getData();
-                    Map<String, DictTreeVO> collect = data1.stream().collect(Collectors.toMap(DictTreeVO::getCode, dictTreeVO -> dictTreeVO));
-                    if(collect.containsKey(deviceExcelTemplete.getDevModel())){
-                        deviceExcelTemplete.setDevModel(collect.get(deviceExcelTemplete.getDevModel()).getId());
-                        trueCollect.add(deviceExcelTemplete);
-                    }else {
-                        DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
-                        BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                        idlegalityDeviceException.setMsg("装置型号不正确");
-                        falseCollect.add(idlegalityDeviceException);
-                    }
-                } else if (Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.CONNECT_DEV.getName())) {
-                    DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.CONNECT_DEV.getCode()).getData();
-                    deviceExcelTemplete.setDevType(data.getId());
-                    List<DictTreeVO> data1 = dictTreeFeignClient.query(data.getId()).getData();
-                    Map<String, DictTreeVO> collect = data1.stream().collect(Collectors.toMap(DictTreeVO::getCode, dictTreeVO -> dictTreeVO));
-                    if(collect.containsKey(deviceExcelTemplete.getDevModel())){
-                        deviceExcelTemplete.setDevModel(collect.get(deviceExcelTemplete.getDevModel()).getId());
-                        trueCollect.add(deviceExcelTemplete);
-                    }else {
-                        DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
-                        BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                        idlegalityDeviceException.setMsg("装置型号不正确");
-                        falseCollect.add(idlegalityDeviceException);
-                    }
-                }else {
+                CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getName, deviceExcelTemplete.getName()).ne(CsEquipmentDeliveryPO::getRunStatus, 0).one();
+                if(Objects.nonNull (one)){
                     DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
                     BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                    idlegalityDeviceException.setMsg("装置类型不正确");
+                    idlegalityDeviceException.setMsg("NDID重复");
                     falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }
+                List<SysDicTreePO> deviceType = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.DEVICE_TYPE.getCode()).getData();
+                //设备类型
+                List<SysDicTreePO> children = deviceType.get(0).getChildren();
+                Map<String, SysDicTreePO> map = children.stream().collect(Collectors.toMap(SysDicTreePO::getName, dictTreeVO -> dictTreeVO));
+
+                List<SysDicTreePO> collect = children.stream().filter(temp -> Objects.equals(temp.getName(), deviceExcelTemplete.getDevType())).collect(Collectors.toList());
+                SysDicTreePO sysDicTreePO = map.get(deviceExcelTemplete.getDevType());
+                if(CollectionUtils.isEmpty(collect)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("设备类型不正确");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }else {
+                    deviceExcelTemplete.setDevType(map.get(deviceExcelTemplete.getDevType()).getId());
+
+                }
+
+                //设备型号
+                List<SysDicTreePO> children1 = sysDicTreePO.getChildren();
+                Map<String, SysDicTreePO> map2 = children1.stream().collect(Collectors.toMap(SysDicTreePO::getName, dictTreeVO -> dictTreeVO));
+
+                List<SysDicTreePO> collect2 = children1.stream().filter(temp -> Objects.equals(temp.getName(), deviceExcelTemplete.getDevModel())).collect(Collectors.toList());
+
+                if(CollectionUtils.isEmpty(collect2)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("设备类型与设备型号不匹配");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }else {
+                    deviceExcelTemplete.setDevModel(map2.get(deviceExcelTemplete.getDevModel()).getId());
+                    trueCollect.add(deviceExcelTemplete);
                 }
 
 
@@ -475,6 +617,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     csEquipmentDeliveryPO.setRunStatus(1);
                     csEquipmentDeliveryPO.setStatus(1);
                     csEquipmentDeliveryPO.setProcess(2);
+                    csEquipmentDeliveryPO.setSort(100);
 
                     CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
                     csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid());
@@ -487,17 +630,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 }).collect (Collectors.toList ( ));
                 csEquipmentProcessPOService.saveBatch(collect1,500);
                 this.saveOrUpdateBatch (collect, 500);
+
+                return collect;
             }
             if (!CollectionUtils.isEmpty (falseCollect)) {
                 ExportParams exportExcel = new ExportParams ("批量导入模板（请严格按照模板标准填入数据）", "非法设备信息");
                 Workbook workbook = ExcelExportUtil.exportExcel (exportExcel, DeviceExcelTemplete.IllegalityDeviceExcelTemplete.class, falseCollect);
                 ExcelStyleUtil.exportFileByWorkbook (workbook, "非法设备信息.xlsx", response);
-
+                return null;
             }
 
         } catch (Exception e) {
             e.printStackTrace ( );
         }
+        return null;
     }
     /*
     * 物理删除设备相关数据
@@ -541,6 +687,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             appLineTopologyDiagramPOQueryWrapper.in("line_id",collect);
             appLineTopologyDiagramService.remove(appLineTopologyDiagramPOQueryWrapper);
         }
+        refreshDeviceDataCache();
     }
 
     @Override
@@ -585,20 +732,28 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     public void updateSoftInfo(String nDid, String id) {
+        boolean result;
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(CsEquipmentDeliveryPO::getNdid,nDid)
                             .ne(CsEquipmentDeliveryPO::getRunStatus,0)
                             .set(CsEquipmentDeliveryPO::getSoftinfoId,id);
-        this.update(lambdaUpdateWrapper);
+        result = this.update(lambdaUpdateWrapper);
+        if (result) {
+            refreshDeviceDataCache();
+        }
     }
 
     @Override
     public void updateModuleNumber(String nDid, Integer number) {
+        boolean result;
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(CsEquipmentDeliveryPO::getNdid,nDid)
                 .ne(CsEquipmentDeliveryPO::getRunStatus,0)
                 .set(CsEquipmentDeliveryPO::getModuleNumber,number);
-        this.update(lambdaUpdateWrapper);
+        result = this.update(lambdaUpdateWrapper);
+        if (result) {
+            refreshDeviceDataCache();
+        }
     }
 
     @Override
@@ -608,9 +763,12 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             askDeviceDataFeignClient.rebootDevice(nDid);
             Thread.sleep(3000);
             String key = AppRedisKey.CONTROL + nDid;
-            String value = redisUtil.getObjectByKey(key).toString();
-            if (Objects.equals(value,"success")) {
-                result = true;
+            Object object = redisUtil.getObjectByKey(key);
+            if (Objects.nonNull(object)) {
+                String value = object.toString();
+                if (Objects.equals(value,"success")) {
+                    result = true;
+                }
             }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
@@ -623,6 +781,25 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         return this.lambdaQuery().ne(CsEquipmentDeliveryPO::getRunStatus,0).list();
     }
 
+    @Override
+    public boolean judgeDevModel(String nDid) {
+        boolean result = false;
+        //获取装置id
+        CsEquipmentDeliveryPO po = findDevByNDid(nDid);
+        //设备型号
+        String code = dictTreeFeignClient.queryById(po.getDevModel()).getData().getCode();
+        if (Objects.equals(DicTreeEnum.PQ_COM.getCode(),code)) {
+            result = true;
+        }
+        return result;
+    }
+
+    @Override
+    public CsEquipmentDeliveryPO getDevByLineId(String lineId) {
+        CsLinePO linePO = csLinePOService.getById(lineId);
+        return this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId,linePO.getDeviceId()).ne(CsEquipmentDeliveryPO::getRunStatus,0).one();
+    }
+
     /**
      * 根据ndid生成二维码
      * @param ndid

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

@@ -10,9 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.PubUtils;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
@@ -26,19 +24,18 @@ import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
-import com.njcn.csdevice.service.CsDevModelRelationService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroupService;
+import com.njcn.csdevice.service.ICsLedgerService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
 import com.njcn.csdevice.utils.DataChangeUtil;
 import com.njcn.csharmonic.api.EventFeignClient;
+import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
-import com.njcn.csharmonic.pojo.vo.CsEventVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
-
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.dto.EventDataSetDTO;
 import com.njcn.influx.pojo.dto.StatisticalDataDTO;
@@ -53,6 +50,7 @@ import com.njcn.system.pojo.po.EleEvtParm;
 import com.njcn.system.pojo.vo.CsStatisticalSetVO;
 import com.njcn.system.pojo.vo.EleEpdPqdListVO;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -80,48 +78,24 @@ import java.util.stream.Stream;
 public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> implements ICsGroupService {
 
     private final ICsDataArrayService csDataArrayService;
-
     private final CsGroArrMapper csGroArrMapper;
-
     private final CsGroupMapper csGroupMapper;
-
     private final CsDataArrayMapper csDataArrayMapper;
-
     private final CommonService commonService;
-
     private final EpdFeignClient epdFeignClient;
-
     private final CsLineFeignClient csLineFeignClient;
-
+    private final ICsLedgerService iCsLedgerService;
     private final DicDataFeignClient dicDataFeignClient;
-
     private final EquipmentFeignClient equipmentFeignClient;
-
     private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
-
     private final EvtDataService evtDataService;
-
     private final DecimalFormat df = new DecimalFormat("#0.00");
-
     private final EleEvtFeignClient eleEvtFeignClient;
-
     private final OverlimitMapper overlimitMapper;
-
     private final CsDataSetMapper csDataSetMapper;
-
     private final EventFeignClient eventFeignClient;
-
     private final InfluxDbParamUtil influxDbParamUtil;
 
-    private final Set<String> POWER_LIST = new HashSet<>(Arrays.asList(
-            "电网有功功率", "电网无功功率", "电网视在功率", "负载有功功率",
-            "负载无功功率", "负载视在功率", "有功功率", "无功功率",
-            "视在功率", "基波有功功率", "基波无功功率",
-            "基波视在功率", "三相总有功功率", "三相总无功功率",
-            "三相总视在功率"
-    ));
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<CsGroupVO> getGroupData(String dataSet) {
@@ -176,13 +150,13 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         }else {
                             re = DataChangeUtil.secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), csLinePO.getPtRatio(), csLinePO.getCtRatio());
                         }
-                        if (changePower(vo.getAnotherName())) {
+                        if (changePower(vo.getAnotherName()) && Objects.equals(dataLevel,"Primary")) {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(re / 1000).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         } else {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(re).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         }
                     } else {
-                        if (changePower(vo.getAnotherName())) {
+                        if (changePower(vo.getAnotherName()) && Objects.equals(dataLevel,"Primary")) {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(statisticalDataDTO.getValue()/1000).setScale(2, RoundingMode.HALF_UP).doubleValue())));
                         } else {
                             vo.setDataValue(Double.valueOf(df.format(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(2, RoundingMode.HALF_UP).doubleValue())));
@@ -193,6 +167,8 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 }
                 if (vo.getAnotherName().contains("A相") || vo.getAnotherName().contains("B相") || vo.getAnotherName().contains("C相")) {
                     vo.setAnotherName(vo.getAnotherName().substring(0,2));
+                } else if (vo.getAnotherName().contains("AB") || vo.getAnotherName().contains("BC") || vo.getAnotherName().contains("CA")) {
+                    vo.setAnotherName(vo.getAnotherName().substring(0,2).concat("相"));
                 }
                 arrayList.add(vo);
             }
@@ -319,6 +295,12 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             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();
+            CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
+            if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
+                throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
+            }
+            Double ct = finalCsLinePOList.get(0).getCtRatio();
+            Double pt = finalCsLinePOList.get(0).getPtRatio();
             if(CollectionUtil.isNotEmpty(commonStatisticalQueryParam.getList())){
                 for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){
 
@@ -328,7 +310,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             CommonQueryParam commonQueryParam = new CommonQueryParam();
                             commonQueryParam.setLineId(temp.getLineId());
                             commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
-                            commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency()));
+                            commonQueryParam.setColumnName(epdPqd.getName()+ (StringUtils.isEmpty(param.getFrequency()) ? "":"_"+param.getFrequency()));
                             commonQueryParam.setPhasic(epdPqd.getPhase());
 
                             commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(commonStatisticalQueryParam.getStartTime(),DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
@@ -340,18 +322,114 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             return commonQueryParam;
                         }).collect(Collectors.toList());
                         List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
-                        //List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtData(commonQueryParams);
                         List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
+                            String unit;
                             ThdDataVO vo = new ThdDataVO();
                             vo.setLineId(temp.getLineId());
-                            vo.setPhase(temp.getPhaseType());
+                            vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
                             String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                             vo.setPosition(position);
                             vo.setTime(temp.getTime());
                             vo.setStatMethod(temp.getValueType());
                             vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                            if(temp.getValue()!=null) {
+                                double re = 0;
+                                if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                            re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000));
+                                            vo.setStatisticalData(re);
+                                            unit = "k" + epdPqd.getUnit();
+                                        } else {
+                                            vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
+                                            unit = epdPqd.getUnit();
+                                        }
+                                    } else {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    re = temp.getValue() * pt / 1000;
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() * ct;
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() * pt * ct / 1000;
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                            }
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }else {
+                                            re = temp.getValue();
+                                            unit = epdPqd.getUnit();
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }
+
+                                    }
+                                } else {
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    re = temp.getValue() / pt;
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() / ct;
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() / pt / ct;
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    break;
+                                            }
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }else {
+                                            re = temp.getValue();
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }
+                                    } else {
+                                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                    }
+                                    unit = epdPqd.getUnit();
+                                }
+                            } else {
+                                vo.setStatisticalData(null);
+                                if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        unit = epdPqd.getUnit();
+                                    } else {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                            }
+                                        }else {
+                                            unit = epdPqd.getUnit();
+                                        }
+                                    }
+                                } else {
+                                    unit = epdPqd.getUnit();
+                                }
+                            }
+                            vo.setUnit(unit);
                             vo.setStatisticalIndex(epdPqd.getId());
-                            vo.setUnit(epdPqd.getUnit());
                             vo.setStatisticalName(epdPqd.getName());
                             vo.setAnotherName(epdPqd.getShowName());
                             return vo;
@@ -393,7 +471,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                     ThdDataVO vo = new ThdDataVO();
                     vo.setLineId(temp.getLineId());
-                    vo.setPhase(temp.getPhaseType());
+                    vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
                     String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                     vo.setPosition(position);
                     vo.setTime(temp.getTime());
@@ -421,9 +499,12 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             csEventVOPage.getRecords().forEach(temp->{
                 //事件描述、相别、暂降幅值,需要特殊处理赋值
                 //事件描述
+                CsLedger dataById = iCsLedgerService.findDataById(temp.getLineId());
+                temp.setLineName(dataById.getName());
                 EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
                 if(ele!=null){
                     temp.setShowName(ele.getShowName());
+
                     //相别
                     List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
                     List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();
@@ -532,7 +613,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                                 List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                                     ThdDataVO vo = new ThdDataVO();
                                     vo.setLineId(temp.getLineId());
-                                    vo.setPhase(temp.getPhaseType());
+                                    vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
                                     String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                                     vo.setPosition(position);
                                     vo.setTime(temp.getTime());
@@ -632,7 +713,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                                 ThdDataVO vo = new ThdDataVO();
                                 vo.setLineId(temp.getLineId());
-                                vo.setPhase(temp.getPhaseType());
+                                vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
                                 String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
                                 vo.setPosition(position);
                                 vo.setTime(temp.getTime());
@@ -764,8 +845,6 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
 
     //单位处理
     public void getUnit(List<EnergyTemplateVO> energyTemplates, List<EleEpdPqd> eleEpdPqds, List<DataGroupTemplateVO> dataGroupTemplates, String type) {
-        List<String> pList =  Arrays.asList("电网有功功率", "电网无功功率", "电网视在功率","负载有功功率","负载无功功率","负载视在功率"
-                ,"有功功率","无功功率","视在功率","基波有功功率","基波无功功率","基波视在功率","三相总有功功率","三相总无功功率","三相总视在功率");
         // 使用Map来存储EleEpdPqd的ID和Unit，以便快速查找
         Map<String, String> unitMap = new HashMap<>();
         for (EleEpdPqd item : eleEpdPqds) {
@@ -790,7 +869,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         for (DataGroupTemplateVO dataGroupTemplate : dataGroupTemplates) {
             EnergyTemplateVO energyTemplate = energyTemplateMap.get(dataGroupTemplate.getId());
             if (energyTemplate != null && energyTemplate.getUnit() != null) {
-                if (changePower(dataGroupTemplate.getName())) {
+                if (changePower(dataGroupTemplate.getName()) && Objects.equals("Primary",type)) {
                     dataGroupTemplate.setName(dataGroupTemplate.getName() + "(k" + energyTemplate.getUnit() + ")");
                 } else {
                     dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");
@@ -800,9 +879,12 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         }
     }
 
-    //判断功率是否需要转换
+    //判断指标是否需要转换
     public boolean changePower(String name) {
-        return POWER_LIST.stream()
+        if(name.contains("相角")) {
+            return false;
+        }
+        return HarmonicConstant.POWER_LIST.stream()
                 .anyMatch(name::contains);
     }
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import com.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.constant.DataParam;
@@ -15,16 +16,15 @@ import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.service.*;
-import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.AreaFeignClient;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.pojo.po.Area;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -39,15 +39,12 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> implements ICsLedgerService {
 
-    private final ICsEngineeringUserService csEngineeringUserService;
     private final AreaFeignClient areaFeignClient;
     private final RedisUtil redisUtil;
     private final AppTopologyDiagramMapper appTopologyDiagramMapper;
     private final AppProjectMapper appProjectMapper;
     private final CsEngineeringMapper csEngineeringMapper;
     private final CsLinePOService csLinePOService;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final FileStorageUtil fileStorageUtil;
     private final RoleEngineerDevService roleEngineerDevService;
     private final CsDevModelRelationService csDevModelRelationService;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
@@ -76,34 +73,83 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         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())).
-                peek(
-                        temp->{
-                            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
-                            temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
+
+        Map<String, CsEquipmentDeliveryPO> poMap = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .map(CsLedgerVO::getId)
+                .distinct()
+                .collect(Collectors.toMap(
+                        Function.identity(),
+                        csEquipmentDeliveryMapper::selectById
+                ));
+
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                    item.setProcess(po.getProcess());
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        List<CsLedgerVO> finalLineList = allList.stream()
+                .filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .peek(
+                        item -> {
+                            item.setType("line");
+                            String index = item.getId().substring(item.getId().length()-1);
+                            if (Objects.equals(index,"0")) {
+                                item.setLineType(0);
+                            } else {
+                                item.setLineType(1);
+                            }
+                            LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
+                            queryWrapper.eq(CsLinePO::getLineId,item.getId()).eq(CsLinePO::getStatus,1);
+                            CsLinePO po = csLinePOService.getOne(queryWrapper);
+                            item.setConType(po.getConType());
                         }
-                ).
-                sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-        List<CsLedgerVO> finalLineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+                )
+                .collect(Collectors.toList());
         checkDevSetData(deviceList);
         deviceList.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
         engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
+        engineeringList = engineeringList.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         //获取便携式设备树
         CsLedgerVO portable = new CsLedgerVO();
         portable.setLevel(0);
         portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
-        List<CsLedgerVO> portables = allList.stream().filter(item->Objects.equals(item.getLevel(),2) && Objects.equals(item.getPid(),"0")).collect(Collectors.toList());
-        for(CsLedgerVO c : portables){
-            c.setPid(portable.getId());
-            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(po.getRunStatus());
-            c.setNDId(po.getNdid());
-        }
+        //针对未启用的装置判断
+        List<CsLedgerVO> ledger = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
+                .collect(Collectors.toList());
+        Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
+                .collect(Collectors.toMap(
+                        CsLedgerVO::getId,
+                        csEquipmentDeliveryMapper::selectById,
+                        (existing, replacement) -> existing
+                ));
+        List<CsLedgerVO> portables = ledger.stream()
+                .peek(c -> {
+                    CsEquipmentDeliveryPO po = poMap2.get(c.getId());
+                    c.setPid(portable.getId());
+                    c.setComFlag(po.getRunStatus());
+                    c.setNDId(po.getNdid());
+                    c.setType("device");
+                    c.setName(po.getName());
+                    c.setSort(po.getSort());
+                })
+                .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
+                .collect(Collectors.toList());
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portables.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         checkDevSetData(portables);
         portable.setChildren(portables);
@@ -115,8 +161,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         government.setId(IdUtil.simpleUUID());
         government.setChildren(engineeringList);
         List<CsLedgerVO> tree = new ArrayList<>();
-        tree.add(portable);
-        tree.add(government);
+        if (CollUtil.isNotEmpty(portables)) {
+            tree.add(portable);
+        }
+        if (CollUtil.isNotEmpty(deviceList)) {
+            tree.add(government);
+        }
         return tree;
     }
     //剔除未接入的设备(根据status判断不太稳,所有这里直接判断该设备有没有对应的模板指标)
@@ -157,15 +207,29 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         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())).
-                peek(
-                        temp->{
-                            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
-                            temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
-                            temp.setNDId(csEquipmentDeliveryPO.getNdid());
-                        }
-                ).
-                sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+
+        Map<String, CsEquipmentDeliveryPO> poMap = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .map(CsLedgerVO::getId)
+                .distinct()
+                .collect(Collectors.toMap(
+                        Function.identity(),
+                        csEquipmentDeliveryMapper::selectById
+                ));
+
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                    item.setProcess(po.getProcess());
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .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)));
@@ -176,14 +240,31 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
-        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(portable.getId());
-            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(po.getRunStatus());
-            c.setNDId(po.getNdid());
-        }
+
+        //针对未启用的装置判断
+        List<CsLedgerVO> ledger = allList.stream()
+                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
+                .collect(Collectors.toList());
+        Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
+                .collect(Collectors.toMap(
+                        CsLedgerVO::getId,
+                        csEquipmentDeliveryMapper::selectById,
+                        (existing, replacement) -> existing
+                ));
+        List<CsLedgerVO> portables = ledger.stream()
+                .peek(c -> {
+                    CsEquipmentDeliveryPO po = poMap2.get(c.getId());
+                    c.setPid(portable.getId());
+                    c.setComFlag(po.getRunStatus());
+                    c.setNDId(po.getNdid());
+                    c.setType("device");
+                    c.setName(po.getName());
+                    c.setSort(po.getSort());
+                })
+                .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
+                .collect(Collectors.toList());
+
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portable.setChildren(portables);
 
         CsLedgerVO government = new CsLedgerVO();
@@ -193,8 +274,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         government.setId(IdUtil.simpleUUID());
         government.setChildren(engineeringList);
         List<CsLedgerVO> tree = new ArrayList<>();
-        tree.add(portable);
-        tree.add(government);
+        if (CollUtil.isNotEmpty(portables)) {
+            tree.add(portable);
+        }
+        if (CollUtil.isNotEmpty(deviceList)) {
+            tree.add(government);
+        }
         return tree;
     }
 
@@ -271,10 +356,13 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         engineeringList.forEach(eng -> {
             CsEngineeringPO csEngineeringPO = csEngineeringMapper.selectById(eng.getId());
             eng.setArea(this.getAreaById(csEngineeringPO.getProvince())+this.getAreaById(csEngineeringPO.getCity()));
+            eng.setProvinceId(csEngineeringPO.getProvince());
+            eng.setCityId(csEngineeringPO.getCity());
             eng.setRemark(csEngineeringPO.getDescription());
             eng.setChildren(getChildren(eng, projectList));
             }
         );
+
         return engineeringList;
     }
 
@@ -287,18 +375,105 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     public DevDetailDTO queryDevDetail(String devId) {
         DevDetailDTO device = new DevDetailDTO();
         CsLedger dev = this.findDataById(devId);
-        device.setEquipmentName(dev.getName());
-        device.setEquipmentId(devId);
-        CsLedger project = this.findDataById(dev.getPid());
-        device.setProjectId(project.getId());
-        device.setProjectName(project.getName());
-        CsLedger engineer = this.findDataById(project.getPid());
-        device.setEngineeringid(engineer.getId());
-        device.setEngineeringName(engineer.getName());
+        //如果是便携式设备，pid为0,项目，工程都设置为/
+        if(Objects.equals(dev.getPid(),"0")){
+            device.setEquipmentName(dev.getName());
+            device.setEquipmentId(devId);
+            device.setProjectId("/");
+            device.setProjectName("/");
+            device.setEngineeringid("/");
+            device.setEngineeringName("/");
+        }else {
+            device.setEquipmentName(dev.getName());
+            device.setEquipmentId(devId);
+            CsLedger project = this.findDataById(dev.getPid());
+            device.setProjectId(project.getId());
+            device.setProjectName(project.getName());
+            CsLedger engineer = this.findDataById(project.getPid());
+            device.setEngineeringid(engineer.getId());
+            device.setEngineeringName(engineer.getName());
+        }
+
 
         return device;
     }
 
+    @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;
+    }
+
     /**
      * 获取子节点
      */

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

@@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,10 +68,26 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                             .set(CsLinePO::getVolGrade,csLineParam.getVolGrade())
                             .set(CsLinePO::getPtRatio,csLineParam.getPtRatio())
                             .set(CsLinePO::getCtRatio,csLineParam.getCtRatio())
-                            .set(CsLinePO::getConType,csLineParam.getConType());
+                            .set(CsLinePO::getConType,csLineParam.getConType())
+                            .set(CsLinePO::getLineInterval,csLineParam.getLineInterval());
         this.update(lambdaUpdateWrapper);
     }
 
+    @Override
+    public void updateIds(CsLineParam csLineParam) {
+        LambdaUpdateWrapper<CsLinePO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(CsLinePO::getLineId,csLineParam.getLineId())
+                .eq(CsLinePO::getStatus,1)
+                .set(CsLinePO::getDataSetId,csLineParam.getDataSetId())
+                .set(CsLinePO::getDataModelId,csLineParam.getModelId());
+        this.update(lambdaUpdateWrapper);
+    }
+
+    @Override
+    public List<CsLinePO> getLinesByDevList(List<String> list) {
+        return this.lambdaQuery().in(CsLinePO::getDeviceId,list).eq(CsLinePO::getStatus,1).list();
+    }
+
 //    /**
 //     * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template)
 //     *

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

@@ -46,8 +46,9 @@ public class CsLogsPOServiceImpl extends ServiceImpl<CsLogsPOMapper, CsLogsPO> i
         String userRole = RequestUtil.getUserRole();
         List<String> strings = JSONArray.parseArray(userRole, String.class);
         QueryWrapper<CsLogsPO> csLogsPOQueryWrapper = new QueryWrapper<>();
-        csLogsPOQueryWrapper.lambda().eq(!strings.contains(AppRoleEnum.OPERATION_MANAGER.getCode()),CsLogsPO::getUserName, username).
-                ge(StringUtils.isNotBlank(baseParam.getSearchBeginTime()),CsLogsPO::getCreateTime,baseParam.getSearchBeginTime()).
+        csLogsPOQueryWrapper.lambda()
+//                .eq(!strings.contains(AppRoleEnum.OPERATION_MANAGER.getCode()),CsLogsPO::getUserName, username)
+                .ge(StringUtils.isNotBlank(baseParam.getSearchBeginTime()),CsLogsPO::getCreateTime,baseParam.getSearchBeginTime()).
                 le(StringUtils.isNotBlank(baseParam.getSearchEndTime()),CsLogsPO::getCreateTime,baseParam.getSearchEndTime()).orderByDesc(CsLogsPO::getCreateTime);
         IPage<CsLogsPO> list = this.getBaseMapper().selectPage(returnpage,csLogsPOQueryWrapper);
         return list;