解决冲突

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

-//package com.yeejoin.amos.boot.module.tzs.api.service;
-//
-//import org.springframework.cloud.openfeign.FeignClient;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.typroject.tyboot.core.restful.utils.ResponseModel;
-//
-//
-///**
-// * 装备服务feign
-// *
-// * @author Dell
-// */
-//@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 = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
-//	ResponseModel<Object> getBuildingTreeAndEquip();
-//}
+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+
+/**
+ * 装备服务feign
+ *
+ * @author Dell
+ */
+@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 = "/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

@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
-import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
@@ -195,7 +193,6 @@ public class UseUnitController extends BaseController {
         return ResponseHelper.buildResponse(page);
     }
 
-
     /**
      * 根据警情id 查找设备使用单位信息
      * @param alertId
@@ -214,6 +211,5 @@ public class UseUnitController extends BaseController {
         UseUnitVo useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitVo.class);
         return ResponseHelper.buildResponse(useUnitVo);
     }
-
 }