微调

semiconductor-system/src/main/java/com/system/api/KingDeeApi.java

@@ -7,7 +7,6 @@ import com.system.dao.InitConnectParamMapper;
 import com.system.exception.KingDeeConnectException;
 import com.system.model.DelayedElement;
 import com.system.model.InitConnectParam;
-import com.system.serivce.ISynchronizationService;
 import com.system.utils.HttpUtil;
 import com.system.utils.JsonUtil;
 import com.system.utils.KingDeeLogUtil;
@@ -56,9 +55,6 @@ public class KingDeeApi {
     private InitConnectParamMapper initConnectParamMapper;
 
     @Autowired
-    private ISynchronizationService synchronizationService;
-
-    @Autowired
     private KingDeeLogUtil kingDeeLogUtil;
 
 
@@ -132,7 +128,7 @@ public class KingDeeApi {
     /**
      * 查询单据体
      */
-    public List<List<Object>> getKingDeeData(String sFormId, Map<String, String> key, Map<String, String> where, String kingDeeLogName, String queueId) {
+    public List<List<Object>> getKingDeeData(String sFormId, String queueId, Map<String, String> key, Map<String, String> where, String kingDeeLogName) {
         try {
             if (this.flag) {
                 String content = "{\"FormId\":\"" + sFormId + "\"," + stringKey(key) + stringWhere(where) + "}";
@@ -140,7 +136,7 @@ public class KingDeeApi {
                 List<List<Object>> result = kingDeeK3CloudApi.executeBillQuery(content);
                 //记录查询金蝶云数据的请求及响应信息
                 if (StringUtil.isNotBlank(kingDeeLogName)) {
-                    kingDeeLogUtil.kingDeeSynLogCreate(kingDeeLogName, content, queueId, result);
+                    kingDeeLogUtil.kingDeeSynLogCreate(queueId, kingDeeLogName, content, result);
                 }
                 return result;
             } else {
@@ -159,11 +155,11 @@ public class KingDeeApi {
     public List<List<Object>> synchronization(String sFormId, Map<String, String> key, Map<String, String> where, String kingDeeLogName, String queueId) {
         try {
             if (this.flag) {
-                String content = "{\"FormId\":\"" + sFormId + "\"," + stringKey(key) + stringWhere(where) + "}";
-                System.out.println("================content==============" + content + "=================content===================");
-                List<List<Object>> result = kingDeeK3CloudApi.executeBillQuery(content);
+                String request = "{\"FormId\":\"" + sFormId + "\"," + stringKey(key) + stringWhere(where) + "}";
+                System.out.println("================content==============" + request + "=================content===================");
+                List<List<Object>> result = kingDeeK3CloudApi.executeBillQuery(request);
                 //记录查询金蝶云数据的请求及响应信息
-                kingDeeLogUtil.kingDeeSynLogCreate(kingDeeLogName, queueId, content, result);
+                kingDeeLogUtil.kingDeeSynLogCreate(queueId, kingDeeLogName, request, result);
 
                 return result;
             } else {
@@ -275,7 +271,7 @@ public class KingDeeApi {
             if (index != 0) {
                 this.sendThirdParty(json, index - 1);
             } else {
-                synchronizationService.turnOffSynchronization();
+                HttpUtil.httpGet("http://127.0.0.1:8090/integrate/api/turn/off/synchronization");
 
                 DelayQueue<DelayedElement> delayQueue = new DelayQueue<>();
                 threadPool.execute(() -> {
@@ -288,7 +284,7 @@ public class KingDeeApi {
                         ex.printStackTrace();
                     }
 
-                    synchronizationService.startSynchronization();
+                    HttpUtil.httpGet("http://127.0.0.1:8090/integrate/api/start/synchronization");
                 });
             }
 

semiconductor-system/src/main/java/com/system/kingdee/KingDeeCommonGetKingDeeApi.java

@@ -3,6 +3,7 @@ package com.system.kingdee;
 import com.system.api.KingDeeApi;
 import com.system.constants.KingDeeCommonSynConstants;
 import com.system.utils.KingDeeUtil;
+import com.system.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -22,16 +23,16 @@ public class KingDeeCommonGetKingDeeApi {
     private KingDeeApi kingDeeApi;
 
 
-    public List<Map<String, Object>> getKingDeeData(String sFormId, List<Map<String, String>> fieldList, Map<String, String> where, String kingDeeLogName, String queueId) {
+    public List<Map<String, Object>> getKingDeeData(String sFormId, String queueId, String mesEntryName, List<Map<String, String>> fieldList, Map<String, String> where, String kingDeeLogName) {
         Map<String, String> key = KingDeeCommonSynConstants.purchaseKingDee(fieldList);
-        List<List<Object>> result = kingDeeApi.getKingDeeData(sFormId, key, where, kingDeeLogName, queueId);
-        return purchaseIms(result, fieldList);
+        List<List<Object>> result = kingDeeApi.getKingDeeData(sFormId, queueId, key, where, kingDeeLogName);
+        return purchaseIms(result, fieldList, mesEntryName);
     }
 
     /**
      * 封装第三方字段
      */
-    private List<Map<String, Object>> purchaseIms(List<List<Object>> list, List<Map<String, String>> fieldList) {
+    private List<Map<String, Object>> purchaseIms(List<List<Object>> list, List<Map<String, String>> fieldList, String mesEntryName) {
         List<Map<String, Object>> result = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             String errorName = "Errors";
@@ -41,7 +42,11 @@ public class KingDeeCommonGetKingDeeApi {
 
                 KingDeeCommonSynConstants.purchaseIms(list, fieldList, map, imsList);
 
-                map.put("children", imsList);
+                if (!StringUtil.isNotBlank(mesEntryName)) {
+                    map.put(mesEntryName, imsList);
+                } else {
+                    map.put("children", imsList);
+                }
                 result.add(map);
             } else {
                 //如果有错误信息则返回

semiconductor-system/src/main/java/com/system/kingdee/KingDeeSynchronizationApi.java

@@ -41,9 +41,9 @@ public class KingDeeSynchronizationApi {
      */
     public List<Map<String, Object>> synchronization() {
         //查询未同步数据
-        List<List<Object>> list = kingDeeApi.getKingDeeData(S_FORM_ID, key, new HashMap<String, String>(1) {{
+        List<List<Object>> list = kingDeeApi.getKingDeeData(S_FORM_ID, "", key, new HashMap<String, String>(1) {{
             put("F_LQKJ_SyncCheck", "0");
-        }}, "", "");
+        }}, "");
         return purchaseTo(list);
     }
 

semiconductor-system/src/main/java/com/system/serivce/impl/KingDeeCommonGetServiceImpl.java

 package com.system.serivce.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.system.constants.KingDeeCommonSynConstants;
 import com.system.kingdee.KingDeeCommonGetKingDeeApi;
 import com.system.serivce.IKingDeeCommonGetService;
@@ -10,6 +9,7 @@ import com.system.utils.JsonUtil;
 import com.system.utils.ThirdPartyLogUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -37,7 +37,7 @@ public class KingDeeCommonGetServiceImpl implements IKingDeeCommonGetService {
         String queueId = inVo.getQueueId();
 
         Map<String, String> map = kingDeeCommonSynConstants.getKingDee(inVo.getDocType());
-        if (CollectionUtils.isEmpty(map)) {
+        if (org.springframework.util.CollectionUtils.isEmpty(map)) {
             return RestResponse.fail("自定义查询失败! docType为: " + inVo.getDocType() + " 的表单ERP-MES标识不存在");
         }
 
@@ -53,7 +53,7 @@ public class KingDeeCommonGetServiceImpl implements IKingDeeCommonGetService {
             }
         }
 
-        List<Map<String, Object>> result = kingDeeCommonGetKingDeeApi.getKingDeeData(map.get("sFormId"), fieldList, where, map.get("name"), queueId);
+        List<Map<String, Object>> result = kingDeeCommonGetKingDeeApi.getKingDeeData(map.get("sFormId"), queueId, map.get("mesEntryName"), fieldList, where, map.get("name"));
         if (!CollectionUtils.isEmpty(result)) {
             String temp = "false";
             if (result.get(0).containsKey(temp)) {

semiconductor-system/src/main/java/com/system/utils/KingDeeLogUtil.java

@@ -22,7 +22,7 @@ public class KingDeeLogUtil {
     private KingDeeLogMapper kingDeeLogMapper;
 
 
-    public void kingDeeSynLogCreate(String kingDeeLogName, String queueId, String request, List<List<Object>> response) {
+    public void kingDeeSynLogCreate(String queueId, String kingDeeLogName, String request, List<List<Object>> response) {
         KingDeeLogCreateInVo inVo = this.purchaseInVo(kingDeeLogName, queueId, request, JsonUtil.toString(response));
 
         String errorName = "Errors";