修改重点工程

src/main/java/com/sooka/sponest/dataexchange/remoteapi/fallback/center/data/RemoteDataBaseServiceFallbackFactory.java

@@ -0,0 +1,31 @@
+package com.sooka.sponest.dataexchange.remoteapi.fallback.center.data;
+
+
+import com.ruoyi.common.core.domain.R;
+import com.sooka.sponest.dataexchange.exchange.domian.DataExchangeEntity;
+import com.sooka.sponest.dataexchange.remoteapi.service.center.data.RemoteDataBaseService;
+import com.sooka.sponest.dataexchange.remoteapi.service.center.event.RemoteEventBaseService;
+import com.sooka.sponest.dataexchange.sendChange.domian.CenterdataTKeyProjects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class RemoteDataBaseServiceFallbackFactory implements FallbackFactory<RemoteDataBaseService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteDataBaseServiceFallbackFactory.class);
+
+    @Override
+    public RemoteDataBaseService create(Throwable cause) {
+        log.error("数据中心-服务调用失败:{}", cause.getMessage());
+
+        return new RemoteDataBaseService() {
+
+            @Override
+            public R<?> projects(CenterdataTKeyProjects centerdataTKeyProjects) {
+                return null;
+            }
+        };
+    }
+}

src/main/java/com/sooka/sponest/dataexchange/remoteapi/fallback/center/event/RemoteEventBaseServiceFallbackFactory.java

@@ -40,10 +40,6 @@ public class RemoteEventBaseServiceFallbackFactory implements FallbackFactory<Re
                 return null;
             }
 
-            @Override
-            public R<?> projects(CenterdataTKeyProjects centerdataTKeyProjects) {
-                return null;
-            }
         };
     }
 }

src/main/java/com/sooka/sponest/dataexchange/remoteapi/service/center/data/RemoteDataBaseService.java

@@ -0,0 +1,29 @@
+package com.sooka.sponest.dataexchange.remoteapi.service.center.data;
+
+
+import com.ruoyi.common.core.domain.R;
+import com.sooka.sponest.dataexchange.exchange.domian.DataExchangeEntity;
+import com.sooka.sponest.dataexchange.remoteapi.fallback.center.data.RemoteDataBaseServiceFallbackFactory;
+import com.sooka.sponest.dataexchange.remoteapi.fallback.center.event.RemoteEventBaseServiceFallbackFactory;
+import com.sooka.sponest.dataexchange.remoteapi.service.ModulesServiceNameContants;
+import com.sooka.sponest.dataexchange.sendChange.domian.CenterdataTKeyProjects;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+
+@FeignClient(
+        contextId = "RemoteDataBaseService",
+        value = ModulesServiceNameContants.CENTER_DATA,
+        fallbackFactory = RemoteDataBaseServiceFallbackFactory.class
+)
+public interface RemoteDataBaseService {
+
+    /**
+     * 重点工程
+     * @param centerdataTKeyProjects
+     * @return
+     */
+    @PostMapping("/projects")
+    public R<?> projects(CenterdataTKeyProjects centerdataTKeyProjects);
+
+}

src/main/java/com/sooka/sponest/dataexchange/remoteapi/service/center/event/RemoteEventBaseService.java

@@ -31,12 +31,4 @@ public interface RemoteEventBaseService {
     @PostMapping("/getDataSubscribeTo")
     public R<?> getDataSubscribeTo();
 
-    /**
-     * 重点工程
-     * @param centerdataTKeyProjects
-     * @return
-     */
-    @PostMapping("/projects")
-    public R<?> projects(CenterdataTKeyProjects centerdataTKeyProjects);
-
 }

src/main/java/com/sooka/sponest/dataexchange/sendChange/controller/EngineeringController.java

@@ -9,6 +9,7 @@ import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysFile;
 import com.sooka.sponest.dataexchange.exchange.domian.DataExchangeEntity;
+import com.sooka.sponest.dataexchange.remoteapi.service.center.data.RemoteDataBaseService;
 import com.sooka.sponest.dataexchange.remoteapi.service.center.event.RemoteEventBaseService;
 import com.sooka.sponest.dataexchange.sendChange.domian.CenterdataTKeyProjects;
 import com.sooka.sponest.dataexchange.sendChange.domian.CenterdataTKeyProjectsPictures;
