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 @@ 导入功能 - - 导入规则 - - + 导入规则 + 导入实体 - 返回 导出综合表 + 导入字段 - 导入字段 - + 返回 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 { message.put("status", "数据预读入"); webSocketUtils.sendMessage(loginUser.getId(), message); Iterator 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 { 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 impleme public void saveSingleBatch(List tablexList, LoginUser loginUser, Map 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);