Merge pull request '装置文件系统管理' (#1) from master-temp into master

Reviewed-on: #1

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOnlineRateServiceImpl.java

@@ -85,7 +85,7 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
         Map<String, List<LineDevGetDTO>> LineDevGetMap = devList.stream()
                 .filter(x -> devIdList.contains(x.getDevId()))
                 .collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
-        if (ObjectUtil.isNotNull(calculatedParam.getType()) && calculatedParam.getType() == 1) {
+        if (ObjectUtil.isNotNull(calculatedParam.getType())&&calculatedParam.getType() == 1) {
             LineDevGetMap.forEach((key, value) -> {
                 DataOnlineRateDto.Detail onlineRateDpo = new DataOnlineRateDto.Detail();
                 List<String> collect = value.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
@@ -130,9 +130,9 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
                     List<String> lineIds = value.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
                     lineParam.setLineId(lineIds);
                     List<DataIntegrityDto> integrityDS = dataIntegrityFeignClient.getRawData(lineParam).getData();
-                    Double max = 0.0;
+                    Double max=0.0;
-                    if (CollUtil.isNotEmpty(integrityDS)) {
+                    if(CollUtil.isNotEmpty(integrityDS)){
-                        List<Double> info = new ArrayList<>();
+                        List<Double>  info=new ArrayList<>();
                         for (DataIntegrityDto integrityD : integrityDS) {
                             double realTime = integrityD.getRealTime();
                             double dueTime = integrityD.getDueTime();
@@ -144,7 +144,7 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
                         }
                         max = info.stream().max(Comparator.naturalOrder()).orElse(0.0);
                     }
-                    int v = (int) Math.ceil(InfluxDBPublicParam.DAY_MINUTE * max);
+                    int v = (int)Math.ceil(InfluxDBPublicParam.DAY_MINUTE * max);
                     onlineRateDpo.setOnlineMin(v);
                     onlineRateDpo.setOfflineMin(InfluxDBPublicParam.DAY_MINUTE - v);
                     list.add(onlineRateDpo);
@@ -247,8 +247,6 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
                 long differ = DateUtil.between(date, newDate, DateUnit.MINUTE);
                 if (online.equals(type)) {
                     minute = InfluxDBPublicParam.DAY_MINUTE - (int) differ;
-                } else {
-                    minute = (int) differ;
                 }
             } else {
                 List<PqsCommunicateDto> communicateDataOld = communicateFeignClient.getRawDataEnd(lineParam).getData();

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/PqsCommunicateDto.java

@@ -17,7 +17,6 @@ public class PqsCommunicateDto {
 
     private String description;
 
-    //1是在线 0是离线
     private Integer type;
     //是否更新updateTime标志；数据上送更新1，状态翻转不更新0
     private Integer flag=0;

message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java

@@ -33,7 +33,7 @@ import java.util.Objects;
 @RocketMQMessageListener(
         topic = "Device_Run_Flag_Topic",
         consumerGroup = "Device_Run_Flag_Consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java

@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 @RocketMQMessageListener(
         topic = "LN_Topic",
         consumerGroup = "ln_consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/consumer/FrontHeartBeatConsumer.java

@@ -33,7 +33,7 @@ import java.util.Objects;
 @RocketMQMessageListener(
         topic = "Heart_Beat_Topic",
         consumerGroup = "Heartb_Beat_Topic_Consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/consumer/RealTimeDataConsumer.java

@@ -31,7 +31,7 @@ import java.util.Objects;
 @RocketMQMessageListener(
         topic = "Real_Time_Data_Topic",
         consumerGroup = "real_time_consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/consumer/TopicLogsConsumer.java

@@ -33,7 +33,7 @@ import java.util.Objects;
 @RocketMQMessageListener(
         topic = "log_Topic",
         consumerGroup = "Log_Topic_Consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/consumer/TopicReplyConsumer.java

@@ -32,7 +32,7 @@ import java.util.Objects;
 @RocketMQMessageListener(
         topic = "Topic_Reply_Topic",
         consumerGroup = "Topic_Reply_Topic_Consumer",
-        selectorExpression = "*",
+        selectorExpression = "Test_Tag||Test_Keys",
         consumeThreadNumber = 10,
         enableMsgTrace = true
 )

message/message-boot/src/main/java/com/njcn/message/produce/template/AskRealDataMessaggeTemplate.java

@@ -1,10 +1,8 @@
 package com.njcn.message.produce.template;
 
 
-import com.alibaba.fastjson.JSON;
 import com.njcn.message.constant.BusinessResource;
 import com.njcn.message.constant.BusinessTopic;
-import com.njcn.message.message.AskRealDataMessage;
 import com.njcn.middle.rocket.domain.BaseMessage;
 import com.njcn.middle.rocket.template.RocketMQEnhanceTemplate;
 import org.apache.rocketmq.client.producer.SendResult;
@@ -26,8 +24,7 @@ public class AskRealDataMessaggeTemplate extends RocketMQEnhanceTemplate {
 
     public SendResult sendMember(BaseMessage askRealDataMessage,String nodeId) {
         askRealDataMessage.setSource(BusinessResource.WEB_RESOURCE);
-        AskRealDataMessage dto = JSON.parseObject(askRealDataMessage.getMessageBody(), AskRealDataMessage.class);
+        askRealDataMessage.setKey("Test_Keys");
-        askRealDataMessage.setKey(dto.getLine());
+        return send(nodeId+"_"+BusinessTopic.ASK_REAL_DATA_TOPIC,"Test_Tag" , askRealDataMessage);
-        return send(BusinessTopic.ASK_REAL_DATA_TOPIC,nodeId , askRealDataMessage);
     }
 }

message/message-boot/src/main/java/com/njcn/message/produce/template/DeviceRebootMessageTemplate.java

@@ -1,10 +1,7 @@
 package com.njcn.message.produce.template;
 
-import com.alibaba.fastjson.JSON;
 import com.njcn.message.constant.BusinessResource;
 import com.njcn.message.constant.BusinessTopic;
-import com.njcn.message.message.AskRealDataMessage;
-import com.njcn.message.message.DeviceRebootMessage;
 import com.njcn.middle.rocket.domain.BaseMessage;
 import com.njcn.middle.rocket.template.RocketMQEnhanceTemplate;
 import org.apache.rocketmq.client.producer.SendResult;
@@ -27,6 +24,7 @@ public class DeviceRebootMessageTemplate extends RocketMQEnhanceTemplate {
 
     public SendResult sendMember(BaseMessage baseMessage,String nodeId) {
         baseMessage.setSource(BusinessResource.WEB_RESOURCE);
-        return send(BusinessTopic.CONTROL_TOPIC,nodeId, baseMessage);
+        baseMessage.setKey("Test_Keys");
+        return send(nodeId+"_"+BusinessTopic.CONTROL_TOPIC,"Test_Tag", baseMessage);
     }
 }

message/message-boot/src/main/java/com/njcn/message/produce/template/ProcessRebootMessageTemplate.java

@@ -1,10 +1,7 @@
 package com.njcn.message.produce.template;
 
-import com.alibaba.fastjson.JSON;
 import com.njcn.message.constant.BusinessResource;
 import com.njcn.message.constant.BusinessTopic;
-import com.njcn.message.message.AskRealDataMessage;
-import com.njcn.message.message.ProcessRebootMessage;
 import com.njcn.middle.rocket.domain.BaseMessage;
 import com.njcn.middle.rocket.template.RocketMQEnhanceTemplate;
 import org.apache.rocketmq.client.producer.SendResult;
@@ -27,8 +24,7 @@ public class ProcessRebootMessageTemplate extends RocketMQEnhanceTemplate {
 
     public SendResult sendMember(BaseMessage baseMessage,String nodeId) {
         baseMessage.setSource(BusinessResource.WEB_RESOURCE);
-        ProcessRebootMessage dto = JSON.parseObject(baseMessage.getMessageBody(), ProcessRebootMessage.class);
+        baseMessage.setKey("Test_Keys");
-        baseMessage.setKey(dto.getIndex()+"");
+        return send(nodeId+"_"+BusinessTopic.PROCESS_TOPIC,"Test_Tag", baseMessage);
-        return send(BusinessTopic.PROCESS_TOPIC,nodeId, baseMessage);
     }
 }

message/message-boot/src/main/java/com/njcn/message/produce/template/RecallMessaggeTemplate.java

@@ -24,6 +24,7 @@ public class RecallMessaggeTemplate extends RocketMQEnhanceTemplate {
 
     public SendResult sendMember(BaseMessage recallMessage,String nodeId) {
         recallMessage.setSource(BusinessResource.WEB_RESOURCE);
-        return send(BusinessTopic.RECALL_TOPIC,nodeId , recallMessage);
+        recallMessage.setKey("Test_Keys");
+        return send(nodeId+"_"+BusinessTopic.RECALL_TOPIC,"Test_Tag" , recallMessage);
     }
 }

message/message-boot/src/main/resources/bootstrap-jb.yml

@@ -19,13 +19,16 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @service.server.url@
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-      config:
         username: @nacos.username@
         password: @nacos.password@
+      config:
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml