feat(tcm): 监管删除启停用企业

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESPlanTaskList.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/ESPlanTaskList.java

-package com.yeejoin.amos.patrol.business.dao.repository;
+package com.yeejoin.amos.boot.module.common.api.dao;
 
 
-import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESTaskDetail.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/ESTaskDetail.java

-package com.yeejoin.amos.patrol.business.dao.repository;
+package com.yeejoin.amos.boot.module.common.api.dao;
 
 
-import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.stereotype.Repository;
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESPlanTaskListDto.java

-package com.yeejoin.amos.patrol.dao.entity;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -73,7 +73,6 @@ public class ESPlanTaskListDto {
     private String userDept;
 
 
-
     @Field(type = FieldType.Text)
     private String unplan;
 
@@ -91,7 +90,7 @@ public class ESPlanTaskListDto {
     private String omission;
 
     @Field(type = FieldType.Object)
-    private List<PlanTaskDetail> points;
+    private List<PlanTaskDetailDto> points;
 
 
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESTaskDetailDto.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESTaskDetailDto.java

-package com.yeejoin.amos.patrol.dao.entity;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PlanTaskDetailDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * The persistent class for the p_plan_task_detail database table.
+ */
+@Data
+public class PlanTaskDetailDto implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    private long id;
+
+    private Date createDate;
+
+    /**
+     * 是否完成：是否完成0-未完成，1-已完成，2-超时漏检
+     */
+    private int isFinish;
+    /**
+     * 点编号
+     */
+
+    private long pointId;
+    /**
+     * 任务批次号
+     */
+
+    private long taskNo;
+
+    /**
+     * 具体执行人id
+     */
+
+    private String executorId;
+
+
+    /**
+     * 点名称
+     */
+
+    private String name;
+
+
+    /**
+     * 点编号
+     */
+
+    private String pointNo;
+
+    /**
+     * 执行时间
+     */
+
+    private Date executorDate;
+
+    /**
+     * 状态：0 未开始；1 合格；2 不合格；3 漏检
+     */
+
+    private String status;
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/PatrolMapper.java

+package com.yeejoin.amos.boot.module.tcm.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PatrolMapper extends BaseMapper {
+
+    List<ESTaskDetailDto> findAllByTaskNos(@Param("taskNos") List<String> taskNos);
+
+    void deleteAllPlanTaskDetailByTaskNos(@Param("taskNos") List<String> taskNos);
+
+    void deleteAllPlanTaskById(@Param("ids") List<String> ids);
+
+
+    List<String> selectPlanTaskIdsByUseCode(@Param("useCode") String useCode);
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
@@ -76,4 +77,11 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
      */
     @Select("SELECT count(1) from tzs_user_equip where user_seq = #{userSeq}")
     Integer queryUserBindEquNum(@Param("userSeq") String userSeq);
+
+    /**
+     *  统计指定单位下的人数
+     * @param unitCodes 单位code集合
+     * @return 人数统计信息
+     */
+    List<CountDto> countUserByUnitCodes(@Param("unitCodes") List<String> unitCodes);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/PatrolMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.PatrolMapper">
+    <delete id="deleteAllPlanTaskDetailByTaskNos">
+        delete from
+        "p_plan_task_detail" pptd
+        where
+        pptd.task_no in
+        <foreach collection="taskNos" item="no" open="(" separator="," close=")">
+            #{no}
+        </foreach>
+    </delete>
+    <delete id="deleteAllPlanTaskById">
+        delete from "p_plan_task" ppt
+        where ppt.id  = ANY(ARRAY[
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ])
+    </delete>
+
+    <select id="findAllByTaskNos" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
+        select
+        pptd.id
+        from
+        "p_plan_task_detail" pptd
+        where
+        pptd.task_no = ANY(ARRAY[
+        <foreach collection="taskNos" item="no" open="(" separator="," close=")">
+            #{no}
+        </foreach>
+        ])
+    </select>
+    <select id="selectPlanTaskIdsByUseCode" resultType="java.lang.String">
+        select
+            a.id
+        from
+            p_plan_task  a
+        where
+            a.use_code = #{useCode}
+            and (a.finish_status != '2' or a.finish_status != '3')
+    </select>
+</mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -397,4 +397,21 @@
             and (e.unit_type like '%检验机构%' or  e.unit_type  like '%检测机构%')
             and u.post like '%6616%'
     </select>
+    <select id="countUserByUnitCodes" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        SELECT
+            e.use_unit_code as keyStr,
+            count(1) as longValue
+        FROM
+            "tzs_user_info" u,
+            "tz_base_enterprise_info" e
+        where
+            u.unit_code = e.use_code
+            and u.is_delete = false
+            and e.use_code = ANY(ARRAY[
+            <foreach collection="unitCodes" item="unitCode" separator=",">
+                #{unitCode}
+            </foreach>
+            ])
+          group by e.use_code
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.EnterpriseManageServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -55,6 +56,9 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
     @Autowired
+    EnterpriseManageServiceImpl enterpriseManageService;
+
+    @Autowired
     RedisUtils redisUtils;
 
     @Value("classpath:/json/equipCategory.json")
@@ -375,4 +379,27 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     public ResponseModel<TzIndividualityDto> personalInfoUpdateById(@RequestBody Map<String, Object> map) {
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.personalInfoUpdateById(map));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除企业", notes = "批量删除企业")
+    public ResponseModel<Boolean> deleteBatch(@RequestParam String ids) {
+        return ResponseHelper.buildResponse(enterpriseManageService.delete(Arrays.asList(ids.split(","))));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/enableBatch")
+    @ApiOperation(httpMethod = "PUT", value = "企业启用", notes = "企业启用")
+    public ResponseModel<Boolean> enableBatch(@RequestParam String ids) {
+        return ResponseHelper.buildResponse(enterpriseManageService.enable(Arrays.asList(ids.split(","))));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/disableBatch")
+    @ApiOperation(httpMethod = "PUT", value = "企业停用", notes = "企业停用")
+    public ResponseModel<Boolean> disableBatch(@RequestParam String ids) {
+        return ResponseHelper.buildResponse(enterpriseManageService.disable(Arrays.asList(ids.split(","))));
+    }
+
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -43,7 +43,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
 
     private final EsUserInfoDao esUserInfoDao;
 
-    @Value("${jyjc.open.online: true}")
+    @Value("${jyjc.open.online:true}")
     private Boolean onlineJyjc;
 
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/pom.xml

@@ -21,17 +21,6 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.tomcat</groupId>
-					<artifactId>tomcat-jdbc</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>

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

 package com.yeejoin.amos.patrol.business.controller;
 
 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.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.ESPlanTaskList;
 import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
 import com.yeejoin.amos.patrol.business.dto.CheckDto;
 import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskAlarmInfoVo;
@@ -18,7 +18,6 @@ import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskDetailVo;
 import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskEquipInfoVo;
 import com.yeejoin.amos.patrol.business.dto.TopicEntityVo;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckInputParam;
 import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
 import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.patrol.business.service.intfc.ICheckService;
@@ -42,7 +41,6 @@ import com.yeejoin.amos.patrol.common.enums.PlanTaskTypeStatusEnum;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
-import com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
@@ -56,7 +54,6 @@ import com.yeejoin.amos.patrol.utils.UserTransmittableUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -93,12 +90,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping(value = "/api/check")

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
 import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import org.apache.ibatis.annotations.Param;
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.patrol.business.dto.PlanTaskStaticDto;
 import com.yeejoin.amos.patrol.business.dto.StaticTableUpdateDto;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckChkExListBo;

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.data;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;

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

 package com.yeejoin.amos.patrol.business.dto;
 
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.dao.entity.PlanTask;
 import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import lombok.Data;

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

 
 package com.yeejoin.amos.patrol.business.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -9,6 +10,12 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
+import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -710,7 +717,7 @@ public class CheckServiceImpl implements ICheckService {
                         List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
                         int unqualified = Integer.parseInt(esPlanTaskListDto.getUnqualified()) + 1;
                         esPlanTaskListDto.setUnqualified( unqualified + "");
-                        esPlanTaskListDto.setPoints(maps);
+                        esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(maps));
                         esPlanTaskList.save(esPlanTaskListDto);
                     });
                 } else {
@@ -718,7 +725,7 @@ public class CheckServiceImpl implements ICheckService {
                     op.ifPresent(esPlanTaskListDto->{
                         String ids = String.format("(%d)",planTaskId);
                         List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
-                        esPlanTaskListDto.setPoints(maps);
+                        esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(maps));
                         esPlanTaskList.save(esPlanTaskListDto);
                     });
                 }
@@ -731,6 +738,10 @@ public class CheckServiceImpl implements ICheckService {
         }
     }
 
+    private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
+        return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
+    }
+
     private CheckInput setInputValueByItemType(CheckInput checkInput, String dataJson, String itemType, CheckInputParam item, String isScore) {
 
         if (XJConstant.INPUT_ITEM_SELECT.equals(itemType)) {

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
 import com.yeejoin.amos.patrol.business.bo.PlanTaskSyncBo;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;

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

@@ -9,6 +9,12 @@ import com.google.common.base.Joiner;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
+import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -599,8 +605,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
      */
     private void handleEsPlanTaskListPointsByIds(List<String> taskDetailIds, List<String> taskIds) {
         taskIds.forEach(taskId -> esPlanTaskList.findById(taskId).ifPresent(esPlanTaskListDto -> {
-            List<PlanTaskDetail> points = esPlanTaskListDto.getPoints();
-            List<PlanTaskDetail> filterPoints = points.stream().filter(point -> !taskDetailIds.contains(Objects.toString(point.getId()))).collect(Collectors.toList());
+            List<PlanTaskDetailDto> points = esPlanTaskListDto.getPoints();
+            List<PlanTaskDetailDto> filterPoints = points.stream().filter(point -> !taskDetailIds.contains(Objects.toString(point.getId()))).collect(Collectors.toList());
             esPlanTaskList.deleteById(taskId);
             if (!filterPoints.isEmpty()) {
                 esPlanTaskListDto.setPoints(filterPoints);
@@ -1247,7 +1253,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         Map<String, List<PlanTaskStaticDto>> collect3 = planTaskStaticListMap.stream().collect(Collectors.groupingBy(PlanTaskStaticDto::getPlanTaskId));
         Map<Long, List<PlanTaskDetail>> collect = planTaskDetailList.stream().collect(Collectors.groupingBy(PlanTaskDetail::getTaskNo));
         for (ESPlanTaskListDto esPlanTaskListDto : esPlanTaskListDtos) {
-            esPlanTaskListDto.setPoints(collect.get(Long.valueOf(esPlanTaskListDto.getPlanTaskId())));
+            esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(collect.get(Long.valueOf(esPlanTaskListDto.getPlanTaskId()))));
             if (!ValidationUtil.isEmpty(planTaskIds)) {
                 esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getFinshNum()) ? "0" : collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getFinshNum());
                 esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getOmission()) ? "0" : collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getOmission());
@@ -1271,6 +1277,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         log.info("任务存入es，耗时：{} 秒", stopWatch7.getTotalTimeSeconds());
     }
 
+    private PlanTaskDetailDto castPlanTaskEntry2Dto(PlanTaskDetail planTaskDetail) {
+        return BeanUtil.copyProperties(planTaskDetail, PlanTaskDetailDto.class);
+    }
 
     public static CheckInput paraseSelect(CheckInput checkInput, String json) {
         JSONArray jsonArray = JSONArray.parseArray(json);
@@ -1696,8 +1705,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             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("('" + esPlanTaskListDto.getPlanTaskId() + "')");
-            esPlanTaskListDto.setPoints(planTaskDetailList);
-
+            esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(planTaskDetailList));
             esPlanTaskList.save(esPlanTaskListDto);
         }
     }
@@ -1999,7 +2007,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             esPlanTaskListDto.setUnqualified(this.filterByStatus("2", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
             esPlanTaskListDto.setUnplan(this.filterByStatus("0", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
             esPlanTaskListDto.setTaskPlanNum(this.filterByStatus("1", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
-            esPlanTaskListDto.setPoints(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails));
+            esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails)));
         });
         return esPlanTaskListDtos;
     }
