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 @@