From 8b5f7469e4470e4b89f1659e1dc361dff5ea1b09 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 09:52:54 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index fe5e167..1ab8a01 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -3,10 +3,12 @@
import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.SiteNameVO;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -21,6 +23,8 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.integration.api.feignClient.IntegrationClient;
+import com.ruoyi.integration.api.model.EndCharge;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,18 +55,16 @@
@RequestMapping("/t-charging-gun")
public class TChargingGunController {
- private final TChargingGunService chargingGunService;
-
+ @Autowired
+ private TChargingGunService chargingGunService;
+ @Autowired
+ private IntegrationClient integrationClient;
+
@Resource
private TChargingPileService chargingPileService;
@Resource
private ISiteService siteService;
- @Autowired
- public TChargingGunController(TChargingGunService chargingGunService) {
- this.chargingGunService = chargingGunService;
- }
-
/**
* 查询充电枪列表
*/
@@ -132,6 +134,8 @@
@PutMapping(value = "/stopCharging")
public AjaxResult<String> stopCharging(@RequestParam("id") Integer id) {
// TODO 硬件 结束充电
+// EndCharge endCharge = new EndCharge();
+// integrationClient.endCharge(endCharge);
return AjaxResult.success();
}
@@ -208,5 +212,16 @@
siteNameVO.setSiteName(site.getName());
return R.ok(siteNameVO);
}
+ /**
+ * 根据枪编号获取充电枪
+ * @param code
+ * @return
+ */
+ @PostMapping("/getChargingGunByCode/{code}")
+ public R<TChargingGun> getChargingGunByCode(@PathVariable("code") String code){
+ return R.ok(chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
+ .eq(TChargingGun::getCode, code)
+ .last("LIMIT 1")));
+ }
}
--
Gitblit v1.7.1