Merge remote-tracking branch 'origin/master_liaozeyong'

pom.xml

@@ -147,6 +147,19 @@
 			<artifactId>hutool-all</artifactId>
 			<version>5.8.25</version>
 		</dependency>
+
+		<!-- 二维码 -->
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+			<version>3.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>javase</artifactId>
+			<version>3.4.1</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -1,5 +1,6 @@
 package com.jsh.erp.datasource.entities;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import java.util.Date;
  * 单据主表实体类
  */
 @Data
+@TableName("jsh_depot_head")
 public class DepotHead {
 
     @ApiModelProperty("主键id")

src/main/java/com/jsh/erp/datasource/entities/DepotItem.java

@@ -1,5 +1,6 @@
 package com.jsh.erp.datasource.entities;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import java.util.Date;
  * 单据子表实体类
  */
 @Data
+@TableName("jsh_depot_item")
 public class DepotItem {
 
     @ApiModelProperty("主键id")

src/main/java/com/jsh/erp/datasource/entities/Log.java

@@ -1,7 +1,12 @@
 package com.jsh.erp.datasource.entities;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
+@TableName("jsh_log")
 public class Log {
     private Long id;
 

src/main/java/com/jsh/erp/service/DepotHeadService.java

@@ -1,6 +1,7 @@
 package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jsh.erp.datasource.entities.DepotHead;
 import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
 import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-public interface DepotHeadService {
+public interface DepotHeadService extends IService<DepotHead> {
     DepotHead getDepotHead(long id)throws Exception;
 
     List<DepotHead> getDepotHead()throws Exception;

src/main/java/com/jsh/erp/service/DepotItemService.java

@@ -2,6 +2,7 @@ package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.vo.DepotItemStockWarningCount;
 import com.jsh.erp.datasource.vo.DepotItemVoBatchNumberList;
@@ -13,7 +14,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-public interface DepotItemService {
+public interface DepotItemService extends IService<DepotItem> {
     DepotItem getDepotItem(long id)throws Exception;
 
     List<DepotItem> getDepotItem()throws Exception;

src/main/java/com/jsh/erp/service/LogService.java

@@ -1,6 +1,7 @@
 package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.vo.LogVo4List;
 import org.springframework.transaction.annotation.Transactional;
@@ -8,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
-public interface LogService {
+public interface LogService extends IService<Log> {
 
     Log getLog(long id)throws Exception;
 

src/main/java/com/jsh/erp/util/QRCodeGenerator.java

@@ -0,0 +1,51 @@
+package com.jsh.erp.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.jsh.erp.base.AjaxResult;
+
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 二维码生成器
+ */
+public class QRCodeGenerator {
+
+    /**
+     * 生成二维码图片
+     * @param text 二维码内容
+     * @param width 二维码宽度
+     * @param height 二维码高度
+     * @param filePath 二维码数据文件路径
+     * @throws Exception
+     */
+    public static void generateQRCodeImage(String text, int width, int height, String filePath) throws Exception {
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); // 设置编码格式为UTF-8
+        BitMatrix bitMatrix = qrCodeWriter.encode(text, BarcodeFormat.QR_CODE, width, height, hints);
+        Path path = FileSystems.getDefault().getPath(filePath);
+        MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path); // 输出图片格式为PNG
+    }
+
+    /**
+     * 生成二维码图片
+     * @param text 图片内容
+     * @return
+     */
+    public String generateQRCodeImage(String text) throws Exception {
+        int width = 300;
+        int height = 300;
+        String filePath = "filePath";
+        generateQRCodeImage(text, width, height, filePath);
+        return filePath;
+    }
+
+}