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 0177d6fe..3b9fdc0d 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 @@ -30,7 +30,7 @@ public class QrImgUtils { public static void uploadImg(XhpcTerminal xhpcTerminal, String serialNumber, Environment environment, XhpcImgMapper xhpcImgMapper, String chargingStationName, int forIndex, Map letterMap, String name) { //生成桩的二维码图片 //1.生成二维码链接内容: - StringBuilder prefix = new StringBuilder("https://www.scxhua.cn?pNum="); + StringBuilder prefix = new StringBuilder(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 863ab47b..4bc26fbe 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 @@ -58,14 +58,15 @@ pile.type, pile.power, concat('https://www.scxhua.cn?pNum=', terminal.serial_number) AS qrContent - FROM xhpc_img AS img - INNER JOIN xhpc_terminal AS terminal ON img.terminal_id = terminal.terminal_id - INNER JOIN xhpc_charging_pile AS pile ON pile.charging_pile_id = terminal.charging_pile_id - INNER JOIN xhpc_charging_station AS station ON station.charging_station_id = pile.charging_station_id - WHERE station.charging_station_id = 1 + FROM xhpc_terminal AS terminal + LEFT JOIN xhpc_img img ON img.terminal_id = terminal.terminal_id + AND img.del_flag = 0 + LEFT JOIN xhpc_charging_pile pile ON pile.charging_pile_id = terminal.charging_pile_id + AND pile.del_flag = 0 + LEFT JOIN xhpc_charging_station station ON station.charging_station_id = terminal.charging_station_id + AND station.del_flag = 0 + WHERE terminal.charging_station_id = #{stationId} AND terminal.del_flag = 0 - AND pile.del_flag = 0 - AND img.del_flag = 0 @@ -74,13 +75,8 @@ SELECT i.url FROM xhpc_img AS i - LEFT JOIN xhpc_terminal AS t ON i.terminal_id = t.terminal_id - WHERE t.terminal_id IN ( - SELECT terminal_id - FROM xhpc_terminal - WHERE charging_pile_id = #{pileId} - ) - AND t.del_flag = 0 + WHERE i.terminal_id IN + (SELECT terminal_id FROM xhpc_terminal WHERE charging_pile_id = #{pileId} AND del_flag = 0) AND i.del_flag = 0 @@ -90,12 +86,9 @@ SELECT i.url FROM xhpc_img AS i LEFT JOIN xhpc_terminal AS t ON i.terminal_id = t.terminal_id - WHERE t.terminal_id IN ( - SELECT terminal_id - FROM xhpc_terminal - WHERE charging_station_id = #{stationId} - ) - AND t.del_flag = 0 + AND i.del_flag = 0 + WHERE t.terminal_id IN + (SELECT terminal_id FROM xhpc_terminal WHERE charging_station_id = #{stationId} AND del_flag = 0)