1.bean 名称重复

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

@@ -16,8 +16,6 @@ import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
  */
 @FeignClient(name = "${video.fegin.name:video}", path = "video", configuration = {MultipartSupportConfig.class})
 public interface VideoFeignClient {
-
-
     @RequestMapping(value = "/video-original/url/video/{indexCode}", method = RequestMethod.GET)
     ResponseModel<String> videoUrlByIndexCode(@PathVariable("indexCode") String indexCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/VideoFeignClient.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/EqVideoFeignClient.java

@@ -15,9 +15,7 @@ import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
  * @createDate: 2021/10/20
  */
 @FeignClient(name = "${video.fegin.name}", path = "video", configuration = {MultipartSupportConfig.class})
-public interface VideoFeignClient {
-
-
+public interface EqVideoFeignClient {
     @RequestMapping(value = "/video-original/url/video/{indexCode}", method = RequestMethod.GET)
     ResponseModel<String> videoUrlByIndexCode(@PathVariable("indexCode") String indexCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -91,7 +91,6 @@ import com.yeejoin.equipmanage.common.vo.EquipmentDetailVo;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
 import com.yeejoin.equipmanage.common.vo.EquipmentSpecific3dVo;
 import com.yeejoin.equipmanage.config.EquipmentIotMqttReceiveConfig;
-import com.yeejoin.equipmanage.fegin.VideoFeignClient;
 import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -49,7 +49,7 @@ import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
 import com.yeejoin.equipmanage.common.enums.IndustryEnum;
 import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.fegin.VideoFeignClient;
+import com.yeejoin.equipmanage.fegin.EqVideoFeignClient;
 import com.yeejoin.equipmanage.mapper.VideoMapper;
 import com.yeejoin.equipmanage.service.IBuilldService;
 import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
@@ -105,7 +105,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     
     
     @Autowired
-    VideoFeignClient videoFeignClient;
+    EqVideoFeignClient eqVideoFeignClient;
 
 
     @Value("${param.htvideo.url}")
@@ -534,7 +534,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     private String getVideoUrl(String code){
     	  String url = "";
     	try{
-    		ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(code);
+    		ResponseModel<String> da = eqVideoFeignClient.videoUrlByIndexCode(code);
     		if(!ObjectUtils.isEmpty(da)){
     			url = da.getResult().substring(da.getResult().indexOf("openUrl"));
     		}