From c8e28e0aaa2ec041c234673d977c4d4871a666a8 Mon Sep 17 00:00:00 2001 From: yuyang Date: Fri, 18 Mar 2022 14:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charging/station/service/XhpcDownCodeServiceImpl.java | 6 ++++++ .../com/xhpc/charging/station/utils/img/QrImgUtils.java | 3 +++ .../src/main/resources/mapper/XhpcDownCodeMapper.xml | 4 ++-- .../src/main/resources/mapper/XhpcCommunityMapper.xml | 1 + .../src/main/resources/mapper/XhpcCustomersMapper.xml | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcDownCodeServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcDownCodeServiceImpl.java index aef7df97..ce94247e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcDownCodeServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcDownCodeServiceImpl.java @@ -87,6 +87,9 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { for(int i = 1; i <= list.size(); i ++){ Map map = list.get(i - 1); if(null != map) { + if(map.get("qrContent") !=null){ + map.put("qrContent",environment.getProperty("img.qrLinkContent")+map.get("qrContent").toString()); + } dataRow = sheet.createRow(i); for(int j = 0; j < valuesLength; j ++){ if(null != map.get(values[j])){ @@ -162,6 +165,9 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { for (int i = 1; i <= list.size(); i++) { Map map = list.get(i - 1); if (null != map) { + if(map.get("qrContent") !=null){ + map.put("qrContent",environment.getProperty("img.qrLinkContent")+map.get("qrContent").toString()); + } dataRow = sheet.createRow(i); for (int j = 0; j < valuesLength; j++) { if (null != map.get(values[j])) { 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 3b9fdc0d..296509e5 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 @@ -31,6 +31,9 @@ public class QrImgUtils { //生成桩的二维码图片 //1.生成二维码链接内容： StringBuilder prefix = new StringBuilder(environment.getProperty("img.qrLinkContent")); + System.out.println("========prefix===========》"+environment.getProperty("img.qrLinkContent")); + System.out.println("========prefix===========》"+environment.getProperty("img.qrLinkContent")); + System.out.println("========prefix===========》"+environment.getProperty("img.qrLinkContent")); String QrContent = prefix.append(xhpcTerminal.getSerialNumber()).toString(); try { //2.生成二维码图片： diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml index 5d641861..75c54f4e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml @@ -38,7 +38,7 @@ p.serial_number AS psn, p.type, p.power, - concat('https://www.scxhua.cn?pNum=', t.serial_number) AS qrContent + t.serial_number as qrContent FROM xhpc_terminal AS t LEFT JOIN xhpc_charging_station AS s ON t.charging_station_id = s.charging_station_id LEFT JOIN xhpc_charging_pile AS p ON p.charging_pile_id = t.charging_pile_id @@ -57,7 +57,7 @@ pile.serial_number AS psn, pile.type, pile.power, - concat('https://www.scxhua.cn?pNum=', terminal.serial_number) AS qrContent + terminal.serial_number as qrContent FROM xhpc_terminal AS terminal LEFT JOIN xhpc_img img ON img.terminal_id = terminal.terminal_id AND img.del_flag = 0 diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml index d4c45d35..e81def17 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml @@ -196,6 +196,7 @@ co.community_id as communityId, co.name as name, co.service_preferential as servicePreferential, + co.commission_type as commissionType, co.min_people as minPeople, co.contact_name as contactName, co.contact_phone as contactPhone, diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml index 1a4568e2..6231c036 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml @@ -195,6 +195,7 @@ co.address as address, co.dimension as dimension, co.status as status, + co.commission_type as commissionType, group_concat(me.charging_station_id) chargingStationIds from xhpc_customers co left join xhpc_mechanism me on me.mechanism_id = co.customers_id and me.source = 1 and me.del_flag =0