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

@@ -137,4 +137,9 @@ public class DangerDto implements Serializable {
      * 治理方式名称
      */
     private String reformTypeName;
+
+    /**
+     * 隐患类型
+     */
+    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

@@ -17,7 +17,7 @@ import java.util.Map;
 /**
  * @author DELL
  */
-@FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger", configuration = FeignConfiguration.class)
+@FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger", configuration = {FeignConfiguration.class,FeignClientErrorDecoder.class})
 public interface DangerFeignClient {
 
     /**
@@ -41,23 +41,16 @@ public interface DangerFeignClient {
 
     /**
      * 隐患分页查询
-     *
-     * @param page        分页信息
-     * @param ids         隐患ids
-     * @param dangerLevel 隐患级别
-     * @param dangerState 隐患状态
+     * @param param 过滤条件
      * @return FeignClientResult
      */
     @GetMapping(value = "/page/list")
-    FeignClientResult<Page<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
+    FeignClientResult<Page<DangerDto>> pageList(@RequestBody Map param);
 
 
     /**
      * 查询所有的隐患
-     *
-     * @param ids         隐患ids
-     * @param dangerLevel 隐患级别
-     * @param dangerState 隐患状态
+     * @param param 过滤条件
      * @return FeignClientResult
      */
     @GetMapping(value = "/list/all")

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

+package com.yeejoin.amos.supervision.business.feign;
+
+
+import feign.Response;
+import feign.Util;
+import feign.codec.ErrorDecoder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+
+@Slf4j
+public class FeignClientErrorDecoder implements ErrorDecoder {
+
+    @Override
+    public Exception decode(String methodKey, Response response) {
+        log.info("feign client response:", response);
+        String body = null;
+        try {
+            body = Util.toString(response.body().asReader());
+        } catch (IOException e) {
+            log.error("feign.IOException", e);
+        }
+        if (response.status() >= 400 && response.status() <= 500) {
+            return null;
+        }
+        return null;
+    }
+}

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

@@ -63,9 +63,9 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         String dangerIdsStr = Joiner.on(",").join(dangerIds);
         //2.调用隐患模块查询关联隐患的具体数据（业务系统直落关系，具体隐患数据再隐患服务进行储存）
         Map<String, Object> param = new HashMap<>();
-        param.put("ids", dangerIdsStr);
-        param.put("level", level);
-        param.put("status", status);
+        param.put("dangerIds", dangerIdsStr);
+        param.put("dangerLevel", level);
+        param.put("dangerState", status);
         FeignClientResult<List<DangerDto>> daResult = feignClient.listAll(param);
         List<DangerDto> allData = daResult.getResult();
         Map<Long, HiddenDangerDto> keyMap = hiddenDangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
@@ -115,7 +115,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<HiddenDangerDto> dangers = hiddenDangerMapper.listByCondition(planId, pointId);
         List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId);
         String dangerIdsStr = Joiner.on(",").join(dangerIds);
-        FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(page, dangerIdsStr, level, status);
+        Map<String, Object> param = buildRequestBody(page, level, status, dangerIdsStr);
+        FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(param);
         Page<DangerDto> dangerDtoIPage = feignClientResult.getResult();
         Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
         dangerDtoIPage.getRecords().forEach(r -> {
@@ -124,10 +125,21 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             r.setCheckUserName(hiddenDangerDto != null ? hiddenDangerDto.getCheckUserName() : "");
             r.setPointName(hiddenDangerDto != null ? hiddenDangerDto.getPointName() : "");
             r.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
+            r.setDangerTypeName(hiddenDangerDto != null ? hiddenDangerDto.getDangerTypeName() : "");
         });
         return dangerDtoIPage;
     }
 
+    private Map<String, Object> buildRequestBody(Page page, String level, String status, String dangerIdsStr) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("dangerIds", dangerIdsStr);
+        param.put("dangerLevel", level);
+        param.put("dangerState", status);
+        param.put("current", page.getCurrent());
+        param.put("size", page.getSize());
+        return param;
+    }
+
     @Override
     public void importDanger(Long planId, List<HiddenDangerImportDto> list) {
         //1.调用创建隐患
@@ -160,7 +172,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             hiddenDanger.setCreateDate(new Date());
             return hiddenDanger;
         }).collect(Collectors.toList());
-        for (int i = 0; i <= hiddenDangers.size(); i++) {
+        for (int i = 0; i < hiddenDangers.size(); i++) {
             String[] pointArray = list.get(i).getPointName().split("@");
             hiddenDangers.get(i).setPointId(pointArray.length > 1 ? Long.parseLong(pointArray[1]) : null);
         }