防火监督修改

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckItemFinishStatusEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum CheckItemFinishStatusEnum {
+
+    TIME_DESC("未执行", "0"),
+    TIME_ASC("已执行", "1");
+
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 编号
+     */
+    private String code;
+
+    CheckItemFinishStatusEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static List<Map<String, Object>> getEnumList() {
+        return Arrays.stream(CheckItemFinishStatusEnum.values()).map(e -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", e.getName());
+            map.put("value", e.getCode());
+            return map;
+        }).collect(Collectors.toList());
+    }
+
+    public static String getName(String value) {
+        for (CheckItemFinishStatusEnum c : CheckItemFinishStatusEnum.values()) {
+            if (c.getCode().equals(value)) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckTypeSuEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum CheckTypeSuEnum {
+
+    TIME_DESC("日常检查", "1"),
+    TIME_ASC("专项检查", "2");
+
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 编号
+     */
+    private String code;
+
+    CheckTypeSuEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static List<Map<String, Object>> getEnumList() {
+        return Arrays.stream(CheckTypeSuEnum.values()).map(e -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put(e.getCode(), e.getName());
+            return map;
+        }).collect(Collectors.toList());
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/OrderByEnum.java

@@ -5,21 +5,16 @@ import java.util.stream.Collectors;
 
 /**
  * @author DELL
- * 维保任务排序
+ * 防火监督任务排序
  */
 
 public enum OrderByEnum {
     /**
-     * 维保任务排序
+     * 防火监督任务排序
      */
     TIME_DESC("时间倒序", "1", "beginTime desc"),
     TIME_ASC("时间正序", "2", "beginTime asc"),
-    PLAN_TASK_NUM_ASC("检查设施数正序", "3", "taskPlanNum asc"),
-    PLAN_TASK_NUM_DESC("检查设施数倒序", "4", "taskPlanNum desc"),
-    FINISH_NUM_DESC("完成数倒序", "5", "finishNum desc"),
-    FINISH_NUM_ASC("完成数正序", "6", "finishNum asc"),
-    PLAN_TASK_ITEM_NUM_ASC("检查项正序", "7", "itemNum asc"),
-    PLAN_TASK_ITEM_NUM_DESC("检查项正序", "8", "itemNum desc");
+    PLAN_TASK_NUM_ASC("计划检查项数正序", "3", "taskPlanNum asc");
 
     /**
      * 名字

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanTaskDetailIsFinishEnum.java

 package com.yeejoin.amos.supervision.common.enums;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public enum PlanTaskDetailIsFinishEnum {
 	UNFINISHED("未开始",0),
@@ -64,6 +66,17 @@ public enum PlanTaskDetailIsFinishEnum {
 		}
 		return null;
 	}
+
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> nameList = new ArrayList<>();
+		for (PlanTaskDetailIsFinishEnum c: PlanTaskDetailIsFinishEnum.values()) {
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("name", c.getName());
+			map.put("value", c.getValue() +"");
+			nameList.add(map);
+		}
+		return nameList;
+	}
 	
 	public static List<String> getEnumNameList() {
 		List<String> nameList = new ArrayList<String>();

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanTaskFinishStatusEnum.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public enum PlanTaskFinishStatusEnum {
 	NOTSTARTED("未开始",0),
-	UNDERWAY("待执行",1),
+	UNDERWAY("执行中",1),
 	FINISHED("已结束",2),
 	OVERTIME("已超时",3);
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/AbstractBaseController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
 import org.springframework.cglib.beans.BeanMap;
@@ -653,4 +654,7 @@ public abstract class AbstractBaseController extends BaseController{
   	  return map;
   	}
 
+  	public ReginParams.PersonIdentity opIdentifyInfo(){
+		return getSelectedOrgInfo().getPersonIdentity();
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/CheckController.java

@@ -22,6 +22,7 @@ import javax.xml.transform.stream.StreamSource;
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
 import com.yeejoin.amos.supervision.core.async.AsyncTask;
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
 import com.yeejoin.amos.supervision.mqtt.WebMqttComponent;
@@ -543,19 +544,19 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "查询计划执行结果信息", notes = "查询计划执行结果信息")
     @GetMapping(value = "/page/list", produces = "application/json;charset=UTF-8")
     public ResponseModel getPlanExecuteInfo(
-            @ApiParam(value = "计划id") @RequestParam(value = "planId") Long planId,
+            @ApiParam(value = "计划id") @RequestParam(value = "routeId") Long routeId,
             @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) Long pointId,
             @ApiParam(value = "执行状态") @RequestParam(value = "executeState", required = false) String executeState,
             @ApiParam(value = "状态") @RequestParam(value = "status", required = false) String status,
-            @ApiParam(value = "单位id") @RequestParam(value = "companyName", required = false) String companyName,
+            @ApiParam(value = "单位id") @RequestParam(value = "teamId", required = false) String teamId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("planId", planId);
+        map.put("routeId", routeId);
         map.put("pointId", pointId);
         map.put("executeState", executeState);
         map.put("status", status);
-        map.put("companyName", companyName);
+        map.put("teamId", teamId);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return ResponseHelper.buildResponse(checkService.getPlanExecuteInfo(map, pageable));
     }
@@ -567,13 +568,7 @@ public class CheckController extends AbstractBaseController {
         return ResponseHelper.buildResponse(checkService.getPlanExecuteStates());
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "查询计划执行所有单位", notes = "查询计划执行所有单位")
-    @GetMapping(value = "/search/teams", produces = "application/json;charset=UTF-8")
-    public ResponseModel getPlanExecuteTeams() {
-        return ResponseHelper.buildResponse(checkService.getPlanExecuteTeams());
-    }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存检查记录", notes = "保存检查记录")
     @RequestMapping(value = "/saveRecord", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PointController.java

@@ -809,8 +809,17 @@ public class PointController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询巡检点详情<font color='blue'>手机app</font>)", notes = "查询巡检点详情<font color='blue'>手机app</font>)")
     @GetMapping(value = "/detail/item", produces = "application/json;charset=UTF-8")
-    public ResponseModel queryItemDetailByPointId(@ApiParam(value = "巡检点id", required = true) @RequestParam(name = "pointId") Long id) {
-            return ResponseHelper.buildResponse(iPointService.queryItemDetailByPointId(id));
+    public ResponseModel queryItemDetailByPointId(
+            @ApiParam(value = "路线id", required = true) @RequestParam(name = "routeId") Long routeId,
+            @ApiParam(value = "巡检点id", required = true) @RequestParam(name = "pointId") Long id) {
+            return ResponseHelper.buildResponse(iPointService.queryItemDetailByPointId(id, routeId));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划执行所有单位", notes = "查询计划执行所有单位")
+    @GetMapping(value = "/search/teams", produces = "application/json;charset=UTF-8")
+    public ResponseModel getPlanExecuteTeams() {
+        return ResponseHelper.buildResponse(iPointService.getPlanExecuteTeams());
     }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/UserController.java

@@ -11,6 +11,7 @@ import java.util.TreeSet;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import com.yeejoin.amos.supervision.jpush.AppMessagePushService;
 import org.slf4j.Logger;
@@ -846,4 +847,12 @@ public class UserController extends AbstractBaseController {
         return CommonResponseUtil.failure(e.getMessage());
     }
         }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
+    @ApiOperation(value = "获取人员身份信息", notes = " 获取人员身份信息")
+    @GetMapping(value = "/identify")
+    public CommonResponse personIdentity() {
+        return CommonResponseUtil.success(opIdentifyInfo());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskDetailMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 public interface PlanTaskDetailMapper extends BaseMapper {
 	void finishTaskDetail(@Param(value="planTaskDetailId") long planTaskDetailId, @Param(value="pointId") long pointId, @Param(value="planTaskId") long planTaskId
-						, @Param(value="executorId") String executorId , @Param(value="executorName") String executorName);
+						, @Param(value="executorId") String executorId , @Param(value="executorName") String executorName , @Param(value="size") int size );
 
 	Map findPlanTaskByTaskIdAndPointId(@Param(value="planTaskId") long planTaskId,@Param(value="pointId") long pointId);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskMapper.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.supervision.dao.entity.PlanTask;
@@ -77,10 +78,12 @@ public interface PlanTaskMapper extends BaseMapper {
 	Map queryPlanTaskById(@Param(value="planTaskId") Long planTaskId);
 	/**
 	 * 	通过计划任务Id获取任务所有点信息
-	 * @param planTaskId
+	 * @param params
 	 * @return
 	 */
-	List getPlanTaskPoints(@Param(value="planTaskId") Long planTaskId);
+	List<Map<String, Object>> getPlanTaskPoints(HashMap<String, Object> params);
+
+	long getPlanTaskPointsCount(HashMap<String, Object> params);
 	/**
 	 * 	获取用户当前所有可以做的任务个数
 	 * @param userId

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PointMapper.java

@@ -157,5 +157,10 @@ public interface PointMapper extends BaseMapper {
 	 */
 	List<Long> getPointoriginalidbyrouteid(@Param(value = "routeId") Long routeId);
 
-	List<Map<String, Object>> queryItemsByPointId(@Param(value = "pointId") Long pointId);
+	List<Map<String, Object>> queryItemsByPointId(@Param(value = "pointId") Long pointId ,@Param(value = "routeId") Long routeId);
+
+	/**
+	 * 查询点id，name
+	 */
+	List<Map<String, Object>> getPlanExecuteTeams();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/FeignBasicAuthRequestInterceptor.java

@@ -21,9 +21,12 @@ public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
         }
         ServletRequestAttributes attributes = (ServletRequestAttributes) requestAttributes;
         HttpServletRequest request = attributes.getRequest();
-  
+
         //设置header
-        String token = request.getHeader("X-Access-Token");
+        String token = request.getHeader("token");
+        if (token == null) {
+            token = request.getHeader("X-Access-Token");
+        }
         String product = request.getHeader("product");
         String appKey = request.getHeader("appKey");
         template.header("token", token);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/JCSFeignClient.java

+package com.yeejoin.amos.supervision.business.feign;
+
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @author DELL
+ */
+@FeignClient(name = "${jcs.fegin.name}",configuration = FeignConfiguration.class)
+public interface JCSFeignClient {
+
+    /**
+     * 查询用户单位信息
+     * @param userId 用户id
+     * @return ResponseModel<ReginParams.PersonIdentity>
+     */
+    @GetMapping(value = "jcs/org-usr/getLoginUserDetails?userId={userId}")
+    FeignClientResult getUserUnit(@PathVariable String userId);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -939,13 +939,12 @@ public class CheckServiceImpl implements ICheckService {
         if (total == 0) {
             return new PageImpl<>(content, page, total);
         }
-        map.put("status", PlanTaskFinishStatusEnum.getValue(String.valueOf(map.get("status"))));
         map.put("offset", page.getOffset());
         map.put("pageSize", page.getPageSize());
         content = checkMapper.getCheckItems(map);
         content.forEach(c -> {
             if (c.containsKey("finishStatus")) {
-                String finishStatusDesc = PlanTaskFinishStatusEnum.getName(Integer.parseInt(c.get("finishStatus").toString()));
+                String finishStatusDesc = CheckItemFinishStatusEnum.getName(c.get("finishStatus").toString());
                 c.put("finishStatus", finishStatusDesc);
             }
         });
@@ -953,8 +952,8 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public List<Map<String, String>> getPlanExecuteStates() {
-        return PlanTaskFinishStatusEnum.getEnumList();
+    public List<Map<String, Object>> getPlanExecuteStates() {
+        return CheckItemFinishStatusEnum.getEnumList();
     }
 
     @Override
@@ -1385,12 +1384,11 @@ public class CheckServiceImpl implements ICheckService {
     @Transactional
     public CheckDto saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception {
         ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
-        //执行人-维保人员，非amos 账号
-        if (ObjectUtils.isEmpty(reginParams.getUserModel()) && ObjectUtils.isEmpty(reginParams.getCompany()) && ObjectUtils.isEmpty(reginParams.getDepartment()) ) {
+        if (ObjectUtils.isEmpty(reginParams.getUserModel()) && ObjectUtils.isEmpty(reginParams.getCompany()) && ObjectUtils.isEmpty(personIdentity) ) {
             throw new RuntimeException("获取用户信息失败");
         }
-        String mtUserSeq = reginParams.getUserModel().getUserId();
-        String userName = reginParams.getUserModel().getUserName();
+        String mtUserSeq = personIdentity.getPersonSeq();
+        String userName = personIdentity.getPersonName();
 //        String mtUserSeq = personIdentity.getPersonSeq();
         PlanTask planTask = planTaskService.selectPlanTaskStatus(recordParam.getPlanTaskId());
         Map detail = planTaskDetailMapper.findPlanTaskByTaskIdAndPointId(recordParam.getPlanTaskId(), recordParam.getPointId());
@@ -1420,11 +1418,11 @@ public class CheckServiceImpl implements ICheckService {
                 check.setUserId(mtUserSeq);
                 check.setCheckTime(new Date());
                 check.setUploadTime(new Date());
-                check.setUserName(reginParams.getUserModel().getUserName());
+                check.setUserName(personIdentity.getPersonName());
                 check.setCompanyId(reginParams.getCompany().getSequenceNbr().toString());
                 check.setCompanyName(reginParams.getCompany().getCompanyName());
-                check.setDepId(reginParams.getDepartment().getSequenceNbr().toString());
-                check.setDepName(reginParams.getDepartment().getDepartmentName());
+                check.setDepId(personIdentity.getCompanyId());
+                check.setDepName(personIdentity.getCompanyName());
             } else {
                 // 更新
                 check = checkByPointId;
@@ -1446,11 +1444,11 @@ public class CheckServiceImpl implements ICheckService {
                 if (!companyName.contains(reginParams.getCompany().getCompanyName())) {
                     check.setCompanyName(companyName+","+reginParams.getCompany().getCompanyName());
                 }
-                if (!depId.contains(reginParams.getDepartment().getSequenceNbr().toString())) {
-                    check.setDepId(depId+","+reginParams.getDepartment().getSequenceNbr().toString());
+                if (!depId.contains(personIdentity.getCompanyId())) {
+                    check.setDepId(depId+","+personIdentity.getCompanyId());
                 }
-                if (!depName.contains(reginParams.getDepartment().getDepartmentName())) {
-                    check.setDepName(depName+","+reginParams.getDepartment().getDepartmentName());
+                if (!depName.contains(personIdentity.getCompanyName())) {
+                    check.setDepName(depName+","+personIdentity.getCompanyName());
                 }
 
             }
@@ -1553,7 +1551,13 @@ public class CheckServiceImpl implements ICheckService {
                 checkShotDao.saveAll(allShot);
             }
 
-            planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), recordParam.getPointId(), recordParam.getPlanTaskId(), mtUserSeq, userName);
+            int size = 0;
+            if (!ObjectUtils.isEmpty(list)) {
+                size = list.size();
+            }
+
+            planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), recordParam.getPointId(),
+                    recordParam.getPlanTaskId(), mtUserSeq, userName, size);
             //7.返回不合格记录
             return new CheckDto(check.getId(), unqualifiedCheckItemList);
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.dao.entity.*;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.util.ArrayListWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -150,6 +151,10 @@ public class PlanServiceImpl implements IPlanService {
         saveRoute.setName(plan.getName());
         saveRoute.setOrgCode(plan.getOrgCode());
         saveRoute.setCreatorId(plan.getCreateBy());
+        if (!ObjectUtils.isEmpty(addPlanRequest.getOwnerId())) {
+            String ownerId = StringUtils.join(addPlanRequest.getOwnerId().toArray(), ",");
+            saveRoute.setOwnerId(ownerId);
+        }
         Route route = iRouteDao.save(saveRoute);
 
         if (!ObjectUtils.isEmpty(route.getId())) {
@@ -166,16 +171,19 @@ public class PlanServiceImpl implements IPlanService {
                             routePoint.setRouteId(route.getId());
                             routePoint.setPointId(point);
                             iRoutePointDao.save(routePoint);
+
+//                            List<PointInputItem> pointInputItems = pointMapper.getCheckPointById(point);
+                            List<PointInputItem> pointInputItems = iPointInputItemDao.getPointInputItemByPointId(point);
+                            pointMapper.getPointClassInputItemById(point);
+                            if (!ObjectUtils.isEmpty(pointInputItems)) {
+                                pointInputItems.forEach(pointInputItem -> {
+                                    RoutePointItem routePointItem = new RoutePointItem();
+                                    routePointItem.setRoutePointId(routePoint.getId());
+                                    routePointItem.setPointInputItemId(pointInputItem.getId());
+                                    iRoutePointItemDao.save(routePointItem);
+                                });
+                            }
                         });
-                        List<PointInputItem> pointInputItems = pointMapper.getPointRouteItem(pointVos);
-                        if (!ObjectUtils.isEmpty(pointInputItems)) {
-                            pointInputItems.forEach(pointInputItem -> {
-                                RoutePointItem routePointItem = new RoutePointItem();
-                                routePointItem.setRoutePointId(route.getId());
-                                routePointItem.setPointInputItemId(pointInputItem.getId());
-                                iRoutePointItemDao.save(routePointItem);
-                            });
-                        }
                     }
                 }
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -30,6 +30,7 @@ import com.yeejoin.amos.supervision.business.vo.CalDateVo;
 import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
+import com.yeejoin.amos.supervision.common.enums.PlanTaskDetailIsFinishEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanTaskFinishStatusEnum;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.response.AppCheckInputRespone;
@@ -608,8 +609,23 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     @Override
-    public List getPlanTaskPoints(Long planTaskId) {
-        return planTaskMapper.getPlanTaskPoints(planTaskId);
+    public  Page<Map<String, Object>>  getPlanTaskPoints(HashMap<String, Object> params,  CommonPageable pageable) {
+        List<Map<String, Object>> content = Lists.newArrayList();
+        long total = planTaskMapper.getPlanTaskPointsCount(params);
+        if (total == 0) {
+            return new PageImpl<>(content, pageable, total);
+        }
+        params.put("offset", pageable.getOffset());
+        params.put("pageSize", pageable.getPageSize());
+        List<Map<String, Object>> result = planTaskMapper.getPlanTaskPoints(params);
+        result.forEach(r -> {
+            if (r.containsKey("finish")) {
+                String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("finish").toString()));
+                r.put("isFinishDesc", isFinishDesc);
+            }
+        });
+        return new PageImpl<>(result, pageable, total);
+//        return result;
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java

@@ -1215,8 +1215,8 @@ public class PointServiceImpl implements IPointService {
     }
 
     @Override
-    public List<Map<String, Object>> queryItemDetailByPointId(Long id) {
-        List<Map<String, Object>> list = pointMapper.queryItemsByPointId(id);
+    public List<Map<String, Object>> queryItemDetailByPointId(Long id, Long routeId) {
+        List<Map<String, Object>> list = pointMapper.queryItemsByPointId(id, routeId);
         if (0 < list.size()) {
             for (Map<String, Object> map : list) {
                 if (map.containsKey("picJson") && !ObjectUtils.isEmpty(map.get("picJson"))) {
@@ -1227,4 +1227,9 @@ public class PointServiceImpl implements IPointService {
         return list;
     }
 
+    @Override
+    public List<Map<String, Object>> getPlanExecuteTeams() {
+        return pointMapper.getPlanExecuteTeams();
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/ICheckService.java

@@ -267,7 +267,7 @@ public interface ICheckService {
 
     Page<HashMap<String, Object>> getPlanExecuteInfo(HashMap<String, Object> map, CommonPageable page);
 
-    List<Map<String, String>> getPlanExecuteStates();
+    List<Map<String, Object>> getPlanExecuteStates();
 
     List<Map<String, Object>> getPlanExecuteTeams();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanTaskService.java

@@ -91,10 +91,10 @@ public interface IPlanTaskService {
 
 	/**
 	 * 	根据计划ID获取所有的 任务计划巡检点
-	 * @param planTaskId
+	 * @param params
 	 * @return
 	 */
-	List getPlanTaskPoints(Long planTaskId);
+	Page<Map<String, Object>> getPlanTaskPoints(HashMap<String, Object> params,  CommonPageable pageable);
 
 	/**
 	 * 	获取用户当前所有有的计划任务

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPointService.java

@@ -327,6 +327,8 @@ public interface IPointService {
      */
     void delPointByPointNo(Long id);
 
-    List<Map<String, Object>> queryItemDetailByPointId(Long id);
+    List<Map<String, Object>> queryItemDetailByPointId(Long id, Long routeId);
+
+    List<Map<String, Object>> getPlanExecuteTeams();
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/framework/PersonIdentify.java

+package com.yeejoin.amos.supervision.core.framework;
+
+import java.lang.annotation.*;
+
+/**
+ * @author DELL
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface PersonIdentify {
+	/**
+	 * 是否进行人员校验
+	 * @return
+	 */
+	boolean isNeedIdentity() default true;
+}
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/framework/PersonIdentifyAspect.java

+package com.yeejoin.amos.supervision.core.framework;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
+import com.yeejoin.amos.supervision.exception.PermissionException;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@Aspect
+@Component
+@ResponseBody
+@Order(value = 1)
+public class PersonIdentifyAspect {
+
+    @Autowired
+    RedisUtils redisUtils;
+    @Autowired
+    JCSFeignClient jcsFeignClient;
+
+    final int HTTP_OK_STATUS = 200;
+
+    @Before(value = "@annotation(com.yeejoin.amos.supervision.core.framework.PersonIdentify) && @annotation(permission)")
+    public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) throws PermissionException {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (permission.isNeedIdentity() && reginParam != null) {
+            //调用jcs，进行人员身份判断，是维保公司人员还是业主单位人员
+            String userId = reginParam.getUserModel().getUserId();
+            FeignClientResult responseModel = jcsFeignClient.getUserUnit(userId);
+            if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) {
+                throw new RuntimeException(responseModel.getDevMessage());
+            }
+            List result = (List)responseModel.getResult();
+            ReginParams.PersonIdentity personIdentity = new ReginParams.PersonIdentity();
+            if (!ObjectUtils.isEmpty(result)) {
+                Map map = (Map)result.get(0);
+                Map other = (Map)map.get("other");
+                Map person = (Map)map.get("PERSON");
+                if (!ObjectUtils.isEmpty(person)) {
+                    personIdentity.setPersonSeq((String) person.get("sequenceNbr"));
+                    personIdentity.setPersonName((String) person.get("recUserName"));
+                }
+                if (!ObjectUtils.isEmpty(other)) {
+                    personIdentity.setCompanyId((String) other.get("sequenceNbr"));
+                    personIdentity.setCompanyName((String) other.get("bizOrgName"));
+                }
+
+//                ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) result.get(0), ReginParams.PersonIdentity.class);
+                reginParam.setPersonIdentity(personIdentity);
+                redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
+            } else {
+                throw new RuntimeException("人员未绑定！");
+            }
+        }
+    }
+
+}

amos-boot-system-supervision/src/main/resources/application.properties

@@ -19,7 +19,7 @@ spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 #DB properties:
 spring.jpa.show-sql = true
-spring.jpa.hibernate.ddl-auto = none
+spring.jpa.hibernate.ddl-auto = none    
 spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
 mybatis.mapper-locations = classpath:db/mapper/*.xml
@@ -35,7 +35,7 @@ equip.fegin.name=AMOS-EQUIPMANAGE
 equip.fegin.prefix=/equip
 input.custom.prefix = QYZD
 input.statute.prefix = FG
-
+jcs.fegin.name=JCS
 
 Security.fegin.name=AMOS-API-PRIVILEGE
 

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1898,54 +1898,69 @@
         SELECT
             count(1)
         FROM
-        p_check pc, p_check_input pci, p_plan_task_detail pptd
+            p_input_item pii
+            LEFT JOIN p_point_inputitem ppi ON pii.id = ppi.input_item_id
+            LEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = ppi.id
+            LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id AND prp.point_id =  ppi.point_id
+            LEFT JOIN p_check_input pci ON pci.route_point_item_id = prpi.id
+            LEFT JOIN p_point pp ON ppi.point_id =pp.id
         WHERE
-        pc.id = pci.check_id
-        AND pc.plan_task_detail_id = pptd.id
-        AND pc.plan_id = #{planId}
-        <if test="pointId != null and pointId != ''">
-            AND pc.point_id = #{pointId}
-        </if>
-        <if test="executeState != null and executeState != ''">
-            AND pptd.is_finish = #{executeState}
-        </if>
-        <!--            <if test="status != null and status != ''">-->
-        <!--                AND pc.point_id = #{status}-->
-        <!--            </if>-->
+            prp.route_id = #{routeId}
+            <if test="pointId != null and pointId != '' and pointId != -1">
+                AND ppi.point_id = #{pointId}
+            </if>
+        <choose>
+            <when test="status != null and status != '' and status==0">
+                AND  pci.id IS NULL
+            </when>
+            <when test="status != null and status != '' and status==1">
+                AND pci.id IS NOT NULL
+            </when>
+        </choose>
         <if test="teamId != null and teamId != ''">
-            AND pc.company_id = #{teamId}
+            AND pp.original_id = #{teamId}
         </if>
     </select>
 
     <select id="getCheckItems" resultType="Map">
         SELECT
-            pc.id checkId,
-            pci.id checkInputId,
-            pci.input_name itemName,
-            pptd.is_finish finishStatus,
+            ppi.id inputItemId,
+            pii.name itemName,
+            pci.id IS NOT NULL finishStatus,
             pci.safety_danger_num safetyNum,
             pci.major_danger_num majorNum,
-            DATE_FORMAT(pc.check_time,'%Y-%m-%d %H:%i:%s') checkTime,
-            pc.user_name executeName,
-            pc.company_name companyName
+            DATE_FORMAT(pci.create_date,'%Y-%m-%d %H:%i:%s') checkTime,
+            pp.name companyName,
+            pci.user_name executeName
         FROM
-            p_check pc, p_check_input pci, p_plan_task_detail pptd
+            p_input_item pii
+            LEFT JOIN p_point_inputitem ppi ON pii.id = ppi.input_item_id
+            LEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = ppi.id
+            LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id AND prp.point_id =  ppi.point_id
+            LEFT JOIN p_check_input pci ON pci.route_point_item_id = prpi.id
+            LEFT JOIN p_point pp ON ppi.point_id =pp.id
         WHERE
-            pc.id = pci.check_id
-            AND pc.plan_task_detail_id = pptd.id
-            AND pc.plan_id = #{planId}
+            prp.route_id = #{routeId}
             <if test="pointId != null and pointId != '' and pointId != -1">
-                AND pc.point_id = #{pointId}
+                AND ppi.point_id = #{pointId}
             </if>
-            <if test="status != null and status != ''">
-                AND pptd.is_finish = #{status}
+            <choose>
+                <when test="status != null and status != '' and status==0">
+                    AND  pci.id IS NULL
+                </when>
+                <when test="status != null and status != '' and status==1">
+                    AND pci.id IS NOT NULL
+                </when>
+            </choose>
+            <if test="teamId != null and teamId != ''">
+                AND pp.original_id = #{teamId}
             </if>
 <!--            <if test="status != null and status != ''">-->
 <!--                AND pc.point_id = #{status}-->
 <!--            </if>-->
-            <if test="companyName != null and companyName != ''">
-                AND pc.company_name = #{company_name}
-            </if>
+<!--            <if test="companyName != null and companyName != ''">-->
+<!--                AND pc.company_name = #{company_name}-->
+<!--            </if>-->
         limit #{offset},#{pageSize}
     </select>
 

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -179,6 +179,7 @@
 					pt.org_code orgCode,
 					p.name taskName,
 					p.check_type_name checkTypeName,
+					P.check_type_id checkTypeId,
 					pt.status,
 					pt.user_id userId,
 					date_format(
@@ -201,14 +202,11 @@
 					pt.route_id,
 					pt.user_name userName,
 					r.owner_id,
-			        R.owner_name as ownerName,
-					ptd.item_num AS itemNum,
-					ptd.executor_id AS executorId
+			        r.owner_name as ownerName
 				FROM
 					p_plan_task pt
 					INNER JOIN p_plan p ON pt.plan_id = p.id
 					INNER JOIN p_route r on r.id = pt.route_id
-					INNER JOIN p_plan_task_detail ptd ON ptd.task_no = pt.id
 			) a
 		<include refid="mobile-plan-task-where" />
 		limit #{offset},#{pageSize}
@@ -217,8 +215,8 @@
 		<where>
 			<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
 			<if test="executorId != null and executorId > 0 "> and find_in_set(#{executorId},a.executorId)>0</if>
-			<if test="companyId != null"> and a.owner_id = #{companyId}</if>
-			<if test="taskType != null"> and a.checkTypeName = #{taskType}</if>
+			<if test="companyId != null"> and find_in_set(#{companyId},a.owner_id)>0</if>
+			<if test="taskType != null"> and a.checkTypeId = #{taskType}</if>
 			<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
 			<if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
 				AND (
@@ -265,13 +263,13 @@
 				pt.org_code as orgCode,
 				pt.begin_time as beginTime,
 				pt.end_time as endTime,
+				pt.point_num as taskPlanNum,
 				r.owner_id,
-				ptd.item_num AS itemNum
+				P.check_type_id checkTypeId
 			FROM
 				p_plan_task pt
 			INNER JOIN  p_plan p ON pt.plan_id = p.id
 			INNER JOIN p_route r on r.id = pt.route_id
-			INNER JOIN p_plan_task_detail ptd ON ptd.task_no = pt.id
 			) a
 		<include refid="mobile-plan-task-where" />
 	</select>
@@ -365,17 +363,66 @@
 			p.is_fixed isFixed,
 			pt.route_id routeId,
 			c.id checkId,
-			prp.order_no orderNo
+			prp.order_no orderNo,
+			ptd.item_num itemNum,
+			ptd.executed_num executedNum,
+			ptd.safety_danger_num safetyDangerNum,
+			ptd.major_danger_num majorDangerNum,
+			ptd.executor_date beginTime,
+			ptd.item_num taskPlanNum
 		FROM
 			p_plan_task_detail ptd
 		LEFT JOIN p_plan_task pt  ON pt.id = ptd.task_no
 		LEFT JOIN p_point p ON p.id = ptd.point_id
 		LEFT JOIN p_check c ON c.plan_task_detail_id = ptd.id
 		LEFT JOIN p_route_point prp ON prp.point_id = ptd.point_id AND prp.route_id = pt.route_id
+		LEFT JOIN p_plan ppn ON ppn.id = pt.plan_id
 		WHERE
 			p.is_delete = 0
-		<if test="planTaskId != null and planTaskId > 0  ">and pt.id = #{planTaskId}</if>
-		ORDER BY orderNo
+		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},pt.user_id)>0</if>
+		<if test="executorId != null and executorId > 0 "> and find_in_set(#{executorId},ptd.executor_id)>0</if>
+		<if test="finishStatus != null and finishStatus!=''"> and ptd.is_finish = #{finishStatus}</if>
+		<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
+			AND (
+			(
+			ptd.executor_date <![CDATA[>=]]>  #{startTime}
+			AND ptd.executor_date <![CDATA[<=]]> #{endTime}
+			)
+			)
+		</if>
+		<if test="companyId != null and companyId != ''"> and ppn.original_id = #{companyId}</if>
+		<if test="taskType != null and taskType != ''"> and ppn.check_type_id = #{taskType}</if>
+		<if test="planTaskId != null and planTaskId > 0 "> and ptd.task_no = #{planTaskId}</if>
+		<if test="orderBy != null and orderBy != ''"> order by ${orderBy} </if>
+		limit #{offset},#{pageSize}
+	</select>
+
+	<select id="getPlanTaskPointsCount" resultType="long">
+		SELECT
+			count(1)
+		FROM
+		p_plan_task_detail ptd
+		LEFT JOIN p_plan_task pt  ON pt.id = ptd.task_no
+		LEFT JOIN p_point p ON p.id = ptd.point_id
+		LEFT JOIN p_check c ON c.plan_task_detail_id = ptd.id
+		LEFT JOIN p_route_point prp ON prp.point_id = ptd.point_id AND prp.route_id = pt.route_id
+		LEFT JOIN p_plan ppn ON ppn.id = pt.plan_id
+		WHERE
+		p.is_delete = 0
+		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},pt.user_id)>0</if>
+		<if test="executorId != null and executorId > 0 "> and find_in_set(#{executorId},ptd.executor_id)>0</if>
+		<if test="finishStatus != null and finishStatus!=''"> and ptd.is_finish = #{finishStatus}</if>
+		<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
+			AND (
+			(
+			ptd.executor_date <![CDATA[>=]]>  #{startTime}
+			AND ptd.executor_date <![CDATA[<=]]> #{endTime}
+			)
+			)
+		</if>
+		<if test="companyId != null and companyId != ''"> and ppn.original_id = #{companyId}</if>
+		<if test="taskType != null and taskType != ''"> and ppn.check_type_id = #{taskType}</if>
+		<if test="planTaskId != null and planTaskId > 0 "> and ptd.task_no = #{planTaskId}</if>
 	</select>
 
 	<select id="getCurrentPlanTaskCount" resultType="int" parameterType="long">

amos-boot-system-supervision/src/main/resources/db/mapper/plan_task_detail.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper">
 	<update id="finishTaskDetail">
-		call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId},#{executorName})
+		call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId},#{executorName},#{size})
 	</update>
 	
 	<select id="findPlanTaskByTaskIdAndPointId" resultType="Map">

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1150,6 +1150,7 @@
 			pii.data_json dataJson,
 			pii.remark remark,
 			pii.picture_json picJson,
+			prpi.id routePointItemId,
 			CASE pii.`input_type`
 			WHEN 0 THEN
 				'手动录入'
@@ -1159,8 +1160,20 @@
 		FROM
 			p_point_inputitem ppi
 			LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
+			LEFT JOIN p_route_point pp ON pp.route_id = #{routeId}  AND  pp.point_id = ppi.point_id
+			LEFT JOIN p_route_point_item prpi ON prpi.route_point_id =  pp.id AND prpi.point_input_item_id = ppi.id
+			LEFT JOIN p_check_input pci ON pci.route_point_item_id = prpi.id
 		WHERE
-			ppi.point_id = #{pointId} AND pii.is_delete = 0
+			ppi.point_id = #{pointId} AND pii.is_delete = 0 AND pci.route_point_item_id is NULL
 			ORDER BY pii.order_no
 	</select>
+
+	<select id="getPlanExecuteTeams" resultType="map">
+		SELECT
+		    original_id id,
+        	`name`
+        FROM
+        	p_point
+	</select>
+
 </mapper>
\ No newline at end of file