微调

semiconductor-framework/semiconductor-framework-core/src/main/java/com/system/framework/core/config/MybatisPlusConfiguration.java

@@ -2,14 +2,18 @@ package com.system.framework.core.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+/**
+ * @author Inori
+ */
 @EnableTransactionManagement
-@MapperScan("com.system.**.mapper*")
+@MapperScan("com.**.mapper*")
 @Configuration
 public class MybatisPlusConfiguration {
     /**
@@ -19,8 +23,9 @@ public class MybatisPlusConfiguration {
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         //向Mybatis过滤器链中添加分页拦截器
-        interceptor.addInnerInterceptor(new
-                PaginationInnerInterceptor(DbType.MYSQL));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        //乐观锁mybatis插件
+        interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
         return interceptor;
     }
 

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

 package com.system.api;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.system.constants.KingDeeConstants;
 import com.system.dao.InitConnectParamMapper;
 import com.system.exception.KingDeeConnectException;
 import com.system.model.DelayedElement;
@@ -326,7 +327,7 @@ public class KingDeeApi {
             }
 
             Map<String, Object> map = new HashMap<>();
-            map.put("code", "0002");
+            map.put("code", KingDeeConstants.ERROR_CODE);
             map.put("data", new ArrayList<>());
             map.put("message", "第三方请求超时");
             map.put("success", "false");
@@ -343,7 +344,7 @@ public class KingDeeApi {
             }
 
             Map<String, Object> map = new HashMap<>();
-            map.put("code", "0002");
+            map.put("code", KingDeeConstants.ERROR_CODE);
             map.put("data", new ArrayList<>());
             map.put("message", "插件请求超时");
             map.put("success", "false");

semiconductor-system/src/main/java/com/system/constants/KingDeeConstants.java

+package com.system.constants;
+
+/**
+ * @author Inori
+ */
+public interface KingDeeConstants {
+
+    String CODE_NAME = "resultCode";
+
+
+    String SUCCESS_CODE = "0000";
+
+
+    String ERROR_CODE = "0002";
+
+
+}

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

@@ -55,12 +55,8 @@ public class KingDeeCommonPushKingDeeApi {
                     }
                 }
             }
-            /* 修改条件FEntryID */
-            //entityMap.put("FEntryID", map.get("FEntry_ID"));
-            list.add(entityMap);
 
-            /* 修改条件FID */
-            //modelMap.put("FID", map.get("FID"));
+            list.add(entityMap);
         }
         modelMap.put(entryName, list);
 

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

 package com.system.utils;
 
 import com.system.config.ThreadLocalConfig;
+import com.system.constants.KingDeeConstants;
 import com.system.dao.KingDeeLogMapper;
 import com.system.transfer.kingdee.KingDeeLogCreateInVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,9 +74,7 @@ public class KingDeeLogUtil {
 
         Map<String, Object> map = JsonUtil.toMap(response, String.class, Object.class);
         if (StringUtil.isNotBlank(response) && !CollectionUtils.isEmpty(map)) {
-            String code = "0000";
-            String codeName = "resultCode";
-            if (map.containsKey(codeName) && code.equals(map.get(codeName))) {
+            if (map.containsKey(KingDeeConstants.CODE_NAME) && KingDeeConstants.SUCCESS_CODE.equals(map.get(KingDeeConstants.CODE_NAME))) {
                 inVo.setFlag(1);
             } else {
                 inVo.setFlag(0);

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

 package com.system.utils;
 
+import com.system.constants.KingDeeConstants;
 import com.system.dao.SynchronizationRecordsMapper;
 import com.system.dao.ThirdPartyLogMapper;
 import com.system.transfer.kingdee.SynchronizationRecordsDeleteInVo;
@@ -50,9 +51,7 @@ public class ThirdPartyLogUtil {
 
         Map<String, Object> map = JsonUtil.toMap(response, String.class, Object.class);
         if (!CollectionUtils.isEmpty(map)) {
-            String code = "true";
-            String codeName = map.get("success").toString();
-            if (code.equals(codeName)) {
+            if (KingDeeConstants.SUCCESS_CODE.equals(map.get(KingDeeConstants.CODE_NAME))) {
                 inVo.setFlag(1);
                 synchronizationRecordsMapper.synchronizationRecordsDelete(new SynchronizationRecordsDeleteInVo(id));
             } else {
@@ -60,9 +59,9 @@ public class ThirdPartyLogUtil {
                 inVo.setMessage(map.get("message").toString());
                 synchronizationRecordsMapper.synchronizationRecordsUpdate(id, queueId, 2);
             }
-        }else {
+        } else {
             inVo.setFlag(0);
-            inVo.setMessage("第三方响应信息");
+            inVo.setMessage("第三方响应信息错误");
             synchronizationRecordsMapper.synchronizationRecordsUpdate(id, queueId, 2);
         }
 
@@ -79,9 +78,7 @@ public class ThirdPartyLogUtil {
         inVo.setResponse(response);
 
         Map<String, Object> map = JsonUtil.toMap(response, String.class, Object.class);
-        String code = "0000";
-        String codeName = "resultCode";
-        if (code.equals(map.get(codeName))) {
+        if (KingDeeConstants.SUCCESS_CODE.equals(map.get(KingDeeConstants.CODE_NAME))) {
             inVo.setFlag(1);
         } else {
             inVo.setFlag(0);