diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index a25f14f9..d9d0df15 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1492,9 +1492,10 @@ public class DepositoryController { for (Place place : placeByDid ) { String qrCodeByDepository = placeService.findQrCodeByPlace(place.getId()); - String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, depository.getDname() + "-" + place.getCode(), 60, 200); + String name = depository.getDname() + "-" + place.getKingdeecode(); + String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, name, 60, 200); try { - File file = RestResponse.base64ToFile(qrCode); + File file = ZipMultiFileUtil.base64ToFile(qrCode,name); qrCodeListForPlaces.add(file); } catch (Exception e) { e.printStackTrace(); @@ -1502,9 +1503,10 @@ public class DepositoryController { } // 将其暂存到本地 String qrCodeByDepository = depositoryService.findQrCodeByDepository(depository.getId()); - String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, depository.getDname(), 60, 200); + String name = depository.getDname(); + String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, name, 60, 200); try { - File file = RestResponse.base64ToFile(qrCode); + File file = ZipMultiFileUtil.base64ToFile(qrCode,name); qrCodeListForPlaces.add(file); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java index 5a8cfd44..c7ad5021 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java @@ -129,48 +129,5 @@ public class RestResponse implements Serializable { } - /** - * 将base64编码转为file对象 - * @param base64 - * @return - * @throws Exception - */ - public static File base64ToFile(String base64) throws Exception { - if(base64.contains("data:image")){ - base64 = base64.substring(base64.indexOf(",")+1); - } - base64 = base64.toString().replace("\r\n", ""); - //创建文件目录 - String prefix=".jpeg"; - File file = File.createTempFile(UUID.randomUUID().toString(), prefix); - BufferedOutputStream bos = null; - FileOutputStream fos = null; - try { - BASE64Decoder decoder = new BASE64Decoder(); - byte[] bytes = decoder.decodeBuffer(base64); - fos = new FileOutputStream(file); - bos = new BufferedOutputStream(fos); - bos.write(bytes); - }finally { - if (bos != null) { - try { - bos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (fos != null) { - try { - fos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return file; - } - - - } diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/ZipMultiFileUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/ZipMultiFileUtil.java index bcc917da..522f887e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/ZipMultiFileUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/ZipMultiFileUtil.java @@ -12,6 +12,8 @@ import java.util.zip.ZipOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sun.misc.BASE64Decoder; + /** * 压缩工具类 */ @@ -111,5 +113,45 @@ public class ZipMultiFileUtil { } } - + + /** + * 将base64编码转为file对象 + * @param base64 + * @return + * @throws Exception + */ + public static File base64ToFile(String base64, String fileName) throws Exception { + if(base64.contains("data:image")){ + base64 = base64.substring(base64.indexOf(",")+1); + } + base64 = base64.toString().replace("\r\n", ""); + //创建文件目录 + String prefix=".jpeg"; + File file = new File(FILE_PATH+fileName+prefix); + BufferedOutputStream bos = null; + FileOutputStream fos = null; + try { + BASE64Decoder decoder = new BASE64Decoder(); + byte[] bytes = decoder.decodeBuffer(base64); + fos = new FileOutputStream(file); + bos = new BufferedOutputStream(fos); + bos.write(bytes); + }finally { + if (bos != null) { + try { + bos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return file; + } } diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html index 7cdcea1b..ae45566d 100644 --- a/target/classes/templates/pages/depository/table-stock.html +++ b/target/classes/templates/pages/depository/table-stock.html @@ -197,6 +197,7 @@ page: true, skin: 'line', done: function (res, curr, count) { + bindTableToolbarFunction(); $.each(res['data'], function (i, j) { let jElement = j['warningCount']; let placeCode = j['placeCode'].split(" "); @@ -223,10 +224,8 @@ $(aItem).append('') } } - - }); - bindTableToolbarFunction(); + } });