From e2fbaf944315e5bc54a1c4237e99503c91e9793c Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 29 Mar 2023 11:54:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=B7=A1=E6=A3=80=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 16 ++++++++++++++++ .../inv/DeviceInspectPlanController.java | 10 +++++----- .../req/inv/AddDeviceInspectOrderRequest.java | 2 +- .../service/inv/DeviceInspectPlanService.java | 6 +++--- .../inv/impl/DeviceInspectPlanServiceImpl.java | 14 +++++++++++--- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 61149f644..3dd603625 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -47,6 +47,22 @@ public class Constant { */ public static final String DEVICE_MA_ORDER = "DMA"; + /** + * 设备巡检计划前缀 + */ + public static final String DEVICE_INSPECT_PLAN_ORDER = "DIP"; + + /** + * 设备报修前缀 + */ + public static final String DEVICE_REPAIR_ORDER = "DRA"; + + /** + * 设备维保单前缀 + */ + public static final String DEVICE_INSPECT_ORDER = "DIO"; + + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java index 9b08e7e16..6515e3eb6 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java @@ -6,7 +6,7 @@ import com.glxp.api.common.req.UpdateRequest; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.DeviceInspectPlanResponse; @@ -46,15 +46,15 @@ public class DeviceInspectPlanController { /** * 添加设备巡检计划 * - * @param addDeviceInspectOrderRequest + * @param deviceInspectPlanRequest * @return */ @PostMapping("/udiwms/inv/device/inspect/plan/addInspectPlan") - public BaseResponse addInspectPlan(@RequestBody AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { - if (null == addDeviceInspectOrderRequest || StrUtil.isBlank(addDeviceInspectOrderRequest.getCode())) { + public BaseResponse addInspectPlan(@RequestBody AddDeviceInspectPlanRequest deviceInspectPlanRequest) { + if (null == deviceInspectPlanRequest || StrUtil.isBlank(deviceInspectPlanRequest.getCode())) { return ResultVOUtils.paramVerifyFail(); } - return deviceInspectPlanService.addDeviceInspectPlan(addDeviceInspectOrderRequest); + return deviceInspectPlanService.addDeviceInspectPlan(deviceInspectPlanRequest); } /** diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java index 3031d4d18..0640359cc 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java @@ -39,7 +39,7 @@ public class AddDeviceInspectOrderRequest { private Integer status; /** - * 设备状态（0：异常；2：正常） + * 设备状态（0：异常；1：正常） */ private String deviceStatus; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java index b4a797886..6ed4b8a9d 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java @@ -2,7 +2,7 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; import com.glxp.api.res.inv.DeviceInspectPlanResponse; @@ -24,10 +24,10 @@ public interface DeviceInspectPlanService { /** * 添加巡检计划 * - * @param addDeviceInspectOrderRequest + * @param deviceInspectPlanRequest * @return */ - BaseResponse addDeviceInspectPlan(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest); + BaseResponse addDeviceInspectPlan(AddDeviceInspectPlanRequest deviceInspectPlanRequest); /** * 更新巡检计划 diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java index 0d890201e..c8d956584 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java @@ -5,13 +5,16 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; import com.glxp.api.dao.inv.DeviceInspectPlanDao; import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; import com.glxp.api.res.inv.DeviceInspectPlanResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.DeviceInspectPlanService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +33,8 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService { private DeviceInspectPlanDao deviceInspectPlanDao; @Resource private CustomerService customerService; + @Resource + private GennerOrderUtils gennerOrderUtils; @Override public List filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest) { @@ -43,11 +48,14 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService { } @Override - public BaseResponse addDeviceInspectPlan(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { + public BaseResponse addDeviceInspectPlan(AddDeviceInspectPlanRequest deviceInspectPlanRequest) { DeviceInspectPlanEntity deviceInspectPlanEntity = new DeviceInspectPlanEntity(); - BeanUtil.copyProperties(addDeviceInspectOrderRequest, deviceInspectPlanEntity); + BeanUtil.copyProperties(deviceInspectPlanRequest, deviceInspectPlanEntity); deviceInspectPlanEntity.setCreateUser(customerService.getUserIdStr()); Date date = new Date(); + String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_PLAN_ORDER, "yyyyMMdd")); + deviceInspectPlanEntity.setOrderId(orderId); + deviceInspectPlanEntity.setStatus(0); deviceInspectPlanEntity.setCreateTime(date); deviceInspectPlanEntity.setUpdateTime(date); deviceInspectPlanDao.insert(deviceInspectPlanEntity);