fegin服务-接口修改

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/EquipFeignService.java

@@ -13,19 +13,19 @@ import java.util.Map;
 
 
 /**
- * 换流站服务feign
+ * 装备服务feign
  *
  * @author Dell
  */
-@FeignClient(name = "AMOS-AUTOSYS", path = "fireAutoSys")
+@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip")
 //@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
 public interface EquipFeignService {
 
 	/**
-	 * 获取风险点列表
+	 * 获取消防建筑树
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/api/risksource/children/list", method = RequestMethod.GET)
-	ResponseModel<Object> getRiskSourceChildrenList();
+	@RequestMapping(value = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
+	ResponseModel<Object> getBuildingTreeAndEquip();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/UseUnitController.java

@@ -79,14 +79,14 @@ public class UseUnitController extends BaseController {
     }
 
     /**
-     * 获取风险点列表
+     * 获取消防建筑树
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/riskSource/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取风险点列表", notes = "获取风险点列表")
-    public ResponseModel<Object> getRiskSourceList() {
-        ResponseModel<Object> result = equipFeignService.getRiskSourceChildrenList();
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/buildingTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取消防建筑树", notes = "获取消防建筑树")
+    public ResponseModel<Object> getBuildingTreeAndEquip() {
+        ResponseModel<Object> result = equipFeignService.getBuildingTreeAndEquip();
         return result;
     }
 

amos-boot-tzs-system/src/main/resources/application-dev.properties

@@ -8,3 +8,14 @@ spring.datasource.password=root_123
 eureka.instance.hostname=172.16.10.72
 eureka.instance.prefer-ip-address=true
 eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
+
+#redis properties:
+spring.redis.database=0
+spring.redis.host=172.16.10.85
+spring.redis.port=6379
+spring.redis.password=amos2019Redis
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300