Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -13,27 +13,27 @@ import java.util.List;
 /**
  * @author DELL
  */
-@FeignClient(value = "API-DANGER-API", path = "danger")
+@FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger",configuration = FeignConfiguration.class)
 public interface DangerFeignClient {
 
     /**
      * 隐患详情
      *
-     * @param sequenceNbr 隐患主键
+     * @param id 隐患主键
      * @return FeignClientResult
      */
-    @GetMapping(value = "/{sequenceNbr}/detail")
-    FeignClientResult<DangerDto> getOne(@PathVariable Long sequenceNbr);
+    @GetMapping(value = "/detail")
+    FeignClientResult<DangerDto> getOne(@RequestParam Long id);
 
 
     /**
      * 隐患的创建或者更新
      *
-     * @param danger 隐患对象数组
+     * @param latentDangerDtoList 隐患对象数组
      * @return FeignClientResult
      */
-    @PostMapping(value = "/saveOrUpdateBatch")
-    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> danger);
+    @PostMapping(value = "/patrol/save")
+    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> latentDangerDtoList);
 
     /**
      * 隐患分页查询
@@ -44,7 +44,7 @@ public interface DangerFeignClient {
      * @param dangerState 隐患状态
      * @return FeignClientResult
      */
-    @GetMapping(value = "/page-list")
+    @GetMapping(value = "/page/list")
     FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);