修改二维码生产

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<String,Object> 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<String, Object> 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])) {

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.生成二维码图片：

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

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,

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