[二维码]修改

dev-task/src/main/java/com/tykj/dev/device/task/repository/TaskDao.java

@@ -82,4 +82,7 @@ public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationE
     List<Task> findAllByBusinessTypeAndCustomInfoAndBillStatus(Integer businessType,String customInfo,Integer billStatus);
 
     List<Task> findAllByBusinessTypeAndBillIdIn(Integer businessType,List<Integer> billIds);
+    //zsp
+
+    Task findByParentTaskId(Integer parentTaskId);
 }

dev-zxing/src/main/java/com/tykj/dev/device/zxing/util/ZXingUtil.java

@@ -5,10 +5,17 @@ import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.common.HybridBinarizer;
+import com.tykj.dev.device.task.repository.TaskDao;
+import com.tykj.dev.device.task.service.TaskService;
+import com.tykj.dev.device.task.subject.bto.TaskBto;
+import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.zxing.vo.ZxingTaskVo;
 import javassist.NotFoundException;
+import org.apache.tomcat.util.http.fileupload.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
@@ -28,16 +35,19 @@ import java.util.UUID;
  * DATE:2021-7-20
  * Author:zsp
  */
+@Service
 public class ZXingUtil {
 
 
     /** 二维码上传位置 */
-    private static String codePath = "src/";
+//    private static String codePath = "src/";
     /** 二维码宽度 */
-    private static Integer width = 50;
+    private static Integer width = 100;
     /** 二维码高度 */
-    private static Integer height = 50;
+    private static Integer height = 100;
 
+    @Autowired
+    private TaskDao taskDao;
     /**
      * 解析二维码
      *
@@ -57,7 +67,7 @@ public class ZXingUtil {
 //        Result result = new MultiFormatReader().decode(bitmap, decodeHints);
 //        return result.getText();
 //    }
-    public static String decode(MultipartFile file) throws IOException, com.google.zxing.NotFoundException {
+    public ZxingTaskVo decode(MultipartFile file) throws IOException, com.google.zxing.NotFoundException {
         BufferedImage bufferedImage = ImageIO.read(new FileInputStream((File)file));
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         Binarizer binarizer = new HybridBinarizer(source);
@@ -65,7 +75,12 @@ public class ZXingUtil {
         HashMap<DecodeHintType, Object> decodeHints = new HashMap<DecodeHintType, Object>();
         decodeHints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
         Result result = new MultiFormatReader().decode(bitmap, decodeHints);
-        return result.getText();
+        ZxingTaskVo zxingTaskVo = null;
+        if (result.getText() != null){
+            Task task = taskDao.findByParentTaskId(Integer.valueOf(result.getText()));
+            zxingTaskVo = new ZxingTaskVo(task.getParentTaskId(), task.getId());
+        }
+        return zxingTaskVo;
     }
 
     /**
@@ -100,7 +115,6 @@ public class ZXingUtil {
 
         InputStream in = null;
         byte[] data = null;
-
         // 读取图片字节数组
         try {
             in = new FileInputStream(imgFile);
@@ -113,8 +127,7 @@ public class ZXingUtil {
         }
         // 对字节数组Base64编码
         BASE64Encoder encoder = new BASE64Encoder();
-
-        return encoder.encode(data);// 返回Base64编码过的字节数组字符串
+        return  encoder.encode(data);// 返回Base64编码过的字节数组字符串
     }
 
 }

dev-zxing/src/main/java/com/tykj/dev/device/zxing/vo/ZxingTaskVo.java

+package com.tykj.dev.device.zxing.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * DATE:2021-7-20
+ * Author:zsp
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ZxingTaskVo {
+
+    private Integer taskId;
+
+    private Integer childTaskId;
+}