Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-api/src/main/java/com/usky/fire/RemoteFireService.java

@@ -11,9 +11,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-@FeignClient(contextId = "remoteFireService", value = "usky-fire" , fallbackFactory = RemoteFireFallbackFactory.class)
+@FeignClient(contextId = "remoteFireService", value = "service-fire" , fallbackFactory = RemoteFireFallbackFactory.class)
 public interface RemoteFireService {
 
-    @GetMapping(value = "/addPatrolInspectionAbnormalData")
-    public void addPatrolInspectionAbnormalData();
+    @GetMapping("/addPatrolInspectionAbnormalData")
+    void addPatrolInspectionAbnormalData();
 }

service-fire/service-fire-api/src/main/java/com/usky/fire/factory/RemoteFireFallbackFactory.java

@@ -1,7 +1,9 @@
 package com.usky.fire.factory;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.exception.FeignBadRequestException;
 import com.usky.fire.RemoteFireService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +29,7 @@ public class RemoteFireFallbackFactory implements FallbackFactory<RemoteFireServ
         {
             @Override
             public void addPatrolInspectionAbnormalData() {
-
+                throw new FeignBadRequestException(500,"获取巡检漏检数据异常"+throwable.getMessage());
             }
         };
     }

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/api/patrolInspectionDataApi.java

@@ -24,6 +24,7 @@ public class patrolInspectionDataApi implements RemoteFireService {
     @Autowired
     private PatrolInspectionPlanSonService patrolInspectionPlanSonService;
 
+    @Override
     public void addPatrolInspectionAbnormalData(){
         patrolInspectionPlanSonService.addPatrolInspectionAbnormalData();
     }