zhc077
/
projectManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhc077:1ea5a17f3666dd76eae874fa449f42bcf03618e6
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master
...
compare: zhc077:e57512d638b43fe525d3f3798cf9d6f7cd7e4dd9
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master

2 Commits
1ea5a17f36 ... e57512d638

Author SHA1 Message Date
zjh e57512d638 Merge remote-tracking branch 'origin/dev_2307' into dev_2307
1 year ago
zjh 9759640383 导入规则修改
1 year ago
2 changed files with 78 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 3
      ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
  2. 111
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

3
ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
Unescape View File

@ -609,8 +609,7 @@ export default {
'对应功能(必填):填写正确的功能名称', '对应功能(必填):填写正确的功能名称',
'对应实体(非必填):填写正确的实体名称', '对应实体(非必填):填写正确的实体名称',
'对应字段(非必填):填写正确的字段名称', '对应字段(非必填):填写正确的字段名称',
'顺序号(必填):同功能下不重复,为正整数且与规则编码顺序号相等', '顺序号(必填):同功能下不重复,为三位数正整数',
'规则编码(必填):功能编码+顺序号（格式001）',
'规则描述(非必填)', '规则描述(非必填)',
'责任人(非必填):如果有多个值请使用逗号分割', '责任人(非必填):如果有多个值请使用逗号分割',
'任务等级(必填):值：1、2、3、4、5个等级', '任务等级(必填):值：1、2、3、4、5个等级',

111
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java
Unescape View File

@ -310,7 +310,7 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
if ( if (
StringUtils.isBlank(list.get(i).getRuleNo()) || StringUtils.isBlank(list.get(i).getRuleNo()) ||
StringUtils.isBlank(list.get(i).getProjectId()) || 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).getPmDescribe() == null &&
StringUtils.isBlank(list.get(i).getModuleId()) || StringUtils.isBlank(list.get(i).getModuleId()) ||
StringUtils.isBlank(list.get(i).getFunctionId()) || StringUtils.isBlank(list.get(i).getFunctionId()) ||
@ -501,7 +501,10 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
rulex.setFieldId(fieldx.getId()); rulex.setFieldId(fieldx.getId());
} }
Double duration = null; Double duration = null;
String duration1 = ruleVo.getDuration();
if(!StringUtils.isBlank(duration1)) {
try { try {
duration = Double.valueOf(duration1);
if (duration < 0) { if (duration < 0) {
message.put("isError", "true"); message.put("isError", "true");
message.put("closeable", "true"); message.put("closeable", "true");
@ -509,7 +512,7 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对"); return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对");
} }
duration = Double.valueOf(ruleVo.getDuration());
rulex.setDuration(duration); rulex.setDuration(duration);
} catch (Exception e) { } catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
@ -519,6 +522,7 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
webSocketUtils.sendMessage(loginUser.getId(), message); webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对"); return Result.error("第" + (i + 1) + "条数据,任务时长输入错误,请核对");
} }
}
Double d; Double d;
String realDuration = ruleVo.getRealDuration(); String realDuration = ruleVo.getRealDuration();
@ -645,48 +649,57 @@ String workLevel = ruleVo.getWorkLevel();
//规则编码 //规则编码
String ruleCode = ruleVo.getRuleCode(); // String ruleCode = ruleVo.getRuleCode();
String functionCode1 = functionx.getFunctionCode(); // String functionCode1 = functionx.getFunctionCode();
if (ruleCode == null) { // if (ruleCode == null) {
message.put("isError", "true"); // message.put("isError", "true");
message.put("closeable", "true"); // message.put("closeable", "true");
message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); // message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对");
webSocketUtils.sendMessage(loginUser.getId(), message); // webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); // return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对");
} // }
//截取到功能编码校验(去除后三位) // //截取到功能编码校验(去除后三位)
if (!ruleCode.substring(0, ruleCode.length() - 3).equals(functionCode1)) { // if (!ruleCode.substring(0, ruleCode.length() - 3).equals(functionCode1)) {
message.put("isError", "true"); // message.put("isError", "true");
message.put("closeable", "true"); // message.put("closeable", "true");
message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); // message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对");
webSocketUtils.sendMessage(loginUser.getId(), message); // webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); // return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对");
} // }
//
//后三位 // //后三位
String substring = ruleCode.substring(ruleCode.length() - 3); // String substring = ruleCode.substring(ruleCode.length() - 3);
try { // try {
Integer integer1 = Integer.valueOf(substring); // Integer integer1 = Integer.valueOf(substring);
if (integer1 < 0) { // if (integer1 < 0) {
message.put("isError", "true"); // message.put("isError", "true");
message.put("closeable", "true"); // message.put("closeable", "true");
message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); // message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对");
webSocketUtils.sendMessage(loginUser.getId(), message); // webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); // return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对");
} // }
} catch (NumberFormatException e) { // } catch (NumberFormatException e) {
message.put("isError", "true"); // message.put("isError", "true");
message.put("closeable", "true"); // message.put("closeable", "true");
message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对"); // message.put("status", "第" + (i + 1) + "条数据,规则编码错误,请核对");
webSocketUtils.sendMessage(loginUser.getId(), message); // webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对"); // return Result.error("第" + (i + 1) + "条数据,规则编码错误,请核对");
} // }
rulex.setRuleCode(ruleCode); // 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 ruleNo = ruleVo.getRuleNo();
String c = ruleCode.substring(ruleCode.length() - ruleNo.length()); if(!ruleNo.matches("^[0-9]*[1-9][0-9]*$") && (Integer.valueOf(ruleNo) < 1000)){
//三位数整数且与编码后三位相同
if (!(c.equals(ruleNo) && ruleNo.matches("^[0-9]*[1-9][0-9]*$") && (Integer.valueOf(ruleNo) < 1000))) {
message.put("isError", "true"); message.put("isError", "true");
message.put("closeable", "true"); message.put("closeable", "true");
message.put("status", "第" + (i + 1) + "条数据,规则序号错误,请核对"); message.put("status", "第" + (i + 1) + "条数据,规则序号错误,请核对");
@ -694,7 +707,17 @@ String workLevel = ruleVo.getWorkLevel();
return Result.error("第" + (i + 1) + "条数据,规则序号错误,请核对"); return Result.error("第" + (i + 1) + "条数据,规则序号错误,请核对");
} }
rulex.setRuleNo(ruleNo); 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(); String pmDescribe = ruleVo.getPmDescribe();
@ -765,7 +788,7 @@ String workLevel = ruleVo.getWorkLevel();
rulexList.add(rulex); rulexList.add(rulex);
} }
} }
} finally{ finally{
//清理预存表 //清理预存表
iRuleVoService.remove(null); iRuleVoService.remove(null);
} }

Write Preview
Loading…
Cancel
Save