From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 10 ++---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 41 ++++++++++----------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java | 12 +++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 38 +++++++++---------
5 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 191076b..aba788a 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -483,26 +483,28 @@
settlementExportVO.setCreateTime1(createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
settlementExportVO.setStartTime1(startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
settlementExportVO.setEndTime1(endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- switch (settlementExportVO.getStatus()){
- case 0:
- settlementExportVO.setStatusName("未知");
- break;
- case 1:
- settlementExportVO.setStatusName("等待中/已插枪");
- break;
- case 2:
- settlementExportVO.setStatusName("启动中");
- break;
- case 3:
- settlementExportVO.setStatusName("充电中");
- break;
- case 4:
- settlementExportVO.setStatusName("停止中");
- break;
- case 5:
- settlementExportVO.setStatusName("已结束");
- break;
+ if (chargingOrder.getStatus()!=null){
+ switch (chargingOrder.getStatus()){
+ case 0:
+ settlementExportVO.setStatusName("未知");
+ break;
+ case 1:
+ settlementExportVO.setStatusName("等待中/已插枪");
+ break;
+ case 2:
+ settlementExportVO.setStatusName("启动中");
+ break;
+ case 3:
+ settlementExportVO.setStatusName("充电中");
+ break;
+ case 4:
+ settlementExportVO.setStatusName("停止中");
+ break;
+ case 5:
+ settlementExportVO.setStatusName("已结束");
+ break;
+ }
}
settlementExportVO.setOrderTypeName("充电订单");
settlementExportVO.setChargingType("单桩双充");
@@ -589,7 +591,6 @@
excelWriter.fill(new FillWrapper("data1", chargingBillVOS), fillConfig, writeSheet);
excelWriter.fill(new FillWrapper("data2", chargingBillVOS), fillConfig, writeSheet2);
excelWriter.fill(new FillWrapper("data3", data.getList()), fillConfig, writeSheet3);
- excelWriter.fill(new FillWrapper("data4", data.getList()), fillConfig, writeSheet3);
excelWriter.finish();
} catch (Exception e) {
return R.fail("excel导出失败！");
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index bca4199..23bcde7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -206,7 +206,7 @@
*/
@ResponseBody
@PostMapping("/getChargingPileById/{id}")
- public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
+ public R<TChargingPile> getChargingPileById(@PathVariable("id") Integer id){
TChargingPile chargingPile = chargingPileService.getById(id);
return R.ok(chargingPile);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
index 7fb53ff..5ae633b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
@@ -1,6 +1,8 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.model.TRepair;
import com.ruoyi.chargingPile.service.TRepairService;
@@ -38,8 +40,8 @@
private TRepairService repairService;
@Resource
private TokenService tokenService;
- @Autowired
- private SysUserClient userClient;
+ @Resource
+ private AppUserClient appUserClient;
/**
* 添加故障报修管理
@@ -50,9 +52,9 @@
public AjaxResult<String> add(@Validated @RequestBody TRepair dto) {
Long userId = tokenService.getLoginUserApplet().getUserId();
// 查询报修人员信息
- SysUser user = userClient.getSysUser(userId).getData();
- if(Objects.nonNull(user)){
- dto.setRepairman(user.getUserName());
+ TAppUser user = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(user)){
+ dto.setRepairman(user.getName());
}
repairService.add(dto);
return AjaxResult.success();
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 70a11ec..05f6dc8 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -170,19 +170,19 @@
return AjaxResult.error("设备编号已存在");
}
//调用华为Iot创建设备
- AddDevice addDevice = new AddDevice();
- addDevice.setProductId("66da68d21837002b28b34ec0");
- addDevice.setNodeId(chargingPile.getCode());
- addDevice.setDeviceName(chargingPile.getName());
- addDevice.setDescription(chargingPile.getNumber().toString());
- AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
- if(null != deviceResp){
- int httpStatusCode = deviceResp.getHttpStatusCode();
- if(httpStatusCode == 201){
- chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
- this.save(chargingPile);
- }
- }
+// AddDevice addDevice = new AddDevice();
+// addDevice.setProductId("66da68d21837002b28b34ec0");
+// addDevice.setNodeId(chargingPile.getCode());
+// addDevice.setDeviceName(chargingPile.getName());
+// addDevice.setDescription(chargingPile.getNumber().toString());
+// AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
+// if(null != deviceResp){
+// int httpStatusCode = deviceResp.getHttpStatusCode();
+// if(httpStatusCode == 201){
+// chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
+// }
+// }
+ this.save(chargingPile);
return AjaxResult.success();
}
@@ -266,12 +266,12 @@
for (Integer id : ids) {
TChargingPile chargingPile = this.getById(id);
//调用华为Iot删除设备
- if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
- DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
- if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
- this.removeById(chargingPile);
- }
- }
+// if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
+// DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
+// if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
+// }
+// }
+ this.removeById(chargingPile);
}
return AjaxResult.success();
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index ff9c554..7dac1d8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -984,13 +984,13 @@
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
- String code1 = chargingOrder.getCode();
- TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ String code1 = order.getCode();
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
//异步线程处理停机
ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
cachedThreadPool.execute(()->{
//调用硬件停止充电，停止成功后开始计算费用退款
- TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingOrder.getChargingPileId()).getData();
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(order.getChargingPileId()).getData();
PlatformStopCharging platformStopCharging = new PlatformStopCharging();
platformStopCharging.setCharging_pile_code(chargingPile.getCode());
platformStopCharging.setCharging_gun_code(chargingGun.getCode());
@@ -1865,9 +1865,7 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
- System.err.println(start.getTime() + "\n" + end.getTime() + "\n" + lists.get(0).getStart() + "\n" + lists.get(0).getEnd());
-
-
+
for (AccountingStrategyDetailOrderVo strategyDetail : lists) {
BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
--
Gitblit v1.7.1