From a208b51bccff584689dc918e799c63febbcae832 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 十月 2024 11:56:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 21535a0..114a346 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -53,6 +53,7 @@
import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
+import com.ruoyi.order.service.impl.TChargingOrderServiceImpl;
import com.ruoyi.order.util.PreviousSixMonths;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
@@ -63,6 +64,8 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.models.auth.In;
import jdk.nashorn.internal.runtime.ListAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.ApiOperation;
@@ -94,6 +97,8 @@
@RestController
@RequestMapping("/t-charging-order")
public class TChargingOrderController {
+
+ private Logger log = LoggerFactory.getLogger(TChargingOrderController.class);
@Resource
private TChargingOrderService chargingOrderService;
@@ -465,7 +470,8 @@
*/
@ResponseBody
@PostMapping(value = "/securityDetection")
- public void securityDetection(@RequestBody SecurityDetection securityDetection){
+ public void securityDetection(@RequestBody SecurityDetectionVO securityDetection){
+ log.error("-------------------安全检测数据-------------------：" + securityDetection);
chargingOrderService.securityDetection(securityDetection);
}
@@ -475,8 +481,8 @@
*/
@ResponseBody
@PostMapping(value = "/startChargeSuccessfully")
- public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessage message){
- System.err.println("远程启动应答：" + message);
+ public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessageVO message){
+ log.error("-------------------远程启动充电请求应答-------------------：" + message);
chargingOrderService.startChargeSuccessfully(message);
}
@@ -556,6 +562,20 @@
public AjaxResult stopCharging(@PathVariable String id) {
return chargingOrderService.stopCharging(id);
}
+
+
+ /**
+ * 停止充电应答处理逻辑
+ * @param platformStopChargingReply
+ */
+ @PostMapping("/terminateSuccessfulResponse")
+ public void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply){
+ log.error("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply);
+ chargingOrderService.terminateSuccessfulResponse(platformStopChargingReply);
+ }
+
+
+
@ResponseBody
@GetMapping(value = "/six/charge")
@@ -749,16 +769,16 @@
// 获取本月1号的日期
YearMonth yearMonth = YearMonth.from(today);
- start = yearMonth.atDay(1);
-
- System.out.println("本月1号是: " + start);
+// start = yearMonth.atDay(1);
+//
+// System.out.println("本月1号是: " + start);
}else if (statisticsQueryDto.getDayType()==4){
LocalDate today = LocalDate.now();
// 获取当前年份
int currentYear = today.getYear();
// 获取今年1月1日的日期
- start = LocalDate.of(currentYear, 1, 1);
- System.out.println("今年1月1日是: " + start);
+ start = statisticsQueryDto.getStartTime();
+ end = statisticsQueryDto.getEndTime();
}else if (statisticsQueryDto.getDayType()==5){
// 获取今年1月1日的日期
@@ -1316,6 +1336,18 @@
return R.ok(userMap);
}
+
+ @GetMapping(value = "/getGunIdsByUserId")
+ @ApiOperation(value = "查询当前用户正在充电中的枪id集合", tags = {"小程序-首页-用户充电订单信息"})
+ public R<List<Integer>> getGunIdsByUserId() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ List<TChargingOrder> list = chargingOrderService.list(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getAppUserId, userId)
+ .eq(TChargingOrder::getStatus, 3));
+ List<Integer> gunIds = list.stream().map(TChargingOrder::getChargingGunId).collect(Collectors.toList());
+ return R.ok(gunIds);
+ }
+
public static void main(String[] args) {
// 示例数据
List<TChargingOrder> list = getSampleData();
@@ -1376,6 +1408,7 @@
*/
@PostMapping("/endCharge")
public void endCharge(@RequestParam("code") String code){
+ log.error(code + "：-------------------充电桩自动结束充电-------------------");
chargingOrderService.endCharge(code, 2);
}
@@ -1385,6 +1418,7 @@
*/
@PostMapping("/excelEndCharge")
public void excelEndCharge(@RequestParam("code") String code){
+ log.error(code + "：-------------------充电异常，停止充电-------------------");
chargingOrderService.excelEndCharge(code);
}
--
Gitblit v1.7.1