From 79e4714f2d1b750921d9b3a2c2e315ac0c29f648 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 16 Aug 2023 17:21:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=94=9F=E6=88=90=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/QRCodeComponent.java | 175 +++++++++++++++++ .../springblade/common/utils/QRCodeUtil.java | 181 ------------------ .../common/utils/SystemFilePathComponent.java | 18 ++ .../src/main/resources/application.yml | 2 + .../src/main/resources/application.yml | 2 + .../BasicdataGoodsAllocationServiceImpl.java | 8 +- .../impl/BasicdataGoodsShelfServiceImpl.java | 9 +- .../src/main/resources/application.yml | 3 +- .../DistributionStockArticleServiceImpl.java | 17 +- .../src/main/resources/application-dev.yml | 3 + .../src/main/resources/application.yml | 4 +- .../test/com/logpm/distribution/MyTest.java | 4 +- .../mt/mapper/MtFactoryOrderMainMapper.xml | 1 + .../factory/mt/mapper/MtPackageInfoMapper.xml | 3 +- .../impl/PanFactoryDataServiceImpl.java | 4 +- .../src/main/resources/application.yml | 2 + .../feign/WarehouseWaybillClient.java | 3 + .../src/main/resources/application.yml | 2 + 18 files changed, 237 insertions(+), 204 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java delete mode 100644 blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java create mode 100644 blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java b/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java new file mode 100644 index 000000000..10cc0d599 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java @@ -0,0 +1,175 @@ +package org.springblade.common.utils; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.MultiFormatWriter; +import com.google.zxing.WriterException; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import javax.swing.filechooser.FileSystemView; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * 二维码工具 + * + * @Author:debug (SteadyJack) + * @Link: weixin-> debug0868 qq-> 1948831260 + * @Date: 2020/11/16 22:38 + **/ +@Slf4j +@Component +public class QRCodeComponent { + + @Autowired + private SystemFilePathComponent systemFilePathComponent; + + //CODE_WIDTH：二维码宽度，单位像素 + private final int CODE_WIDTH = 100; + //CODE_HEIGHT：二维码高度，单位像素 + private final int CODE_HEIGHT = 100; + //FRONT_COLOR：二维码前景色，0x000000 表示黑色 + private final int FRONT_COLOR = 0x000000; + //BACKGROUND_COLOR：二维码背景色，0xFFFFFF 表示白色 + //演示用 16 进制表示，和前端页面 CSS 的取色是一样的，注意前后景颜色应该对比明显，如常见的黑白 + private final int BACKGROUND_COLOR = 0xFFFFFF; + //默认生成二维码格式 + private final String FileFormat = "png"; + + + public String createCodeToFile(String content) { + try { + //getResource("/")等同于到resource文件夹下 +// String imgPath = QRCodeUtil.class.getResource("").getPath()+path; +// InputStream inputStream = QRCodeUtil.class.getClassLoader().getResourceAsStream("test.properties"); +// ClassLoader classLoader = QRCodeUtil.class.getClassLoader(); +// URL resource = classLoader.getResource("resources/static/"); +// File file = new File(resource.getFile()); + return makeQrCodeImage(content, getBufferedImage(content)); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @NotNull + private String makeQrCodeImage(String content, BufferedImage bufferedImage2) throws IOException { + String imgPath = systemFilePathComponent.filePath; + File codeImgFileSaveDir = new File(imgPath); + //1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖 + String fileName = UUID.randomUUID() + "." + FileFormat; + content = content.trim(); + if (codeImgFileSaveDir == null || codeImgFileSaveDir.isFile()) { + //二维码图片存在目录为空，默认放在桌面... + codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory(); + } + if (!codeImgFileSaveDir.exists()) { + //二维码图片存在目录不存在，开始创建... + codeImgFileSaveDir.mkdirs(); + } + //核心代码-生成二维码 + BufferedImage bufferedImage = bufferedImage2; + File codeImgFile = new File(codeImgFileSaveDir, fileName); + ImageIO.write(bufferedImage, FileFormat, codeImgFile); + fileName = imgPath + fileName; + return fileName; + } + + public String createCodeToFileType(String content) { + try { + return makeQrCodeImage(content, getBufferedImageMatrix(content)); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * 生成二维码并输出到输出流, 通常用于输出到网页上进行显示，输出到网页与输出到磁盘上的文件中，区别在于最后一句 ImageIO.write + * write(RenderedImage im,String formatName,File output)：写到文件中 + * write(RenderedImage im,String formatName,OutputStream output)：输出到输出流中 + * + * @param content ：二维码内容 + */ + public void createCodeToOutputStream(String content, HttpServletResponse response) throws WriterException, IOException { + if (StringUtils.isBlank(content)) { + return; + } + content = content.trim(); + //核心代码-生成二维码 + BufferedImage bufferedImage = getBufferedImage(content); + //区别就是这一句，输出到输出流中，如果第三个参数是 File，则输出到文件中 + ImageIO.write(bufferedImage, FileFormat, response.getOutputStream()); + log.info("二维码图片生成到输出流成功..."); + } + + //核心代码-生成二维码 + public BufferedImage getBufferedImage(String content) throws WriterException { + + //com.google.zxing.EncodeHintType：编码提示类型,枚举类型 + Map hints = new HashMap(); + + //EncodeHintType.CHARACTER_SET：设置字符编码类型 + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + + //EncodeHintType.ERROR_CORRECTION：设置误差校正 + //ErrorCorrectionLevel：误差校正等级，L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction + //不设置时，默认为 L 等级，等级不一样，生成的图案不同，但扫描的结果是一样的 + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); + + //EncodeHintType.MARGIN：设置二维码边距，单位像素，值越小，二维码距离四周越近 + hints.put(EncodeHintType.MARGIN, 1); + + MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); + BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, CODE_WIDTH, CODE_HEIGHT, hints); + BufferedImage bufferedImage = new BufferedImage(CODE_WIDTH, CODE_HEIGHT, BufferedImage.TYPE_INT_BGR); + for (int x = 0; x < CODE_WIDTH; x++) { + for (int y = 0; y < CODE_HEIGHT; y++) { + bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR); + } + } + return bufferedImage; + } //核心代码-生成二维码 + + public BufferedImage getBufferedImageMatrix(String content) throws WriterException { + + //com.google.zxing.EncodeHintType：编码提示类型,枚举类型 + Map hints = new HashMap(); + + //EncodeHintType.CHARACTER_SET：设置字符编码类型 + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + + //EncodeHintType.ERROR_CORRECTION：设置误差校正 + //ErrorCorrectionLevel：误差校正等级，L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction + //不设置时，默认为 L 等级，等级不一样，生成的图案不同，但扫描的结果是一样的 + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); + + //EncodeHintType.MARGIN：设置二维码边距，单位像素，值越小，二维码距离四周越近 + hints.put(EncodeHintType.MARGIN, 1); + + MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); + BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 100, 30, hints); + BufferedImage bufferedImage = new BufferedImage(100, 30, BufferedImage.TYPE_INT_BGR); + for (int x = 0; x < 100; x++) { + for (int y = 0; y < 30; y++) { + bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR); + } + } + return bufferedImage; + } +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java deleted file mode 100644 index 7f45e8581..000000000 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java +++ /dev/null @@ -1,181 +0,0 @@ -package org.springblade.common.utils; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; -import javax.swing.filechooser.FileSystemView; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -/** - * 二维码工具 - * @Author:debug (SteadyJack) - * @Link: weixin-> debug0868 qq-> 1948831260 - * @Date: 2020/11/16 22:38 - **/ -public class QRCodeUtil { - private static final Logger log= LoggerFactory.getLogger(QRCodeUtil.class); - - //CODE_WIDTH：二维码宽度，单位像素 - private static final int CODE_WIDTH = 100; - //CODE_HEIGHT：二维码高度，单位像素 - private static final int CODE_HEIGHT = 100; - //FRONT_COLOR：二维码前景色，0x000000 表示黑色 - private static final int FRONT_COLOR = 0x000000; - //BACKGROUND_COLOR：二维码背景色，0xFFFFFF 表示白色 - //演示用 16 进制表示，和前端页面 CSS 的取色是一样的，注意前后景颜色应该对比明显，如常见的黑白 - private static final int BACKGROUND_COLOR = 0xFFFFFF; - //默认生成二维码格式 - private static final String FileFormat="png"; - - private static final String path="qrCodeImg"; - - - public static String createCodeToFile(String content) { - try { - //getResource("/")等同于到resource文件夹下 -// String imgPath = QRCodeUtil.class.getResource("").getPath()+path; -// InputStream inputStream = QRCodeUtil.class.getClassLoader().getResourceAsStream("test.properties"); -// ClassLoader classLoader = QRCodeUtil.class.getClassLoader(); -// URL resource = classLoader.getResource("resources/static/"); -// File file = new File(resource.getFile()); - String imgPath = QRCodeUtil.class.getResource("").getPath()+path; - File codeImgFileSaveDir = new File(imgPath); - //1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖 - String fileName = UUID.randomUUID() + "." +FileFormat; - content = content.trim(); - if (codeImgFileSaveDir==null || codeImgFileSaveDir.isFile()) { - //二维码图片存在目录为空，默认放在桌面... - codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory(); - } - if (!codeImgFileSaveDir.exists()) { - //二维码图片存在目录不存在，开始创建... - codeImgFileSaveDir.mkdirs(); - } - //核心代码-生成二维码 - BufferedImage bufferedImage = getBufferedImage(content); - File codeImgFile = new File(codeImgFileSaveDir, fileName); - ImageIO.write(bufferedImage, FileFormat, codeImgFile); - fileName = imgPath.substring(1) +"/"+fileName; - return fileName; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public static String createCodeToFileType(String content) { - try { - //getResource("/")等同于到resource文件夹下 - String imgPath = QRCodeUtil.class.getResource("").getPath()+path; - File codeImgFileSaveDir = new File(imgPath); - //1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖 - String fileName = UUID.randomUUID() + "." +FileFormat; - content = content.trim(); - if (codeImgFileSaveDir==null || codeImgFileSaveDir.isFile()) { - //二维码图片存在目录为空，默认放在桌面... - codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory(); - } - if (!codeImgFileSaveDir.exists()) { - //二维码图片存在目录不存在，开始创建... - codeImgFileSaveDir.mkdirs(); - } - //核心代码-生成二维码 - BufferedImage bufferedImage = getBufferedImageMatrix(content); - File codeImgFile = new File(codeImgFileSaveDir, fileName); - ImageIO.write(bufferedImage, FileFormat, codeImgFile); - fileName = imgPath.substring(1) +"/"+fileName; - return fileName; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** - * 生成二维码并输出到输出流, 通常用于输出到网页上进行显示，输出到网页与输出到磁盘上的文件中，区别在于最后一句 ImageIO.write - * write(RenderedImage im,String formatName,File output)：写到文件中 - * write(RenderedImage im,String formatName,OutputStream output)：输出到输出流中 - * @param content ：二维码内容 - */ -// OutputStream outputStream, - public static void createCodeToOutputStream(String content, HttpServletResponse response) throws WriterException, IOException { - if (StringUtils.isBlank(content)) { - return; - } - content = content.trim(); - //核心代码-生成二维码 - BufferedImage bufferedImage = getBufferedImage(content); - //区别就是这一句，输出到输出流中，如果第三个参数是 File，则输出到文件中 - ImageIO.write(bufferedImage, FileFormat,response.getOutputStream()); - log.info("二维码图片生成到输出流成功..."); - } - - //核心代码-生成二维码 - public static BufferedImage getBufferedImage(String content) throws WriterException { - - //com.google.zxing.EncodeHintType：编码提示类型,枚举类型 - Map hints = new HashMap(); - - //EncodeHintType.CHARACTER_SET：设置字符编码类型 - hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); - - //EncodeHintType.ERROR_CORRECTION：设置误差校正 - //ErrorCorrectionLevel：误差校正等级，L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction - //不设置时，默认为 L 等级，等级不一样，生成的图案不同，但扫描的结果是一样的 - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); - - //EncodeHintType.MARGIN：设置二维码边距，单位像素，值越小，二维码距离四周越近 - hints.put(EncodeHintType.MARGIN, 1); - - MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); - BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, CODE_WIDTH, CODE_HEIGHT, hints); - BufferedImage bufferedImage = new BufferedImage(CODE_WIDTH, CODE_HEIGHT, BufferedImage.TYPE_INT_BGR); - for (int x = 0; x < CODE_WIDTH; x++) { - for (int y = 0; y < CODE_HEIGHT; y++) { - bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR); - } - } - return bufferedImage; - } //核心代码-生成二维码 - public static BufferedImage getBufferedImageMatrix(String content) throws WriterException { - - //com.google.zxing.EncodeHintType：编码提示类型,枚举类型 - Map hints = new HashMap(); - - //EncodeHintType.CHARACTER_SET：设置字符编码类型 - hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); - - //EncodeHintType.ERROR_CORRECTION：设置误差校正 - //ErrorCorrectionLevel：误差校正等级，L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction - //不设置时，默认为 L 等级，等级不一样，生成的图案不同，但扫描的结果是一样的 - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); - - //EncodeHintType.MARGIN：设置二维码边距，单位像素，值越小，二维码距离四周越近 - hints.put(EncodeHintType.MARGIN, 1); - - MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); - BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 100, 30, hints); - BufferedImage bufferedImage = new BufferedImage(100, 30, BufferedImage.TYPE_INT_BGR); - for (int x = 0; x < 100; x++) { - for (int y = 0; y < 30; y++) { - bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR); - } - } - return bufferedImage; - } -} diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java b/blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java new file mode 100644 index 000000000..76f7ba696 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java @@ -0,0 +1,18 @@ +package org.springblade.common.utils; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * 文件系统路径 + */ + +@Data +@Component +public class SystemFilePathComponent { + + @Value("${logpm.file_system_path}") + public String filePath; + +} diff --git a/blade-service/logpm-aftersales/src/main/resources/application.yml b/blade-service/logpm-aftersales/src/main/resources/application.yml index 28bbf533b..ccb601ee4 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application.yml @@ -48,3 +48,5 @@ xxl: logpath: ../data/applogs/logpm-factory-xxljob/jobhandler logretentiondays: -1 port: 7018 +logpm: + file_system_path: D:\logpm_temp_file\ diff --git a/blade-service/logpm-basic/src/main/resources/application.yml b/blade-service/logpm-basic/src/main/resources/application.yml index d6926f57b..9bfa7634b 100644 --- a/blade-service/logpm-basic/src/main/resources/application.yml +++ b/blade-service/logpm-basic/src/main/resources/application.yml @@ -38,3 +38,5 @@ spring: +logpm: + file_system_path: D:\logpm_temp_file\ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java index 0c5c948c2..f9f0fb827 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java @@ -29,7 +29,7 @@ import com.logpm.basicdata.service.IBasicdataGoodsAllocationService; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import lombok.AllArgsConstructor; -import org.springblade.common.utils.QRCodeUtil; +import org.springblade.common.utils.QRCodeComponent; import org.springblade.common.utils.TemplateUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -71,6 +71,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectBasicdataGoodsAllocationPage(IPage page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) { return page.setRecords(baseMapper.selectBasicdataGoodsAllocationPage(page, BasicdataGoodsAllocation)); @@ -179,7 +181,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl getQrRCodeImg(String qrCode, HttpServletResponse response) { String filename = null; try { - filename = QRCodeUtil.createCodeToFile(qrCode); + filename = qrCodeComponent.createCodeToFile(qrCode); } catch (Exception e) { e.printStackTrace(); log.error("二维码图片生成失败+{"+e.getMessage()+"}"); @@ -234,7 +235,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(basicdataGoodsShelfEntity), Map.class); String qrCode = (String) map.get("qrCode"); - String filename = QRCodeUtil.createCodeToFile(qrCode); + String filename = qrCodeComponent.createCodeToFile(qrCode); list.add(filename); map.put("img",filename); try { @@ -260,7 +261,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { @@ -421,8 +422,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl>>>> 文件路径{}", filename); @@ -500,10 +501,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class); String qrCode = (String) map.get("qrCode"); - String filename = QRCodeUtil.createCodeToFile(qrCode); + String filename = qrCodeComponent.createCodeToFile(qrCode); list.add(filename); map.put("img", getEmpAutograph(filename)); - String filetypeName = QRCodeUtil.createCodeToFileType(qrCode); + String filetypeName = qrCodeComponent.createCodeToFileType(qrCode); map.put("imgType", getEmpAutograph(filetypeName)); list.add(filetypeName); try { @@ -541,9 +542,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class); - String filename = QRCodeUtil.createCodeToFile(orderNoList.getQrCode()); + String filename = qrCodeComponent.createCodeToFile(orderNoList.getQrCode()); map.put("img", getEmpAutograph(filename)); - String fileTypeName = QRCodeUtil.createCodeToFileType(orderNoList.getQrCode()); + String fileTypeName = qrCodeComponent.createCodeToFileType(orderNoList.getQrCode()); map.put("imgType", getEmpAutograph(fileTypeName)); data.add(map); } diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml index e344dc40d..87a009b0c 100644 --- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml +++ b/blade-service/logpm-distribution/src/main/resources/application-dev.yml @@ -2,6 +2,9 @@ server: port: 8600 + + + #数据源配置 #spring: # datasource: diff --git a/blade-service/logpm-distribution/src/main/resources/application.yml b/blade-service/logpm-distribution/src/main/resources/application.yml index d6926f57b..9045bb125 100644 --- a/blade-service/logpm-distribution/src/main/resources/application.yml +++ b/blade-service/logpm-distribution/src/main/resources/application.yml @@ -36,5 +36,5 @@ spring: main: allow-circular-references: true - - +logpm: + file_system_path: D:\logpm_temp_file\ diff --git a/blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java b/blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java index b4c45e2c7..32f3b4a6c 100644 --- a/blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java +++ b/blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java @@ -43,9 +43,7 @@ public class MyTest { @Test public void te(){ Map params = new HashMap<>(); - params.put("id","1686560469635727362"); - params.put("qrCode","23072200246-1" - ); + params.put("ids","1686560469635727362"); try { OrderPackgeCodeDataVO orderPackgeCodeDataVO =distributionStockArticleService.showOrderPackgeCode(params); System.out.println(orderPackgeCodeDataVO); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml index ccd2adcab..bc8546155 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml @@ -80,6 +80,7 @@ + order by mfo.create_time desc diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml index b6ca51100..18ad9263f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml @@ -81,8 +81,9 @@ WHERE pi.is_deleted = 0 - and fom.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode} + and fom.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode} + order by pi.create_time desc