refactor(device): 重构设备交付服务并更新Nacos配置

- 在多个模块的bootstrap.yml中添加Nacos用户名密码配置
- 注释掉日志配置中的用户名密码参数避免安全风险
- 重构CsEquipmentDeliveryServiceImpl中的updateEquipmentDelivery方法
- 添加NDID变更处理逻辑，包括设备注册表更新和Redis缓存迁移
- 实现设备名称重复校验功能
- 添加工程项目的变更处理和台账树更新
- 移除CsEventPO中的rms和uchg字段及JsonFormat注解
- 将getYzd方法从CsEventPOServiceImpl迁移到PortableOfflLogServiceImpl
- 添加事件严重度和落点计算功能
- 更新补召查询逻辑，使用SortBy参数区分不同类型
- 添加CsLedgerService的queryByPid接口实现

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

@@ -768,29 +768,6 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         return vo;
     }
 
-    /**
-     * 获取该事件的严重度
-     *
-     * @param persisttime 持续时间 ms单位
-     * @param eventvaule  暂降、暂升幅值
-     */
-    public static String getYzd(Float persisttime, Float eventvaule) {
-        float yzd;
-        DecimalFormat df = new DecimalFormat("0.000");// 格式化小数
-        if (persisttime <= 20) {
-            yzd = 1 - eventvaule;
-        } else if (persisttime > 20 && persisttime <= 200) {
-            yzd = 2 * (1 - eventvaule);
-        } else if (persisttime > 200 && persisttime <= 500) {
-            yzd = 3.3f * (1 - eventvaule);
-        } else if (persisttime > 500 && persisttime <= 10000) {
-            yzd = 5 * (1 - eventvaule);
-        } else {
-            yzd = 10 * (1 - eventvaule);
-        }
-        return df.format(yzd);
-    }
-
     public String getTag(Integer type) {
         String tag;
         switch (type) {

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

@@ -5,20 +5,15 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
-import com.njcn.access.api.CsTopicFeignClient;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.pojo.RspDataDto;
 import com.njcn.access.pojo.dto.ReqAndResDto;
 import com.njcn.access.pojo.dto.file.FileDto;
 import com.njcn.access.utils.ChannelObjectUtil;
-import com.njcn.access.utils.MqttUtil;
-import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.DeviceFtpFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.api.PortableOffLogFeignClient;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
@@ -75,15 +70,9 @@ import static com.njcn.access.enums.TypeEnum.DATA_48;
 public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
 
     private final MqttPublisher publisher;
-    private final CsTopicFeignClient csTopicFeignClient;
     private final RedisUtil redisUtil;
     private final ChannelObjectUtil channelObjectUtil;
-    private final MqttUtil mqttUtil;
-    private static Integer mid = 1;
-    private final DeviceFtpFeignClient deviceFtpFeignClient;
     private final FileStorageUtil fileStorageUtil;
-    private final GeneralInfo generalInfo;
-    private final PortableOffLogFeignClient portableOffLogFeignClient;
     private final EquipmentFeignClient equipmentFeignClient;
     private final CsLineFeignClient csLineFeignClient;
 

cs-harmonic/cs-harmonic-boot/src/main/resources/bootstrap.yml

@@ -21,9 +21,13 @@ spring:
       discovery:
         ip: @service.server.url@
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
       config:
         server-addr: @nacos.url@
+        username: @nacos.username@
+        password: @nacos.password@
         namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
@@ -41,6 +45,7 @@ spring:
 
 #项目日志的配置
 logging:
+  #  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&group=DEFAULT_GROUP&dataId=logback.xml
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
     root: warn