root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改paper_array的转换异常

Browse Source
This commit is contained in:
yanps
2023-12-17 11:03:01 +08:00
parent be12fd8773
commit 24286d5e57
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
View File

@@ -4,9 +4,9 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@@ -789,7 +789,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
* 解析出库的顺序 * 解析出库的顺序
*/ */
public List<Paper> getPaperArray(String paper_array) { 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; return papers;
} }

3
acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
View File

@@ -1,5 +1,6 @@
package org.nl.acs.task.service.dto; package org.nl.acs.task.service.dto;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Data; import lombok.Data;
@@ -340,6 +341,8 @@ public class TaskDto implements Serializable {
//array device_code\material_code\qty //array device_code\material_code\qty
private String paper_array; private String paper_array;
private JSONArray paperArray;
@Override @Override

3
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -505,6 +505,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void create(TaskDto dto) throws Exception { public void create(TaskDto dto) throws Exception {
dto = foramte(dto); dto = foramte(dto);
if(ObjectUtil.isNotEmpty(dto.getPaperArray())){
dto.setPaper_array(dto.getPaperArray().toJSONString());
}
if (!StrUtil.isEmpty(dto.getVehicle_code())) { if (!StrUtil.isEmpty(dto.getVehicle_code())) {
TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code()); TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code());
if (vehicle_dto != null) { if (vehicle_dto != null) {