1.查询到期维保设施

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeign.java

@@ -8,40 +8,44 @@ import java.util.List;
 import java.util.Map;
 
 //装备
-@FeignClient(name ="${equip.fegin.name}")
+@FeignClient(name = "${equip.fegin.name}")
 public interface EquipFeign {
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/equipSpecific/getSourceNameByEquipSpeId", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> getEquipDetail(@RequestParam(value = "id", required = true) Long id);
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/equipSpecific/getSourceNameByEquipSpeId", method = RequestMethod.GET, consumes = "application/json")
+    LinkedHashMap<String, Object> getEquipDetail(@RequestParam(value = "id", required = true) Long id);
 
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/equipSpecific/getSourceNameList", method = RequestMethod.POST ,consumes="application/json")
-    LinkedHashMap<String,Object> getEquipList(@RequestBody Long id);
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/equipSpecific/getSourceNameList", method = RequestMethod.POST, consumes = "application/json")
+    LinkedHashMap<String, Object> getEquipList(@RequestBody Long id);
 
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/listAll", method = RequestMethod.GET ,consumes="application/json")
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/warehouse-structure/listAll", method = RequestMethod.GET, consumes = "application/json")
     String getStructureNameAll();
 
     /**
      * 消防建筑树
+     *
      * @return
      */
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/building/tree", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> getBuildingTree();
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/building/tree", method = RequestMethod.GET, consumes = "application/json")
+    LinkedHashMap<String, Object> getBuildingTree();
+
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/building/getBuildingAbsolutePosition", method = RequestMethod.GET, consumes = "application/json")
+    LinkedHashMap<String, Object> getBuildingAbsolutePosition();
 
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/building/getBuildingAbsolutePosition", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> getBuildingAbsolutePosition();
     /**
-     *  所属局域树
+     * 所属局域树
+     *
      * @return
      */
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/area/tree", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> getRegionTress();
+    @RequestMapping(value = "${equip.fegin.prefix}" + "/area/tree", method = RequestMethod.GET, consumes = "application/json")
+    LinkedHashMap<String, Object> getRegionTress();
 
     /**
      * 查询维保到期设备
+     *
      * @param type
-     * @param companyId
+     * @param id
      * @return
      */
-    @GetMapping(value = "${equip.fegin.prefix}+/facility")
-    List<Map<String,Object>> overTimeMaintenanceFacility(@RequestParam String type,String companyId);
+    @GetMapping(value = "${equip.fegin.prefix}+/maintenanceResourceData/getFireFacilityList")
+    List<Map<String, Object>> overTimeMaintenanceFacility(@RequestParam String type, @RequestParam String id);
 }