1.隐患

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -73,4 +73,25 @@ public class DangerDto {
      * 检查项名称
      */
     private String inputItemName;
+
+    /**
+     * 检查时间
+     */
+    private String checkTime;
+
+    /**
+     * 2470	49	2052
+     * 检查人员名称
+     */
+    private String checkUserName;
+
+    /**
+     * 责任单位
+     */
+    private String pointName;
+
+    /**
+     * 状态
+     */
+    private String stateName;
 }

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

@@ -53,7 +53,7 @@ public class HiddenDangerController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询隐患详情", notes = "查询隐患详情")
     @GetMapping("/{latentDangerId}")
-    public ResponseModel getOne(@PathVariable String latentDangerId) {
+    public ResponseModel getOne(@PathVariable Long latentDangerId) {
         DangerDto dangerDto = iHiddenDangerService.getOne(latentDangerId);
         return ResponseHelper.buildResponse(dangerDto);
     }

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
+import com.yeejoin.amos.supervision.business.dto.HiddenDangerDto;
 import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
 import org.apache.ibatis.annotations.Param;
 import sun.awt.SunHints;
@@ -16,5 +17,5 @@ public interface HiddenDangerMapper extends BaseMapper {
      * @param pointId 点id
      * @return List<HiddenDanger>
      */
-    List<HiddenDanger> listByCondition(@Param(value = "planId") String planId,@Param(value = "pointId") Long pointId);
+    List<HiddenDangerDto> listByCondition(@Param(value = "planId") String planId, @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/dto/HiddenDangerDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author DELL
+ */
+@Data
+public class HiddenDangerDto {
+
+    private Long id;
+
+    /**
+     * 隐患id
+     */
+    private Long latentDangerId;
+
+    /**
+     * 检查记录id
+     */
+    private Long checkId;
+
+    /**
+     * 检查项记录id
+     */
+    private Long checkInputId;
+
+    /**
+     * 计划id
+     */
+    private Long planId;
+
+    /**
+     * 点id
+     */
+    private Long pointId;
+
+
+    /**
+     * 隐患类型（1-防火监督检查；2-自行检查）
+     */
+    private String dangerType;
+
+    /**
+     * 隐患类型名称
+     */
+    private String dangerTypeName;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新日期
+     */
+    private Date updateDate;
+
+    /**
+     * 检查时间
+     */
+    private String checkTime;
+
+    /**
+     * 2470	49	2052
+     * 检查人员名称
+     */
+    private String checkUserName;
+
+    /**
+     * 责任单位
+     */
+    private String pointName;
+
+    /**
+     * 状态
+     */
+    private String stateName;
+
+    /**
+     * 检查项名称
+     */
+    private String inputItemName;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerExportDto.java

 package com.yeejoin.amos.supervision.business.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
 public class HiddenDangerExportDto {
+
+    /**
+     * 隐患名称
+     */
+    @Excel(name = "安全隐患", orderNum = "0")
+    private String name;
+
+    /**
+     * 检查项名称
+     */
+    @Excel(name = "检查项", orderNum = "1")
+    private String inputItemName;
+
+    /**
+     * 隐患级别
+     */
+    @Excel(name = "隐患级别", orderNum = "2")
+    private String dangerLevelName;
+
+    /**
+     * 治理方式
+     */
+    @Excel(name = "治理方式", orderNum = "3")
+    private String governWayName;
+
+    /**
+     * 整改期限
+     */
+    @Excel(name = "整改期限", orderNum = "4")
+    private Date reformLimitDate;
+
+    /**
+     * 检查时间
+     */
+    @Excel(name = "检查时间", orderNum = "5")
+    private String checkTime;
+
+    /**2470	49	2052
+     * 检查人员名称
+     */
+    @Excel(name = "检查人员名称", orderNum = "6")
+    private String checkUserName;
+
+    /**
+     * 责任单位
+     */
+    @Excel(name = "责任单位", orderNum = "7")
+    private String pointName;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", orderNum = "8")
+    private String stateName;
+
+    /**
+     * 隐患来源
+     */
+    @Excel(name = "隐患来源", orderNum = "9")
+    private String dangerTypeName;
 }

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

@@ -23,7 +23,7 @@ public interface DangerFeignClient {
      * @return FeignClientResult
      */
     @GetMapping(value = "/{sequenceNbr}/detail")
-    FeignClientResult<DangerDto> getOne(@PathVariable String sequenceNbr);
+    FeignClientResult<DangerDto> getOne(@PathVariable Long sequenceNbr);
 
 
     /**
@@ -45,7 +45,7 @@ public interface DangerFeignClient {
      * @return FeignClientResult
      */
     @GetMapping(value = "/page-list")
-    FeignClientResult<IPage> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
+    FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
 
 
     /**
@@ -57,5 +57,5 @@ public interface DangerFeignClient {
      * @return FeignClientResult
      */
     @GetMapping(value = "/list-all")
-    FeignClientResult<Object> listAll(@RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
+    FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
 }

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

@@ -8,13 +8,13 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
 import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao;
+import com.yeejoin.amos.supervision.business.dto.HiddenDangerDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
 import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.IHiddenDangerService;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
 import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
-import liquibase.pro.packaged.D;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -25,6 +25,8 @@ import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -50,11 +52,33 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
 
     @Override
     public List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status) {
-        return null;
+        //1.查询指定计划和公司的关联隐患数据
+        List<HiddenDangerDto> hiddenDangers = hiddenDangerMapper.listByCondition(planId, pointId);
+        List<Long> dangerIds = Lists.transform(hiddenDangers, HiddenDangerDto::getLatentDangerId);
+        String dangerIdsStr = Joiner.on(",").join(dangerIds);
+        //2.调用隐患模块查询关联隐患的具体数据（业务系统直落关系，具体隐患数据再隐患服务进行储存）
+        FeignClientResult<List<DangerDto>> daResult = feignClient.listAll(dangerIdsStr, level, status);
+        List<DangerDto> allData = daResult.getResult();
+        Map<Long, HiddenDangerDto> keyMap = hiddenDangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
+        //3.将查询会来的数据与业务数据拼接，进行返回
+        return allData.stream().map(s -> {
+            HiddenDangerExportDto exportDto = new HiddenDangerExportDto();
+            Bean.copyExistPropertis(s, exportDto);
+            HiddenDangerDto hiddenDangerDto = keyMap.get(s.getId());
+            exportDto.setCheckTime(hiddenDangerDto != null ? hiddenDangerDto.getCheckTime() : "");
+            exportDto.setCheckUserName(hiddenDangerDto != null ? hiddenDangerDto.getCheckUserName() : "");
+            exportDto.setPointName(hiddenDangerDto != null ? hiddenDangerDto.getPointName() : "");
+            exportDto.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
+            return exportDto;
+        }).collect(Collectors.toList());
     }
 
     @Override
-    public DangerDto getOne(String latentDangerId) {
+    public DangerDto getOne(Long latentDangerId) {
+        HiddenDanger hiddenDanger = iHiddenDangerDao.findByLatentDangerId(latentDangerId);
+        if (hiddenDanger == null) {
+            throw new DataNotFound("该隐患数据不存在");
+        }
         FeignClientResult<DangerDto> feignClientResult = feignClient.getOne(latentDangerId);
         return feignClientResult.getResult();
     }
@@ -65,7 +89,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         if (hiddenDanger == null) {
             throw new DataNotFound("该隐患数据不存在");
         }
-        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(Collections.singletonList(latentDangerId));
+        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(Collections.singletonList(dangerDto));
         List<DangerDto> saveDangers = feignClientResult.getResult();
         if (!saveDangers.isEmpty()) {
             hiddenDanger.setUpdateDate(new Date());
@@ -78,11 +102,20 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
 
     @Override
     public IPage pageList(Page page, String planId, Long pointId, String level, String status) {
-        List<HiddenDanger> dangers = hiddenDangerMapper.listByCondition(planId, pointId);
-        List<Long> dangerIds = Lists.transform(dangers, HiddenDanger::getLatentDangerId);
+        List<HiddenDangerDto> dangers = hiddenDangerMapper.listByCondition(planId, pointId);
+        List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId);
         String dangerIdsStr = Joiner.on(",").join(dangerIds);
-        FeignClientResult<IPage> feignClientResult = feignClient.pageList(page, dangerIdsStr, level, status);
-        return feignClientResult.getResult();
+        FeignClientResult<IPage<DangerDto>> feignClientResult = feignClient.pageList(page, dangerIdsStr, level, status);
+        IPage<DangerDto> dangerDtoIPage = feignClientResult.getResult();
+        Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
+        dangerDtoIPage.getRecords().forEach(r -> {
+            HiddenDangerDto hiddenDangerDto = keyMap.get(r.getId());
+            r.setCheckTime(hiddenDangerDto != null ? hiddenDangerDto.getCheckTime() : "");
+            r.setCheckUserName(hiddenDangerDto != null ? hiddenDangerDto.getCheckUserName() : "");
+            r.setPointName(hiddenDangerDto != null ? hiddenDangerDto.getPointName() : "");
+            r.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
+        });
+        return dangerDtoIPage;
     }
 
     @Override
@@ -100,7 +133,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(dtoList);
         List<DangerDto> dangerDbs = feignClientResult.getResult();
         //2.保存隐患关系表
-        List<HiddenDanger> hiddenDangers = dangerDbs.stream().map(d->{
+        List<HiddenDanger> hiddenDangers = dangerDbs.stream().map(d -> {
             HiddenDanger hiddenDanger = new HiddenDanger();
             hiddenDanger.setCreateBy(RequestContext.getExeUserId());
             hiddenDanger.setPlanId(planId);

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

@@ -15,11 +15,11 @@ public interface IHiddenDangerService {
     /**
      * 重新指定的隐患数据
      *
-     * @param planId
-     * @param pointId
-     * @param level
-     * @param status
-     * @return
+     * @param planId  计划id
+     * @param pointId 点id
+     * @param level   隐患级别
+     * @param status  状态
+     * @return List<HiddenDangerExportDto>
      */
     List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status);
 
@@ -30,7 +30,7 @@ public interface IHiddenDangerService {
      * @param dangerId 隐患id
      * @return DangerDto
      */
-    DangerDto getOne(String dangerId);
+    DangerDto getOne(Long dangerId);
 
     /**
      * 隐患更新

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

@@ -3,8 +3,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper">
 
-    <select id="listByCondition" resultType="com.yeejoin.amos.supervision.dao.entity.HiddenDanger">
-        select * from p_hidden_danger phd
+    <select id="listByCondition" resultType="com.yeejoin.amos.supervision.business.dto.HiddenDangerDto">
+        SELECT
+            phd.*,
+            ci.input_name as inputItemName,
+            ci.user_name as checkUserName,
+            ci.create_date as checkTime,
+            c.point_name
+        FROM `p_hidden_danger` phd
+        left join  p_check_input ci on phd.check_input_id = ci.id
+        left join  p_check c on c.id = phd.check_id
         <where>
             <if test="planId !=null and planId != ''">and phd.plan_id=#{planId}</if>
             <if test="pointId !=null and pointId != ''">and phd.point_id=#{pointId}</if>