Merge branch 'developer' into chenhao

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

@@ -73,6 +73,8 @@ import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
 @RequestMapping(value = "/api/check")
@@ -603,4 +605,46 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "源ids,逗号分隔", required = true) @PathVariable String... relationId) {
         return CommonResponseUtil.success(checkService.obtainLastCheckRecord(relationId));
     }
+
+    /**
+     * 查询计划执行结果信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @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 = "pointId", required = false) Long pointId,
+            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String executeState,
+            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String status,
+            @ApiParam(value = "点id") @RequestParam(value = "pointId", 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("pointId", pointId);
+        map.put("executeState", executeState);
+        map.put("status", status);
+        map.put("teamId", teamId);
+        CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
+        return ResponseHelper.buildResponse(checkService.getPlanExecuteInfo(map, pageable));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划执行状态", notes = "查询计划执行状态")
+    @GetMapping(value = "/search/states", produces = "application/json;charset=UTF-8")
+    public ResponseModel getPlanExecuteState() {
+        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());
+    }
+
 }

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

@@ -40,6 +40,8 @@ import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
 @RequestMapping(value = "/api/route")
@@ -419,4 +421,19 @@ public class RouteController extends AbstractBaseController {
         LinkedHashMap<String, Object> routePointIdMap = routeService.getPointIdByRouteId(routeIdList);
         return CommonResponseUtil.success(routePointIdMap);
     }
+
+    /**
+     * 根据路线查询点
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "根据路线查询点信息", notes = "根据路线查询点信息")
+    @GetMapping(value = "/point/{id}", produces = "application/json;charset=UTF-8")
+    public ResponseModel queryPointByRouteId(
+            @ApiParam(value = "巡检路线id", required = true) @PathVariable(name = "id") long id) {
+            return ResponseHelper.buildResponse(routeService.queryPointByRouteId(id));
+    }
+
 }

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

@@ -277,4 +277,10 @@ public interface CheckMapper extends BaseMapper {
 
     //Map<String, String> queryUserInfoByIds(@Param(value = "userIds") String userIds);
 
+	long getItemCount(HashMap<String, Object> params);
+
+	List<HashMap<String, Object>> getCheckItems(HashMap<String, Object> params);
+
+	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/dao/mapper/RouteMapper.java

@@ -100,4 +100,6 @@ public interface RouteMapper extends BaseMapper {
 	List<HashMap<String, Object>> queryRoutePointItemByCondition(RoutePointInputItemRequest request);
 	
 	List<Route> queryRoutesByOrgCode(@Param(value = "ownerId") String ownerId, @Param("orgCode") String orgCode);
+
+	List<Map<String, Object>> queryPointByRouteId(@Param("id") Long id);
 }

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

@@ -23,6 +23,8 @@ import com.yeejoin.amos.supervision.business.service.intfc.IEquipmentHandlerServ
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
+import com.yeejoin.amos.supervision.common.enums.*;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -78,10 +80,6 @@ import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
 import com.yeejoin.amos.supervision.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.supervision.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.supervision.business.util.Toke;
-import com.yeejoin.amos.supervision.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.supervision.common.enums.PointLevelEnum;
-import com.yeejoin.amos.supervision.common.enums.PointStatusEnum;
-import com.yeejoin.amos.supervision.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.supervision.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.supervision.core.common.response.CalendarStatusCountRespone;
@@ -1152,6 +1150,36 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
+    public Page<HashMap<String, Object>> getPlanExecuteInfo(HashMap<String, Object> map, CommonPageable page) {
+        List<HashMap<String, Object>> content = org.assertj.core.util.Lists.newArrayList();
+        long total = checkMapper.getItemCount(map);
+        if (total == 0) {
+            return new PageImpl<>(content, page, total);
+        }
+        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()));
+                c.put("finishStatus", finishStatusDesc);
+            }
+        });
+        return new PageImpl<>(content, page, total);
+    }
+
+    @Override
+    public List<Map<String, String>> getPlanExecuteStates() {
+        return PlanTaskFinishStatusEnum.getEnumList();
+    }
+
+    @Override
+    public List<Map<String, Object>> getPlanExecuteTeams() {
+        List<Map<String, Object>> list = checkMapper.getPlanExecuteTeams();
+        return list;
+    }
+
+    @Override
     public List<HashMap<String, Object>> getEquipInputByCheckId(CheckDetailInputPageParam param) {
         // 如果不传巡检ID，则获取最新一条巡检点对应的巡检记录ID
         if (param.getCheckID() == -1) {

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

@@ -422,4 +422,9 @@ public class RouteServiceImpl implements IRouteService {
         // TODO Auto-generated method stub
         return routeMapper.queryRoutesByOrgCode(ownerId, orgCode);
     }
+
+    @Override
+    public List<Map<String, Object>> queryPointByRouteId(Long id) {
+        return routeMapper.queryPointByRouteId(id);
+    }
 }

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.exception.YeeException;
 import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
@@ -271,4 +272,10 @@ public interface ICheckService {
      * @return CheckRecordDto
      */
     Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
