huangpeng 8 месяцев назад
Родитель
Сommit
2ca0217eb0

+ 28 - 13
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC112ApiRequestAndProcessing.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWyysService;
+import com.rongwei.bscommon.sys.service.impl.JtXcjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -8,13 +10,9 @@ 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.List;
+import java.util.HashMap;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +22,32 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWyysService jtWyysService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC112ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtWyysService jtWyysService) {
+        KC112ApiRequestAndProcessing.jtWyysService = jtWyysService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +56,9 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtWyysService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

+ 42 - 10
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC113ApiRequestAndProcessing.java

@@ -1,20 +1,23 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtYjbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtYjbhgl;
 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;
-
 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,17 +27,36 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtYjbhglService jtYjbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC113ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtYjbhglService jtYjbhglService) {
+        KC113ApiRequestAndProcessing.jtYjbhglService = jtYjbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtYjbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtYjbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtYjbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtYjbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("yjtcr", JtYjbhgl::getYjtcr));
+        assembleData.add(setDatePattern("yjtcsj", JtYjbhgl::getYjtcsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("zgfksj", JtYjbhgl::getZgfksj,DATE_PATTERN_YMD));
+        assembleData.add(setOrdinaryDate("zgfkzrr", JtYjbhgl::getZgfkzrr));
+        JtYjbhgl jtYjbhgl1 = jtYjbhglService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtYjbhgl1, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +67,16 @@ public class KC113ApiRequestAndProcessing 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");
+        }
+
+
+
+        jtYjbhglService.update(new LambdaUpdateWrapper<JtYjbhgl>()
+                .eq(JtYjbhgl::getId, id).set(JtYjbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

+ 26 - 9
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC114ApiRequestAndProcessing.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWyysService;
+import com.rongwei.bscommon.sys.service.JtYjbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 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;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +25,32 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtYjbhglService jtYjbhglService;
+
+
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC114ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtYjbhglService jtYjbhglService) {
+        KC114ApiRequestAndProcessing.jtYjbhglService = jtYjbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -45,6 +61,7 @@ public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtYjbhglService.removeById(id);
         return R.ok();
     }
 }

+ 44 - 7
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC115ApiRequestAndProcessing.java

@@ -1,11 +1,17 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtScsdlService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtScsdl;
+import com.rongwei.bsentity.domain.JtYjbhgl;
 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 +19,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +31,39 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScsdlService jtScsdlService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC115ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScsdlService jtScsdlService) {
+        KC115ApiRequestAndProcessing.jtScsdlService = jtScsdlService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
+        assembleData.add(setOrdinaryDate("DATAID", JtScsdl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtScsdl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtScsdl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtScsdl::getXmmc));
+        assembleData.add(setOrdinaryDate("qdbh", JtScsdl::getQdbh));
+        assembleData.add(setOrdinaryDate("qdmc", JtScsdl::getQdmc));
+        assembleData.add(setOrdinaryDate("rwhjbh", JtScsdl::getRwhjbh));
+        assembleData.add(setOrdinaryDate("rwhjmc", JtScsdl::getRwhjmc));
+        assembleData.add(setOrdinaryDate("zzjdsdzrr", JtScsdl::getZzjdsdzrr));
+        assembleData.add(setOrdinaryDate("dzqmyyjdmc", JtScsdl::getQmmc));
+        assembleData.add(setDatePattern("pzsj", JtScsdl::getPzsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("zgcshsqrqzgzsj", JtScsdl::getQzsj,DATE_PATTERN_YMD));
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        JtScsdl jtScsdl= jtScsdlService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtScsdl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +74,14 @@ public class KC115ApiRequestAndProcessing 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");
+        }
+        jtScsdlService.update(new LambdaUpdateWrapper<JtScsdl>()
+                .eq(JtScsdl::getId, id).set(JtScsdl::getDataid, realDataId));
         return R.ok();
     }
 }
+

