From 24286d5e57151944b64b777c8bf8f8b7bedf2d51 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Sun, 17 Dec 2023 11:03:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9paper=5Farray=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paper_tube_device2/PaperTubeConveyor2DeviceDriver.java  | 6 +++---
 .../src/main/java/org/nl/acs/task/service/dto/TaskDto.java  | 3 +++
 .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java  | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
index 71c31973c..e7f1d1996 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
@@ -4,9 +4,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -789,7 +789,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
      * 解析出库的顺序
      */
     public List<Paper> getPaperArray(String paper_array) {
-        List<Paper> papers = JSONUtil.toList(paper_array, Paper.class);
+        List<Paper> papers = JSONUtil.parseArray(paper_array).toList(Paper.class);
         return papers;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
index 3db2e300a..eeabca48c 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
@@ -1,5 +1,6 @@
 package org.nl.acs.task.service.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
@@ -340,6 +341,8 @@ public class TaskDto implements Serializable {
     //array  device_code\material_code\qty
     private String paper_array;
 
+    private JSONArray paperArray;
+
 
 
     @Override
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 7b4c6f652..9bd423925 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -505,6 +505,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
     @Transactional(rollbackFor = Exception.class)
     public void create(TaskDto dto) throws Exception {
         dto = foramte(dto);
+        if(ObjectUtil.isNotEmpty(dto.getPaperArray())){
+            dto.setPaper_array(dto.getPaperArray().toJSONString());
+        }
         if (!StrUtil.isEmpty(dto.getVehicle_code())) {
             TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code());
             if (vehicle_dto != null) {