优化导入界面

dev^2
mqh 1 year ago
parent cc98e3b7d9
commit 2a962992df
  1. 10
      ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
  2. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
  3. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java

@ -99,21 +99,19 @@
<a-button type="primary" icon="import">导入功能</a-button> <a-button type="primary" icon="import">导入功能</a-button>
</a-upload> </a-upload>
<a-button type="primary" icon="import"
<a-button type="primary" icon="import" @click="showProcess( ruleData)">导入规则</a-button> @click="showProcess( ruleData)">导入规则
</a-button>
<a-button type="primary" icon="import" <a-button type="primary" icon="import"
@click="showProcess(tablexData)">导入实体 @click="showProcess(tablexData)">导入实体
</a-button> </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="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> </div>
<!-- table区域-begin --> <!-- table区域-begin -->

@ -337,7 +337,6 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
message.put("status", "数据预读入"); message.put("status", "数据预读入");
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
Iterator<TablexVo> iterator = list.iterator(); Iterator<TablexVo> iterator = list.iterator();
// for (TablexVo tablexVo : list) {
for (TablexVo tablexVo : list) { for (TablexVo tablexVo : list) {
//判断当前存入条是否为空值 //判断当前存入条是否为空值
if (StringUtils.isBlank(tablexVo.getModuleId()) && if (StringUtils.isBlank(tablexVo.getModuleId()) &&
@ -348,8 +347,6 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
StringUtils.isBlank(tablexVo.getStatus()) && StringUtils.isBlank(tablexVo.getStatus()) &&
StringUtils.isBlank(tablexVo.getVerisonStatus()) && StringUtils.isBlank(tablexVo.getVerisonStatus()) &&
StringUtils.isBlank(tablexVo.getVerison())) { StringUtils.isBlank(tablexVo.getVerison())) {
// list.remove(tablexVo);
// break;
continue; continue;
} }
//判断版本号长度 //判断版本号长度

@ -43,7 +43,7 @@ public class TablexServiceImpl extends ServiceImpl<TablexMapper, Tablex> impleme
public void saveSingleBatch(List<Tablex> tablexList, LoginUser loginUser, Map<String, String> message) { public void saveSingleBatch(List<Tablex> tablexList, LoginUser loginUser, Map<String, String> message) {
for (int i = 0; i < tablexList.size(); i++){ for (int i = 0; i < tablexList.size(); i++){
try { try {
Thread.sleep(3000L); Thread.sleep(1000L);
message.put("uploaded", String.valueOf(i + 1)); message.put("uploaded", String.valueOf(i + 1));
this.save(tablexList.get(i)); this.save(tablexList.get(i));
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);

Loading…
Cancel
Save