feature 代码提交

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

@@ -2,14 +2,16 @@ package com.rongwei.bscommon.sys.service;
 
 import com.rongwei.rwcommon.base.R;
 
+import java.util.List;
+
 /**
  * @author ：sc
  * @since ：2024/12/2
  */
 public interface SynchronizationDataService {
-    R pushDataSync(String id, String code);
+    R pushDataSync(String ids, String code);
 
-    R deleteDataSync(String id, String dataIdid, String code);
+    R deleteDataSync(List<String> id, List<String>  dataIds, String code);
 
     R uploadFile(String fileId);
 }

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

@@ -2,12 +2,12 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.rongwei.bscommon.sys.service.SynchronizationDataService;
-import com.rongwei.bscommon.sys.strategy.api.ApiRequestAndProcessingStrategy;
 import com.rongwei.bscommon.sys.strategy.api.*;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,12 +34,12 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
     /**
      * 业务数据同步方法
      *
-     * @param id   业务数据ID
+     * @param ids   业务数据ID
      * @param code 接口编码
      * @return
      */
     @Override
-    public R pushDataSync(String id, String code) {
+    public R pushDataSync(String ids, String code) {
         ApiRequestAndProcessingStrategy apiRequestAndProcessingStrategy = null;
         switch (code) {
             case "KC101":
@@ -111,14 +112,17 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
                 break;
         }
         CalculatorContext primaryContext = new CalculatorContext(apiRequestAndProcessingStrategy);
-        // 数据组装
-        Map<String, Object> apiCallData = primaryContext.executeStrategy(id, null, code);
+        for (String id : ids.split(",")) {
+            // 数据组装
+            Map<String, Object> apiCallData = primaryContext.executeStrategy(id, null, code);
+            primaryContext.apiCallAndDataProcessing(id, null, code, apiCallData);
+        }
         // 接口请求并 处理
-        return primaryContext.apiCallAndDataProcessing(id, null, code, apiCallData);
+        return R.ok("接口同步成功");
     }
 
     @Override
-    public R deleteDataSync(String id, String dataId, String code) {
+    public R deleteDataSync(List<String> idList, List<String> dataIdList, String code) {
         ApiRequestAndProcessingStrategy apiRequestAndProcessingStrategy = null;
         switch (code) {
             case "KC102":
@@ -191,10 +195,18 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
                 break;
         }
         CalculatorContext primaryContext = new CalculatorContext(apiRequestAndProcessingStrategy);
-        // 数据组装
-        Map<String, Object> apiCallData = primaryContext.executeStrategy(id, dataId, code);
+
+        for (int i = 0; i < idList.size(); i++) {
+            // 数据组装
+            Map<String, Object> apiCallData = null;
+            if (StringUtils.isNotBlank(dataIdList.get(i))) {
+                apiCallData = primaryContext.executeStrategy(idList.get(i), dataIdList.get(i), code);
+                primaryContext.apiCallAndDataProcessing(idList.get(i), dataIdList.get(i), code, apiCallData);
+            }
+        }
+
         // 接口请求并 处理
-        return primaryContext.apiCallAndDataProcessing(id, dataId, code, apiCallData);
+        return R.ok("接口同步成功");
     }
 
     @Override

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

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
 
 import java.util.Map;
 
@@ -14,4 +16,25 @@ public interface ApiRequestAndProcessingStrategy {
     Map<String, Object> assembleData(String id, String dataId, String code);
 
     R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiDataConfigDTOS);
+
+    default String apiCallSuffixGetSyncStateHandle(ApiReturnDto apiReturnDto) {
+        // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        if (apiReturnData == null) {
+            return null;
+        }
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
+        if (StringUtils.isBlank(realDataId)) {
+            System.err.println("接口请求成功,但无法获取dataId");
+            return null;
+        }
+        if (!apiReturnDto.isSuccessful()) {
+            return null;
+        }
+        if (StringUtils.isBlank(realDataId)) {
+            return null;
+        }
+        apiReturnDto.setSuccessful(true);
+        return realDataId;
+    }
 }

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

@@ -1,12 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
-import com.rongwei.bscommon.sys.service.impl.JtPxjhqdServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtGsjtbsjServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
-import com.rongwei.bsentity.domain.JtPxjhqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -18,8 +15,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
@@ -30,7 +26,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+    private static JtGsjtbsjServiceImpl jtGsjtbsjService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -38,34 +34,81 @@ public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
-        KC101ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    public void setJtXcjhqdServiceImpl(JtGsjtbsjServiceImpl jtGsjtbsjService) {
+        KC101ApiRequestAndProcessing.jtGsjtbsjService = jtGsjtbsjService;
     }
+
+
     @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("year", JkCompanyAssessment::getYear));
