*）修改feign启动参数错误

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -64,7 +64,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/equipSpecific/getAirEquipSpecificDetail", method = RequestMethod.GET)
-    ResponseModel<Object> getAirEquipSpecificDetail(@RequestParam Long stockDetailId) throws InnerInvokException;
+    ResponseModel<Object> getAirEquipSpecificDetail(@RequestParam("stockDetailId") Long stockDetailId) throws InnerInvokException;
 
     /**
      * 获取车辆列表
@@ -83,13 +83,13 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/car/list-allpag", method = RequestMethod.GET)
-    ResponseModel<Object> equipmentCarList( @RequestParam Long teamId,
-                                                               @RequestParam String name,
-                                                               @RequestParam String code ,
-                                                               @RequestParam String pageNum,
-                                                               @RequestParam String pageSize,
-                                                               @RequestParam Long id,
-                                                               @RequestParam Boolean isNo );
+    ResponseModel<Object> equipmentCarList( @RequestParam("teamId") Long teamId,
+                                                               @RequestParam("name") String name,
+                                                               @RequestParam("code") String code ,
+                                                               @RequestParam("pageNum") String pageNum,
+                                                               @RequestParam("pageSize") String pageSize,
+                                                               @RequestParam("id") Long id,
+                                                               @RequestParam("isNo") Boolean isNo );
 
 
 
@@ -133,14 +133,14 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/building/getOne", method = RequestMethod.GET)
-    ResponseModel<Object> getOne(@RequestParam Long instanceId);
+    ResponseModel<Object> getOne(@RequestParam("instanceId") Long instanceId);
     /**
      * 获取指定建筑的经纬度信息
      *
      * @return
      */
     @RequestMapping(value = "/building/getBuildingToLongitudeAndLatitude", method = RequestMethod.GET)
-    ResponseModel<Object> getBuildingToLongitudeAndLatitude(@RequestParam String instanceId);
+    ResponseModel<Object> getBuildingToLongitudeAndLatitude(@RequestParam("instanceId") String instanceId);
     /**
      * 更新车辆状态
      *
@@ -156,20 +156,20 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/sourceFile/findImgByFileCategory", method = RequestMethod.GET)
-    ResponseModel<List<Map<String, Object>>> findImgByFileCategory(@RequestParam String id, @RequestParam String fileCategory);
+    ResponseModel<List<Map<String, Object>>> findImgByFileCategory(@RequestParam("id") String id, @RequestParam("fileCategory") String fileCategory);
 
     /**
      * 车辆信息
      **/
     @RequestMapping(value = "/car/getTeamCarList", method = RequestMethod.GET)
