From 07d0d74e8db1d9e536fdfe33b80c568ccfc7febe Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 16 五月 2025 11:06:29 +0800
Subject: [PATCH] 政务云硬件数据上传
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/MotorAbortServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TransactionRecordService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileReturnsGroundLockDataService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/config/TopicConstants.java | 2
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SecurityDetectionService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OpenOrCloseGroundLockService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsAbortServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/EndChargeService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ErrorMessageMessageServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformConfirmationChargingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java | 300 --------------------
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ConfirmTransactionRecordService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ErrorMessageMessageService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java | 8
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsAbortService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileStartsChargingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingHandshakeService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ReadRealTimeMonitoringDataService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java | 7
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java | 5
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeReplyService.java | 3
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsInformationServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TransactionRecordServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SecurityDetectionServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/GroundLockRealTimeDataService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ParameterSettingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/EndChargeServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsDemandAndChargerExportationService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java | 3
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/resources/bootstrap.yml | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ParameterSettingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingHandshakeServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 5
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingReplyService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java | 12
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java | 6
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/MotorAbortService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsInformationService.java | 4
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java | 6
100 files changed, 309 insertions(+), 488 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 cedb457..7b39d9a 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
@@ -15,8 +15,11 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+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.concurrent.*;
@@ -28,69 +31,15 @@
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;
@Autowired
private MqttPushUtil mqttPushUtil;
/**
* 每天的9点执行的任务
*/
- @Scheduled(cron = "0 0 9 * * *")
-// @Scheduled(fixedRate = 60000)
+// @Scheduled(cron = "0 0 9 * * *")
+ @Scheduled(fixedRate = 60000)
public void taskDay(){
try {
// 传输mongodb的硬件数据
@@ -132,251 +81,22 @@
try {
LocalDate localDate = LocalDate.now().minusDays(1);
- String startTime = localDate + " 00:00:00";
- String endTime = localDate + " 23:59:59";
+ 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<AcquisitionBillingMode> acquisitionBillingModeList = acquisitionBillingModeService.getRangeTimeData(startTime, endTime);
- List<BillingModeVerify> billingModeVerifyList = billingModeVerifyService.getRangeTimeData(startTime, endTime);
- List<BmsAbort> bmsAbortList = bmsAbortService.getRangeTimeData(startTime, endTime);
- List<BmsDemandAndChargerExportation> bmsDemandAndChargerExportationList = bmsDemandAndChargerExportationService.getRangeTimeData(startTime, endTime);
- List<Online> onlineList = onlineService.getRangeTimeData(startTime, endTime);
- List<EndCharge> endChargeList = endChargeService.getRangeTimeData(startTime, endTime);
- List<ErrorMessageMessage> errorMessageMessageList = errorMessageMessageService.getRangeTimeData(startTime, endTime);
List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringDataList = uploadRealTimeMonitoringDataService.getRangeTimeData(startTime, endTime);
- List<ChargingHandshake> chargingHandshakeList = chargingHandshakeService.getRangeTimeData(startTime, endTime);
- List<ParameterSetting> parameterSettingList = parameterSettingService.getRangeTimeData(startTime, endTime);
- List<MotorAbort> motorAbortList = motorAbortService.getRangeTimeData(startTime, endTime);
- List<BmsInformation> bmsInformationList = bmsInformationService.getRangeTimeData(startTime, endTime);
- List<ChargingPileStartsCharging> chargingPileStartsChargingList = chargingPileStartsChargingService.getRangeTimeData(startTime, endTime);
- List<PlatformStartChargingReply> platformStartChargingReplyList = platformStartChargingReplyService.getRangeTimeData(startTime, endTime);
- List<PlatformStopChargingReply> platformStopChargingReplyList = platformStopChargingReplyService.getRangeTimeData(startTime, endTime);
- List<TransactionRecord> transactionRecordList = transactionRecordService.getRangeTimeData(startTime, endTime);
- List<UpdateBalanceReply> updateBalanceReplyList = updateBalanceReplyService.getRangeTimeData(startTime, endTime);
- List<SynchronizeOfflineCardReply> synchronizeOfflineCardReplyList = synchronizeOfflineCardReplyService.getRangeTimeData(startTime, endTime);
- List<ClearOfflineCardReply> clearOfflineCardReplyList = clearOfflineCardReplyService.getRangeTimeData(startTime, endTime);
- List<WorkingParameterSettingReply> workingParameterSettingReplyList = workingParameterSettingReplyService.getRangeTimeData(startTime, endTime);
- List<TimingSetting> timingSettingList = timingSettingService.getRangeTimeData(startTime, endTime);
- List<SetupBillingModelReply> setupBillingModelReplyList = setupBillingModelReplyService.getRangeTimeData(startTime, endTime);
- List<GroundLockRealTimeData> groundLockRealTimeDataList = groundLockRealTimeDataService.getRangeTimeData(startTime, endTime);
- List<ChargingPileReturnsGroundLockData> chargingPileReturnsGroundLockDataList = chargingPileReturnsGroundLockDataService.getRangeTimeData(startTime, endTime);
- List<PlatformRestartReply> platformRestartReplyList = platformRestartReplyService.getRangeTimeData(startTime, endTime);
- List<PlatformRemoteUpdateReply> platformRemoteUpdateReplyList = platformRemoteUpdateReplyService.getRangeTimeData(startTime, endTime);
- List<QrCodeDeliveryReply> qrCodeDeliveryReplyList = qrCodeDeliveryReplyService.getRangeTimeData(startTime, endTime);
- List<SecurityDetection> securityDetectionList = securityDetectionService.getRangeTimeData(startTime, endTime);
customthreadPoolExecutor.execute(() -> {
- if (acquisitionBillingModeList != null && acquisitionBillingModeList.size() > 0) {
- for (AcquisitionBillingMode acquisitionBillingMode : acquisitionBillingModeList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", acquisitionBillingMode.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", acquisitionBillingMode.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (billingModeVerifyList != null && billingModeVerifyList.size() > 0) {
- for (BillingModeVerify billingModeVerify : billingModeVerifyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", billingModeVerify.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", billingModeVerify.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (bmsAbortList != null && bmsAbortList.size() > 0) {
- for (BmsAbort bmsAbort : bmsAbortList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", bmsAbort.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsAbort.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (bmsDemandAndChargerExportationList != null && bmsDemandAndChargerExportationList.size() > 0) {
- for (BmsDemandAndChargerExportation bmsDemandAndChargerExportation : bmsDemandAndChargerExportationList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", bmsDemandAndChargerExportation.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsDemandAndChargerExportation.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (onlineList != null && onlineList.size() > 0) {
- for (Online online : onlineList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", online.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", online.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (endChargeList != null && endChargeList.size() > 0) {
- for (EndCharge endCharge : endChargeList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", endCharge.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", endCharge.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (errorMessageMessageList != null && errorMessageMessageList.size() > 0) {
- for (ErrorMessageMessage errorMessageMessage : errorMessageMessageList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", errorMessageMessage.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", errorMessageMessage.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
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);
mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", uploadRealTimeMonitoringData.getCharging_pile_code()), jsonObject.toJSONString());
}
}
- if (chargingHandshakeList != null && chargingHandshakeList.size() > 0) {
- for (ChargingHandshake chargingHandshake : chargingHandshakeList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", chargingHandshake.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingHandshake.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (parameterSettingList != null && parameterSettingList.size() > 0) {
- for (ParameterSetting parameterSetting : parameterSettingList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", parameterSetting.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", parameterSetting.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (motorAbortList != null && motorAbortList.size() > 0) {
- for (MotorAbort motorAbort : motorAbortList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", motorAbort.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", motorAbort.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (bmsInformationList != null && bmsInformationList.size() > 0) {
- for (BmsInformation bmsInformation : bmsInformationList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", bmsInformation.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsInformation.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (chargingPileStartsChargingList != null && chargingPileStartsChargingList.size() > 0) {
- for (ChargingPileStartsCharging chargingPileStartsCharging : chargingPileStartsChargingList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", chargingPileStartsCharging.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileStartsCharging.getCharging_pile_code()),jsonObject.toJSONString());
- }
- }
- if (platformStartChargingReplyList != null && platformStartChargingReplyList.size() > 0) {
- for (PlatformStartChargingReply platformStartChargingReply : platformStartChargingReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", platformStartChargingReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStartChargingReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (platformStopChargingReplyList != null && platformStopChargingReplyList.size() > 0) {
- for (PlatformStopChargingReply platformStopChargingReply : platformStopChargingReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", platformStopChargingReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStopChargingReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (transactionRecordList != null && transactionRecordList.size() > 0) {
- for (TransactionRecord transactionRecord : transactionRecordList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", transactionRecord.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", transactionRecord.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
-// if (updateBalanceReplyList != null && updateBalanceReplyList.size() > 0) {
-// for (UpdateBalanceReply updateBalanceReply : updateBalanceReplyList) {
-// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", updateBalanceReply.getCharging_pile_code()), JSONObject.toJSONString(updateBalanceReply));
-// }
-// }
-// if (synchronizeOfflineCardReplyList != null && synchronizeOfflineCardReplyList.size() > 0) {
-// for (SynchronizeOfflineCardReply synchronizeOfflineCardReply : synchronizeOfflineCardReplyList) {
-// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", synchronizeOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(synchronizeOfflineCardReply));
-// }
-// }
-// if (clearOfflineCardReplyList != null && clearOfflineCardReplyList.size() > 0) {
-// for (ClearOfflineCardReply clearOfflineCardReply : clearOfflineCardReplyList) {
-// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", clearOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(clearOfflineCardReply));
-// }
-// }
- if (workingParameterSettingReplyList != null && workingParameterSettingReplyList.size() > 0) {
- for (WorkingParameterSettingReply workingParameterSettingReply : workingParameterSettingReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", workingParameterSettingReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", workingParameterSettingReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (timingSettingList != null && timingSettingList.size() > 0) {
- for (TimingSetting timingSetting : timingSettingList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", timingSetting.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", timingSetting.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
-// if (setupBillingModelReplyList != null && setupBillingModelReplyList.size() > 0) {
-// for (SetupBillingModelReply setupBillingModelReply : setupBillingModelReplyList) {
-// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", setupBillingModelReply.getCharging_pile_code()), JSONObject.toJSONString(setupBillingModelReply));
-// }
-// }
- if (groundLockRealTimeDataList != null && groundLockRealTimeDataList.size() > 0) {
- for (GroundLockRealTimeData groundLockRealTimeData : groundLockRealTimeDataList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", groundLockRealTimeData.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", groundLockRealTimeData.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (chargingPileReturnsGroundLockDataList != null && chargingPileReturnsGroundLockDataList.size() > 0) {
- for (ChargingPileReturnsGroundLockData chargingPileReturnsGroundLockData : chargingPileReturnsGroundLockDataList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", chargingPileReturnsGroundLockData.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileReturnsGroundLockData.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (platformRestartReplyList != null && platformRestartReplyList.size() > 0) {
- for (PlatformRestartReply platformRestartReply : platformRestartReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", platformRestartReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRestartReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (platformRemoteUpdateReplyList != null && platformRemoteUpdateReplyList.size() > 0) {
- for (PlatformRemoteUpdateReply platformRemoteUpdateReply : platformRemoteUpdateReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", platformRemoteUpdateReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRemoteUpdateReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (qrCodeDeliveryReplyList != null && qrCodeDeliveryReplyList.size() > 0) {
- for (QrCodeDeliveryReply qrCodeDeliveryReply : qrCodeDeliveryReplyList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", qrCodeDeliveryReply.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", qrCodeDeliveryReply.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
- if (securityDetectionList != null && securityDetectionList.size() > 0) {
- for (SecurityDetection securityDetection : securityDetectionList) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("device_code", securityDetection.getCharging_pile_code());
- jsonObject.put("report_time", System.currentTimeMillis());
- mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", securityDetection.getCharging_pile_code()), jsonObject.toJSONString());
- }
- }
-
});
TimeUnit.MILLISECONDS.sleep(1);
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeReplyService.java
index 06e46e9..831b97a 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeReplyService.java
@@ -5,6 +5,7 @@
import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.jianguan.mongodb.base.BaseService;
+import java.util.Date;
import java.util.List;
public interface AcquisitionBillingModeReplyService extends BaseService<AcquisitionBillingModeReply> {
@@ -15,6 +16,6 @@
* @param endTime 结束时间
* @return
*/
- List<AcquisitionBillingModeReply> getRangeTimeData(String startTime, String endTime);
+ List<AcquisitionBillingModeReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
index ffb61d9..62ef124 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
@@ -4,6 +4,7 @@
import com.ruoyi.integration.api.model.AcquisitionBillingModeReply;
import com.ruoyi.jianguan.mongodb.base.BaseService;
+import java.util.Date;
import java.util.List;
public interface AcquisitionBillingModeService extends BaseService<AcquisitionBillingMode> {
@@ -14,6 +15,6 @@
* @param endTime 结束时间
* @return
*/
- List<AcquisitionBillingMode> getRangeTimeData(String startTime, String endTime);
+ List<AcquisitionBillingMode> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyReplyService.java
index c508bdb..e049769 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyReplyService.java
@@ -1,9 +1,9 @@
package com.ruoyi.jianguan.mongodb.service;
-import com.ruoyi.integration.api.model.AcquisitionBillingModeReply;
import com.ruoyi.integration.api.model.BillingModeVerifyReply;
import com.ruoyi.jianguan.mongodb.base.BaseService;
+import java.util.Date;
import java.util.List;
public interface BillingModeVerifyReplyService extends BaseService<BillingModeVerifyReply> {
@@ -14,6 +14,6 @@
* @param endTime 结束时间
* @return
*/
- List<BillingModeVerifyReply> getRangeTimeData(String startTime, String endTime);
+ List<BillingModeVerifyReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyService.java
index 7970e53..5c31143 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BillingModeVerifyService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.api.model.BillingModeVerifyReply;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface BillingModeVerifyService extends BaseService<BillingModeVerify> {
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<BillingModeVerify> getRangeTimeData(String startTime, String endTime);
+ List<BillingModeVerify> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsAbortService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsAbortService.java
index db79dde..ca2032d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsAbortService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsAbortService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface BmsAbortService extends BaseService<BmsAbort> {
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<BmsAbort> getRangeTimeData(String startTime, String endTime);
+ List<BmsAbort> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsDemandAndChargerExportationService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsDemandAndChargerExportationService.java
index 0160b3b..5caefa3 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsDemandAndChargerExportationService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsDemandAndChargerExportationService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface BmsDemandAndChargerExportationService extends BaseService<BmsDemandAndChargerExportation> {
@@ -22,6 +22,6 @@
* @param endTime 结束时间
* @return
*/
- List<BmsDemandAndChargerExportation> getRangeTimeData(String startTime, String endTime);
+ List<BmsDemandAndChargerExportation> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsInformationService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsInformationService.java
index 5778d1c..e42758e 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsInformationService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/BmsInformationService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface BmsInformationService extends BaseService<BmsInformation> {
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<BmsInformation> getRangeTimeData(String startTime, String endTime);
+ List<BmsInformation> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingHandshakeService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingHandshakeService.java
index e1894af..b3aa0f7 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingHandshakeService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingHandshakeService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface ChargingHandshakeService extends BaseService<ChargingHandshake> {
@@ -16,5 +16,5 @@
* @param endTime 结束时间
* @return
*/
- List<ChargingHandshake> getRangeTimeData(String startTime, String endTime);
+ List<ChargingHandshake> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileReturnsGroundLockDataService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileReturnsGroundLockDataService.java
index 5874e48..163c887 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileReturnsGroundLockDataService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileReturnsGroundLockDataService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface ChargingPileReturnsGroundLockDataService extends BaseService<ChargingPileReturnsGroundLockData> {
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<ChargingPileReturnsGroundLockData> getRangeTimeData(String startTime, String endTime);
+ List<ChargingPileReturnsGroundLockData> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileStartsChargingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileStartsChargingService.java
index ab80f81..69975d4 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileStartsChargingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ChargingPileStartsChargingService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface ChargingPileStartsChargingService extends BaseService<ChargingPileStartsCharging> {
@@ -15,5 +15,5 @@
* @param endTime 结束时间
* @return
*/
- List<ChargingPileStartsCharging> getRangeTimeData(String startTime, String endTime);
+ List<ChargingPileStartsCharging> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardReplyService.java
index 0915b61..4990d42 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardReplyService.java
@@ -3,7 +3,7 @@
import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.integration.api.model.ClearOfflineCardReply;
import com.ruoyi.jianguan.mongodb.base.BaseService;
-
+import java.util.Date;
import java.util.List;
public interface ClearOfflineCardReplyService extends BaseService<ClearOfflineCardReply> {
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<ClearOfflineCardReply> getRangeTimeData(String startTime, String endTime);
+ List<ClearOfflineCardReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardService.java
index c3480b9..8d569f0 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ClearOfflineCardService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface ClearOfflineCardService extends BaseService<ClearOfflineCard> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<ClearOfflineCard> getRangeTimeData(String startTime, String endTime);
+ List<ClearOfflineCard> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ConfirmTransactionRecordService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ConfirmTransactionRecordService.java
index 9d61e51..ed9ea6d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ConfirmTransactionRecordService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ConfirmTransactionRecordService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface ConfirmTransactionRecordService extends BaseService<ConfirmTransactionRecord> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<ConfirmTransactionRecord> getRangeTimeData(String startTime, String endTime);
+ List<ConfirmTransactionRecord> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/EndChargeService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/EndChargeService.java
index 2cdc178..43f7014 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/EndChargeService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/EndChargeService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface EndChargeService extends BaseService<EndCharge> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<EndCharge> getRangeTimeData(String startTime, String endTime);
+ List<EndCharge> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ErrorMessageMessageService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ErrorMessageMessageService.java
index fea698b..b1244fc 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ErrorMessageMessageService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ErrorMessageMessageService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.rocket.model.ErrorMessageMessage;
import java.util.List;
-
+import java.util.Date;
public interface ErrorMessageMessageService extends BaseService<ErrorMessageMessage> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<ErrorMessageMessage> getRangeTimeData(String startTime, String endTime);
+ List<ErrorMessageMessage> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/GroundLockRealTimeDataService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/GroundLockRealTimeDataService.java
index 7e9248f..f855826 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/GroundLockRealTimeDataService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/GroundLockRealTimeDataService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.rocket.model.ErrorMessageMessage;
import java.util.List;
-
+import java.util.Date;
public interface GroundLockRealTimeDataService extends BaseService<GroundLockRealTimeData> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<GroundLockRealTimeData> getRangeTimeData(String startTime, String endTime);
+ List<GroundLockRealTimeData> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/MotorAbortService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/MotorAbortService.java
index 8696c4e..5f9d33f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/MotorAbortService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/MotorAbortService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface MotorAbortService extends BaseService<MotorAbort> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<MotorAbort> getRangeTimeData(String startTime, String endTime);
+ List<MotorAbort> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineReplyService.java
index 32db915..a979f10 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
/**
* 登录认证应答接口
*/
@@ -18,5 +18,5 @@
* @param endTime 结束时间
* @return
*/
- List<OnlineReply> getRangeTimeData(String startTime, String endTime);
+ List<OnlineReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineService.java
index c7ce4cf..cd6e96f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OnlineService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
/**
* 充电桩登录认证接口
*/
@@ -16,5 +16,5 @@
* @param endTime 结束时间
* @return
*/
- List<Online> getRangeTimeData(String startTime, String endTime);
+ List<Online> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OpenOrCloseGroundLockService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OpenOrCloseGroundLockService.java
index c3e1f58..0fa1bb7 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OpenOrCloseGroundLockService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/OpenOrCloseGroundLockService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface OpenOrCloseGroundLockService extends BaseService<OpenOrCloseGroundLock> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<OpenOrCloseGroundLock> getRangeTimeData(String startTime, String endTime);
+ List<OpenOrCloseGroundLock> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ParameterSettingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ParameterSettingService.java
index ae80189..0f32296 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ParameterSettingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ParameterSettingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface ParameterSettingService extends BaseService<ParameterSetting> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<ParameterSetting> getRangeTimeData(String startTime, String endTime);
+ List<ParameterSetting> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformConfirmationChargingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformConfirmationChargingService.java
index e7a479b..6127fa4 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformConfirmationChargingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformConfirmationChargingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformConfirmationChargingService extends BaseService<PlatformConfirmationCharging> {
/**
@@ -14,6 +14,6 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformConfirmationCharging> getRangeTimeData(String startTime, String endTime);
+ List<PlatformConfirmationCharging> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateReplyService.java
index b2c6144..8bc04f3 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformRemoteUpdateReplyService extends BaseService<PlatformRemoteUpdateReply> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformRemoteUpdateReply> getRangeTimeData(String startTime, String endTime);
+ List<PlatformRemoteUpdateReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateService.java
index 2a73978..1a1397c 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRemoteUpdateService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformRemoteUpdateService extends BaseService<PlatformRemoteUpdate> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformRemoteUpdate> getRangeTimeData(String startTime, String endTime);
+ List<PlatformRemoteUpdate> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartReplyService.java
index 018f461..7c6b7e5 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformRestartReplyService extends BaseService<PlatformRestartReply> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformRestartReply> getRangeTimeData(String startTime, String endTime);
+ List<PlatformRestartReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartService.java
index cf3ab74..b9e1af2 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformRestartService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformRestartService extends BaseService<PlatformRestart> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformRestart> getRangeTimeData(String startTime, String endTime);
+ List<PlatformRestart> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingReplyService.java
index 19f7a71..4ee5dae 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformStartChargingReplyService extends BaseService<PlatformStartChargingReply> {
/**
@@ -21,6 +21,6 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformStartChargingReply> getRangeTimeData(String startTime, String endTime);
+ List<PlatformStartChargingReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingService.java
index f033c2d..869b529 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStartChargingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformStartChargingService extends BaseService<PlatformStartCharging> {
/**
@@ -14,5 +14,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformStartCharging> getRangeTimeData(String startTime, String endTime);
+ List<PlatformStartCharging> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingReplyService.java
index 3d8a560..3322bd6 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingReplyService.java
@@ -6,7 +6,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformStopChargingReplyService extends BaseService<PlatformStopChargingReply> {
/**
@@ -20,5 +20,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformStopChargingReply> getRangeTimeData(String startTime, String endTime);
+ List<PlatformStopChargingReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingService.java
index 6508000..bb5f008 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/PlatformStopChargingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface PlatformStopChargingService extends BaseService<PlatformStopCharging> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<PlatformStopCharging> getRangeTimeData(String startTime, String endTime);
+ List<PlatformStopCharging> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryReplyService.java
index 20acbf8..240a1ac 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
/**
*/
public interface QrCodeDeliveryReplyService extends BaseService<QrCodeDeliveryReply> {
@@ -15,5 +15,5 @@
* @param endTime 结束时间
* @return
*/
- List<QrCodeDeliveryReply> getRangeTimeData(String startTime, String endTime);
+ List<QrCodeDeliveryReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryService.java
index e435a92..04f8649 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QrCodeDeliveryService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
/**
*/
public interface QrCodeDeliveryService extends BaseService<QrCodeDelivery> {
@@ -15,5 +15,5 @@
* @param endTime 结束时间
* @return
*/
- List<QrCodeDelivery> getRangeTimeData(String startTime, String endTime);
+ List<QrCodeDelivery> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardReplyService.java
index 3056ab7..720e5a1 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface QueryOfflineCardReplyService extends BaseService<QueryOfflineCardReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<QueryOfflineCardReply> getRangeTimeData(String startTime, String endTime);
+ List<QueryOfflineCardReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardService.java
index 17ec661..736a52d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/QueryOfflineCardService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface QueryOfflineCardService extends BaseService<QueryOfflineCard> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<QueryOfflineCard> getRangeTimeData(String startTime, String endTime);
+ List<QueryOfflineCard> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ReadRealTimeMonitoringDataService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ReadRealTimeMonitoringDataService.java
index 6d14223..e0e167f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ReadRealTimeMonitoringDataService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/ReadRealTimeMonitoringDataService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface ReadRealTimeMonitoringDataService extends BaseService<ReadRealTimeMonitoringData> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<ReadRealTimeMonitoringData> getRangeTimeData(String startTime, String endTime);
+ List<ReadRealTimeMonitoringData> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SecurityDetectionService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SecurityDetectionService.java
index e122029..2949499 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SecurityDetectionService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SecurityDetectionService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
/**
*/
public interface SecurityDetectionService extends BaseService<SecurityDetection> {
@@ -23,5 +23,5 @@
* @param endTime 结束时间
* @return
*/
- List<SecurityDetection> getRangeTimeData(String startTime, String endTime);
+ List<SecurityDetection> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelReplyService.java
index 1d3d576..f4f6b16 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface SetupBillingModelReplyService extends BaseService<SetupBillingModelReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<SetupBillingModelReply> getRangeTimeData(String startTime, String endTime);
+ List<SetupBillingModelReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelService.java
index b326492..d863b61 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SetupBillingModelService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface SetupBillingModelService extends BaseService<SetupBillingModel> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<SetupBillingModel> getRangeTimeData(String startTime, String endTime);
+ List<SetupBillingModel> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardReplyService.java
index 74f0c25..0afeea0 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface SynchronizeOfflineCardReplyService extends BaseService<SynchronizeOfflineCardReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<SynchronizeOfflineCardReply> getRangeTimeData(String startTime, String endTime);
+ List<SynchronizeOfflineCardReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardService.java
index b8c60f6..7f3d899 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/SynchronizeOfflineCardService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface SynchronizeOfflineCardService extends BaseService<SynchronizeOfflineCard> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<SynchronizeOfflineCard> getRangeTimeData(String startTime, String endTime);
+ List<SynchronizeOfflineCard> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingReplyService.java
index ccdada5..8fbcb6e 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface TimingSettingReplyService extends BaseService<TimingSettingReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<TimingSettingReply> getRangeTimeData(String startTime, String endTime);
+ List<TimingSettingReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingService.java
index 10542a4..c08479c 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TimingSettingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface TimingSettingService extends BaseService<TimingSetting> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<TimingSetting> getRangeTimeData(String startTime, String endTime);
+ List<TimingSetting> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TransactionRecordService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TransactionRecordService.java
index ae8723d..bd92eaf 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TransactionRecordService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/TransactionRecordService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface TransactionRecordService extends BaseService<TransactionRecord> {
/**
@@ -20,5 +20,5 @@
* @param endTime 结束时间
* @return
*/
- List<TransactionRecord> getRangeTimeData(String startTime, String endTime);
+ List<TransactionRecord> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceReplyService.java
index 09496cc..67f6c97 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface UpdateBalanceReplyService extends BaseService<UpdateBalanceReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<UpdateBalanceReply> getRangeTimeData(String startTime, String endTime);
+ List<UpdateBalanceReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceService.java
index 417e684..7bf5b51 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UpdateBalanceService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface UpdateBalanceService extends BaseService<UpdateBalance> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<UpdateBalance> getRangeTimeData(String startTime, String endTime);
+ List<UpdateBalance> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
index 53c7a51..7bf8a04 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
@@ -8,7 +8,7 @@
import java.text.ParseException;
import java.util.List;
-
+import java.util.Date;
public interface UploadRealTimeMonitoringDataService extends BaseService<UploadRealTimeMonitoringData> {
/**
@@ -35,5 +35,5 @@
* @param endTime 结束时间
* @return
*/
- List<UploadRealTimeMonitoringData> getRangeTimeData(String startTime, String endTime);
+ List<UploadRealTimeMonitoringData> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingReplyService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingReplyService.java
index 11f56b9..cca1456 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingReplyService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingReplyService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface WorkingParameterSettingReplyService extends BaseService<WorkingParameterSettingReply> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<WorkingParameterSettingReply> getRangeTimeData(String startTime, String endTime);
+ List<WorkingParameterSettingReply> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingService.java
index a048e2c..74320d5 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/WorkingParameterSettingService.java
@@ -5,7 +5,7 @@
import com.ruoyi.jianguan.mongodb.base.BaseService;
import java.util.List;
-
+import java.util.Date;
public interface WorkingParameterSettingService extends BaseService<WorkingParameterSetting> {
/**
* 获取前一日的所有数据数据
@@ -13,5 +13,5 @@
* @param endTime 结束时间
* @return
*/
- List<WorkingParameterSetting> getRangeTimeData(String startTime, String endTime);
+ List<WorkingParameterSetting> getRangeTimeData(Date startTime, Date endTime);
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java
index a82b68c..f8307ea 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
-import java.util.List;
+import java.util.List;import java.util.Date;
+import java.util.Objects;
+
@Service
public class AcquisitionBillingModeReplyServiceImpl implements AcquisitionBillingModeReplyService {
@@ -36,10 +38,10 @@
}
@Override
- public List<AcquisitionBillingModeReply> getRangeTimeData(String startTime, String endTime) {
+ public List<AcquisitionBillingModeReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<AcquisitionBillingModeReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java
index b6e2f29..6b89828 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class AcquisitionBillingModeServiceImpl implements AcquisitionBillingModeService {
@@ -35,10 +37,10 @@
return mongoTemplate.findAll(AcquisitionBillingMode.class);
}
@Override
- public List<AcquisitionBillingMode> getRangeTimeData(String startTime, String endTime) {
+ public List<AcquisitionBillingMode> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<AcquisitionBillingMode> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java
index 173d519..0e561c3 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java
@@ -12,7 +12,10 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
+
@Service
public class BillingModeVerifyReplyServiceImpl implements BillingModeVerifyReplyService {
@Autowired
@@ -35,10 +38,10 @@
}
@Override
- public List<BillingModeVerifyReply> getRangeTimeData(String startTime, String endTime) {
+ public List<BillingModeVerifyReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<BillingModeVerifyReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyServiceImpl.java
index b74f0c2..9598e1d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BillingModeVerifyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class BillingModeVerifyServiceImpl implements BillingModeVerifyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<BillingModeVerify> getRangeTimeData(String startTime, String endTime) {
+ public List<BillingModeVerify> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<BillingModeVerify> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsAbortServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsAbortServiceImpl.java
index 3e9b0e7..47b5de1 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsAbortServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsAbortServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class BmsAbortServiceImpl implements BmsAbortService {
@@ -35,10 +37,10 @@
}
@Override
- public List<BmsAbort> getRangeTimeData(String startTime, String endTime) {
+ public List<BmsAbort> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<BmsAbort> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java
index 3580056..a47af71 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class BmsDemandAndChargerExportationServiceImpl implements BmsDemandAndChargerExportationService {
@@ -48,10 +50,10 @@
}
@Override
- public List<BmsDemandAndChargerExportation> getRangeTimeData(String startTime, String endTime) {
+ public List<BmsDemandAndChargerExportation> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<BmsDemandAndChargerExportation> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsInformationServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsInformationServiceImpl.java
index a69f5bd..9494337 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsInformationServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/BmsInformationServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class BmsInformationServiceImpl implements BmsInformationService {
@@ -35,10 +37,10 @@
}
@Override
- public List<BmsInformation> getRangeTimeData(String startTime, String endTime) {
+ public List<BmsInformation> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<BmsInformation> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingHandshakeServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingHandshakeServiceImpl.java
index 89bf4b1..6b604af 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingHandshakeServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingHandshakeServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ChargingHandshakeServiceImpl implements ChargingHandshakeService {
@@ -41,10 +43,10 @@
}
@Override
- public List<ChargingHandshake> getRangeTimeData(String startTime, String endTime) {
+ public List<ChargingHandshake> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ChargingHandshake> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java
index 9a6fc3e..fef282a 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ChargingPileReturnsGroundLockDataServiceImpl implements ChargingPileReturnsGroundLockDataService {
@@ -35,10 +37,10 @@
}
@Override
- public List<ChargingPileReturnsGroundLockData> getRangeTimeData(String startTime, String endTime) {
+ public List<ChargingPileReturnsGroundLockData> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ChargingPileReturnsGroundLockData> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java
index 059dcce..17d4df2 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ChargingPileStartsChargingServiceImpl implements ChargingPileStartsChargingService {
@@ -35,10 +37,10 @@
}
@Override
- public List<ChargingPileStartsCharging> getRangeTimeData(String startTime, String endTime) {
+ public List<ChargingPileStartsCharging> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ChargingPileStartsCharging> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java
index a6cdfaa..5ec057e 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ClearOfflineCardReplyServiceImpl implements ClearOfflineCardReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<ClearOfflineCardReply> getRangeTimeData(String startTime, String endTime) {
+ public List<ClearOfflineCardReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ClearOfflineCardReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardServiceImpl.java
index c98c819..aef9fe2 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ClearOfflineCardServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ClearOfflineCardServiceImpl implements ClearOfflineCardService {
@@ -35,10 +37,10 @@
}
@Override
- public List<ClearOfflineCard> getRangeTimeData(String startTime, String endTime) {
+ public List<ClearOfflineCard> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ClearOfflineCard> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java
index 6419467..223c0ea 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ConfirmTransactionRecordServiceImpl implements ConfirmTransactionRecordService {
@@ -37,10 +39,10 @@
}
@Override
- public List<ConfirmTransactionRecord> getRangeTimeData(String startTime, String endTime) {
+ public List<ConfirmTransactionRecord> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ConfirmTransactionRecord> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/EndChargeServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/EndChargeServiceImpl.java
index 458661a..5997a34 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/EndChargeServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/EndChargeServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
@@ -37,10 +39,10 @@
}
@Override
- public List<EndCharge> getRangeTimeData(String startTime, String endTime) {
+ public List<EndCharge> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<EndCharge> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ErrorMessageMessageServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ErrorMessageMessageServiceImpl.java
index 9b697e4..50015bd 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ErrorMessageMessageServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ErrorMessageMessageServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
@@ -37,10 +39,10 @@
}
@Override
- public List<ErrorMessageMessage> getRangeTimeData(String startTime, String endTime) {
+ public List<ErrorMessageMessage> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ErrorMessageMessage> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java
index 1ae67db..6d9ad56 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class GroundLockRealTimeDataServiceImpl implements GroundLockRealTimeDataService {
@@ -35,10 +37,10 @@
}
@Override
- public List<GroundLockRealTimeData> getRangeTimeData(String startTime, String endTime) {
+ public List<GroundLockRealTimeData> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<GroundLockRealTimeData> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/MotorAbortServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/MotorAbortServiceImpl.java
index b9244cb..666f899 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/MotorAbortServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/MotorAbortServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class MotorAbortServiceImpl implements MotorAbortService {
@@ -35,10 +37,10 @@
}
@Override
- public List<MotorAbort> getRangeTimeData(String startTime, String endTime) {
+ public List<MotorAbort> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<MotorAbort> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineReplyServiceImpl.java
index 50dfb7c..d9b7146 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -40,10 +42,10 @@
}
@Override
- public List<OnlineReply> getRangeTimeData(String startTime, String endTime) {
+ public List<OnlineReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<OnlineReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineServiceImpl.java
index 028b2ea..98ac072 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OnlineServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -40,10 +42,10 @@
}
@Override
- public List<Online> getRangeTimeData(String startTime, String endTime) {
+ public List<Online> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<Online> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java
index 96f7cac..9a61ab2 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class OpenOrCloseGroundLockServiceImpl implements OpenOrCloseGroundLockService {
@@ -35,10 +37,10 @@
}
@Override
- public List<OpenOrCloseGroundLock> getRangeTimeData(String startTime, String endTime) {
+ public List<OpenOrCloseGroundLock> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<OpenOrCloseGroundLock> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ParameterSettingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ParameterSettingServiceImpl.java
index ad8e6f6..952c843 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ParameterSettingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ParameterSettingServiceImpl.java
@@ -13,7 +13,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ParameterSettingServiceImpl implements ParameterSettingService {
@@ -36,10 +38,10 @@
}
@Override
- public List<ParameterSetting> getRangeTimeData(String startTime, String endTime) {
+ public List<ParameterSetting> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ParameterSetting> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java
index 2d02d3f..7087672 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformConfirmationChargingServiceImpl implements PlatformConfirmationChargingService {
@@ -35,10 +37,10 @@
}
@Override
- public List<PlatformConfirmationCharging> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformConfirmationCharging> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformConfirmationCharging> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java
index ffe3c17..a856da8 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformRemoteUpdateReplyServiceImpl implements PlatformRemoteUpdateReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<PlatformRemoteUpdateReply> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformRemoteUpdateReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformRemoteUpdateReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java
index ec11cfe..7b5e54d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformRemoteUpdateServiceImpl implements PlatformRemoteUpdateService {
@@ -35,10 +37,10 @@
}
@Override
- public List<PlatformRemoteUpdate> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformRemoteUpdate> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformRemoteUpdate> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartReplyServiceImpl.java
index 37bf865..5ac6856 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformRestartReplyServiceImpl implements PlatformRestartReplyService {
@@ -36,10 +38,10 @@
}
@Override
- public List<PlatformRestartReply> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformRestartReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformRestartReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartServiceImpl.java
index 96a758f..dc0d8fc 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformRestartServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformRestartServiceImpl implements PlatformRestartService {
@@ -35,10 +37,10 @@
}
@Override
- public List<PlatformRestart> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformRestart> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformRestart> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java
index 7d3ed84..35dd0fd 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformStartChargingReplyServiceImpl implements PlatformStartChargingReplyService {
@@ -50,10 +52,10 @@
}
@Override
- public List<PlatformStartChargingReply> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformStartChargingReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformStartChargingReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingServiceImpl.java
index 460f342..03328c5 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStartChargingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformStartChargingServiceImpl implements PlatformStartChargingService {
@@ -35,10 +37,10 @@
}
@Override
- public List<PlatformStartCharging> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformStartCharging> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformStartCharging> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java
index b9e725e..2c8ba29 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java
@@ -16,6 +16,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformStopChargingReplyServiceImpl implements PlatformStopChargingReplyService {
@@ -51,10 +52,10 @@
}
@Override
- public List<PlatformStopChargingReply> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformStopChargingReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformStopChargingReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java
index 1def769..2bc67bc 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class PlatformStopChargingServiceImpl implements PlatformStopChargingService {
@@ -37,10 +39,10 @@
}
@Override
- public List<PlatformStopCharging> getRangeTimeData(String startTime, String endTime) {
+ public List<PlatformStopCharging> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<PlatformStopCharging> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java
index 426064a..d03736b 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -40,10 +42,10 @@
}
@Override
- public List<QrCodeDeliveryReply> getRangeTimeData(String startTime, String endTime) {
+ public List<QrCodeDeliveryReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<QrCodeDeliveryReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
index 61ccf5a..4442a7f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -40,10 +42,10 @@
}
@Override
- public List<QrCodeDelivery> getRangeTimeData(String startTime, String endTime) {
+ public List<QrCodeDelivery> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<QrCodeDelivery> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java
index adc1b70..600e45b 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class QueryOfflineCardReplyServiceImpl implements QueryOfflineCardReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<QueryOfflineCardReply> getRangeTimeData(String startTime, String endTime) {
+ public List<QueryOfflineCardReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<QueryOfflineCardReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardServiceImpl.java
index da0fca1..7658165 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QueryOfflineCardServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class QueryOfflineCardServiceImpl implements QueryOfflineCardService {
@@ -35,10 +37,10 @@
}
@Override
- public List<QueryOfflineCard> getRangeTimeData(String startTime, String endTime) {
+ public List<QueryOfflineCard> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<QueryOfflineCard> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java
index 693f0f0..414535f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class ReadRealTimeMonitoringDataServiceImpl implements ReadRealTimeMonitoringDataService {
@@ -35,10 +37,10 @@
}
@Override
- public List<ReadRealTimeMonitoringData> getRangeTimeData(String startTime, String endTime) {
+ public List<ReadRealTimeMonitoringData> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<ReadRealTimeMonitoringData> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SecurityDetectionServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SecurityDetectionServiceImpl.java
index 5463d72..219dba1 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SecurityDetectionServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SecurityDetectionServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -52,10 +54,10 @@
}
@Override
- public List<SecurityDetection> getRangeTimeData(String startTime, String endTime) {
+ public List<SecurityDetection> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<SecurityDetection> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java
index 55196d7..ec5c942 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class SetupBillingModelReplyServiceImpl implements SetupBillingModelReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<SetupBillingModelReply> getRangeTimeData(String startTime, String endTime) {
+ public List<SetupBillingModelReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<SetupBillingModelReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelServiceImpl.java
index 1cff1f4..675b7ef 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SetupBillingModelServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class SetupBillingModelServiceImpl implements SetupBillingModelService {
@@ -35,10 +37,10 @@
}
@Override
- public List<SetupBillingModel> getRangeTimeData(String startTime, String endTime) {
+ public List<SetupBillingModel> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<SetupBillingModel> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java
index 93db082..bb57415 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class SynchronizeOfflineCardReplyServiceImpl implements SynchronizeOfflineCardReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<SynchronizeOfflineCardReply> getRangeTimeData(String startTime, String endTime) {
+ public List<SynchronizeOfflineCardReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<SynchronizeOfflineCardReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java
index 9587a8e..8328cc4 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class SynchronizeOfflineCardServiceImpl implements SynchronizeOfflineCardService {
@@ -37,10 +39,10 @@
}
@Override
- public List<SynchronizeOfflineCard> getRangeTimeData(String startTime, String endTime) {
+ public List<SynchronizeOfflineCard> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<SynchronizeOfflineCard> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingReplyServiceImpl.java
index 37c44e4..0f579c6 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class TimingSettingReplyServiceImpl implements TimingSettingReplyService {
@@ -36,10 +38,10 @@
}
@Override
- public List<TimingSettingReply> getRangeTimeData(String startTime, String endTime) {
+ public List<TimingSettingReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<TimingSettingReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingServiceImpl.java
index 430613f..b328583 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TimingSettingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class TimingSettingServiceImpl implements TimingSettingService {
@@ -35,10 +37,10 @@
}
@Override
- public List<TimingSetting> getRangeTimeData(String startTime, String endTime) {
+ public List<TimingSetting> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<TimingSetting> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TransactionRecordServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TransactionRecordServiceImpl.java
index 4f6e8e6..87ba5e8 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TransactionRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/TransactionRecordServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class TransactionRecordServiceImpl implements TransactionRecordService {
@@ -52,10 +54,10 @@
}
@Override
- public List<TransactionRecord> getRangeTimeData(String startTime, String endTime) {
+ public List<TransactionRecord> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<TransactionRecord> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java
index fbf24e2..2298034 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class UpdateBalanceReplyServiceImpl implements UpdateBalanceReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<UpdateBalanceReply> getRangeTimeData(String startTime, String endTime) {
+ public List<UpdateBalanceReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<UpdateBalanceReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceServiceImpl.java
index 08b59a2..b949f9b 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UpdateBalanceServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class UpdateBalanceServiceImpl implements UpdateBalanceService {
@@ -37,10 +39,10 @@
}
@Override
- public List<UpdateBalance> getRangeTimeData(String startTime, String endTime) {
+ public List<UpdateBalance> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<UpdateBalance> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
index 56bd831..35647e5 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
@@ -21,6 +21,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class UploadRealTimeMonitoringDataServiceImpl implements UploadRealTimeMonitoringDataService {
@@ -174,10 +175,10 @@
}
@Override
- public List<UploadRealTimeMonitoringData> getRangeTimeData(String startTime, String endTime) {
+ public List<UploadRealTimeMonitoringData> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<UploadRealTimeMonitoringData> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java
index cdc3810..85cdfcd 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class WorkingParameterSettingReplyServiceImpl implements WorkingParameterSettingReplyService {
@@ -35,10 +37,10 @@
}
@Override
- public List<WorkingParameterSettingReply> getRangeTimeData(String startTime, String endTime) {
+ public List<WorkingParameterSettingReply> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<WorkingParameterSettingReply> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingServiceImpl.java
index 01ccbcb..bebb427 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/WorkingParameterSettingServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Service
public class WorkingParameterSettingServiceImpl implements WorkingParameterSettingService {
@@ -35,10 +37,10 @@
}
@Override
- public List<WorkingParameterSetting> getRangeTimeData(String startTime, String endTime) {
+ public List<WorkingParameterSetting> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<WorkingParameterSetting> list = mongoTemplate.find(
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/config/TopicConstants.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/config/TopicConstants.java
index e0532e6..8ec633b 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/config/TopicConstants.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/config/TopicConstants.java
@@ -5,6 +5,6 @@
/**
* topic 政务云上传数据
*/
- public static String CHARGE_PILE_CODE = "/devices/v1/MTA5Mjg0NTY3Mzg3MjYyMTU2OA==/CHARGE_PILE_CODE/sys/properties/report";
+ public static String CHARGE_PILE_CODE = "/devices/v1/MTM1OTkwNjEzMjc5NzE2MTQ3Mg==/CHARGE_PILE_CODE/sys/properties/report";
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
index aabab4c..92f360b 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
@@ -14,10 +14,14 @@
@Component
public class MqttPushUtil {
- private final static String HOST = "tcp://127.0.0.1:9882";
- private final static String CLIENT_ID = "mqttx_3267186711111fdsasdsa";
- private final static String USER_NAME = "admin";
- private final static String PASS_WORD = "mingxingdianli123";
+// private final static String HOST = "tcp://127.0.0.1:9882";
+// private final static String CLIENT_ID = "mqttx_3267186711111fdsasdsa";
+// private final static String USER_NAME = "admin";
+// private final static String PASS_WORD = "mingxingdianli123";
+ private final static String HOST = "tcp://183.220.129.95:1883";
+ private final static String CLIENT_ID = "mqttx_3267186711111mxcdszyun";
+ private final static String USER_NAME = "mxEmqx";
+ private final static String PASS_WORD = "admin";
private final static Integer TIME_OUT = 30000;
private final static Integer KEEP_ALIVE = 60000;
private MqttClient mqttClient;
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-jianguan/src/main/resources/bootstrap.yml
index e0d0a05..9ca593a 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-jianguan/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
allow-circular-references: true
profiles:
# 环境配置
-# active: dev
- active: prod
+ active: dev
+# active: prod
---
spring:
--
Gitblit v1.7.1