From 26526de10d49c3422a6d6c2d55fe5a2997786ad9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 13:58:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
index 256da72..f21d309 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
@@ -2,25 +2,25 @@
import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.integration.api.model.*;
import com.ruoyi.jianguan.mongodb.service.*;
import com.ruoyi.jianguan.mqtt.config.TopicConstants;
import com.ruoyi.jianguan.mqtt.util.MqttPushUtil;
-import com.ruoyi.jianguan.rocket.model.ErrorMessageMessage;
import io.netty.util.concurrent.DefaultThreadFactory;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.*;
/**
@@ -34,16 +34,25 @@
private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Autowired
private MqttPushUtil mqttPushUtil;
+ @Autowired
+ private RedisService redisService;
/**
* 每天的9点执行的任务
*/
- @Scheduled(cron = "0 0 12 * * *")
-// @Scheduled(fixedRate = 60000)
+ @Scheduled(fixedRate = 86400000)
public void taskDay(){
try {
- // 传输mongodb的硬件数据
- createCustomThreadPool();
+ // 判断是否存在标识
+ Thread.sleep(1000);
+ String flag = redisService.getCacheObject("cloud_integration");
+ System.out.println("市政云硬件数据传输标识:" + flag);
+ if (Objects.isNull(flag)) {
+ log.info("市政云硬件数据传输无标识,开始传输硬件数据");
+ redisService.setCacheObject("cloud_integration", "1",24L,TimeUnit.HOURS);
+ // 传输mongodb的硬件数据
+ createCustomThreadPool();
+ }
}catch (Exception e){
e.printStackTrace();
}
@@ -87,28 +96,23 @@
Date endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(end);
// 查询所有的mango数据
List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringDataList = uploadRealTimeMonitoringDataService.getRangeTimeData(startTime, endTime);
- System.out.println("查询所有的mango数据:"+uploadRealTimeMonitoringDataList.size());
+ System.err.println("查询所有的mango数据:"+uploadRealTimeMonitoringDataList.size());
customthreadPoolExecutor.execute(() -> {
if (uploadRealTimeMonitoringDataList != null && uploadRealTimeMonitoringDataList.size() > 0) {
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : uploadRealTimeMonitoringDataList) {
- log.info("线程：{},办理业务", Thread.currentThread().getName());
JSONObject jsonObject = new JSONObject();
jsonObject.put("device_code", uploadRealTimeMonitoringData.getCharging_pile_code());
jsonObject.put("report_time", System.currentTimeMillis());
jsonObject.put("properties", uploadRealTimeMonitoringData);
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", uploadRealTimeMonitoringData.getCharging_pile_code()), jsonObject.toJSONString());
+ R<String> chargePileCode = mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", uploadRealTimeMonitoringData.getCharging_pile_code()), jsonObject.toJSONString());
+ log.info("返回结果：{}", chargePileCode.getData());
log.info("数据：{}", uploadRealTimeMonitoringData.getCharging_pile_code());
+ log.info("数据：{}", jsonObject.toJSONString());
}
}
});
TimeUnit.MILLISECONDS.sleep(1);
-
-// Future<String> future = customthreadPoolExecutor.submit(() -> {
-// log.info("线程：{},办理业务", Thread.currentThread().getName());
-// return "业务办理完成";
-// });
-// log.info(future.get());
} finally {
gracefulShutdown(customthreadPoolExecutor);
}
--
Gitblit v1.7.1