-        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
-        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
-        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
-        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
-        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
-        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
-        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
-        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
-        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
-        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
-        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
-        return stringObjectMap;
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtGsjtbsj::getId));
+        /*******************附件*********************/
+        assembleData.add(setFileInfo("jschfjglzd", JtGsjtbsj::getJschfjglzd, true));
+        assembleData.add(setFileInfo("kcsjmbbxzn", JtGsjtbsj::getKcsjmbbxzn, true));
+        assembleData.add(setFileInfo("kcsjmbbxznfbzm", JtGsjtbsj::getKcsjmbbxzn, true));
+        assembleData.add(setFileInfo("gzdgzdsmbbxznfbzm", JtGsjtbsj::getGzdgzdsmbbxznfbzm, true));
+        assembleData.add(setFileInfo("gzdgzdsmbbxznfbzm", JtGsjtbsj::getGzdgzdsmbbxznfbzm, true));
+        assembleData.add(setFileInfo("ztfapslcfjflzd", JtGsjtbsj::getZtfapslcfjflzd, true));
+        assembleData.add(setFileInfo("yjbhglyjqd", JtGsjtbsj::getYjbhglyjqd, true));
+        assembleData.add(setFileInfo("glhgxlcfjflzd", JtGsjtbsj::getGlhgxlcfjflzd, true));
+        assembleData.add(setFileInfo("wtbhglwtqd", JtGsjtbsj::getWtbhglwtqd, true));
+        assembleData.add(setFileInfo("scbhglwbscyjqd", JtGsjtbsj::getScbhglwbscyjqd, true));
+        assembleData.add(setFileInfo("epcfaschgxfjglzdfrztzr", JtGsjtbsj::getEpcfaschgxfjglzdfrztzr, true));
+        assembleData.add(setFileInfo("sjjdkzzm", JtGsjtbsj::getSjjdkzzm, true));
+        assembleData.add(setFileInfo("bgglzd", JtGsjtbsj::getBgglzd, true));
+        assembleData.add(setFileInfo("ndjh", JtGsjtbsj::getNdjh, true));
+        assembleData.add(setFileInfo("szhgzmb", JtGsjtbsj::getSzhgzmb, true));
+        assembleData.add(setFileInfo("rjxtsjtgwj", JtGsjtbsj::getRjxtsjtgwj, true));
+        assembleData.add(setFileInfo("zjfjflglzd", JtGsjtbsj::getZjfjflglzd, true));
+        assembleData.add(setFileInfo("cgzlgdfjflglzd", JtGsjtbsj::getJszlgdfjflglzd, true));
+        assembleData.add(setFileInfo("cgzlgdfjflglzdfbzm", JtGsjtbsj::getJszlgdfjflglzdfbzm, true));
+        assembleData.add(setFileInfo("cgzhzd", JtGsjtbsj::getCgzhzd, true));
+        assembleData.add(setFileInfo("cgzhmkjswd", JtGsjtbsj::getCgzhmkjswd, true));
+        assembleData.add(setFileInfo("cgzhqdfbwj", JtGsjtbsj::getCgzhqdfbwj, true));
+        assembleData.add(setFileInfo("zgcsrmwjhtwj", JtGsjtbsj::getZgcsrmwjhtwj, true));
+        /******************说明**************************/
+        assembleData.add(setOrdinaryDate("jschfjglzdwzsm", JtGsjtbsj::getJschfjglzdwzsm));
+        assembleData.add(setOrdinaryDate("kcsjmbbxznwzsm", JtGsjtbsj::getKcsjmbbxznwzsm));
+        assembleData.add(setOrdinaryDate("gzdgzdsmbbxznwzsm", JtGsjtbsj::getGzdgzdsmbbxznwzsm));
+        assembleData.add(setOrdinaryDate("ztfapslcfjflzdwzsm", JtGsjtbsj::getZtfapslcfjflzdwzsm));
+        assembleData.add(setOrdinaryDate("yjbhglwzsm", JtGsjtbsj::getYjbhglwzsm));
+        assembleData.add(setOrdinaryDate("glhgxlcfjflzdwzsm", JtGsjtbsj::getGlhgxlcfjflzdwzsm));
+        assembleData.add(setOrdinaryDate("wtbhglwzsm", JtGsjtbsj::getWtbhglwzsm));
+        assembleData.add(setOrdinaryDate("scbhglwzsm", JtGsjtbsj::getScbhglwzsm));
+        assembleData.add(setOrdinaryDate("epcfaschgxwzsm", JtGsjtbsj::getEpcfaschgxwzsm));
+        assembleData.add(setOrdinaryDate("sjjdkzmwzsm", JtGsjtbsj::getSjjdkzmwzsm));
+        assembleData.add(setOrdinaryDate("bgglzdwzsm", JtGsjtbsj::getBgglzdwzsm));
+        assembleData.add(setOrdinaryDate("ndjhwzsm", JtGsjtbsj::getNdjhwzsm));
+        assembleData.add(setOrdinaryDate("szhgzmbwzsm", JtGsjtbsj::getSzhgzmbwzsm));
+        assembleData.add(setOrdinaryDate("zyywcpszhfgl", JtGsjtbsj::getZyywcpszhfgl));
+        assembleData.add(setOrdinaryDate("rjxtsjwzsm", JtGsjtbsj::getRjxtsjwzsm));
+        assembleData.add(setOrdinaryDate("ssdwfysl", JtGsjtbsj::getSsdwfysl));
+        assembleData.add(setOrdinaryDate("xcjhwzsm", JtGsjtbsj::getXcjhwzsm));
+        assembleData.add(setOrdinaryDate("zjfjflglzdwzsm", JtGsjtbsj::getZjfjflglzdwzsm));
+        assembleData.add(setOrdinaryDate("zjzr", JtGsjtbsj::getZjzr));
+        assembleData.add(setOrdinaryDate("bndkhsjdwsl", JtGsjtbsj::getBndkhsjdwsl));
+        assembleData.add(setOrdinaryDate("ssdwjsglkhwzsm", JtGsjtbsj::getSsdwjsglkhwzsm));
+        assembleData.add(setOrdinaryDate("cgzlgdfjflglzdwzsm", JtGsjtbsj::getJszlgdfjflglzdwzsm));
+        assembleData.add(setOrdinaryDate("zgcsrmwjhtwjwzsm", JtGsjtbsj::getZgcsrmwjhtwjwzsm));
+        JtGsjtbsj jtGsjtbsj = jtGsjtbsjService.getById(id);
+        return assembleApiData(jtGsjtbsj, assembleData);
     }
 
     @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> apiDataConfigDTOS) {
         ApiCallDto paramVo = new ApiCallDto();
-        paramVo.setData(apiCallData);
+        paramVo.setData(apiDataConfigDTOS);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtGsjtbsjService.update(new LambdaUpdateWrapper<JtGsjtbsj>()
+                .eq(JtGsjtbsj::getId, id)
+                .set(JtGsjtbsj::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtGsjtbsj::getDataid, realDataId));
         return R.ok();
     }