@@ -34,7 +35,7 @@ import java.util.List;
 public class EngineeringController {
 
     @Resource
-    private RemoteEventBaseService remoteEventBaseService;
+    private RemoteDataBaseService remoteDataBaseService;
     @Resource
     private RemoteConfigService remoteConfigService;
     //    @Value("${}")
@@ -49,9 +50,10 @@ public class EngineeringController {
     @PostMapping("/pushEngineeringData")
     @ResponseBody
     public R<?> pushEngineeringData(@RequestBody CenterdataTKeyProjects centerdataTKeyProjects) {
-        log.info("dataExchangeEntity:{}",centerdataTKeyProjects);
+        log.info("centerdataTKeyProjects:{}",centerdataTKeyProjects);
         if (StringUtils.isNotEmpty(SecurityUtils.getToken())) {
-            R<?> result = remoteEventBaseService.projects(centerdataTKeyProjects);
+            log.info("SecurityUtils.getToken()",SecurityUtils.getToken());
+            R<?> result = remoteDataBaseService.projects(centerdataTKeyProjects);
             if (result.getCode() == 200) {
                 return R.ok("推送成功");
             } else {
@@ -89,53 +91,53 @@ public class EngineeringController {
      * @param
      * @return
      */
-    @PostMapping("/pushAreaData")
-    @ResponseBody
-    public R<?> pushAreaData(@RequestBody DataExchangeEntity dataExchangeEntity) {
-        log.info("dataExchangeEntity:{}",dataExchangeEntity);
-        List<String> pictureList = new ArrayList<>();
-        if (StringUtils.isNotEmpty(SecurityUtils.getToken()) && !CollectionUtils.isEmpty(dataExchangeEntity.getEventPicture())) {
-            for (String picture : dataExchangeEntity.getEventPicture()) {
-                if (!"image".equals(FilePrefixUtils.getUrlSuffix(picture))) {
-                    log.error("事件图片必须为图片格式---{}", dataExchangeEntity);
-                    return R.fail("事件图片必须为图片格式");
-                } else {
-                    MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(picture, System.currentTimeMillis() + ".jpg");
-                    SysFile sysFile = SpringUtils.getBean(RemoteFileService.class).upload(multipartFile).getData();
-                    pictureList.add(sysFile.getUrl());
-                }
-            }
-            dataExchangeEntity.setPictureUrlList(pictureList);
-            R<?> result = remoteEventBaseService.insert3rdSystemEvent(dataExchangeEntity);
-            if (result.getCode() == 200) {
-                return R.ok("推送成功");
-            } else {
-                return R.fail(result.getMsg());
-            }
-        } else {
-            return R.fail("推送失败");
-        }
-    }
-
-
-    @PostMapping("/receiveAreaData")
-    @ResponseBody
-    public R<?> receiveAreaData(@RequestBody DataExchangeEntity dataExchangeEntity) {
-        System.out.println(dataExchangeEntity);
-        R<String> appUrl = remoteConfigService.remotegetConfigKey("appUrl");
-        List<String> pictureList = new ArrayList<>();
-        for (String picture : dataExchangeEntity.getEventPicture()) {
-            pictureList.add(appUrl.getData().toString() + picture);
-        }
-        dataExchangeEntity.setEventPicture(pictureList);
-        // TODO: 2024/1/9 0009 待修改
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("", dataExchangeEntity);
-        try {
-            RestUtil.post(url, jsonObject);
-        } catch (Exception e) {
-            log.info("远程调用119报错");
-        }
-        return R.ok("接收成功");
-    }
+//    @PostMapping("/pushAreaData")
+//    @ResponseBody
+//    public R<?> pushAreaData(@RequestBody DataExchangeEntity dataExchangeEntity) {
+//        log.info("dataExchangeEntity:{}",dataExchangeEntity);
+//        List<String> pictureList = new ArrayList<>();
+//        if (StringUtils.isNotEmpty(SecurityUtils.getToken()) && !CollectionUtils.isEmpty(dataExchangeEntity.getEventPicture())) {
+//            for (String picture : dataExchangeEntity.getEventPicture()) {
+//                if (!"image".equals(FilePrefixUtils.getUrlSuffix(picture))) {
+//                    log.error("事件图片必须为图片格式---{}", dataExchangeEntity);
+//                    return R.fail("事件图片必须为图片格式");
+//                } else {
+//                    MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(picture, System.currentTimeMillis() + ".jpg");
+//                    SysFile sysFile = SpringUtils.getBean(RemoteFileService.class).upload(multipartFile).getData();
+//                    pictureList.add(sysFile.getUrl());
+//                }
+//            }
+//            dataExchangeEntity.setPictureUrlList(pictureList);
+//            R<?> result = remoteDataBaseService.insert3rdSystemEvent(dataExchangeEntity);
+//            if (result.getCode() == 200) {
+//                return R.ok("推送成功");
+//            } else {
+//                return R.fail(result.getMsg());
+//            }
+//        } else {
+//            return R.fail("推送失败");
+//        }
+//    }
+//
+//
+//    @PostMapping("/receiveAreaData")
+//    @ResponseBody
+//    public R<?> receiveAreaData(@RequestBody DataExchangeEntity dataExchangeEntity) {
+//        System.out.println(dataExchangeEntity);
+//        R<String> appUrl = remoteConfigService.remotegetConfigKey("appUrl");
+//        List<String> pictureList = new ArrayList<>();
+//        for (String picture : dataExchangeEntity.getEventPicture()) {
+//            pictureList.add(appUrl.getData().toString() + picture);
+//        }
+//        dataExchangeEntity.setEventPicture(pictureList);
+//        // TODO: 2024/1/9 0009 待修改
+//        JSONObject jsonObject = new JSONObject();
+//        jsonObject.put("", dataExchangeEntity);
+//        try {
+//            RestUtil.post(url, jsonObject);
+//        } catch (Exception e) {
+//            log.info("远程调用119报错");
+//        }
+//        return R.ok("接收成功");
+//    }
 }