-    ResponseModel<List<Map<String, Object>>> getTeamCarList(@RequestParam Double longitude, @RequestParam Double latitude);
+    ResponseModel<List<Map<String, Object>>> getTeamCarList(@RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude);
     
     
     /**
      * 车辆信息详情
      **/
     @RequestMapping(value = "/car/getCarDetailById/{id}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> getCarDetailById(@PathVariable Long id);
+    ResponseModel<Map<String, Object>> getCarDetailById(@PathVariable("id") Long id);
 
     /**
      * 获取消防建筑树
@@ -187,13 +187,13 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam long current, @RequestParam long size, @RequestParam Long buildingId);
+    ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam("current") long current, @RequestParam("size") long size, @RequestParam("buildingId") Long buildingId);
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> getVideopag( @RequestParam String current,
-                                                          @RequestParam String size,
-                                                          @RequestParam String buildingId,
-                                                          @RequestParam String code,
-                                                          @RequestParam String equipmentName
+    ResponseModel<Page<Map<String, Object>>> getVideopag( @RequestParam("current") String current,
+                                                          @RequestParam("size") String size,
+                                                          @RequestParam("buildingId") String buildingId,
+                                                          @RequestParam("code") String code,
+                                                          @RequestParam("equipmentName") String equipmentName
     );
 
     /**
@@ -203,15 +203,15 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Double longitude,@RequestParam Double latitude,@RequestParam Double distance);
+    ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam("longitude") Double longitude,@RequestParam("latitude") Double latitude,@RequestParam("distance") Double distance);
 
 
     @RequestMapping(value = "/video/pageList", method = RequestMethod.GET)
-    ResponseModel<Page<VideoDto>> pageList(@RequestParam Integer current,
-                                           @RequestParam Integer size,
-                                           @RequestParam String code,
-                                           @RequestParam String name,
-                                           @RequestParam String typeCode);
+    ResponseModel<Page<VideoDto>> pageList(@RequestParam("current") Integer current,
+                                           @RequestParam("size") Integer size,
+                                           @RequestParam("code") String code,
+                                           @RequestParam("name") String name,
+                                           @RequestParam("typeCode") String typeCode);
 
     @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> getVideoList( @RequestParam(value = "viewId") Long viewId,
@@ -228,7 +228,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/video/getByid", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> getByid( @RequestParam Long id);
+    ResponseModel<Map<String, Object>> getByid( @RequestParam("id") Long id);
 
     /**
      *
@@ -237,19 +237,19 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/car/simple/{id}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> queryCarSimpleInfoById(@PathVariable Long id);
+    ResponseModel<Map<String, Object>> queryCarSimpleInfoById(@PathVariable("id") Long id);
 
     /**
      * 统计
      **/
     @RequestMapping(value = "/equipSpecificAlarm/getCountAlarm/{type}", method = RequestMethod.GET)
-    ResponseModel<Integer> getCountAlarm(@PathVariable String type);
+    ResponseModel<Integer> getCountAlarm(@PathVariable("type") String type);
 
     /**
      * 统计
      **/
     @RequestMapping(value = "/equipSpecificAlarm/getcountAlarmHandle/{type}", method = RequestMethod.GET)
-    ResponseModel<Integer> getcountAlarmHandle(@PathVariable String type);
+    ResponseModel<Integer> getcountAlarmHandle(@PathVariable("type") String type);
 
     /**
      * 获取装备全路径
@@ -265,7 +265,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/building/getFormInstanceById", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> getFormInstanceById(@RequestParam Long instanceId);
+    ResponseModel<Map<String, Object>> getFormInstanceById(@RequestParam("instanceId") Long instanceId);
 
     /**
      * 查询所有建筑的数据字典 // 需求 958 新增值班区域 值班区域id 字段  获取下拉列表 by kongfm 2021-09-15
@@ -279,10 +279,10 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "equipment-category/tree/{type}", method = RequestMethod.GET)
-    ResponseModel<List<LinkedHashMap<String, Object>>> getEquipmentCategory(@PathVariable String type);
+    ResponseModel<List<LinkedHashMap<String, Object>>> getEquipmentCategory(@PathVariable("type") String type);
 
     @RequestMapping(value = "/equipment/listLike/{code}", method = RequestMethod.GET)
-    ResponseModel<List<LinkedHashMap<String, Object>>> listLikePage(@PathVariable String code);
+    ResponseModel<List<LinkedHashMap<String, Object>>> listLikePage(@PathVariable("code") String code);
 
     /**
      * 未处理消防告警 by litw 2021年10月25日
@@ -318,11 +318,11 @@ public interface EquipFeignClient {
 
     
     @RequestMapping(value = "/car/{id}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> selectOneById( @PathVariable Long id);
+    ResponseModel<Map<String, Object>> selectOneById( @PathVariable("id") Long id);
 
 
     @RequestMapping(value = "/car/getCarDetailByCarNum/{carNum}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> getCarDetailByCarNum( @PathVariable String carNum);
+    ResponseModel<Map<String, Object>> getCarDetailByCarNum( @PathVariable("carNum") String carNum);
 
 
     @RequestMapping(value = "/car/all/fusion", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -23,15 +23,15 @@ public interface IotFeignClient {
      * 根据航班号查询航班信息
      **/
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/{flightNo}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> getDynamicFlightInfo(@PathVariable String flightNo);
+    ResponseModel<Map<String, Object>> getDynamicFlightInfo(@PathVariable(value = "flightNo") String flightNo);
 
 
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> findImgByFileCategory();
     
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/detail/{dynamicFlightId}", method = RequestMethod.GET)
-    ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable String dynamicFlightId);
+    ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable(value = "dynamicFlightId") String dynamicFlightId);
 
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/plane/{dynamicFlightId}", method = RequestMethod.GET)
-    ResponseModel<Object> DynamicFlightInfo(@PathVariable String dynamicFlightId);
+    ResponseModel<Object> DynamicFlightInfo(@PathVariable(value = "dynamicFlightId") String dynamicFlightId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/VideoFeignClient.java

@@ -17,5 +17,5 @@ public interface VideoFeignClient {
 
 
     @RequestMapping(value = "/video-original/url/video/{indexCode}", method = RequestMethod.GET)
-    ResponseModel<String> videoUrlByIndexCode(@PathVariable String indexCode);
+    ResponseModel<String> videoUrlByIndexCode(@PathVariable("indexCode") String indexCode);
 }