我的巡检任务

src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java

@@ -1,23 +1,17 @@
 package com.glxp.api.controller.inv;
 
-import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
-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.DeviceInspectPlanDelectEntity;
+import com.glxp.api.constant.Constant;
-import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
-import com.glxp.api.req.inv.AddDeviceInspectPlanRequest;
-import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
 import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
-import com.glxp.api.req.system.DeleteRequest;
-import com.glxp.api.res.inv.DeviceInspectPlanResponse;
 import com.glxp.api.res.inv.DeviceInspectTakeResponse;
-import com.glxp.api.service.inv.DeviceInspectPlanService;
 import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
 import com.glxp.api.service.inv.DeviceInspectTaskService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,6 +34,8 @@ public class DeviceInspectTakeController {
 
     @Resource
     DeviceInspectTaskDetailService deviceInspectTaskDetailService;
+    @Resource
+    private GennerOrderUtils gennerOrderUtils;
 
     /**
      * 查询设设备巡检任务接口
@@ -68,6 +64,27 @@ public class DeviceInspectTakeController {
         return ResultVOUtils.success();
     }
 
+    @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceTake")
+    public BaseResponse uploadDeviceTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
+        deviceInspectTaskEntity.setUpdateTime(new Date());
+        boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity);
+        if(!falg){
+            return ResultVOUtils.error(999,"更新失败");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+
+    @PostMapping("/udiwms/inv/device/inspect/take/addDeviceInspecTake")
+    public BaseResponse addDeviceInspecTake(@RequestBody  DeviceInspectTaskEntity deviceInspectTaskEntity) {
+        String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_PLAN_ORDER, "yyyyMMdd"));
+        deviceInspectTaskEntity.setOrderId(orderId);
+        deviceInspectTaskEntity.setCreateTime(new Date());
+         deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity);
+         return ResultVOUtils.success(deviceInspectTaskEntity);
+    }
+
 
 
 

src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java

@@ -4,14 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 @Data
 @TableName(value = "device_inspect_task")
 public class DeviceInspectTaskEntity implements Serializable {
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -95,5 +96,9 @@ public class DeviceInspectTaskEntity implements Serializable {
     @TableField(value = "expectedTime")
     private Date expectedTime;
 
+    @TableField(value = "type")
+    private Integer type;
+
+
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java

@@ -108,6 +108,7 @@ public class DeviceInspectTakeResponse {
     private Date remindTime;
     private String inspectName;
     private Date expectedTime;
+    private Integer type;
 
 
 

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java

@@ -1,14 +1,12 @@
 package com.glxp.api.service.inv;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
+import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
+import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
-import com.glxp.api.res.inv.DeviceInspectPlanResponse;
 import com.glxp.api.res.inv.DeviceInspectTakeResponse;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
-import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 
 import javax.annotation.Resource;
 import java.util.Collections;
@@ -40,3 +38,5 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
     }
 
 }
+
+

src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml

@@ -21,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, orderId, planOrderIdFk, deptCode, invCode, code, `status`, inspectUser, remindTime, 
+    id, orderId, planOrderIdFk, deptCode, invCode, code, `status`, inspectUser, remindTime,
     remark, strartTime, endTime, createTime, updateTime
   </sql>
 
@@ -49,7 +49,8 @@
     ( SELECT `employeeName` FROM auth_user WHERE id = t.inspectUser ) inspectName,
     t1.deviceName,
     t1.ggxh,
-    t1.batchNo
+    t1.batchNo,
+    t.type
     from device_inspect_task t
     left join dept_device_detail t1 on t.code = t1.code
     <where>
@@ -94,4 +95,4 @@
   </select>
 
 
-</mapper>
+</mapper>