+
+
 }

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

@@ -1,23 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JtYxwjfbqdServiceImpl;
-import com.rongwei.bscommon.sys.service.impl.JtZjfjflqdServiceImpl;
+import com.rongwei.bscommon.sys.service.impl.JtGsjtbsjServiceImpl;
 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
  *
@@ -27,36 +20,41 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+    private static JtGsjtbsjServiceImpl jtGsjtbsjService;
 
 
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC102ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }
+
     @Autowired
-    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
-        KC102ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    public void setJtXcjhqdServiceImpl(JtGsjtbsjServiceImpl jtGsjtbsjService) {
+        KC102ApiRequestAndProcessing.jtGsjtbsjService = jtGsjtbsjService;
     }
 
     @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);
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dateId);
+        }};
         return stringObjectMap;
     }
 
     @Override
-    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);
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
+
         // 后续逻辑处理
-        jtZjfjflqdService.removeById(id);
+        jtGsjtbsjService.removeByMap(new HashMap<String, Object>() {{
+            put("DATAID", dataId);
+        }});
         return R.ok();
     }
 }

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

@@ -1,8 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtFjglxmServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JtFjglxm;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -15,8 +16,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
@@ -27,7 +28,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+    private static JtFjglxmServiceImpl jtFjglxmService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -35,34 +36,43 @@ public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
-        KC103ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    public void setjkCompanyAssessmentServiceImpl(JtFjglxmServiceImpl jtFjglxmService) {
+        KC103ApiRequestAndProcessing.jtFjglxmService = jtFjglxmService;
     }
