feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SynchronizationDataServiceImpl.java

@@ -6,6 +6,7 @@ import com.rongwei.bscommon.sys.strategy.AssembleKC134ApiData;
 import com.rongwei.bscommon.sys.strategy.CalculatorContext;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.dto.ApiCallDto;
+import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.slf4j.Logger;
@@ -14,6 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
 
 /**
  * @author ：sc
@@ -45,8 +50,10 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
                 break;
         }
         CalculatorContext primaryContext = new CalculatorContext(assembleApiDataStrategy);
-        primaryContext.executeStrategy(id);
-        return null;
+        // 数据组装
+        Map<String, Object> apiCallData = primaryContext.executeStrategy(id);
+        // 接口请求并 处理
+        return primaryContext.apiCallAndDataProcessing(id, code, apiCallData);
     }
 
     @Override

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/AssembleApiDataStrategy.java

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy;
 
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
+import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 /**
@@ -12,9 +14,9 @@ import java.util.function.Function;
  * @date 2024/12/03
  */
 public interface AssembleApiDataStrategy {
-    List<OrgApiDataConfigDTO> assembleData(String id);
-
+    Map<String, Object> assembleData(String id);
 
 
 
+    R apiCallAndDataProcessing(String id,String code,Map<String, Object> apiDataConfigDTOS);
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/AssembleKC134ApiData.java

@@ -1,13 +1,19 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.dto.ApiCallDto;
+import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
 
 /**
@@ -18,11 +24,27 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePatte
  */
 @Component
 public class AssembleKC134ApiData implements AssembleApiDataStrategy {
+    @Autowired
+    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+
     @Override
-    public  List<OrgApiDataConfigDTO>  assembleData(String id) {
-        List<OrgApiDataConfigDTO> assembleData=new ArrayList<>();
+    public Map<String, Object> assembleData(String id) {
+        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
-        return assembleData;
+
+        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        return stringObjectMap;
+    }
+
+    @Override
+    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+        ApiCallDto paramVo = new ApiCallDto();
+        paramVo.setData(apiCallData);
+        paramVo.setApiCode(code);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        return R.ok();
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/CalculatorContext.java

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy;
 
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
+import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * CalculatorContext class
@@ -19,7 +21,11 @@ public class CalculatorContext {
         this.strategy = strategy;
     }
 
-    public List<OrgApiDataConfigDTO> executeStrategy(String id) {
+    public Map<String, Object> executeStrategy(String id) {
         return strategy.assembleData(id);
     }
+
+    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+        return strategy.apiCallAndDataProcessing(id, code, apiCallData);
+    }
 }