Merge branch 'master' of http://192.168.0.27:8090/inori/kingdee-adapter

src/main/java/com/system/controller/KingDeeSyncController.java

@@ -29,6 +29,7 @@ public class KingDeeSyncController {
     @ApiOperation("金蝶同步")
     @GetMapping("/kingdee/synchronization")
     public RestResponse kingdeeSynchronization() {
+        System.out.println("金蝶同步====");
         synchronizationService.kingdeeSynchronization();
         return RestResponse.success();
     }
@@ -36,6 +37,7 @@ public class KingDeeSyncController {
     @ApiOperation("手动同步")
     @GetMapping("/kingdee/manual/synchronization")
     public RestResponse manualSynchronization() {
+        System.out.println("手动同步====");
         synchronizationService.kingdeeManualSynchronization();
         return RestResponse.success();
     }
@@ -43,6 +45,7 @@ public class KingDeeSyncController {
     @ApiOperation("手动同步（带参数）")
     @PostMapping("/kingdee/manual/synchronizationByParam")
     public RestResponse manualSynchronizationByParam(@RequestBody Map<String, String> docTypeMap) {
+        System.out.println("手动同步(带参数)===="+docTypeMap);
         synchronizationService.manualSynchronizationByParam(docTypeMap.get("docType"));
         return RestResponse.success();
     }

src/main/java/com/system/service/impl/KingDeeCommonSyncServiceImpl.java

@@ -194,8 +194,9 @@ public class KingDeeCommonSyncServiceImpl implements IKingDeeCommonSyncService {
      * 同步至第三方
      */
     private void encapsulationRequest(Map<String, String> config, String queueId, Integer id, List<Map<String, Object>> dataList) {
-        System.out.println("dataList"+dataList);
         for(Map<String, Object> curData:dataList){
+            curData.put("docType",config.get("docType"));
+            System.out.println("curData"+curData);
             String response = kingDeeCommonSyncApi.sendThirdParty(JsonUtil.toString(curData));
             response = unicodeToString(response);
 

src/main/java/com/system/service/impl/SynchronizationServiceImpl.java

@@ -67,6 +67,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
 
     @Override
     public void kingdeeManualSynchronization() {
+        System.out.println("kingdeeManualSynchronization=====");
         threadPool.execute(() -> {
             List<SynchronizationRecordsListOutVoRecords> recordsList = synchronizationRecordsMapper.synchronizationRecordsListByStatus(Stream.of(1, 2).collect(Collectors.toList()));
 
@@ -123,12 +124,13 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
 
     @Transactional(rollbackFor = Exception.class)
     public void synchronization() {
+        System.out.println("synchronization=====");
         List<Map<String, Object>> tempList = kingDeeSynchronizationApi.synchronization();
 
         if (!CollectionUtils.isEmpty(tempList)) {
             synchronizationRecordsMapper.synchronizationRecordsTempCreate(tempList);
         }
-
+        System.out.println("tempList===="+tempList);
         List<String> objectList = tempList.stream().filter(m -> !"LQKJ_IMSSync".equals(m.get("sFormId"))).map(m -> String.valueOf(m.get("fid"))).collect(Collectors.toList());
         List<Map<String, Object>> dataList = new ArrayList<>();
 
@@ -157,7 +159,8 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
             if (!CollectionUtils.isEmpty(idList)) {
                 synchronizationRecordsMapper.synchronizationRecordsUpdateByIdList(idList);
             }
-
+            System.out.println("idList===="+idList);
+            System.out.println("recordsList===="+recordsList);
             for (SynchronizationRecordsListOutVoRecords records : recordsList) {
                 if (!"LQKJ_IMSSync".equals(records.getSFormId())) {
                     kingDeeCommonSyncService.synchronization(records.getId(), records.getSFormId(), records.getDataId(), records.getEntryId());