From 3b18316e578b2674ecddf88cfc33613a695c3d10 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 七月 2025 11:32:50 +0800
Subject: [PATCH] 政务云数据上传bug修改
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java | 102 ++++++++++++++++++---------------------------------
1 files changed, 36 insertions(+), 66 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 fab531d..ef85729 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
@@ -1,7 +1,12 @@
package com.ruoyi.jianguan.governmentCloud;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.R;
+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 io.netty.util.concurrent.DefaultThreadFactory;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -9,6 +14,10 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
import java.util.concurrent.*;
/**
@@ -19,66 +28,14 @@
public class UploadDataTaskUtil {
@Autowired
- private AcquisitionBillingModeService acquisitionBillingModeService;
- @Autowired
- private BillingModeVerifyService billingModeVerifyService;
- @Autowired
- private BmsAbortService bmsAbortService;
- @Autowired
- private BmsDemandAndChargerExportationService bmsDemandAndChargerExportationService;
- @Autowired
- private OnlineService onlineService;
- @Autowired
- private EndChargeService endChargeService;
- @Autowired
- private ErrorMessageMessageService errorMessageMessageService;
- @Autowired
private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Autowired
- private ChargingHandshakeService chargingHandshakeService;
- @Autowired
- private ParameterSettingService parameterSettingService;
- @Autowired
- private MotorAbortService motorAbortService;
- @Autowired
- private BmsInformationService bmsInformationService;
- @Autowired
- private ChargingPileStartsChargingService chargingPileStartsChargingService;
- @Autowired
- private PlatformStartChargingReplyService platformStartChargingReplyService;
- @Autowired
- private PlatformStopChargingReplyService platformStopChargingReplyService;
- @Autowired
- private TransactionRecordService transactionRecordService;
- @Autowired
- private UpdateBalanceReplyService updateBalanceReplyService;
- @Autowired
- private SynchronizeOfflineCardReplyService synchronizeOfflineCardReplyService;
- @Autowired
- private ClearOfflineCardReplyService clearOfflineCardReplyService;
- @Autowired
- private WorkingParameterSettingReplyService workingParameterSettingReplyService;
- @Autowired
- private TimingSettingService timingSettingService;
- @Autowired
- private SetupBillingModelReplyService setupBillingModelReplyService;
- @Autowired
- private GroundLockRealTimeDataService groundLockRealTimeDataService;
- @Autowired
- private ChargingPileReturnsGroundLockDataService chargingPileReturnsGroundLockDataService;
- @Autowired
- private PlatformRestartReplyService platformRestartReplyService;
- @Autowired
- private PlatformRemoteUpdateReplyService platformRemoteUpdateReplyService;
- @Autowired
- private QrCodeDeliveryReplyService qrCodeDeliveryReplyService;
- @Autowired
- private SecurityDetectionService securityDetectionService;
+ private MqttPushUtil mqttPushUtil;
/**
* 每天的9点执行的任务
*/
- @Scheduled(cron = "0 0 9 * * *")
+ @Scheduled(cron = "0 0 12 * * ?")
public void taskDay(){
try {
// 传输mongodb的硬件数据
@@ -97,7 +54,7 @@
* 3. 适用于需要定时执行或周期性执行的场景
*/
@SneakyThrows
- public static void createCustomThreadPool() {
+ public void createCustomThreadPool() {
/*
创建自定义线程池
字段：
@@ -119,21 +76,30 @@
);
try {
- log.info("\n================ 普通任务执行 ================");
+ LocalDate localDate = LocalDate.now().minusDays(1);
+ String start = localDate + " 00:00:00";
+ String end = localDate + " 23:59:59";
+ Date startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(start);
+ Date endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(end);
+ // 查询所有的mango数据
+ List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringDataList = uploadRealTimeMonitoringDataService.getRangeTimeData(startTime, endTime);
+ System.err.println("查询所有的mango数据:"+uploadRealTimeMonitoringDataList.size());
customthreadPoolExecutor.execute(() -> {
-
-
-
+ if (uploadRealTimeMonitoringDataList != null && uploadRealTimeMonitoringDataList.size() > 0) {
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : uploadRealTimeMonitoringDataList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", uploadRealTimeMonitoringData.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ jsonObject.put("properties", uploadRealTimeMonitoringData);
+ 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);
-
- log.info("\n================ 带返回值的任务执行 ================");
- Future<String> future = customthreadPoolExecutor.submit(() -> {
- log.info("线程：{},办理业务", Thread.currentThread().getName());
- return "业务办理完成";
- });
- log.info(future.get());
} finally {
gracefulShutdown(customthreadPoolExecutor);
}
@@ -165,4 +131,8 @@
}
}
+ public static void main(String[] args) {
+ System.err.println(System.currentTimeMillis());
+ }
+
}
--
Gitblit v1.7.1