xiugai

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

@@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 
 @Component
@@ -25,7 +26,7 @@ public class RemoteDataBaseServiceFallbackFactory implements FallbackFactory<Rem
         return new RemoteDataBaseService() {
 
             @Override
-            public R<?> receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects) {
+            public R<?> receivedMessage(Map<String, Object> map) {
                 return null;
             }
         };

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

@@ -11,6 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
+import java.util.Map;
 
 
 @FeignClient(
@@ -26,6 +27,6 @@ public interface RemoteDataBaseService {
      * @return
      */
     @PostMapping("/projects/receivedMessage")
-    public R<?> receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects);
+    public R<?> receivedMessage(Map<String, Object> map);
 
 }

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

@@ -4,10 +4,12 @@ package com.sooka.sponest.dataexchange.sendChange.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.file.FilePrefixUtils;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysFile;
+import com.ruoyi.system.api.model.LoginUser;
 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;
@@ -27,7 +29,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Controller
@@ -38,6 +42,8 @@ public class EngineeringController {
     private RemoteDataBaseService remoteDataBaseService;
     @Resource
     private RemoteConfigService remoteConfigService;
+    @Resource
+    private TokenService tokenService;
     //    @Value("${}")
     private String url;
 
@@ -53,7 +59,12 @@ public class EngineeringController {
         log.info("centerdataTKeyProjects:{}",list);
         if (StringUtils.isNotEmpty(SecurityUtils.getToken())) {
             log.info("SecurityUtils.getToken():{}",SecurityUtils.getToken());
-            R<?> result = remoteDataBaseService.receivedMessage(list);
+            LoginUser loginUser = tokenService.getLoginUser(SecurityUtils.getToken());
+            Map<String, Object> map = new HashMap<>();
+            map.put("list",list);
+            map.put("userInfo",loginUser);
+            log.info("loginUser:{}",loginUser);
+            R<?> result = remoteDataBaseService.receivedMessage(map);
             if (result.getCode() == 200) {
                 return R.ok(null,"推送成功");
             } else {