Merge remote-tracking branch 'origin/master'

jsglkh-common/pom.xml

@@ -23,11 +23,11 @@
             <artifactId>jsglkh-entity</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.1.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-generator</artifactId>-->
+<!--            <version>3.1.2</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 </project>

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

@@ -22,7 +22,7 @@ import java.util.Map;
 public class SynchronizationDataServiceImpl implements SynchronizationDataService {
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
-    private FileItemServiceImpl sysFileItemServiceImpl;
+    private SysFileItemServiceImpl sysFileItemServiceImpl;
     @Autowired
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
@@ -60,36 +60,48 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
                 apiRequestAndProcessingStrategy = new KC119ApiRequestAndProcessing();
             case "KC121":
                 apiRequestAndProcessingStrategy = new KC121ApiRequestAndProcessing();
+                break;
             case "KC123":
                 apiRequestAndProcessingStrategy = new KC123ApiRequestAndProcessing();
+                break;
             case "KC125":
                 apiRequestAndProcessingStrategy = new KC125ApiRequestAndProcessing();
+                break;
             case "KC127":
                 apiRequestAndProcessingStrategy = new KC127ApiRequestAndProcessing();
+                break;
             case "KC129":
                 apiRequestAndProcessingStrategy = new KC129ApiRequestAndProcessing();
+                break;
             case "KC131":
                 apiRequestAndProcessingStrategy = new KC131ApiRequestAndProcessing();
+                break;
             case "KC133":
                 apiRequestAndProcessingStrategy = new KC133ApiRequestAndProcessing();
+                break;
             case "KC135":
                 apiRequestAndProcessingStrategy = new KC135ApiRequestAndProcessing();
+                break;
             case "KC137":
                 apiRequestAndProcessingStrategy = new KC137ApiRequestAndProcessing();
+                break;
             case "KC139":
                 apiRequestAndProcessingStrategy = new KC139ApiRequestAndProcessing();
+                break;
             case "KC141":
                 apiRequestAndProcessingStrategy = new KC141ApiRequestAndProcessing();
+                break;
             case "KC143":
                 apiRequestAndProcessingStrategy = new KC143ApiRequestAndProcessing();
+                break;
             default:
                 break;
         }
         CalculatorContext primaryContext = new CalculatorContext(apiRequestAndProcessingStrategy);
         // 数据组装
-        Map<String, Object> apiCallData = primaryContext.executeStrategy(id,null);
+        Map<String, Object> apiCallData = primaryContext.executeStrategy(id, null, code);
         // 接口请求并 处理
-        return primaryContext.apiCallAndDataProcessing(id, code, apiCallData);
+        return primaryContext.apiCallAndDataProcessing(id, null, code, apiCallData);
     }
 
     @Override
@@ -118,36 +130,48 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
                 apiRequestAndProcessingStrategy = new KC120ApiRequestAndProcessing();
             case "KC122":
                 apiRequestAndProcessingStrategy = new KC122ApiRequestAndProcessing();
+                break;
             case "KC124":
                 apiRequestAndProcessingStrategy = new KC124ApiRequestAndProcessing();
+                break;
             case "KC126":
                 apiRequestAndProcessingStrategy = new KC126ApiRequestAndProcessing();
+                break;
             case "KC128":
                 apiRequestAndProcessingStrategy = new KC128ApiRequestAndProcessing();
+                break;
             case "KC130":
                 apiRequestAndProcessingStrategy = new KC130ApiRequestAndProcessing();
+                break;
             case "KC132":
                 apiRequestAndProcessingStrategy = new KC132ApiRequestAndProcessing();
+                break;
             case "KC134":
                 apiRequestAndProcessingStrategy = new KC134ApiRequestAndProcessing();
+                break;
             case "KC136":
                 apiRequestAndProcessingStrategy = new KC136ApiRequestAndProcessing();
+                break;
             case "KC138":
                 apiRequestAndProcessingStrategy = new KC138ApiRequestAndProcessing();
+                break;
             case "KC140":
                 apiRequestAndProcessingStrategy = new KC140ApiRequestAndProcessing();
+                break;
             case "KC142":
                 apiRequestAndProcessingStrategy = new KC142ApiRequestAndProcessing();
+                break;
             case "KC144":
                 apiRequestAndProcessingStrategy = new KC144ApiRequestAndProcessing();
+                break;
             default:
                 break;
         }
         CalculatorContext primaryContext = new CalculatorContext(apiRequestAndProcessingStrategy);
         // 数据组装
-        Map<String, Object> apiCallData = primaryContext.executeStrategy(id,code);
+        Map<String, Object> apiCallData = primaryContext.executeStrategy(id, dataId, code);
         // 接口请求并 处理
-        return primaryContext.apiCallAndDataProcessing(id, code, apiCallData);
+        return primaryContext.apiCallAndDataProcessing(id, dataId, code, apiCallData);
     }
 
     @Override

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

@@ -6,7 +6,7 @@ import com.rongwei.bscommon.sys.service.FileItemService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.springframework.stereotype.Service;
 
