From 2a962992df7f6241397a253fab29e93af27392c9 Mon Sep 17 00:00:00 2001
From: mqh <1571896045@qq.com>
Date: Sat, 22 Jul 2023 15:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modulex/ModulexList.vue                | 12 +++++-------
 .../modules/tablex/controller/TablexController.java  |  3 ---
 .../tablex/service/impl/TablexServiceImpl.java       |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
index 35f1779..2ee49d6 100644
--- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
@@ -99,21 +99,19 @@
         <a-button type="primary" icon="import">导入功能</a-button>
       </a-upload>
 
-
-        <a-button type="primary" icon="import" @click="showProcess( ruleData)">导入规则</a-button>
-
-
+      <a-button type="primary" icon="import"
+                @click="showProcess( ruleData)">导入规则
+      </a-button>
 
       <a-button type="primary" icon="import"
                 @click="showProcess(tablexData)">导入实体
       </a-button>
 
-      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
       <a-button type="primary" icon="download" @click="exportxsxl('模块，功能，规则表')">导出综合表</a-button>
 
+      <a-button type="primary" icon="import" @click="showProcess( fieldData)">导入字段</a-button>
 
-        <a-button type="primary" icon="import" @click="showProcess( fieldData)">导入字段</a-button>
-
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
index 02f6c9b..9888b99 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
@@ -337,7 +337,6 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
             message.put("status", "数据预读入");
             webSocketUtils.sendMessage(loginUser.getId(), message);
             Iterator<TablexVo> iterator = list.iterator();
-//            for (TablexVo tablexVo : list) {
             for (TablexVo tablexVo : list) {
                 //判断当前存入条是否为空值
                 if (StringUtils.isBlank(tablexVo.getModuleId()) &&
@@ -348,8 +347,6 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
                         StringUtils.isBlank(tablexVo.getStatus()) &&
                         StringUtils.isBlank(tablexVo.getVerisonStatus()) &&
                         StringUtils.isBlank(tablexVo.getVerison())) {
-//                    list.remove(tablexVo);
-//                    break;
                     continue;
                 }
                 //判断版本号长度
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
index be1132c..1fad2b0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
@@ -43,7 +43,7 @@ public class TablexServiceImpl extends ServiceImpl<TablexMapper, Tablex> impleme
     public void saveSingleBatch(List<Tablex> tablexList, LoginUser loginUser, Map<String, String> message) {
         for (int i = 0; i < tablexList.size(); i++){
             try {
-                Thread.sleep(3000L);
+                Thread.sleep(1000L);
                 message.put("uploaded", String.valueOf(i + 1));
                 this.save(tablexList.get(i));
                 webSocketUtils.sendMessage(loginUser.getId(), message);