From 5d6bf27d5a4b743b86b180f57589592ffde78b73 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Tue, 30 Nov 2021 16:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=9C=A8=E8=A1=A8=E6=A0=BC=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/XhpcDownCodeServiceImpl.java | 8 ++++---- .../src/main/resources/bootstrap.yml | 10 +++++----- .../resources/mapper/XhpcDownCodeMapper.xml | 17 +++++++++++------ 3 files changed, 20 insertions(+), 15 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 1b61dfca..0c0825d2 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 @@ -70,7 +70,7 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { //3、创建头部第一行 HSSFRow headRow = sheet.createRow(0); HSSFCell cell; - String[] header = new String[] {"终端名称","归属电站","终端编码","电桩编码","终端类型(1直流（快） 2交流（慢)","电桩功率(KM)"}; + String[] header = new String[]{"终端名称", "归属电站", "终端编码", "电桩编码", "终端类型(1直流（快） 2交流（慢)", "电桩功率(KM)", "二维码内容"}; for (int i = 0; i < header.length; i++) { cell = headRow.createCell(i); cell.setCellValue(header[i]); @@ -78,7 +78,7 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { //4、填写数据 HSSFRow dataRow; HSSFCell dataCell; - String[] values = {"tName", "sName", "tSN", "psn", "type", "power"}; + String[] values = {"tName", "sName", "tSN", "psn", "type", "power", "qrContent"}; int valuesLength = values.length; for(int i = 1; i <= list.size(); i ++){ Map map = list.get(i - 1); @@ -145,7 +145,7 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { //3、创建头部第一行 HSSFRow headRow = sheet.createRow(0); HSSFCell cell; - String[] header = new String[]{"终端名称", "归属电站", "终端编码", "电桩编码", "终端类型(1直流（快） 2交流（慢)", "电桩功率(KM)"}; + String[] header = new String[]{"终端名称", "归属电站", "终端编码", "电桩编码", "终端类型(1直流（快） 2交流（慢)", "电桩功率(KM)", "二维码内容"}; for (int i = 0; i < header.length; i++) { cell = headRow.createCell(i); cell.setCellValue(header[i]); @@ -153,7 +153,7 @@ public class XhpcDownCodeServiceImpl implements IXhpcDownCodeService { //4、填写数据 HSSFRow dataRow; HSSFCell dataCell; - String[] values = {"tName", "sName", "tSN", "psn", "type", "power"}; + String[] values = {"tName", "sName", "tSN", "psn", "type", "power", "qrContent"}; int valuesLength = values.length; for (int i = 1; i <= list.size(); i++) { Map map = list.get(i - 1); diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-charging-station/src/main/resources/bootstrap.yml index 5080ba01..5a7a4521 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/bootstrap.yml @@ -27,16 +27,16 @@ spring: #二维码Logo图片获取位置： #imgPath: "D:\\Enterprise_Resources\\XiaoHuaMaterialImgs\\xhcd_logo.png" -imgPath: "/www/wwwroot/scxhua.cn/xhpc-charging-stion/logo.png" +imgPath: "/www/wwwroot/xhpc.scxhua.com/xhpc-charging-stion/logo.png" #生成的二维码存放位置： #destPath: "D:\\Enterprise_Resources\\XiaoHuaFullImgs" -destPath: "/www/wwwroot/scxhua.cn/xhpc-charging-stion/XiaoHuaFullImgs" +destPath: "/www/wwwroot/xhpc.scxhua.com/xhpc-charging-stion/XiaoHuaFullImgs" #生成的最终完整图片的存放位置： #fullImgDestPath: "D:\\Enterprise_Resources\\XiaoHuaFullImgs\\" -fullImgDestPath: "/www/wwwroot/scxhua.cn/xhpc-charging-stion/XiaoHuaFullImgs/" +fullImgDestPath: "/www/wwwroot/xhpc.scxhua.com/xhpc-charging-stion/XiaoHuaFullImgs/" #底图图片存放位置： #bottomImg: "D:\\Enterprise_Resources\\XiaoHuaMaterialImgs\\BottomImg.png" -bottomImg: "/www/wwwroot/scxhua.cn/xhpc-charging-stion/BottomImg.png" +bottomImg: "/www/wwwroot/xhpc.scxhua.com/xhpc-charging-stion/BottomImg.png" #生成的二维码zip包位置 #zipLocation: "D:\\Enterprise_Resources\\QrZip" -zipLocation: "/www/wwwroot/scxhua.cn/dist" \ No newline at end of file +zipLocation: "/www/wwwroot/xhpc.scxhua.com/dist" \ No newline at end of file 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 4a0e3b25..4af8f143 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 @@ -29,12 +29,13 @@