From fac94f9e4c24f436662170d8194d238bfa4ad363 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 11:05:26 +0800
Subject: [PATCH] Merge branch 'dev' 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 | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 e2a7f77..35b4c16 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
@@ -32,24 +32,19 @@
* @return
*/
@PostMapping(value = "/getOrderInfoByCode")
- public R<UploadRealTimeMonitoringData> chargingOrderInfo(@RequestParam("orderId") String orderId){
- List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(orderId);
- if(dataByOrderCode.size() > 0){
- UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataByOrderCode.get(0);
- return R.ok(uploadRealTimeMonitoringData);
- }
- return R.ok();
+ public R<UploadRealTimeMonitoringData> getOrderInfoByCode(@RequestParam("orderId") String orderId){
+ UploadRealTimeMonitoringData dataByOrderCode = uploadRealTimeMonitoringDataService.getLastDataById(orderId);
+ return R.ok(dataByOrderCode);
}
/**
* 批量查询
- * @param orderId
* @return
*/
- @PostMapping(value = "/getOrderInfoByCodes")
- public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@RequestParam("orderId") String orderId){
+ @GetMapping(value = "/getOrderInfoByCodes/{ids}")
+ public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@PathVariable("ids") String ids){
List<UploadRealTimeMonitoringData> res = new ArrayList<>();
- for (String s : orderId.split(",")) {
+ for (String s : ids.split(",")) {
List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(s);
if(dataByOrderCode.size() > 0){
UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataByOrderCode.get(0);
@@ -79,6 +74,12 @@
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