巡检默认填报

platform-rest/src/main/java/com/platform/rest/controller/fill/FillGatherTaskController.java

@@ -1,26 +1,24 @@
 package com.platform.rest.controller.fill;
 
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.fill.FillGatherTaskDTO;
-import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.fill.FillGatherTask;
-import com.platform.service.fill.FillGatherTaskService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.fill.ExportFillGatherTaskVO;
 import com.platform.dao.vo.query.fill.FillGatherTaskVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.service.repair.strategy.RepairStrategyFactory;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.fill.FillGatherTaskService;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
 
-import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Description 巡检任务表 控制器
@@ -233,4 +231,15 @@ public class FillGatherTaskController {
         return new R<>();
     }
 
+    /**
+     *  停机默认巡检填报
+     * @return R
+     */
+    @SysLog("停机默认巡检填报")
+    @PutMapping("/default/{taskId}/{detailId}")
+    public R defaultFill(@PathVariable("taskId") String taskId, @PathVariable("detailId") String detailId) {
+        fillGatherTaskService.fillStopDefault(taskId,detailId);
+        return new R<>();
+    }
+
 }

platform-service/src/main/java/com/platform/service/fill/FillGatherTaskService.java

@@ -85,4 +85,11 @@ public interface FillGatherTaskService extends IBaseService<FillGatherTask, Fill
      */
     void verifyTask(FillGatherTaskDTO model);
 
+    /**
+     * 停机默认填报
+     * @param taskId
+     * @param detailId
+     */
+    void fillStopDefault(String taskId,String detailId);
+
                                                                                                                                                                                                                 }

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -396,6 +396,40 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         //sendMessageToChecker(mapper.selectByPrimaryKey(task.getId()),null);
     }
 
+    @Override
+    public void fillStopDefault(String taskId, String detailId) {
+        // 已填报数据
+        FillGatherTask task = mapper.selectByPrimaryKey(taskId);
+        FillGatherTask updTask = new FillGatherTask();
+        // 补充默认填写数据
+        FillGatherTaskDetail queryDetail = fillGatherTaskDetailMapper.selectByPrimaryKey(detailId);
+        FillGatherTaskDetail updDetail = new FillGatherTaskDetail();
+        updDetail.setId(detailId);
+        // 完成默认填报
+        List<FillInfoVO> contents = JSONArray.parseArray(queryDetail.getContent(),FillInfoVO.class);
+        contents.forEach(item->{
+            if(item.getType() == 1){
+                item.setFillValue("0");
+            }else{
+                item.setFillValue("停机（正常）");
+            }
+        });
+        updDetail.setContent(JsonUtils.objectToJson(contents));
+        updDetail.setUpdateUserName(SecurityUtils.getUserInfo().getUsername());
+        updDetail.setUpdateUserId(SecurityUtils.getUserInfo().getUserId());
+        updDetail.setUpdateTime(LocalDateTime.now());
+        updDetail.setStatus(1);
+        fillGatherTaskDetailMapper.updateByPrimaryKeySelective(updDetail);
+        int waitNum = task.getWaitNum() - 1;
+        updTask.setId(task.getId());
+        updTask.setWaitNum(waitNum);
+        if(waitNum <= 0){
+            updTask.setWaitNum(0);
+            updTask.setStatus(FillGatherTaskStatusEnum.COMPLETED.getValue());
+        }
+        mapper.updateByPrimaryKeySelective(updTask);
+    }
+
 
     /**
      * 给巡检人发送消息
@@ -449,17 +483,27 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
     }
 
     public static void main(String[] args) {
-        List<FillInfoVO> contents = new ArrayList<>();
+        String info = "[{\"name\":\"是否跑冒滴漏\",\"remark\":\"正常--异常\",\"selectValue\":\"[{\\\"value\\\":\\\"正常\\\"},{\\\"value\\\":\\\"异常\\\"},{\\\"value\\\":\\\"停机（正常）\\\"}]\",\"type\":2},{\"name\":\"温度\",\"remark\":\"正常-异常-停机\",\"selectValue\":\"正常-异常-停机（正常）\",\"type\":1},{\"name\":\"噪声\",\"remark\":\"正常-异常-停机\",\"selectValue\":\"[{\\\"value\\\":\\\"正常\\\"},{\\\"value\\\":\\\"异常\\\"},{\\\"value\\\":\\\"停机\\\"}]\",\"type\":2},{\"name\":\"振动\",\"remark\":\"正常-异常-停机\",\"selectValue\":\"正常-异常-停机（正常）\",\"type\":1},{\"name\":\"润滑\",\"remark\":\"正常-异常-停机（正常）\",\"selectValue\":\"[{\\\"value\\\":\\\"正常\\\"},{\\\"value\\\":\\\"异常\\\"},{\\\"value\\\":\\\"停机（正常）\\\"}]\",\"type\":2}]";
+        List<FillInfoVO> contents = JSONArray.parseArray(info,FillInfoVO.class);
+        contents.forEach(item->{
+            if(item.getType() == 1){
+                item.setFillValue("0");
+            }else{
+                item.setFillValue("停机（正常）");
+            }
+        });
+        System.out.println(JsonUtils.objectToJson(contents));
+        /*List<FillInfoVO> contents = new ArrayList<>();
         for(int i=0;i<3;i++){
             FillInfoVO vo = new FillInfoVO();
-            vo.setName("12");
-            vo.setRemark("12");
-            vo.setSelectValue("[\"value\" : \"正常\",\"value\" : \"不良\" ]");
+            vo.setName("是否跑冒滴漏");
+            vo.setRemark("正常--异常");
+            vo.setSelectValue("[\"value\" : \"正常\",\"value\" : \"异常\" ]");
             vo.setType(1);
             vo.setFillValue("");
             contents.add(vo);
         }
-        System.out.println(JsonUtils.objectToJson(contents));
+        System.out.println(JsonUtils.objectToJson(contents));*/
     }
 
     /**