-@Service("fileItemServiceImpl")
-public class FileItemServiceImpl extends ServiceImpl<FileItemMapper, SysFileItemDo> implements FileItemService {
+@Service("sysFileServiceImpl")
+public class SysFileItemServiceImpl extends ServiceImpl<FileItemMapper, SysFileItemDo> implements FileItemService {
 
 }

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

@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2024/12/03
  */
 public interface ApiRequestAndProcessingStrategy {
-    Map<String, Object> assembleData(String id, String code);
+    Map<String, Object> assembleData(String id, String dataId, String code);
 
-    R apiCallAndDataProcessing(String id,String code,Map<String, Object> apiDataConfigDTOS);
+    R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiDataConfigDTOS);
 }

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

@@ -19,11 +19,11 @@ public class CalculatorContext {
         this.strategy = strategy;
     }
 
-    public Map<String, Object> executeStrategy(String id,String code) {
-        return strategy.assembleData(id,code);
+    public Map<String, Object> executeStrategy(String id, String dataId, String code) {
+        return strategy.assembleData(id, dataId, code);
     }
 
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
-        return strategy.apiCallAndDataProcessing(id, code, apiCallData);
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+        return strategy.apiCallAndDataProcessing(id, dataId, code, apiCallData);
     }
 }

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

@@ -28,7 +28,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -1,21 +1,16 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JtXcjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 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.setOrdinaryDatePattern;
-
 /**
  * AssembleK34ApiData class
  *
@@ -27,24 +22,26 @@ public class KC134ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Autowired
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+    @Autowired
+    private JtXcjhqdServiceImpl jtXcjhqdService;
 
-        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 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);
         // 后续逻辑处理
-        return R.ok();
+        jtXcjhqdService.removeById(id);
+        return R.ok("删除成功");
     }
 }

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

@@ -28,7 +28,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -28,7 +28,7 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, 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);

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

@@ -10,7 +10,6 @@ import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.commonservice.service.ApiLogService;
 import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.commonservice.service.SysConfigService;
-import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.Constants;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -31,6 +30,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.BusinessReturnCode.CODE_101;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.BusinessReturnCode.CODE_103;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.StandardReturn.*;
+
 /**
  * 考勤考核系统对接SDK
  */
@@ -88,11 +91,8 @@ public class AttendanceAssessmentSdk {
         // 请求地址
         String url = this.clientIp + this.apiVirtualDirectoryMap.get(paramVo.getApiCode());
         logger.info("api地址：{}", url);
-
-
         ApiReturnDto apiReturnDto = null;
         String apiResult = null;
-
         /**********************组装请求参数**************************************/
         Map<String, Map<String, Object>> postData = new HashMap<>(2);
         Map<String, Object> requestData = getRequestData();
@@ -109,6 +109,28 @@ public class AttendanceAssessmentSdk {
             apiResult = HttpRequest.post(url).body(jsonStr).execute().body();
             logger.info("接口返回报文：{}", apiResult);
             apiReturnDto = JSONUtil.toBean(apiResult, ApiReturnDto.class);
+            switch (apiReturnDto.getApsStat()) {
+                case CODE_001:
+                    throw new CustomException("token校验失败");
+                case CODE_002:
+                    throw new CustomException("单位编码为空");
+                case CODE_003:
+                    throw new CustomException("接口无权限");
+                case CODE_004:
+                    throw new CustomException("token过期");
+                case CODE_006:
+                    throw new CustomException("数据超过最大处理数量");
+                default:
+                    break;
+            }
+            switch (apiReturnDto.getSuccessCode()) {
+                case CODE_101:
+                    throw new CustomException("必填项为空");
+                case CODE_103:
+                    throw new CustomException("数据主键或数据编码有误，数据操作失败");
+                default:
+                    break;
+            }
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("接口调用异常", e.getMessage());

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

@@ -18,4 +18,46 @@ public class JXKHConstant {
         public static final String DATE_PATTERN_YMD_POINT = "yyyy.MM.dd";
     }
 
+    public static class BusinessReturnCode {
+        /**
+         * 接口执行成功
+         */
+        public static final int CODE_1100 = 1100;
+        /**
+         * 必填项xxx为空
+         */
+        public static final int CODE_101 = 101;
+        /**
+         * 数据主键或数据编码有误，数据操作失败
+         */
+        public static final int CODE_103 = 103;
+    }
+
+    public static class StandardReturn {
+        /**
+         * 请求成功
+         */
+        public static final String CODE_000 = "000";
+        /**
+         * token校验失败
+         */
+        public static final String CODE_001 = "001";
+        /**
+         * 单位编码为空
+         */
+        public static final String CODE_002 = "002";
+        /**
+         * 接口无权限
+         */
+        public static final String CODE_003 = "003";
+        /**
+         * token过期
+         */
+        public static final String CODE_004 = "004";
+        /**
+         * 数据超过最大处理数量
+         */
+        public static final String CODE_006 = "006";
+    }
 }
+