1.调整巡检计划相关代码

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";

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) {
+    public BaseResponse addInspectPlan(@RequestBody AddDeviceInspectPlanRequest deviceInspectPlanRequest) {
-        if (null == addDeviceInspectOrderRequest || StrUtil.isBlank(addDeviceInspectOrderRequest.getCode())) {
+        if (null == deviceInspectPlanRequest || StrUtil.isBlank(deviceInspectPlanRequest.getCode())) {
             return ResultVOUtils.paramVerifyFail();
         }
-        return deviceInspectPlanService.addDeviceInspectPlan(addDeviceInspectOrderRequest);
+        return deviceInspectPlanService.addDeviceInspectPlan(deviceInspectPlanRequest);
     }
 
     /**

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;
 

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);
 
     /**
      * 更新巡检计划

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<DeviceInspectPlanResponse> 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);