From ce309e5feb3500c40e6aabb254d510edcd663fa8 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Mon, 11 Oct 2021 14:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=9B=9E=E8=B0=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/xhpc-charging-station/pom.xml | 15 +++++++++++---- .../service/XhpcChargingPileServiceImpl.java | 2 +- .../service/XhpcChargingStationServiceImpl.java | 5 +++++ .../charging/station/utils/img/ImageUtil.java | 2 +- .../charging/station/utils/img/QrImgUtils.java | 2 +- .../main/resources/mapper/XhpcTerminalMapper.xml | 2 ++ .../xhpc/order/api/XhpcChargeOrderController.java | 2 +- .../impl/XhpcRealTimeOrderServiceImpl.java | 2 +- .../xhpc-payment/src/main/resources/bootstrap.yml | 6 +++--- .../xhpc-user/src/main/resources/bootstrap.yml | 2 +- .../wxma/socket/OrderNotificationWebSocket.java | 2 +- 11 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/pom.xml b/xhpc-modules/xhpc-charging-station/pom.xml index 9e845fa9..61c5e689 100644 --- a/xhpc-modules/xhpc-charging-station/pom.xml +++ b/xhpc-modules/xhpc-charging-station/pom.xml @@ -139,15 +139,22 @@ ${project.artifactId} + + + src/main/resources + + + src/main/java + + **/*.xml + + + org.springframework.boot spring-boot-maven-plugin 2.4.0 - - - /project/jar/Cloud_jar - diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 9150a16f..50b169ad 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -109,7 +109,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { XhpcTerminal xhpcTerminal = new XhpcTerminal(); xhpcTerminal.setChargingStationId(chargingStationId); xhpcTerminal.setChargingPileId(chargingPileId); - xhpcTerminal.setName(name + "-" + (i)); + xhpcTerminal.setName(name +"号桩"+ "-" + letterMap.get(i)+"枪"); if(i>9){ xhpcTerminal.setSerialNumber(serialNumber + i); }else{ diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index aa04c77a..ab29ef57 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -626,6 +626,11 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi map.put("status", 0); }else if("故障".equals(cacheMap.get("status"))){ map.put("status", 1); + if(cacheMap.get("hf")!=null){ + map.put("cause", cacheMap.get("hf").toString()); + }else{ + map.put("cause", "--"); + } }else{ //充电桩 map.put("status", 3); diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/ImageUtil.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/ImageUtil.java index d64208be..61fd4838 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/ImageUtil.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/ImageUtil.java @@ -273,7 +273,7 @@ public class ImageUtil { g2.setFont(new Font("黑体",Font.BOLD,130)); g2.drawString(letter,250,180); g2.setFont(new Font("楷体",Font.BOLD,60)); - g2.drawString("枪",320,174); + //g2.drawString("枪",320,174); File dest = fullImgdestPath; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/QrImgUtils.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/QrImgUtils.java index cbe679fb..2cbc75c7 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/QrImgUtils.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/utils/img/QrImgUtils.java @@ -25,7 +25,7 @@ public class QrImgUtils { //生成桩的二维码图片 //1.生成二维码链接内容： - StringBuilder prefix = new StringBuilder("https://xhpc.scxhua.cn?pNum="); + StringBuilder prefix = new StringBuilder("https://www.scxhua.cn?pNum="); String QrContent = prefix.append(xhpcTerminal.getSerialNumber()).toString(); try { diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml index 155cf00e..8a217cfa 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml @@ -333,6 +333,8 @@ left join xhpc_charging_station as ct on ct.charging_station_id = ter.charging_station_id where ter.serial_number = #{pNum} and ter.del_flag = 0 + order by ter.number desc + limit 1