+
+    Page<HashMap<String, Object>> getPlanExecuteInfo(HashMap<String, Object> map, CommonPageable page);
+
+    List<Map<String, String>> 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/IRouteService.java

@@ -204,4 +204,6 @@ public interface IRouteService {
      */
     boolean existRouteName(String orgCode, String name);
 
+    List<Map<String, Object>> queryPointByRouteId(Long id);
+
 }

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -168,4 +168,52 @@
             alter table `p_plan_task_detail` modify column `is_finish` int(11) COMMENT '0-未开始，1-执行中，2-已完成，3-超时漏检(有一个检查项漏检则为漏检)' after `create_date`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629886127-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_check ADD COLUMN company_id</comment>
+        <sql>
+            ALTER TABLE `p_check` ADD COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '责任单位id' AFTER `dep_name`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check ADD COLUMN company_name</comment>
+        <sql>
+            ALTER TABLE `p_check` ADD COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '责任单位名称' AFTER `company_id`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check_input" columnName="safety_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_check_input ADD COLUMN safety_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_check_input` ADD COLUMN `safety_danger_num` int(11) DEFAULT NULL COMMENT '安全隐患个数' AFTER `danger_handle_state`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check_input" columnName="major_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_check_input ADD COLUMN major_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_check_input` ADD COLUMN `major_danger_num` int(11) DEFAULT NULL COMMENT '重大隐患个数' AFTER `safety_danger_num`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1894,4 +1894,66 @@
         d.date
     </select>
 
+    <select id="getItemCount" resultType="Map">
+        SELECT
+            count(1)
+        FROM
+        p_check pc, p_check_input pci, p_plan_task_detail pptd
+        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>-->
+        <if test="teamId != null and teamId != ''">
+            AND pc.company_id = #{teamId}
+        </if>
+    </select>
+
+    <select id="getCheckItems" resultType="Map">
+        SELECT
+            pc.id checkId,
+            pci.id checkInputId,
+            pci.input_name itemName,
+            pptd.is_finish 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
+        FROM
+            p_check pc, p_check_input pci, p_plan_task_detail pptd
+        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>-->
+            <if test="teamId != null and teamId != ''">
+                AND pc.company_id = #{teamId}
+            </if>
+        LIMIT limit #{offset},#{pageSize}
+    </select>
+
+    <select id="getPlanExecuteTeams" resultType="Map">
+        SELECT
+            pc.company_id value,
+            pc.company_name name
+        FROM
+            p_check pc
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -345,4 +345,17 @@
 				and r.owner_id = #{ownerId}
 			</if>
 	</select>
+
+	<select id="queryPointByRouteId" resultType="map">
+		SELECT
+			pp.id pointId,
+			pp.name name
+		FROM
+			p_route_point prp
+			LEFT JOIN p_point pp ON pp.id = prp.point_id
+		where
+			prp.route_id = #{id}
+		ORDER BY
+			prp.order_no
+	</select>
 </mapper>
\ No newline at end of file