@@ -2009,10 +2017,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             esPlanTaskListDto.setFinishStatus(String.valueOf(PlanTaskFinishStatusEnum.FINISHED.getValue()));
             esPlanTaskListDto.setFinshNum(esPlanTaskListDto.getPoints().size() + "");
             esPlanTaskListDto.setUnplan("0");
-            esPlanTaskListDto.setPoints(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails));
+            esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails)));
         });
     }
 
+    private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
+        return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
+    }
+
     private List<PlanTaskDetail> buildPlanTaskPoint(String planTaskId, List<PlanTaskDetail> planTaskDetails) {
         return planTaskDetails.stream().filter(t -> Long.parseLong(planTaskId) == t.getTaskNo()).collect(Collectors.toList());
     }

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -30,7 +31,6 @@ import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.core.util.StringUtil;
 import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.patrol.dao.entity.*;
-import com.yeejoin.amos.patrol.exception.YeeException;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.safety.common.cache.PointStatusCache;
 import lombok.extern.slf4j.Slf4j;

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

@@ -14,8 +14,8 @@ import com.yeejoin.amos.patrol.core.common.response.CommonPage;
 import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.patrol.core.common.response.QueryCriteriaRespone;
 import com.yeejoin.amos.patrol.dao.entity.CheckShot;
