From e0d3490c2c785a9e94b3ef5128be97da2978956f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 09 五月 2025 00:35:34 +0800
Subject: [PATCH] 中兵bug修复
---
collect/src/main/resources/application.yml | 2 +-
collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java | 8 --------
collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java | 2 +-
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java | 2 +-
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java b/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
index 97e4bb7..8927e01 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
+++ b/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 {
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java
index d73cce8..83dc80d 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceOfflineCheckService.java
+++ b/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
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
index 98d9f25..63cf226 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
+++ b/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()
diff --git a/collect/src/main/resources/application.yml b/collect/src/main/resources/application.yml
index 4eff48d..c802f59 100644
--- a/collect/src/main/resources/application.yml
+++ b/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琛ㄧず浼犵粺闆姳绠楁硶
--
Gitblit v1.9.3