Merge branch 'master-jb' of http://192.168.1.22:3000/Middleware/cn-data-platform into master-jb

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

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

@@ -9,7 +9,6 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IDataOnlineRateService;
-import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.DataIntegrityFeignClient;
 import com.njcn.dataProcess.api.DataOnlineRateFeignClient;
 import com.njcn.dataProcess.api.DataVFeignClient;
@@ -49,8 +48,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
 
     private static final Logger logger = LoggerFactory.getLogger(IDataOnlineRateServiceImpl.class);
 
-    @Value("${line.num:10}")
+    @Value("${line.num}")
-    private Integer NUM;
+    private Integer NUM = 100;
 
     private final Integer online = 1;
     private final Integer offline = 0;
@@ -70,8 +69,7 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
 
     @Override
     public void dataOnlineRate(CalculatedParam calculatedParam) {
-        MemorySizeUtil.getNowMemory();
+        logger.info("{},onlineRate表转r_stat_onlinerate_d算法开始=====》", LocalDateTime.now());
-        logger.info("{},{}onlineRate表转r_stat_onlinerate_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));

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