From 46b683698c1aa4dc98f31d47c6d8f8b7ea0cfdaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 18 Aug 2023 17:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BB=BB=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/DeviceInspectTakeController.java | 38 ++++++++++++++++++- .../api/upload/SpsSyncDeviceTakeResponse.java | 17 +++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/glxp/api/upload/SpsSyncDeviceTakeResponse.java diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index d9d086aa..a33fb0e4 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inv; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -11,6 +12,7 @@ import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; import com.glxp.api.res.inv.DeviceInspectTakeResponse; import com.glxp.api.service.inv.DeviceInspectTaskDetailService; import com.glxp.api.service.inv.DeviceInspectTaskService; +import com.glxp.api.upload.SpsSyncDeviceTakeResponse; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.lang.reflect.Type; import java.util.Date; import java.util.List; @@ -94,7 +97,40 @@ public class DeviceInspectTakeController { } - + //从管理接收任务信息 + @PostMapping("/deviceTakeApi/sps/sync/deviceTake/upload") + public BaseResponse getDeviceInspecTake(@RequestBody SpsSyncDeviceTakeResponse spsSyncDeviceTakeResponse) { + + //新增 + if(spsSyncDeviceTakeResponse.getType() == 1){ + DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity(); + deviceInspectTaskEntity.setId(null); + deviceInspectTaskService.save(deviceInspectTaskEntity); + List deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList(); + for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) { + deviceInspectTaskDetailEntity.setId(null); + deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity); + } + }else if(spsSyncDeviceTakeResponse.getType() == 2){ + //编辑 + DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity(); + deviceInspectTaskService.updateById(deviceInspectTaskEntity); + deviceInspectTaskDetailService.remove(new QueryWrapper().eq("taskOrderIdFk",deviceInspectTaskEntity.getOrderId())); + List deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList(); + for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) { + deviceInspectTaskDetailService.save(deviceInspectTaskDetailEntity); + } + }else if(spsSyncDeviceTakeResponse.getType() == 3){ + //删除 + DeviceInspectTaskEntity deviceInspectTaskEntity = spsSyncDeviceTakeResponse.getDeviceInspectTaskEntity(); + deviceInspectTaskService.removeById(deviceInspectTaskEntity); + List deviceInspectTaskDetailEntityList = spsSyncDeviceTakeResponse.getDeviceInspectTaskDetailEntityList(); + for (DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity : deviceInspectTaskDetailEntityList) { + deviceInspectTaskDetailService.removeById(deviceInspectTaskDetailEntity); + } + } + return ResultVOUtils.success(); + } diff --git a/src/main/java/com/glxp/api/upload/SpsSyncDeviceTakeResponse.java b/src/main/java/com/glxp/api/upload/SpsSyncDeviceTakeResponse.java new file mode 100644 index 00000000..83abf815 --- /dev/null +++ b/src/main/java/com/glxp/api/upload/SpsSyncDeviceTakeResponse.java @@ -0,0 +1,17 @@ +package com.glxp.api.upload; + +import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.inv.DeviceInspectTaskEntity; +import lombok.Data; + +import java.util.List; + +//同步设备任务 +@Data +public class SpsSyncDeviceTakeResponse { + + private DeviceInspectTaskEntity deviceInspectTaskEntity; + private List deviceInspectTaskDetailEntityList; + private Integer type; //1 新增 2 编辑 3删除 + +}