From 0350c53bd7deeaf30895309eb0c77b21c0da9c4f Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Thu, 19 Aug 2021 15:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/api/HxpcChargeOrderController.java | 2 +- .../order/api/HxpcPileOrderController.java | 50 ++++++++++++------- .../xhpc/order/domain/HxpcChargeOrder.java | 6 +-- .../order/mapper/HxpcChargeOrderMapper.java | 2 +- .../service/IHxpcChargeOrderService.java | 1 + .../impl/HxpcChargeOrderServiceImpl.java | 6 ++- .../mapper/XhpcChargeOrderMapper.xml | 7 ++- 7 files changed, 48 insertions(+), 26 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcChargeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcChargeOrderController.java index c66772b7..6b10fd87 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcChargeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcChargeOrderController.java @@ -99,7 +99,7 @@ public class HxpcChargeOrderController extends BaseController { * @return */ @GetMapping("/gethistotyOrderMessage") - public AjaxResult gethistotyOrderMessage(@RequestParam Long userId,@RequestParam Long historyOrderId,Integer type,Long chargingOrderId) + public AjaxResult gethistotyOrderMessage(@RequestParam Long userId,Long historyOrderId,Integer type,Long chargingOrderId) { return xhpcHistoryOrderService.gethistotyOrderMessage(userId,historyOrderId,type,chargingOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java index afc53436..51424590 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.xhpc.common.api.PileOrderService; +import com.xhpc.common.api.factory.PileOrderFallbackFactory; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.data.redis.CacheOrderData; @@ -16,6 +17,8 @@ import com.xhpc.order.domain.*; import com.xhpc.order.service.IHxpcChargeOrderService; import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcRealTimeOrderService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -46,7 +49,7 @@ public class HxpcPileOrderController extends BaseController { @Autowired private PileOrderService pileOrderService; - + private static final Logger logger = LoggerFactory.getLogger(HxpcPileOrderController.class); /** * 测试 */ @@ -68,16 +71,17 @@ public class HxpcPileOrderController extends BaseController { */ @GetMapping("/chargeOrder/pileStartup") public R pileStartup(@RequestParam(value = "orderNo")String orderNo, @RequestParam(value = "status")Integer status,@RequestParam(value = "remark") String remark) { + logger.info("桩启动回调接口>>>>>状态："+status+"备注++"+"remark"+"订单号"+orderNo); + //解析订单编号 - String s = orderNo.split("\\.")[0]; - String s1 = s.split(":")[1]; + //String s1 = orderNo.substring(6); Long userId =0L; Integer code =200; if (status == 1) { - userId = update(0, 0, remark, s1, 0); + userId = update(0, remark, orderNo, 0); } else { code = 500; - userId = update(-1, 1, remark, s1, 0); + userId = update(-1, remark, orderNo, 0); } Map map = new HashMap<>(); map.put("code", code); @@ -99,11 +103,12 @@ public class HxpcPileOrderController extends BaseController { */ @GetMapping("/chargeOrder/pileStop") public R pileStop(@RequestParam(value = "orderNo")String orderNo, @RequestParam(value = "status")Integer status,@RequestParam(value = "remark") String remark) { + logger.info("桩停止回调接口>>>>>状态："+status+"备注++"+"remark"+"订单号"+orderNo); + //解析订单编号 - String s = orderNo.split("\\.")[0]; - String s1 = s.split(":")[1]; + //String s1 = orderNo.substring(6); Integer code = 300; - Long userId = update(0, 0, remark, s1, 1); + Long userId = update(0, remark, orderNo, 1); Map map = new HashMap<>(); map.put("code", code); map.put("userId", userId); @@ -227,7 +232,7 @@ public class HxpcPileOrderController extends BaseController { Map data = new HashMap<>(); data.put("amountCharged",divide); data.put("gunNumber",gunId); - data.put("chargingOrderId ",chargeOrderId); + data.put("chargingOrderId",chargeOrderId); data.put("soc",soc); data.put("chargingTime",xhpcRealTimeOrder.getChargingTime()); data.put("electricCurrent",c); @@ -235,6 +240,7 @@ public class HxpcPileOrderController extends BaseController { data.put("power",hxpcChargeOrder.getPower()); data.put("chargingDegree",chargingDegree); data.put("remainingTime",xhpcRealTimeOrder.getRemainingTime()); + data.put("serialNumber",orderNo.substring(0,16)); map.put("data", data); JSONObject json = new JSONObject(map); @@ -437,8 +443,6 @@ public class HxpcPileOrderController extends BaseController { xhpcHistoryOrder.setReconciliationStatus(0); xhpcHistoryOrder.setSortingStatus(0); xhpcHistoryOrder.setType(1); - xhpcHistoryOrder.setStatus(0); - xhpcHistoryOrder.setDelFlag(0); //订单总价---运维服务费抽成 xhpcHistoryOrder.setTotalPrice(money); xhpcHistoryOrder.setPromotionDiscount(promotionDiscount); @@ -471,17 +475,21 @@ public class HxpcPileOrderController extends BaseController { /** * @param status 状态 - * @param delFlag 是否删除 * @param remark 备注 * @param serialNumber 订单号 * @param type 结束订单状态 * @return */ - private Long update(Integer status, Integer delFlag, String remark, String serialNumber, Integer type) { - + private Long update(Integer status, String remark, String serialNumber, Integer type) { + logger.info("状态："+status+"备注++"+"remark"+"订单号"+serialNumber); HxpcChargeOrder hxpcChargeOrder = hxpcChargeOrderService.getSerialNumberMessage(serialNumber); - hxpcChargeOrder.setStatus(status); - hxpcChargeOrder.setDelFlag(delFlag); + if(status==0){ + hxpcChargeOrder.setStatus(0); + hxpcChargeOrder.setDelFlag(0); + }else{ + hxpcChargeOrder.setStatus(-1); + hxpcChargeOrder.setDelFlag(1); + } hxpcChargeOrder.setErroRemark(remark); Long userId = hxpcChargeOrder.getUserId(); @@ -518,7 +526,15 @@ public class HxpcPileOrderController extends BaseController { long time = DateUtil.parse("2021-08-18 12:12:12").getTime(); long time1 = DateUtil.parse("2021-08-19 12:12:12").getTime(); + String orderNo="order:69852145896547022108191121220010"; + //解析订单编号 + String s = orderNo.split("\\.")[0]; + String s1 = s.split(":")[1]; + String s2 = orderNo.substring(6); - System.out.println(time1-time); + String s3 = s2.substring(0,16); + System.out.println(s); + System.out.println("<<<<"+s2); + System.out.println("<<<<"+s3); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java index 08aa8311..6ead727a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/HxpcChargeOrder.java @@ -95,7 +95,7 @@ public class HxpcChargeOrder extends BaseEntity { private String amountCharged; /** 功率 */ - private Double power; + private String power; public Long getChargeOrderId() { @@ -297,12 +297,12 @@ public class HxpcChargeOrder extends BaseEntity { this.amountCharged = amountCharged; } - public Double getPower() { + public String getPower() { return power; } - public void setPower(Double power) { + public void setPower(String power) { this.power = power; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/HxpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/HxpcChargeOrderMapper.java index ff059a97..d541f9fb 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/HxpcChargeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/HxpcChargeOrderMapper.java @@ -103,6 +103,6 @@ public interface HxpcChargeOrderMapper { Map getOperatorMessage(@Param("chargingStationId") Long chargingStationId); //获取桩信息 - XhpcChargingPile getXhpcChargingPileById(@Param("chargingPileid") Long chargingPileid); + Map getXhpcChargingPileById(@Param("chargingPileid") Long chargingPileid); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java index 4d33d4dd..421473ea 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java @@ -73,6 +73,7 @@ public interface IHxpcChargeOrderService { */ int updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder); + /** * appUserId 查询用户信息 * @param userId diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java index 5679ce6a..a15fc829 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java @@ -140,7 +140,7 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService { return AjaxResult.error(r1.getMsg()); } //获取桩信息 - XhpcChargingPile xhpcChargingPile = hxpcChargeOrderMapper.getXhpcChargingPileById(xhpcTerminal.getChargingPileId()); + Map xhpcChargingPileById = hxpcChargeOrderMapper.getXhpcChargingPileById(xhpcTerminal.getChargingPileId()); //创建充电订单(充电启动soc初始值，结束是获取,并修改状态) HxpcChargeOrder hxpcChargeOrder = new HxpcChargeOrder(); @@ -150,7 +150,9 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService { hxpcChargeOrder.setSerialNumber(orderNo); hxpcChargeOrder.setSource(0); hxpcChargeOrder.setStatus(-1); - hxpcChargeOrder.setPower(xhpcChargingPile.getPower()); + if(xhpcChargingPileById !=null && xhpcChargingPileById.get("power") !=null){ + hxpcChargeOrder.setPower(xhpcChargingPileById.get("power").toString()); + } hxpcChargeOrder.setRateModelId(xhpcTerminal.getRateModelId()); if(type ==1){ hxpcChargeOrder.setChargingMode("小华充电微信"); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 8d16e69c..8792c43a 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -294,7 +294,10 @@ from xhpc_operator where operator_id=(select operator_id from xhpc_charging_station where charging_station_id=#{chargingStationId}) - + select + charging_pile_id as chargingPileId, + power as power + from xhpc_charging_pile where charging_pile_id=#{chargingPileid} \ No newline at end of file