yangys
2025-05-09 e0d3490c2c785a9e94b3ef5128be97da2978956f
中兵bug修复
已修改4个文件
14 ■■■■ 文件已修改
collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
collect/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
@@ -1,16 +1,10 @@
package com.qianwen.mdc.collect.controller;
import java.util.Arrays;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.qianwen.mdc.collect.config.IotDBSessionConfig;
import com.qianwen.mdc.collect.dto.CalendarShiftInfoDTO;
import com.qianwen.mdc.collect.entity.iotdb.Output;
import com.qianwen.mdc.collect.entity.iotdb.ProcessParam;
import com.qianwen.mdc.collect.mapper.iotdb.OutputMapper;
import com.qianwen.mdc.collect.mapper.iotdb.ProcessParamMapper;
import com.qianwen.mdc.collect.mapper.mgr.CalendarMapper;
@@ -21,9 +15,7 @@
import com.qianwen.mdc.collect.service.OutputAggregateService;
import com.qianwen.mdc.collect.utils.redis.RedisUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@RestController
public class CollectTestController {
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java
@@ -29,7 +29,7 @@
    /**
     * 离线判定时长,默认5分钟
     */
    @Value("${offlineConfigDuration:3000000}")
    @Value("${offlineConfigDuration:300000}")
    private long offlineConfigDuration;
    public static final String OFFLINE_VALUE = "4";//离线状态值
    @Autowired
collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
@@ -57,7 +57,7 @@
     */
    void checkDeviceStatus(List<TelemetryData> teleList){
        DeviceStateCheckConfigVO chkConfigVO = cfgLoader.getCheckConfigVOFromCache();
        long interval = cfgLoader.getCheckConfigVOFromCache().getInterval();
        //long interval = cfgLoader.getCheckConfigVOFromCache().getInterval();
        int wcs;
        
        for(TelemetryData tdata:teleList) {//tdata.getWorkstationId()
collect/src/main/resources/application.yml
@@ -47,7 +47,7 @@
  type-aliases-package: com.qianwen.mdc.collect.entity.iotdb,com.qianwen.mdc.collect.entity.mgr
  #com.qianwen.mdc.collect.entity.iotdb
#离线判定时长(毫秒),超过这个时长无采集数据判定为离线
offlineConfigDuration: 3000000
offlineConfigDuration: 300000
wfg:
# 请一定注意! WorkerIdBitLength + SeqBitLength + DataCenterIdBitLength <= 22
  # 1表示雪花漂移算法,2表示传统雪花算法