微调

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;
-                    if(CollUtil.isNotEmpty(integrityDS)){
-                        List<Double>  info=new ArrayList<>();
+                    Double max = 0.0;
+                    if (CollUtil.isNotEmpty(integrityDS)) {
+                        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,6 +247,8 @@ 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,6 +17,7 @@ public class PqsCommunicateDto {
 
     private String description;
 
+    //1是在线 0是离线
     private Integer type;
     //是否更新updateTime标志；数据上送更新1，状态翻转不更新0
     private Integer flag=0;

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

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