-import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
-import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
 import com.yeejoin.amos.patrol.dao.entity.PlanTask;
 import com.yeejoin.amos.patrol.exception.YeeException;
 import org.springframework.data.domain.Page;

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

 package com.yeejoin.amos.patrol.business.service.intfc;
 
 
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
 import com.yeejoin.amos.patrol.dao.entity.*;
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

 package com.yeejoin.amos.patrol.quartz;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
+import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
+import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
+import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -307,13 +314,17 @@ public class JobService implements IJobService {
                     esTaskDetailDtos.add(esTaskDetailDto);
                 }
                 esTaskDetail.saveAll(esTaskDetailDtos);
-                esPlanTaskListDto.setPoints(planTaskDetailList);
+                esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(planTaskDetailList));
                 esPlanTaskListDtos.add(esPlanTaskListDto);
             }
         }
         esPlanTaskList.saveAll(esPlanTaskListDtos);
     }
 
+    private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
+        return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
+    }
+
     private void updatePlanTaskAndDetailStatus(PlanTask planTask) {
         List<String> esIds = planTaskMapper.selectPlanTaskIdLists(planTask.getPlanId(), PlanTaskFinishStatusEnum.UNDERWAY.getValue(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue());
         if (esIds.size() > 0) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -192,7 +192,10 @@
 	</update>
 
 	<select id="getGenPlanTask" resultType="java.lang.String">
-		select a.id from p_plan_task  a
+		select
+		    a.id
+		from
+		    p_plan_task  a
 		<trim prefix="where" prefixOverrides="AND |OR">
 		<if test="beginDate!=null"> and a.begin_Time >= #{beginDate}</if>
 		<if test="endDate!=null"> and a.begin_Time <![CDATA[<=]]> #{endDate}</if>
@@ -1838,7 +1841,7 @@
 		GROUP BY a.planTaskId
 	</select>
 
-	<select id="selectTaskDetailList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
+	<select id="selectTaskDetailList" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
 		SELECT
 			pptd.id,
 			pptd.task_no planTaskId,
@@ -1854,7 +1857,7 @@
 		WHERE
 			task_no IN ${ids}
 	</select>
-	<select id="selectTaskInfoList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
+	<select id="selectTaskInfoList" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
 		SELECT
 			id planTaskId,
 			date_format(ppt.begin_time,'%Y-%m-%d %H:%i:%s') beginTime,

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/plan_task_detail.xml

@@ -51,7 +51,7 @@
 		</foreach>
 	</delete>
 
-	<select id="findAllByTaskNos" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
+	<select id="findAllByTaskNos" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
 		select
 		pptd.id
 		from