+
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
-        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
-        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
-        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
-        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
-        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
-        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
-        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
-        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
-        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
-        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
-        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtFjglxm::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtFjglxm::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtFjglxm::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtFjglxm::getXmmc));
+        assembleData.add(setOrdinaryDate("zbzt", JtFjglxm::getZbztdw));
+        assembleData.add(setOrdinaryDate("zbztdj", JtFjglxm::getZbztdj));
+        assembleData.add(setOrdinaryDate("xmdw", JtFjglxm::getXmdw));
+        assembleData.add(setOrdinaryDate("sfsyxxywxm", JtFjglxm::getSfxxyw));
+        assembleData.add(setOrdinaryDate("sfzdxm", JtFjglxm::getSfzdxm));
+        assembleData.add(setOrdinaryDate("zfsjsggl", JtFjglxm::getSfsjsggl));
+        assembleData.add(setDatePattern("jhkssj", JtFjglxm::getJhkssj, DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("jhwcsj", JtFjglxm::getJhwcsj, DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("cgzljhgdsj", JtFjglxm::getCgzljhgdsj, DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("cgzlsjgdsj", JtFjglxm::getCgzlsjgdsj, DATE_PATTERN_YMD));
+        JtFjglxm jtFjglxm = jtFjglxmService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtFjglxm, 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);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtFjglxmService.update(new LambdaUpdateWrapper<JtFjglxm>()
+                .eq(JtFjglxm::getId, id)
+                .set(JtFjglxm::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtFjglxm::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -11,11 +11,11 @@ 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;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
 
 /**
  * AssembleK34ApiData class
@@ -38,21 +38,21 @@ public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
     @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);
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dateId);
+        }};
         return stringObjectMap;
     }
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZjfjflqdService.removeById(id);
         return R.ok();

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

@@ -1,13 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtKcsjxmServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JkCompanyAssessment;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtFjglxm;
+import com.rongwei.bsentity.domain.JtKcsjxm;
 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;
 
@@ -15,8 +18,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
@@ -27,7 +30,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+    private static JtKcsjxmServiceImpl jtKcsjxmService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -35,33 +38,40 @@ public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
-        KC105ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    public void setjkCompanyAssessmentServiceImpl(JtKcsjxmServiceImpl jtKcsjxmService) {
+        KC105ApiRequestAndProcessing.jtKcsjxmService = jtKcsjxmService;
     }
+
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
-        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
-        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
-        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
-        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
-        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
-        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
-        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
-        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
-        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
-        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
-        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtKcsjxm::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtKcsjxm::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtKcsjxm::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtKcsjxm::getXmmc));
+        assembleData.add(setOrdinaryDate("qdbh", JtKcsjxm::getQdbh));
+        assembleData.add(setOrdinaryDate("qdmc", JtKcsjxm::getQdmc));
+        assembleData.add(setOrdinaryDate("rwhjbh", JtKcsjxm::getRwhjbh));
+        assembleData.add(setOrdinaryDate("rwhjmc", JtKcsjxm::getRwhjmc));
+        assembleData.add(setOrdinaryDate("rwhjzrr", JtKcsjxm::getRwhjzrr));
+        assembleData.add(setDatePattern("hjjhwcsj", JtKcsjxm::getHjjhwcsj, DATE_PATTERN_YMD));
+        JtKcsjxm jtKcsjxm = jtKcsjxmService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtKcsjxm, 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);
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+
+        jtKcsjxmService.update(new LambdaUpdateWrapper<JtKcsjxm>()
+                .eq(JtKcsjxm::getId, id)
+                .set(JtKcsjxm::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtKcsjxm::getDataid, realDataId));
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -11,11 +11,11 @@ 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;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
 
 /**
  * AssembleK34ApiData class
@@ -38,21 +38,21 @@ public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
     @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);
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dateId);
+        }};
         return stringObjectMap;
     }
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZjfjflqdService.removeById(id);
         return R.ok();

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

@@ -1,13 +1,17 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtGzdgServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtGzdg;
+import com.rongwei.bsentity.domain.JtKcsjxm;
 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;
 
@@ -15,8 +19,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
@@ -27,7 +31,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+    private static JtGzdgServiceImpl jtGzdgService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -35,33 +39,36 @@ public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
-        KC107ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    public void setjkCompanyAssessmentServiceImpl(JtGzdgServiceImpl jtGzdgService) {
+        KC107ApiRequestAndProcessing.jtGzdgService = jtGzdgService;
     }
+
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
-        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
-        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
-        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
-        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
-        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
-        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
-        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
-        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
-        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
-        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        assembleData.add(setOrdinaryDate("DATAID", JtGzdg::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtGzdg::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtGzdg::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtGzdg::getXmmc));
+        assembleData.add(setOrdinaryDate("lx", JtGzdg::getType));
+        assembleData.add(setOrdinaryDate("sdzrr", JtGzdg::getSdzrr));
+        assembleData.add(setDatePattern("sdsj", JtGzdg::getSdsj, DATE_PATTERN_YMD));
+        JtGzdg jkCompanyAssessment = jtGzdgService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, 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);
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtGzdgService.update(new LambdaUpdateWrapper<JtGzdg>()
+                .eq(JtGzdg::getId, id)
+                .set(JtGzdg::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtGzdg::getDataid, realDataId));
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -11,11 +11,11 @@ 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;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
 
 /**
  * AssembleK34ApiData class
@@ -38,21 +38,21 @@ public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
     @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);
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dateId);
+        }};
         return stringObjectMap;
     }
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZjfjflqdService.removeById(id);
         return R.ok();

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

@@ -1,13 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtZtfapsServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JkCompanyAssessment;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtGzdg;
+import com.rongwei.bsentity.domain.JtZtfaps;
 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;
 
@@ -15,8 +18,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
@@ -27,7 +30,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 @Component
 public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+    private static JtZtfapsServiceImpl jtZtfapsService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -35,34 +38,39 @@ public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
-        KC109ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    public void setjkCompanyAssessmentServiceImpl(JtZtfapsServiceImpl jtZtfapsService) {
+        KC109ApiRequestAndProcessing.jtZtfapsService = jtZtfapsService;
     }
+
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
-        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
-        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
-        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
-        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
-        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
-        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
-        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
-        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
-        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
-        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
-        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
-        return stringObjectMap;
+        assembleData.add(setOrdinaryDate("DATAID", JtZtfaps::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtZtfaps::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtZtfaps::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtZtfaps::getXmmc));
+        assembleData.add(setOrdinaryDate("fabh", JtZtfaps::getFabh));
+        assembleData.add(setOrdinaryDate("famc", JtZtfaps::getFamc));
+        assembleData.add(setOrdinaryDate("lzpswjzrr", JtZtfaps::getLzpswjzrr));
+        assembleData.add(setDatePattern("lzpswjpzsj", JtZtfaps::getLzpswjpzsj, DATE_PATTERN_YMD));
+        JtZtfaps jtZtfaps = jtZtfapsService.getById(id);
+        return assembleApiData(jtZtfaps, assembleData);
     }
 
     @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);
         // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+
+
+        jtZtfapsService.update(new LambdaUpdateWrapper<JtZtfaps>()
+                .eq(JtZtfaps::getId, id)
+                .set(JtZtfaps::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtZtfaps::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -2,21 +2,15 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 import com.rongwei.bscommon.sys.service.impl.JtZjfjflqdServiceImpl;
 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
  *
@@ -32,27 +26,29 @@ public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC110ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }
+
     @Autowired
     public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
         KC110ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
     }
-    @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;
     }
 
     @Override
-    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);
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZjfjflqdService.removeById(id);
         return R.ok();

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

@@ -1,11 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtWyysServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtWyys;
+import com.rongwei.bsentity.domain.JtZtfaps;
 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 +18,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
@@ -26,16 +31,23 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     @Autowired
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    @Autowired
+    private JtWyysServiceImpl 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);
-        return stringObjectMap;
+        assembleData.add(setOrdinaryDate("DATAID", JtWyys::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtWyys::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtWyys::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtWyys::getXmmc));
+        assembleData.add(setOrdinaryDate("yzlx", JtWyys::getYzlx));
+        assembleData.add(setOrdinaryDate("kcclswqxzlyzzrr", JtWyys::getZlyzzrr));
+        assembleData.add(setOrdinaryDate("xckcclyzzrr", JtWyys::getXcyzzrr));
+        assembleData.add(setDatePattern("kcclswqxzlyzsj", JtWyys::getZlyzsj, DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("xckcclyzsj", JtWyys::getXcyzsj, DATE_PATTERN_YMD));
+        JtWyys jtWyys = jtWyysService.getById(id);
+        return assembleApiData(jtWyys, assembleData);
     }
 
     @Override
@@ -44,7 +56,12 @@ public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+
+        jtWyysService.update(new LambdaUpdateWrapper<JtWyys>()
+                .eq(JtWyys::getId, id)
+                .set(JtWyys::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtWyys::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -53,10 +53,12 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtWyysService.removeById(id);
         // 后续逻辑处理

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.strategy.api;
 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.JtWyys;
 import com.rongwei.bsentity.domain.JtYjbhgl;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -67,16 +68,12 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
-
-
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
 
         jtYjbhglService.update(new LambdaUpdateWrapper<JtYjbhgl>()
-                .eq(JtYjbhgl::getId, id).set(JtYjbhgl::getDataid, realDataId));
+                .eq(JtYjbhgl::getId, id)
+                .set(JtYjbhgl::getSyncstate,  apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtYjbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -56,10 +56,12 @@ public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtYjbhglService.removeById(id);
         return R.ok();

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

@@ -74,13 +74,12 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+
         jtScsdlService.update(new LambdaUpdateWrapper<JtScsdl>()
-                .eq(JtScsdl::getId, id).set(JtScsdl::getDataid, realDataId));
+                .eq(JtScsdl::getId, id)
+                .set(JtScsdl::getSyncstate,  apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtScsdl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -53,10 +53,12 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtScsdlService.removeById(id);
         // 后续逻辑处理

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

@@ -5,6 +5,7 @@ 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.JtScsdl;
 import com.rongwei.bsentity.domain.JtWtbhgl;
 import com.rongwei.bsentity.domain.JtWtbhgl;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -70,13 +71,13 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+
+
         jtWtbhglService.update(new LambdaUpdateWrapper<JtWtbhgl>()
-                .eq(JtWtbhgl::getId, id).set(JtWtbhgl::getDataid, realDataId));
+                .eq(JtWtbhgl::getId, id)
+                .set(JtWtbhgl::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtWtbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -55,10 +55,12 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtWtbhglService.removeById(id);
         // 后续逻辑处理

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

@@ -2,17 +2,12 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 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;
 
@@ -21,7 +16,6 @@ import java.util.List;
 import java.util.Map;
 
 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;
 
 /**
@@ -48,7 +42,7 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
         assembleData.add(setOrdinaryDate("DATAID", JtScbhgl::getDataid));
         assembleData.add(setOrdinaryDate("INDEXID", JtScbhgl::getId));
@@ -56,27 +50,25 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         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));
+        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;
     }
 
     @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", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
         jtScbhglService.update(new LambdaUpdateWrapper<JtScbhgl>()
-                .eq(JtScbhgl::getId, id).set(JtScbhgl::getDataid, realDataId));
+                .eq(JtScbhgl::getId, id)
+                .set(JtScbhgl::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtScbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -55,10 +55,12 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtScbhglService.removeById(id);
         // 后续逻辑处理

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

@@ -5,6 +5,7 @@ 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.JtScbhgl;
 import com.rongwei.bsentity.domain.JtSjjdqd;
 import com.rongwei.bsentity.domain.JtSjjdqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -68,14 +69,11 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
         jtSjjdqdService.update(new LambdaUpdateWrapper<JtSjjdqd>()
-                .eq(JtSjjdqd::getId, id).set(JtSjjdqd::getDataid, realDataId));
+                .eq(JtSjjdqd::getId, id)
+                .set(JtSjjdqd::getSyncstate,  apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtSjjdqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -49,10 +49,12 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtSjjdqdService.removeById(id);
         // 后续逻辑处理

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

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtSjbgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtSjbgqd;
+import com.rongwei.bsentity.domain.JtSjjdqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -40,7 +42,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtSjbgqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtSjbgqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtSjbgqd::getDataid));
         assembleData.add(setOrdinaryDate("xmbh", JtSjbgqd::getXmbh));
         assembleData.add(setOrdinaryDate("xmmc", JtSjbgqd::getXmmc));
@@ -62,6 +64,11 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtSjbgqdService.update(new LambdaUpdateWrapper<JtSjbgqd>()
+                .eq(JtSjbgqd::getId, id)
+                .set(JtSjbgqd::getSyncstate,    apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtSjbgqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -43,10 +43,12 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtSjbgqdService.removeById(id);
         return R.ok("删除成功");

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

@@ -1,7 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZbrygwjzrfgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JtSjbgqd;
 import com.rongwei.bsentity.domain.JtZbrygwjzrfgqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -41,7 +43,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtZbrygwjzrfgqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtZbrygwjzrfgqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtZbrygwjzrfgqd::getDataid));
         assembleData.add(setOrdinaryDate("glryxm", JtZbrygwjzrfgqd::getGlryxm));
         assembleData.add(setOrdinaryDate("glrygwzz", JtZbrygwjzrfgqd::getGlrygwzz));
@@ -58,6 +60,11 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtZbrygwjzrfgqdService.update(new LambdaUpdateWrapper<JtZbrygwjzrfgqd>()
+                .eq(JtZbrygwjzrfgqd::getId, id)
+                .set(JtZbrygwjzrfgqd::getSyncstate,apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtZbrygwjzrfgqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZbrygwjzrfgqdService.removeById(id);
         return R.ok();

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

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtPxjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtPxjhqd;
+import com.rongwei.bsentity.domain.JtZbrygwjzrfgqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -41,7 +43,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtPxjhqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtPxjhqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtPxjhqd::getDataid));
         assembleData.add(setOrdinaryDate("pxbh", JtPxjhqd::getPxbh));
         assembleData.add(setOrdinaryDate("pxmc", JtPxjhqd::getPxmc));
@@ -63,6 +65,11 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtPxjhqdService.update(new LambdaUpdateWrapper<JtPxjhqd>()
+                .eq(JtPxjhqd::getId, id)
+                .set(JtPxjhqd::getSyncstate,   apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtPxjhqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtPxjhqdService.removeById(id);
         return R.ok();

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

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtNdjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtNdjhqd;
+import com.rongwei.bsentity.domain.JtPxjhqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -41,7 +43,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtNdjhqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtNdjhqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtNdjhqd::getDataid));
         assembleData.add(setOrdinaryDate("jhbh", JtNdjhqd::getJhbh));
         assembleData.add(setOrdinaryDate("jhmc", JtNdjhqd::getJhmc));
@@ -59,7 +61,11 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtNdjhqdService.update(new LambdaUpdateWrapper<JtNdjhqd>()
+                .eq(JtNdjhqd::getId, id)
+                .set(JtNdjhqd::getSyncstate,    apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtNdjhqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -50,10 +50,12 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtNdjhqdService.removeById(id);
         return R.ok();

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

@@ -1,7 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZdxmszmnServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JtNdjhqd;
 import com.rongwei.bsentity.domain.JtZdxmszmn;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -41,7 +43,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtZdxmszmn::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtZdxmszmn::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtZdxmszmn::getDataid));
         assembleData.add(setOrdinaryDate("xmbh", JtZdxmszmn::getXmbh));
         assembleData.add(setOrdinaryDate("xmmc", JtZdxmszmn::getXmmc));
@@ -57,7 +59,11 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtZdxmszmnService.update(new LambdaUpdateWrapper<JtZdxmszmn>()
+                .eq(JtZdxmszmn::getId, id)
+                .set(JtZdxmszmn::getSyncstate,   apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtZdxmszmn::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -50,10 +50,12 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZdxmszmnService.removeById(id);
         return R.ok();

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

@@ -1,8 +1,10 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtXcjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtXcjhqd;
+import com.rongwei.bsentity.domain.JtZdxmszmn;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -40,7 +42,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtXcjhqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtXcjhqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtXcjhqd::getDataid));
         assembleData.add(setOrdinaryDate("xmbh", JtXcjhqd::getXmbh));
         assembleData.add(setOrdinaryDate("xcxmmc", JtXcjhqd::getXmmc));
@@ -64,7 +66,11 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
-        // 后续逻辑处理
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtXcjhqdService.update(new LambdaUpdateWrapper<JtXcjhqd>()
+                .eq(JtXcjhqd::getId, id)
+                .set(JtXcjhqd::getSyncstate,apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtXcjhqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -44,10 +44,12 @@ public class KC134ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtXcjhqdService.removeById(id);
         return R.ok("删除成功");

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZjfjflqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JtXcjhqd;
 import com.rongwei.bsentity.domain.JtZjfjflqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -44,7 +45,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtZjfjflqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtZjfjflqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtZjfjflqd::getDataid));
         assembleData.add(setOrdinaryDate("zjxm", JtZjfjflqd::getZjxm));
         assembleData.add(setOrdinaryDate("zjdj", JtZjfjflqd::getZjdj));
@@ -62,13 +63,11 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
         jtZjfjflqdService.update(new LambdaUpdateWrapper<JtZjfjflqd>()
-                .eq(JtZjfjflqd::getId, id).set(JtZjfjflqd::getDataid, realDataId));
+                .eq(JtZjfjflqd::getId, id)
+                .set(JtZjfjflqd::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtZjfjflqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtZjfjflqdService.removeById(id);
         return R.ok();

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

@@ -45,7 +45,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtJscgpyqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtJscgpyqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtJscgpyqd::getDataid));
         assembleData.add(setOrdinaryDate("cgpyhdmc", JtJscgpyqd::getCgpyhdmc));
         assembleData.add(setOrdinaryDate("pyfl", JtJscgpyqd::getPyfl));
@@ -63,13 +63,11 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
         jtJscgpyqdService.update(new LambdaUpdateWrapper<JtJscgpyqd>()
-                .eq(JtJscgpyqd::getId, id).set(JtJscgpyqd::getDataid, realDataId));
+                .eq(JtJscgpyqd::getId, id)
+                .set(JtJscgpyqd::getSyncstate,  apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtJscgpyqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtJscgpyqdService.removeById(id);
         return R.ok();

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

@@ -8,8 +8,6 @@ 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;
 
@@ -44,7 +42,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtYxwjfbqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtYxwjfbqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtYxwjfbqd::getDataid));
         assembleData.add(setOrdinaryDate("fbwjmc", JtYxwjfbqd::getFbwjmc));
         assembleData.add(setOrdinaryDate("wjlb", JtYxwjfbqd::getWjlb));
@@ -61,12 +59,10 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
-        jtYxwjfbqdService.update(new LambdaUpdateWrapper<JtYxwjfbqd>().eq(JtYxwjfbqd::getId, id).set(JtYxwjfbqd::getDataid, realDataId));
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtYxwjfbqdService.update(new LambdaUpdateWrapper<JtYxwjfbqd>().eq(JtYxwjfbqd::getId, id)
+                .set(JtYxwjfbqd::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtYxwjfbqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtYxwjfbqdService.removeById(id);
         return R.ok();

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

@@ -8,8 +8,6 @@ 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;
 
@@ -44,7 +42,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtJsglcgqd::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtJsglcgqd::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtJsglcgqd::getDataid));
         assembleData.add(setOrdinaryDate("xmmc", JtJsglcgqd::getXmmc));
         assembleData.add(setOrdinaryDate("jxmc", JtJsglcgqd::getJxmc));
@@ -68,12 +66,10 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
-        jtJsglcgqdService.update(new LambdaUpdateWrapper<JtJsglcgqd>().eq(JtJsglcgqd::getId, id).set(JtJsglcgqd::getDataid, realDataId));
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtJsglcgqdService.update(new LambdaUpdateWrapper<JtJsglcgqd>().eq(JtJsglcgqd::getId, id)
+                .set(JtJsglcgqd::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtJsglcgqd::getDataid, realDataId));
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -51,10 +51,12 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtJsglcgqdService.removeById(id);
         return R.ok();

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

@@ -8,8 +8,6 @@ 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;
 
@@ -43,7 +41,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtXysjyq::getIndexid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtXysjyq::getId));
         assembleData.add(setOrdinaryDate("DATAID", JtXysjyq::getDataid));
         assembleData.add(setOrdinaryDate("yxzgcspxbyxgcbzpxbdpxhzhyxgrsl", JtXysjyq::getYxzgcspxbyxgcbzpxbdpxhzhyxgrsl));
         assembleData.add(setFileInfo("jsfabzhsscl", JtXysjyq::getJsfabzhsscl, true));
@@ -64,12 +62,10 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
-        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "");
-        if (StringUtils.isBlank(realDataId)) {
-            throw new CustomException("接口请求成功,但无法获取dataId");
-        }
-        jtXysjyqService.update(new LambdaUpdateWrapper<JtXysjyq>().eq(JtXysjyq::getId, id).set(JtXysjyq::getDataid, realDataId));
+        String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
+        jtXysjyqService.update(new LambdaUpdateWrapper<JtXysjyq>().eq(JtXysjyq::getId, id)
+                .set(JtXysjyq::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtXysjyq::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -51,10 +51,12 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
 
     @Override
     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);
+        if (apiCallData != null) {
+            ApiCallDto paramVo = new ApiCallDto();
+            paramVo.setData(apiCallData);
+            paramVo.setApiCode(code);
+            ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        }
         // 后续逻辑处理
         jtXysjyqService.removeById(id);
         return R.ok();

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/ApiDataOrgUtil.java

@@ -56,7 +56,7 @@ public class ApiDataOrgUtil {
             if (getDataFunction == null) {
                 apply = configDTO.getRealValue();
             } else {
-                apply = configDTO.getDataFunction().apply(infos);
+                apply = infos == null ? null : configDTO.getDataFunction().apply(infos);
             }
             apiData.put(key, ObjConver(apply, configDTO));
         });

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java

@@ -5,11 +5,11 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.rongwei.bsentity.dto.ApiCallDto;
-import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bscommon.sys.service.ApiLogService;
 import com.rongwei.bscommon.sys.service.RedisService;
 import com.rongwei.bscommon.sys.service.SysConfigService;
+import com.rongwei.bsentity.dto.ApiCallDto;
+import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.Constants;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -44,6 +44,7 @@ public class AttendanceAssessmentSdk {
     public static final int TOKEN_EXPIRED_SECONDS = 1700;
     public static final String GSLB = "KC";
     private static final Logger logger = LoggerFactory.getLogger(AttendanceAssessmentSdk.class);
+    private final Map<String, Object> businessDataMap = new HashMap<>(2);
     // 客户端ID
     private String appId;
     // 客户端密钥
@@ -54,8 +55,6 @@ public class AttendanceAssessmentSdk {
     private String clientIp;
     // token的虚拟目录
     private String tokenVirtualDirectory;
-
-    private final Map<String, Object> businessDataMap = new HashMap<>(2);
     // api路由
     private Map<String, String> apiVirtualDirectoryMap = null;
     @Autowired
@@ -95,16 +94,18 @@ public class AttendanceAssessmentSdk {
         /**********************组装请求参数**************************************/
         Map<String, Map<String, Object>> postData = new HashMap<>(2);
         Map<String, Object> requestData = getRequestData();
-        requestData.put("TOKEN", getToken());
-        requestData.put("GSLB", GSLB);
-        Map<String, Object> businessMap = (Map<String, Object>) paramVo.getData();
-        postData.put("STANDARD_DATA", requestData);
-        postData.put("BUSINESS_DATA", businessMap);
-        JSONConfig config = new JSONConfig();
-        config.setIgnoreNullValue(false);
-        String jsonStr = JSONUtil.toJsonStr(postData, config);
-        logger.info("入参：{}", jsonStr);
+        String jsonStr = "";
         try {
+            requestData.put("TOKEN", getToken());
+            requestData.put("GSLB", GSLB);
+            Map<String, Object> businessMap = (Map<String, Object>) paramVo.getData();
+            postData.put("STANDARD_DATA", requestData);
+            postData.put("BUSINESS_DATA", businessMap);
+            JSONConfig config = new JSONConfig();
+            config.setIgnoreNullValue(false);
+            jsonStr = JSONUtil.toJsonStr(postData, config);
+            logger.info("入参：{}", jsonStr);
+
             apiResult = HttpRequest.post(url).body(jsonStr).execute().body();
             logger.info("接口返回报文：{}", apiResult);
             apiReturnDto = JSONUtil.toBean(apiResult, ApiReturnDto.class);
@@ -127,22 +128,29 @@ public class AttendanceAssessmentSdk {
                     throw new CustomException("必填项为空");
                 case CODE_103:
                     throw new CustomException("数据主键或数据编码有误，数据操作失败");
+                case 0:
+                    throw new CustomException("代码异常");
                 default:
                     break;
             }
+            apiReturnDto.setSuccessful(true);
         } catch (cn.hutool.core.io.IORuntimeException ioRuntimeException) {
-            throw new CustomException("接口请求超时");
+            logger.error("请求超时");
         } catch (CustomException e) {
-            e.printStackTrace();
+            logger.error("自定义异常：{}",e.getMessage());
+            apiResult = e.getMessage();
         } catch (Exception exception) {
-            exception.printStackTrace();
-            logger.error("接口调用异常", exception.getMessage());
+            logger.error("接口调用异常:{}", exception.getMessage());
             apiResult = "接口调用异常:" + exception.getMessage();
         } finally {
             // 接口调用结束后续逻辑处理
             String finalApiResult = apiResult;
-            Thread td = new Thread(() -> afterAll(paramVo, jsonStr, finalApiResult));
+            String finalJsonStr = jsonStr;
+            Thread td = new Thread(() -> afterAll(paramVo, finalJsonStr, finalApiResult));
             td.start();
+            if (apiReturnDto == null) {
+                apiReturnDto = new ApiReturnDto();
+            }
         }
         return apiReturnDto;
     }
@@ -200,7 +208,12 @@ public class AttendanceAssessmentSdk {
         postData.put("STANDARD_DATA", getRequestData());
         postData.put("BUSINESS_DATA", this.businessDataMap);
         logger.info("请求url: {}", url);
-        String body = HttpRequest.post(url).body(postData.toString()).execute().body();
+        String body;
+        try {
+            body = HttpRequest.post(url).body(postData.toString()).execute().body();
+        } catch (Exception e) {
+            throw new CustomException("请求token失败");
+        }
         logger.info("接口返回: {}", body);
         if (StringUtils.isEmptyStr(body)) {
             throw new CustomException("请求token失败");

jsglkh-entity/src/main/java/com/rongwei/bsentity/dto/ApiReturnDto.java

@@ -15,28 +15,7 @@ public class ApiReturnDto {
 
     private StandardReturn STANDARD_RETURN;
     private BusinessReturn BUSINESS_RETURN;
-
-    /**
-     * 请求响应业务数据
-     */
-    @Data
-    public class BusinessReturn {
-        private int CODE;
-        private String MSG;
-        private Map<String, String> DATA;
-    }
-
-    /**
-     * 请求响应标准信息
-     */
-    @Data
-    public class StandardReturn {
-        private String ZINSTID;
-        private String ZZRESTIME;
-        private String ZZSTAT;
-        private String ZZMSG;
-    }
-
+    private boolean successful = false;
 
     public String getToken() {
         return this.getBUSINESS_RETURN().getDATA().getOrDefault("TOKEN", "");
@@ -46,8 +25,8 @@ public class ApiReturnDto {
      * 获取接口请求成功返回的数据
      * @return
      */
-    public Map<String, String> getApiReturnData(){
-        return this.getBUSINESS_RETURN().getDATA();
+    public Map<String, String> getApiReturnData() {
+        return this.getBUSINESS_RETURN() == null ? null : this.getBUSINESS_RETURN().getDATA();
     }
 
     /**
@@ -60,8 +39,8 @@ public class ApiReturnDto {
      * 006：数据超过最大处理数量
      * @return
      */
-    public String getApsStat(){
-        return this.getSTANDARD_RETURN().getZZSTAT();
+    public String getApsStat() {
+        return this.getSTANDARD_RETURN() == null ? null : this.getSTANDARD_RETURN().getZZSTAT();
     }
 
     /**
@@ -71,7 +50,28 @@ public class ApiReturnDto {
      * 103：数据主键或数据编码有误，数据操作失败
      * @return
      */
-    public int getSuccessCode(){
-        return this.getBUSINESS_RETURN().getCODE();
+    public int getSuccessCode() {
+        return this.getBUSINESS_RETURN() == null ? 0 : this.getBUSINESS_RETURN().getCODE();
+    }
+
+    /**
+     * 请求响应业务数据
+     */
+    @Data
+    public class BusinessReturn {
+        private int CODE;
+        private String MSG;
+        private Map<String, String> DATA;
+    }
+
+    /**
+     * 请求响应标准信息
+     */
+    @Data
+    public class StandardReturn {
+        private String ZINSTID;
+        private String ZZRESTIME;
+        private String ZZSTAT;
+        private String ZZMSG;
     }
 }

jsglkh-server/src/main/java/com/rongwei/controller/SynchronizationDataController.java

@@ -9,6 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @author ：sc
  * @since ：2024/12/2
@@ -23,19 +28,28 @@ public class SynchronizationDataController {
     /**
      * 新增和修改接口同步方法
      */
-    @PostMapping("/push/{id}/{code}")
-    public R pushDataSync(@PathVariable String id, @PathVariable String code) {
-        return synchronizationDataService.pushDataSync(id, code);
+    @PostMapping("/push")
+    public R pushDataSync(@RequestBody Map<String, String> jsonDatas) {
+        return synchronizationDataService.pushDataSync(jsonDatas.getOrDefault("ids", ""), jsonDatas.getOrDefault("code", ""));
     }
 
+
+
+
     /**
      * 删除接口同步方法
      */
-    @PostMapping("/delete/{id}/{dataId}/{code}")
-    public R deleteDataSync(@PathVariable String id, @PathVariable String dataId, @PathVariable String code) {
-        return synchronizationDataService.deleteDataSync(id, dataId, code);
+    @PostMapping("/delete")
+    public R deleteDataSync(@RequestBody Map<String, String> jsonDatas) {
+        String dataIds = jsonDatas.getOrDefault("dataIds", "");
+        List<String> list = Arrays.asList(dataIds.split(","));
+        List<String> ids = list.stream().map(data -> data.split(":")[0]).collect(Collectors.toList());
+        List<String> dataIdList = list.stream().map(data -> data.split(":")[1]).collect(Collectors.toList());
+        return synchronizationDataService.deleteDataSync(ids, dataIdList, jsonDatas.getOrDefault("code", ""));
     }
 
+
+
     /**
      * 模仿测试文件上传
      */