From 5a001d23ec9ece1e472ce5f0aa343c80d8e60d8d Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 31 Jul 2023 14:26:23 +0800 Subject: [PATCH 1/7] Changes --- .../org/jeecg/modules/fieldx/controller/FieldxController.java | 1 + .../jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java index 57492f5..f114e95 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java @@ -689,6 +689,7 @@ public class FieldxController extends JeecgController { message.put("isError", "true"); message.put("status","单元格样式错误,请根据注意事项保证单元格样式正确"); message.put("closeable","true"); + fieldx222Service.remove(null); webSocketUtils.sendMessage(loginUser.getId(), message); } return Result.OK("文件上传成功"); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java index 781f50c..929f1f6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java @@ -40,10 +40,14 @@ public class FieldxServiceImpl extends ServiceImpl impleme Thread.sleep(500L); message.put("uploaded", String.valueOf(i + 1)); this.save(fieldxList.get(i)); + Tablex tablex = tablexService.getById(fieldxList.get(i).getTableId()); + tablexService.updateVersion(fieldxList.get(i).getTableId(), tablex.getVerison() + 1); + tablexService.updateSql(fieldxList.get(i).getTableId(), fieldxController.createSql(fieldxList.get(i).getTableId())); webSocketUtils.sendMessage(loginUser.getId(), message); } catch (InterruptedException e) { log.error(e.getMessage(), e); } } } + } From 30459b43dd9699e1a08fd3026cb5377843559dc3 Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 31 Jul 2023 14:27:45 +0800 Subject: [PATCH 2/7] Changes --- .../org/jeecg/modules/fieldx/controller/FieldxController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java index f114e95..a9a6366 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java @@ -689,7 +689,7 @@ public class FieldxController extends JeecgController { message.put("isError", "true"); message.put("status","单元格样式错误,请根据注意事项保证单元格样式正确"); message.put("closeable","true"); - fieldx222Service.remove(null); + fieldxService.remove(null); webSocketUtils.sendMessage(loginUser.getId(), message); } return Result.OK("文件上传成功"); From 5c6a761b33b62b1598917dccd6553ef96dd69688 Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 31 Jul 2023 15:35:08 +0800 Subject: [PATCH 3/7] Changes --- .../fieldx/service/impl/FieldxServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java index 929f1f6..b8366ca 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ import java.util.Map; * @Version: V1.0 */ - +@Transactional @Service public class FieldxServiceImpl extends ServiceImpl implements IFieldxService { @Autowired @@ -40,9 +41,11 @@ public class FieldxServiceImpl extends ServiceImpl impleme Thread.sleep(500L); message.put("uploaded", String.valueOf(i + 1)); this.save(fieldxList.get(i)); - Tablex tablex = tablexService.getById(fieldxList.get(i).getTableId()); - tablexService.updateVersion(fieldxList.get(i).getTableId(), tablex.getVerison() + 1); - tablexService.updateSql(fieldxList.get(i).getTableId(), fieldxController.createSql(fieldxList.get(i).getTableId())); + if(fieldxList.get(i).getAssociateTable()==null&&fieldxList.get(i).getAssociateField()==null){ + Tablex tablex = tablexService.getById(fieldxList.get(i).getTableId()); + tablexService.updateVersion(fieldxList.get(i).getTableId(), tablex.getVerison() + 1); + tablexService.updateSql(fieldxList.get(i).getTableId(), fieldxController.createSql(fieldxList.get(i).getTableId())); + } webSocketUtils.sendMessage(loginUser.getId(), message); } catch (InterruptedException e) { log.error(e.getMessage(), e); From 7d4a33b80da8c7ac3b415e4242a7f41b01e6f3f2 Mon Sep 17 00:00:00 2001 From: lijinyu <3023846734@qq.com> Date: Mon, 31 Jul 2023 15:41:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ModulexServiceImpl.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java index 4706413..df6607f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java @@ -668,14 +668,6 @@ public class ModulexServiceImpl extends ServiceImpl impl webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("导入失败,英文名称不能为空"); }modulex.setModuleEnName(moduleEnName); -// String moduleCode = modulexTemplate.getModuleCode(); -// if(moduleCode==null||moduleCode.length()>30){ -// message.put("isError", "true"); -// message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不能为空或者模块编码过长"); -// message.put("closeable","true"); -// webSocketUtils.sendMessage(loginUser.getId(), message); -// return Result.error("导入失败,模块编码不能为空或者模块编码过长"); -// } String modulecode = null; LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Projectx::getProjectName,projectId); @@ -690,13 +682,6 @@ public class ModulexServiceImpl extends ServiceImpl impl return Result.error("导入失败,模块对应的项目编码不存在,请完善对应项目里的项目编码后,重新导入"); } modulecode = projectCode + firstChar; -// if(!modulecode.equals(moduleCode)){ -// message.put("isError", "true"); -// message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不规范，导入失败"); -// message.put("closeable","true"); -// webSocketUtils.sendMessage(loginUser.getId(), message); -// return Result.error("模块编码不规范，导入失败"); -// } modulex.setModuleCode(modulecode); String pmDescribe = modulexTemplate.getPmDescribe(); if(StringUtils.isBlank(pmDescribe)){ @@ -715,7 +700,7 @@ public class ModulexServiceImpl extends ServiceImpl impl modulex.setManagerUsers(null); }else { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); - String[] split = managerUsers.split(","); + String[] split = managerUsers.split("\\s+|,|;|，|、"); List managerUserName= Arrays.stream(split).map(String::valueOf).collect(Collectors.toList()); sysUserLambdaQueryWrapper.in(SysUser::getUsername,managerUserName); List iSysUserServiceOne = iSysUserService.list(sysUserLambdaQueryWrapper); @@ -734,7 +719,6 @@ public class ModulexServiceImpl extends ServiceImpl impl webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("导入失败,责任人信息查询不到"); } -// String strip = org.apache.commons.lang.StringUtils.strip(list.toString(), "[]"); String s = ""; for (int j = 0; j < list.size(); j++) { s = s + list.get(j); From 1ea5a17f3666dd76eae874fa449f42bcf03618e6 Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 31 Jul 2023 16:17:20 +0800 Subject: [PATCH 5/7] Changes --- .../fieldx/service/impl/FieldxServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java index b8366ca..e56838e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java @@ -9,6 +9,7 @@ import org.jeecg.modules.fieldx.service.IFieldxService; import org.jeecg.modules.tablex.entity.Tablex; import org.jeecg.modules.tablex.service.ITablexService; import org.jeecg.modules.tablex.ws.WebSocketUtils; +import org.jsoup.helper.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,12 +41,16 @@ public class FieldxServiceImpl extends ServiceImpl impleme try { Thread.sleep(500L); message.put("uploaded", String.valueOf(i + 1)); - this.save(fieldxList.get(i)); - if(fieldxList.get(i).getAssociateTable()==null&&fieldxList.get(i).getAssociateField()==null){ - Tablex tablex = tablexService.getById(fieldxList.get(i).getTableId()); - tablexService.updateVersion(fieldxList.get(i).getTableId(), tablex.getVerison() + 1); - tablexService.updateSql(fieldxList.get(i).getTableId(), fieldxController.createSql(fieldxList.get(i).getTableId())); + Fieldx fieldx=fieldxList.get(i); + this.save(fieldx); + if(!StringUtil.isBlank(fieldx.getAssociateTable())||!StringUtil.isBlank(fieldx.getAssociateField())){ + webSocketUtils.sendMessage(loginUser.getId(), message); + break; } + Tablex tablex = tablexService.getById(fieldx.getTableId()); + tablexService.updateVersion(fieldx.getTableId(), tablex.getVerison() + 1); + tablexService.updateSql(fieldx.getTableId(), fieldxController.createSql(fieldx.getTableId())); + webSocketUtils.sendMessage(loginUser.getId(), message); } catch (InterruptedException e) { log.error(e.getMessage(), e); From 97596403830c904af4133b87a17c16b67ba54f3a Mon Sep 17 00:00:00 2001 From: zjh <10930829+zheng-jinhao1209@user.noreply.gitee.com> Date: Tue, 1 Aug 2023 16:40:55 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modulex/ModulexList.vue | 3 +- .../rulex/controller/RulexController.java | 131 ++++++++++-------- 2 files changed, 78 insertions(+), 56 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue index b11b49b..d763f4a 100644 --- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue +++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue @@ -609,8 +609,7 @@ export default { '对应功能(必填):填写正确的功能名称', '对应实体(非必填):填写正确的实体名称', '对应字段(非必填):填写正确的字段名称', - '顺序号(必填):同功能下不重复,为正整数且与规则编码顺序号相等', - '规则编码(必填):功能编码+顺序号（格式001）', + '顺序号(必填):同功能下不重复,为三位数正整数', '规则描述(非必填)', '责任人(非必填):如果有多个值请使用逗号分割', '任务等级(必填):值：1、2、3、4、5个等级', diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java index 98abf5d..9cabb64 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java @@ -310,7 +310,7 @@ public class RulexController extends JeecgController { if ( StringUtils.isBlank(list.get(i).getRuleNo()) || StringUtils.isBlank(list.get(i).getProjectId()) || - StringUtils.isBlank(list.get(i).getRuleCode()) || +// StringUtils.isBlank(list.get(i).getRuleCode()) || // StringUtils.isBlank() list.get(i).getPmDescribe() == null && StringUtils.isBlank(list.get(i).getModuleId()) || StringUtils.isBlank(list.get(i).getFunctionId()) || @@ -501,23 +501,27 @@ public class RulexController extends JeecgController { rulex.setFieldId(fieldx.getId()); } Double duration = null; - try { - if (duration < 0){ + String duration1 = ruleVo.getDuration(); + if(!StringUtils.isBlank(duration1)) { + try { + duration = Double.valueOf(duration1); + if (duration < 0) { + message.put("isError", "true"); + message.put("closeable", "true"); + message.put("status", "第" + (i + 1) + "条数据,任务时长输入错误,请核对"); + webSocketUtils.sendMessage(loginUser.getId(), message); + return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对"); + } + + rulex.setDuration(duration); + } catch (Exception e) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了 message.put("isError", "true"); message.put("closeable", "true"); message.put("status", "第" + (i + 1) + "条数据,任务时长输入错误,请核对"); webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对"); } - duration = Double.valueOf(ruleVo.getDuration()); - rulex.setDuration(duration); - } catch (Exception e) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了 - message.put("isError", "true"); - message.put("closeable", "true"); - message.put("status", "第" + (i + 1) + "条数据,任务时长输入错误,请核对"); - webSocketUtils.sendMessage(loginUser.getId(), message); - return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对"); } Double d; @@ -645,48 +649,57 @@ String workLevel = ruleVo.getWorkLevel(); //规则编码 - String ruleCode = ruleVo.getRuleCode(); - String functionCode1 = functionx.getFunctionCode(); - if (ruleCode == null) { - message.put("isError", "true"); - message.put("closeable", "true"); - message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); - webSocketUtils.sendMessage(loginUser.getId(), message); - return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); - } - //截取到功能编码校验(去除后三位) - if (!ruleCode.substring(0, ruleCode.length() - 3).equals(functionCode1)) { - message.put("isError", "true"); - message.put("closeable", "true"); - message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); - webSocketUtils.sendMessage(loginUser.getId(), message); - return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); - } - - //后三位 - String substring = ruleCode.substring(ruleCode.length() - 3); - try { - Integer integer1 = Integer.valueOf(substring); - if (integer1 < 0) { - message.put("isError", "true"); - message.put("closeable", "true"); - message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); - webSocketUtils.sendMessage(loginUser.getId(), message); - return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); - } - } catch (NumberFormatException e) { - message.put("isError", "true"); - message.put("closeable", "true"); - message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); - webSocketUtils.sendMessage(loginUser.getId(), message); - return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); - } - rulex.setRuleCode(ruleCode); +// String ruleCode = ruleVo.getRuleCode(); +// String functionCode1 = functionx.getFunctionCode(); +// if (ruleCode == null) { +// message.put("isError", "true"); +// message.put("closeable", "true"); +// message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); +// webSocketUtils.sendMessage(loginUser.getId(), message); +// return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); +// } +// //截取到功能编码校验(去除后三位) +// if (!ruleCode.substring(0, ruleCode.length() - 3).equals(functionCode1)) { +// message.put("isError", "true"); +// message.put("closeable", "true"); +// message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); +// webSocketUtils.sendMessage(loginUser.getId(), message); +// return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); +// } +// +// //后三位 +// String substring = ruleCode.substring(ruleCode.length() - 3); +// try { +// Integer integer1 = Integer.valueOf(substring); +// if (integer1 < 0) { +// message.put("isError", "true"); +// message.put("closeable", "true"); +// message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); +// webSocketUtils.sendMessage(loginUser.getId(), message); +// return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); +// } +// } catch (NumberFormatException e) { +// message.put("isError", "true"); +// message.put("closeable", "true"); +// message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); +// webSocketUtils.sendMessage(loginUser.getId(), message); +// return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); +// } +// rulex.setRuleCode(ruleCode); //规则序号 +// String ruleNo = ruleVo.getRuleNo(); +// String c = ruleCode.substring(ruleCode.length() - ruleNo.length()); +////三位数整数且与编码后三位相同 +// if (!(c.equals(ruleNo) && ruleNo.matches("^[0-9]*[1-9][0-9]*$") && (Integer.valueOf(ruleNo) < 1000))) { +// message.put("isError", "true"); +// message.put("closeable", "true"); +// message.put("status", "第" + (i + 1) + "条数据,规则序号错误,请核对"); +// webSocketUtils.sendMessage(loginUser.getId(), message); +// return Result.error("第" + (i + 1) + "条数据,规则序号错误,请核对"); +// } +// rulex.setRuleNo(ruleNo); String ruleNo = ruleVo.getRuleNo(); - String c = ruleCode.substring(ruleCode.length() - ruleNo.length()); -//三位数整数且与编码后三位相同 - if (!(c.equals(ruleNo) && ruleNo.matches("^[0-9]*[1-9][0-9]*$") && (Integer.valueOf(ruleNo) < 1000))) { + if(!ruleNo.matches("^[0-9]*[1-9][0-9]*$") && (Integer.valueOf(ruleNo) < 1000)){ message.put("isError", "true"); message.put("closeable", "true"); message.put("status", "第" + (i + 1) + "条数据,规则序号错误,请核对"); @@ -694,7 +707,17 @@ String workLevel = ruleVo.getWorkLevel(); return Result.error("第" + (i + 1) + "条数据,规则序号错误,请核对"); } rulex.setRuleNo(ruleNo); - { + String functionCode1 = functionx.getFunctionCode(); + if (ruleNo.length()==1){ + ruleNo="00"+ruleNo; + }else if (ruleNo.length()==2){ + ruleNo="0"+ruleNo; + } + String ruleCode =functionCode1+ruleNo; + rulex.setRuleCode(ruleCode); + + + //规则描述 String pmDescribe = ruleVo.getPmDescribe(); @@ -765,7 +788,7 @@ String workLevel = ruleVo.getWorkLevel(); rulexList.add(rulex); } } - } finally{ + finally{ //清理预存表 iRuleVoService.remove(null); } From bb952195aef3f5aa56a38f46dcd3e576519a5bba Mon Sep 17 00:00:00 2001 From: itcast Date: Wed, 2 Aug 2023 09:52:46 +0800 Subject: [PATCH 7/7] Changes --- .../jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java index e56838e..e7a928d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java @@ -45,7 +45,7 @@ public class FieldxServiceImpl extends ServiceImpl impleme this.save(fieldx); if(!StringUtil.isBlank(fieldx.getAssociateTable())||!StringUtil.isBlank(fieldx.getAssociateField())){ webSocketUtils.sendMessage(loginUser.getId(), message); - break; + continue; } Tablex tablex = tablexService.getById(fieldx.getTableId()); tablexService.updateVersion(fieldx.getTableId(), tablex.getVerison() + 1);