ソースを参照

feature 代码提交

xiahan 8 ヶ月 前
コミット
a60052f700

+ 39 - 9
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC141ApiRequestAndProcessing.java

@@ -1,11 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtJsglcgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtJsglcgqd;
 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 com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +17,8 @@ import java.util.ArrayList;
 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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,16 +28,35 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtJsglcgqdServiceImpl jtJsglcgqdService;
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC141ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtJsglcgqdServiceImpl jtJsglcgqdService) {
+        KC141ApiRequestAndProcessing.jtJsglcgqdService = jtJsglcgqdService;
+    }
 
     @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
+    public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        assembleData.add(setOrdinaryDate("INDEXID", JtJsglcgqd::getIndexid));
+        assembleData.add(setOrdinaryDate("DATAID", JtJsglcgqd::getDataid));
+        assembleData.add(setOrdinaryDate("xmmc", JtJsglcgqd::getXmmc));
+        assembleData.add(setOrdinaryDate("jxmc", JtJsglcgqd::getJxmc));
+        assembleData.add(setOrdinaryDate("jxlb", JtJsglcgqd::getJxlb));
+        assembleData.add(setOrdinaryDate("jxjb", JtJsglcgqd::getJxjb));
+        assembleData.add(setOrdinaryDate("jxdj", JtJsglcgqd::getJxdj));
+        assembleData.add(setDatePattern("hjsj", JtJsglcgqd::getHjsj, DATE_PATTERN_YMD));
+        assembleData.add(setOrdinaryDate("cyqk", JtJsglcgqd::getCyqk));
+        assembleData.add(setFileInfo("mgjxdhjcl", JtJsglcgqd::getMgjxdhjcl, true));
+        assembleData.add(setOrdinaryDate("sfzddw", JtJsglcgqd::getSfzddw));
+        assembleData.add(setOrdinaryDate("hjpm", JtJsglcgqd::getHjpm));
+        JtJsglcgqd jtGsjtbsj = jtJsglcgqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -45,6 +68,13 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        if (StringUtils.isBlank(realDataId)) {
+            throw new CustomException("接口请求成功,但无法获取dataId");
+        }
+        jtJsglcgqdService.update(new LambdaUpdateWrapper<JtJsglcgqd>().eq(JtJsglcgqd::getId, id).set(JtJsglcgqd::getDataid, realDataId));
+        // 后续逻辑处理
         return R.ok();
     }
 }

+ 34 - 9
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC143ApiRequestAndProcessing.java

@@ -1,11 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtXysjyqServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtXysjyq;
 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 com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +17,7 @@ import java.util.ArrayList;
 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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
 
 /**
  * AssembleK34ApiData class
@@ -24,16 +27,32 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtXysjyqServiceImpl jtXysjyqService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC143ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtXysjyqServiceImpl jtXysjyqService) {
+        KC143ApiRequestAndProcessing.jtXysjyqService = jtXysjyqService;
+    }
 
     @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
+    public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        assembleData.add(setOrdinaryDate("INDEXID", JtXysjyq::getIndexid));
+        assembleData.add(setOrdinaryDate("DATAID", JtXysjyq::getDataid));
+        assembleData.add(setOrdinaryDate("yxzgcspxbyxgcbzpxbdpxhzhyxgrsl", JtXysjyq::getYxzgcspxbyxgcbzpxbdpxhzhyxgrsl));
+        assembleData.add(setFileInfo("jsfabzhsscl", JtXysjyq::getJsfabzhsscl, true));
+        assembleData.add(setFileInfo("gjbzxdnltsxdfa", JtXysjyq::getGjbzxdnltsxdfa, true));
+        assembleData.add(setFileInfo("lxsbhjtzjcl", JtXysjyq::getLxsbhjtzjcl, true));
+        assembleData.add(setFileInfo("yxjscgsbcl", JtXysjyq::getYxjscgsbcl, true));
+        assembleData.add(setFileInfo("jtgfsbcl", JtXysjyq::getJtgfsbcl, true));
+        assembleData.add(setFileInfo("zmcl", JtXysjyq::getZmcl, true));
+        JtXysjyq jtGsjtbsj = jtXysjyqService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -45,6 +64,12 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        if (StringUtils.isBlank(realDataId)) {
+            throw new CustomException("接口请求成功,但无法获取dataId");
+        }
+        jtXysjyqService.update(new LambdaUpdateWrapper<JtXysjyq>().eq(JtXysjyq::getId, id).set(JtXysjyq::getDataid, realDataId));
         return R.ok();
     }
 }