1.联调修改，防火监督

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author DELL
@@ -61,8 +62,8 @@ public interface DangerFeignClient {
      * @param dangerState 隐患状态
      * @return FeignClientResult
      */
-    @GetMapping(value = "/list-all")
-    FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
+    @GetMapping(value = "/list/all")
+    FeignClientResult<List<DangerDto>> listAll(@RequestBody Map param);
 
     /**
      * 隐患等级

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

@@ -26,10 +26,7 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -64,7 +61,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<Long> dangerIds = Lists.transform(hiddenDangers, HiddenDangerDto::getLatentDangerId);
         String dangerIdsStr = Joiner.on(",").join(dangerIds);
         //2.调用隐患模块查询关联隐患的具体数据（业务系统直落关系，具体隐患数据再隐患服务进行储存）
-        FeignClientResult<List<DangerDto>> daResult = feignClient.listAll(dangerIdsStr, level, status);
+        Map<String,Object> param = new HashMap<>();
+        param.put("ids",dangerIdsStr);
+        param.put("level",level);
+        param.put("status",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()));
         //3.将查询会来的数据与业务数据拼接，进行返回