+ 27 - 12
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC116ApiRequestAndProcessing.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtScsdlService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,12 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 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;
-
 /**
  * AssembleK34ApiData class
  *
@@ -24,17 +23,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScsdlService jtScsdlService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC116ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScsdlService jtScsdlService) {
+        KC116ApiRequestAndProcessing.jtScsdlService = jtScsdlService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +56,9 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtScsdlService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

+ 41 - 8
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC117ApiRequestAndProcessing.java

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtWtbhglService;
+import com.rongwei.bscommon.sys.service.JtWtbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtWtbhgl;
+import com.rongwei.bsentity.domain.JtWtbhgl;
 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 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +32,34 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWtbhglService jtWtbhglService;
+
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC117ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtWtbhglService jtWtbhglService) {
+        KC117ApiRequestAndProcessing.jtWtbhglService = jtWtbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtWtbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtWtbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtWtbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtWtbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("wtfkfzr", JtWtbhgl::getWtfkfzr));
+        assembleData.add(setOrdinaryDate("wttcr", JtWtbhgl::getWttcr));
+        assembleData.add(setDatePattern("wtfkrq", JtWtbhgl::getWtfkrq,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("wttcrq", JtWtbhgl::getWttcrq,DATE_PATTERN_YMD));
+        JtWtbhgl jtWtbhgl = jtWtbhglService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtWtbhgl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +70,14 @@ public class KC117ApiRequestAndProcessing 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");
+        }
+        jtWtbhglService.update(new LambdaUpdateWrapper<JtWtbhgl>()
+                .eq(JtWtbhgl::getId, id).set(JtWtbhgl::getDataid, realDataId));
         return R.ok();
     }
 }
+

+ 27 - 10
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC118ApiRequestAndProcessing.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWtbhglService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 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;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +25,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWtbhglService jtWtbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC118ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtWtbhglService jtWtbhglService) {
+        KC118ApiRequestAndProcessing.jtWtbhglService = jtWtbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +58,9 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtWtbhglService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

+ 40 - 8
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC119ApiRequestAndProcessing.java

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtScbhglService;
+import com.rongwei.bscommon.sys.service.JtScbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtScbhgl;
+import com.rongwei.bsentity.domain.JtScbhgl;
 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 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +32,34 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScbhglService jtScbhglService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC119ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScbhglService jtScbhglService) {
+        KC119ApiRequestAndProcessing.jtScbhglService = jtScbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtScbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtScbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtScbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtScbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("wbhfyjfzr", JtScbhgl::getWbhfyjfzr));
+        assembleData.add(setOrdinaryDate("yjtcr", JtScbhgl::getYjtcr));
+        assembleData.add(setDatePattern("hfsj", JtScbhgl::getHfsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("yjtcsj", JtScbhgl::getYjtcsj,DATE_PATTERN_YMD));
+        JtScbhgl jtScbhgl = jtScbhglService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtScbhgl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +70,13 @@ public class KC119ApiRequestAndProcessing 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");
+        }
+        jtScbhglService.update(new LambdaUpdateWrapper<JtScbhgl>()
+                .eq(JtScbhgl::getId, id).set(JtScbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

+ 27 - 10
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC120ApiRequestAndProcessing.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtScbhglService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 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;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +25,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScbhglService jtScbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC120ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScbhglService jtScbhglService) {
+        KC120ApiRequestAndProcessing.jtScbhglService = jtScbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +58,9 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtScbhglService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

+ 41 - 10
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC121ApiRequestAndProcessing.java

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtSjjdqdService;
+import com.rongwei.bscommon.sys.service.JtSjjdqdService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtSjjdqd;
+import com.rongwei.bsentity.domain.JtSjjdqd;
 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 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,27 +32,50 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtSjjdqdService jtSjjdqdService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC121ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtSjjdqdService jtSjjdqdService) {
+        KC121ApiRequestAndProcessing.jtSjjdqdService = jtSjjdqdService;
+    }
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+    @Override
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
+        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
+        assembleData.add(setOrdinaryDate("DATAID", JtSjjdqd::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtSjjdqd::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtSjjdqd::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtSjjdqd::getXmmc));
+        assembleData.add(setOrdinaryDate("sjjdbghyjymc", JtSjjdqd::getName));
+        assembleData.add(setDatePattern("jhjdsj", JtSjjdqd::getJhjdsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("hykzzsj", JtSjjdqd::getHykzsj,DATE_PATTERN_YMD));
+        JtSjjdqd jtSjjdqd = jtSjjdqdService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtSjjdqd, assembleData);
         return stringObjectMap;
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id,String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         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");
+        }
+        jtSjjdqdService.update(new LambdaUpdateWrapper<JtSjjdqd>()
+                .eq(JtSjjdqd::getId, id).set(JtSjjdqd::getDataid, realDataId));
         return R.ok();
     }
 }

+ 27 - 16
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC122ApiRequestAndProcessing.java

@@ -1,20 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtSjjdqdService;
 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.List;
+import java.util.HashMap;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -24,26 +19,42 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtSjjdqdService jtSjjdqdService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC122ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtSjjdqdService jtSjjdqdService) {
+        KC122ApiRequestAndProcessing.jtSjjdqdService = jtSjjdqdService;
+    }
 
-    @Override
-    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();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id,String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtSjjdqdService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }