【DAOP-1.0】数据需求

【功能点】联调问题处理

@@ -14,9 +14,12 @@ import java.util.List;
 @Schema(title = "数据需求状态修改参数")
 @Schema(title = "数据需求状态修改参数")
 public class DemandUpdateStateVO {
 public class DemandUpdateStateVO {
 
 
-    @Schema(description = "加工单位唯一标识")
+    @Schema(description = "加工单位唯一标识列表")
     private List<String> processCompanyGuidList;
     private List<String> processCompanyGuidList;
 
 
+    @Schema(description = "加工单位唯一标识")
+    private String processOrderGuid;
+
     @Schema(description = "资源获取状态【N未开始 A进行中 Y已完成】")
     @Schema(description = "资源获取状态【N未开始 A进行中 Y已完成】")
     private String resourceAcquisitionState;
     private String resourceAcquisitionState;
 
 

@@ -17,6 +17,7 @@ import java.util.List;
  * @author Xiaocq
  * @author Xiaocq
  */
  */
 @FeignClient(value = "ms-daop-configure-service", configuration = FastCallFeignConfiguration.class)
 @FeignClient(value = "ms-daop-configure-service", configuration = FastCallFeignConfiguration.class)
+
 public interface ConfigureFeign {
 public interface ConfigureFeign {
 
 
     /**
     /**

@@ -2,20 +2,26 @@ package com.csbr.qingcloud.portal.feign;
 
 
 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
 import jakarta.validation.Valid;
 import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @author Xiaocq
  * @author Xiaocq
  */
  */
-@FeignClient(value = "ms-data-process-basic-service", configuration = FastCallFeignConfiguration.class)
+@FeignClient(value = "ms-data-process-basic-service",url = "${dataProcessUrl}", configuration = FastCallFeignConfiguration.class)
 public interface DataProcessBasicFeign {
 public interface DataProcessBasicFeign {
 
 
     @PostMapping(value = "/process-order/save", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/process-order/save", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     CommonRes<Boolean> saveProcessOrder(@RequestBody @Valid ProcessOrderRQVO vo);
     CommonRes<Boolean> saveProcessOrder(@RequestBody @Valid ProcessOrderRQVO vo);
 
 
+    @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids);
+
 }
 }

@@ -34,10 +34,8 @@ import org.springframework.stereotype.Service;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * @program: D:/git/ms-data-circulation-portal-service
  * @program: D:/git/ms-data-circulation-portal-service
@@ -545,14 +543,23 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             rsPageList.setRecords(convertToVO(pageList.getRecords()));
             rsPageList.setRecords(convertToVO(pageList.getRecords()));
         }
         }
         // 需要特殊处理数据时使用
         // 需要特殊处理数据时使用
-        /*if(CollectionUtils.isNotEmpty(pageList.getRecords())){
+        if(CollectionUtils.isNotEmpty(pageList.getRecords())){
+            List<String> guids = pageList.getRecords().stream().map(MfDemand::getProcessCompanyGuid).collect(Collectors.toList());
+            Map<String, DemandUpdateStateVO> map = dataProcessBasicFeign.getOrderState(guids).getData();
             List<DemandRSVO> results = new ArrayList<>();
             List<DemandRSVO> results = new ArrayList<>();
             for (MfDemand item : pageList.getRecords()){
             for (MfDemand item : pageList.getRecords()){
                 DemandRSVO vo = convertToVO(item);
                 DemandRSVO vo = convertToVO(item);
+                DemandUpdateStateVO voState = map.get(item.getProcessCompanyGuid());
+                if(voState != null){
+                    vo.setResourceAcquisitionState(voState.getResourceAcquisitionState());
+                    vo.setProductProcessingState(voState.getProductProcessingState());
+                    vo.setProductDeliveryState(voState.getProductDeliveryState());
+                    vo.setProductAcceptState(voState.getProductAcceptState());
+                }
                 results.add(vo);
                 results.add(vo);
             }
             }
             rsPageList.setRecords(results);
             rsPageList.setRecords(results);
-        }*/
+        }
     }
     }
 
 
     //region 辅助操作
     //region 辅助操作