1、更新索引--涉及任务下发、定时器修改、任务执行

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -111,6 +111,7 @@ public class ControllerAop {
 		urls.add("/tcm/base-institution/register");
 		urls.add("/tcm/base-individuality/person/register");
 		urls.add("/tcm/userInfo/arrangement-statistic");
+		urls.add("/tcm/userInfo/getPersonType");
 		// 获取请求路径
 		for (String uri : urls) {
 			Pattern p = Pattern.compile(uri);

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -29,10 +29,7 @@ import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.patrol.core.util.DateUtil;
 import com.yeejoin.amos.patrol.core.util.StringUtil;
-import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
-import com.yeejoin.amos.patrol.dao.entity.PlanTask;
-import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
-import com.yeejoin.amos.patrol.dao.entity.Point;
+import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
 import com.yeejoin.amos.patrol.quartz.JobService;
@@ -134,6 +131,9 @@ public class CheckController extends AbstractBaseController {
     PointMapper pointMapper;
 
     @Autowired
+    ESPlanTaskList esPlanTaskList;
+
+    @Autowired
     JobService jobService;
 
     private String P_STATIC_DAY = "p_static_day";
@@ -212,8 +212,6 @@ public class CheckController extends AbstractBaseController {
 
         return ResponseHelper.buildResponse("提交成功");
     }
-    @Autowired
-    ESPlanTaskList esPlanTaskList;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存巡检记录<font color='blue'>手机app</font>", notes = "保存巡检记录<font color='blue'>手机app</font>")
@@ -256,7 +254,13 @@ public class CheckController extends AbstractBaseController {
                 requestParam.setOrgCode(orgCode);
                 requestParam.setUserId(getUserId());
                 CheckDto checkDto = checkService.saveCheckRecordNew(requestParam, planTask);
-                Long planTaskId = requestParam.getPlanTaskId();
+
+                Long planTaskId = planTask.getId();
+                List<String> ids = new ArrayList<>();
+                ids.add(String.valueOf(planTaskId));
+                Map<String, Object> map = planTaskMapper.selectTaskStatus(planTaskId);
+                String status = map.get("status").toString();
+
                 ESPlanTaskListDto esPlanTaskListDto = esPlanTaskList.findById(String.valueOf(planTaskId)).get();
                 Map task = planTaskMapper.queryPlanTaskById(planTaskId);
                 esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(task.get("finshNum")) ? "0" : task.get("finshNum").toString());
@@ -265,23 +269,12 @@ public class CheckController extends AbstractBaseController {
                 esPlanTaskListDto.setUnplan(ObjectUtils.isEmpty(task.get("unplan")) ? "0" : task.get("unplan").toString());
                 esPlanTaskListDto.setTaskPlanNum(ObjectUtils.isEmpty(task.get("taskPlanNum")) ? "0" : task.get("taskPlanNum").toString());
                 List<PlanTaskDetail> planTaskDetailList = planTaskMapper.selectTaskDetails("('" + planTaskId + "')");
-                for (PlanTaskDetail planTaskDetail : planTaskDetailList) {
-                    Point point = pointMapper.selectPointInfo(planTaskDetail.getPointId());
-                    planTaskDetail.setName(point.getName());
-                    planTaskDetail.setPointNo(point.getPointNo());
-                }
+                esPlanTaskListDto.setFinishStatus(status);
                 esPlanTaskListDto.setPoints(planTaskDetailList);
                 esPlanTaskList.save(esPlanTaskListDto);
 
-                List<String> ids = new ArrayList<>();
-                ids.add(String.valueOf(planTaskId));
-                Map<String, Object> map = planTaskMapper.selectTaskStatus(planTaskId);
-                if(map.get("status").toString().equals(String.valueOf(PlanTaskFinishStatusEnum.FINISHED.getValue()))) {
-                    ESPlanTaskListDto esPlanTaskListDto1 = esPlanTaskList.findById(String.valueOf(planTaskId)).get();
-                    esPlanTaskListDto1.setFinishStatus(map.get("status").toString());
-                    esPlanTaskList.save(esPlanTaskListDto1);
 
-                    jobService.updateEsPlanTaskList(ids, Integer.parseInt(map.get("status").toString()), "app", requestParam);
+                if(status.equals(String.valueOf(PlanTaskFinishStatusEnum.FINISHED.getValue()))) {
                     // 更新统计表
                     if(planTask.getPlanType().equals(String.valueOf(PlanTaskTypeStatusEnum.day.getValue()))) {
                         planTaskMapper.updateSingle(P_STATIC_DAY, XJConstant.RISK_NUM == Integer.parseInt(map.get("riskStatus").toString()) ? 1 : 0,
@@ -357,7 +350,7 @@ public class CheckController extends AbstractBaseController {
      * 巡检计划查询
      *
      * @param
-     * @param param
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -685,7 +678,7 @@ public class CheckController extends AbstractBaseController {
     /**
      * 巡检计划删除（支持批量）
      *
-     * @param param
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -737,7 +730,7 @@ public class CheckController extends AbstractBaseController {
     /**
      * 根据检查项ID获取所有不合格检查项
      *
-     * @param param
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -40,6 +40,7 @@ import com.yeejoin.amos.patrol.core.util.StringUtil;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.quartz.IJobService;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Sets;
@@ -103,6 +104,9 @@ public class CheckServiceImpl implements ICheckService {
     IEquipmentHandlerService equipmentHandlerService;
 
     @Autowired
+    IJobService jobService;
+
+    @Autowired
     private IPointClassifyDao iPointClassifyDao;
 
     @Autowired
@@ -118,6 +122,9 @@ public class CheckServiceImpl implements ICheckService {
     ESTaskDetail esTaskDetail;
 
     @Autowired
+    PointMapper pointMapper;
+
+    @Autowired
     private IdxFeign idxFeign;
 
     private String P_STATIC_DAY = "p_static_day";
@@ -472,10 +479,6 @@ public class CheckServiceImpl implements ICheckService {
     }
 
 
-    @Autowired
-    IJobService jobService;
-
-
     @Override
     @Transactional
     public CheckDto saveCheckRecordNew(CheckRecordParam requestParam , PlanTask planTask) {
@@ -611,9 +614,23 @@ public class CheckServiceImpl implements ICheckService {
             planTaskDetailDao.saveAndFlush(taskDetail);
             ESTaskDetailDto esTaskDetailDto = esTaskDetail.findById(String.valueOf(taskDetail.getId())).get();
             esTaskDetailDto.setPointStatus(String.valueOf(taskDetail.getIsFinish()));
-            Long routId = planTaskMapper.selectRoutId(String.valueOf(taskDetail.getTaskNo()));
-            JSONObject jsonObject = jobService.getCheckInput(routId, taskDetail.getPointId(), "update", requestParam);
-            esTaskDetailDto.setAppCheckInput(jsonObject);
+            JSONObject appCheckInput = esTaskDetailDto.getAppCheckInput();
+            List<CheckInputParam> checkItems = requestParam.getCheckItems();
+            Map<String,List<Map<String,Object>>> mapList = (Map<String,List<Map<String,Object>>>)JSON.parse(appCheckInput.toJSONString());
+
+            List<AppCheckInputRespone> appCheckInputRespones = new ArrayList<>();
+
+            for (Map<String,Object> map : mapList.get("items")) {
+                AppCheckInputRespone appCheckInputRespone = new AppCheckInputRespone();
+                CheckInputParam checkInputId = checkItems.stream().filter(x -> x.getInputItemId()== Long.valueOf(map.get("checkInputId").toString())).collect(Collectors.toList()).get(0);
+                BeanUtils.copyProperties(appCheckInputRespone, map);
+                appCheckInputRespone.setInputValue(checkInputId.getInputValue());
+                appCheckInputRespone.setPointInputImgUrls(ObjectUtils.isEmpty(checkInputId) ? new ArrayList<>() : checkInputId.getCheckInputImg());
+                appCheckInputRespones.add(appCheckInputRespone);
+            }
+            appCheckInput.put("items", appCheckInputRespones);
+            esTaskDetailDto.setPointImgUrls(requestParam.getCheckRecordImg());
+            esTaskDetailDto.setAppCheckInput(appCheckInput);
             esTaskDetail.save(esTaskDetailDto);
 
             check.setError(error);