From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java
index 7928fbe..f1271ae 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java
@@ -1,14 +1,15 @@
package com.ruoyi.integration.controller;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -34,10 +35,29 @@
public R<UploadRealTimeMonitoringData> chargingOrderInfo(@RequestParam("orderId") String orderId){
List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(orderId);
if(dataByOrderCode.size() > 0){
- UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataByOrderCode.get(dataByOrderCode.size() - 1);
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataByOrderCode.get(0);
return R.ok(uploadRealTimeMonitoringData);
}
return R.ok();
+ }
+
+ /**
+ * 批量查询
+ * @param orderId
+ * @return
+ */
+ @PostMapping(value = "/getOrderInfoByCodes")
+ public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@RequestParam("orderId") String orderId){
+ List<UploadRealTimeMonitoringData> res = new ArrayList<>();
+ for (String s : orderId.split(",")) {
+ List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(s);
+ if(dataByOrderCode.size() > 0){
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataByOrderCode.get(0);
+ res.add(uploadRealTimeMonitoringData);
+ }
+
+ }
+ return R.ok(res);
}
@@ -51,6 +71,20 @@
List<UploadRealTimeMonitoringData> list = uploadRealTimeMonitoringDataService.getDataByOrderCode(code);
return R.ok(list);
}
+
+
+ @PostMapping(value = "/getAll")
+ public R<UploadRealTimeMonitoringPageData> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
+ UploadRealTimeMonitoringPageData list = uploadRealTimeMonitoringDataService.getDataAll(mongoChargingOrderQuery);
+ return R.ok(list);
+ }
+
+ @PostMapping(value = "/delete")
+ public R delete(@RequestParam String id) throws ParseException {
+ uploadRealTimeMonitoringDataService.delete(id);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1