From 867d30da736af1a434830679334b9e36f2f1c76f Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sat, 6 Apr 2024 20:23:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=87=BA=E5=85=A5=E5=BA=93=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms_pro/hd/.idea/compiler.xml | 5 ++ wms_pro/hd/nladmin-system/pom.xml | 8 +++ .../flow/framework/config/InitFlowConfig.java | 15 +++-- .../impl/FormTaskActivityBehavior.java | 9 ++- .../framework/entity/ExecutionEntity.java | 1 - .../entity/node/impl/task/impl/FormTask.java | 8 ++- .../process/nodeType/TypeHandler.java | 18 +++++- .../nodeType/excess/impl/ClassHandler.java | 22 ++++++++ .../excess/impl/ExpressionHandler.java | 21 +++++++ .../nodeType/excess/impl/ScriptHandler.java | 22 ++++++++ .../process/nodeType/impl/ClassHandler.java | 17 ------ .../nodeType/impl/ExpressionHandler.java | 15 ----- .../process/nodeType/impl/ScriptHandler.java | 16 ------ .../coderule/SysCodeRuleController.java | 15 ++--- .../coderule/SysCodeRuleDetailController.java | 8 +-- .../controller/dept/DeptController.java | 8 +-- .../controller/dict/SysDictController.java | 2 +- .../controller/menu/SysMenuController.java | 16 +++--- .../controller/monitor/MonitorController.java | 8 +-- .../controller/param/SysParamController.java | 8 +-- .../SysDataPermissionController.java | 8 +-- .../quartz/SysQuartzJobController.java | 14 ++--- .../controller/role/SysRoleController.java | 10 ++-- .../controller/user/UserController.java | 2 +- .../service/coderule/ISysCodeRuleService.java | 6 +- .../dao/mapper/SysCodeRuleMapper.java | 5 ++ .../coderule/dao/mapper/SysCodeRuleMapper.xml | 5 ++ .../coderule/impl/SysCodeRuleServiceImpl.java | 37 ++++++------ .../service/menu/impl/SysMenuServiceImpl.java | 38 ++----------- .../resources/config/application-dev3.yml | 2 +- .../nladmin-system/src/test/java/Test3.java | 56 ------------------- 31 files changed, 201 insertions(+), 224 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ScriptHandler.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ClassHandler.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ExpressionHandler.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ScriptHandler.java delete mode 100644 wms_pro/hd/nladmin-system/src/test/java/Test3.java diff --git a/wms_pro/hd/.idea/compiler.xml b/wms_pro/hd/.idea/compiler.xml index 7fe7bb85..acbb839a 100644 --- a/wms_pro/hd/.idea/compiler.xml +++ b/wms_pro/hd/.idea/compiler.xml @@ -11,4 +11,9 @@ + + \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/pom.xml b/wms_pro/hd/nladmin-system/pom.xml index ed6ac191..cfa5fd69 100644 --- a/wms_pro/hd/nladmin-system/pom.xml +++ b/wms_pro/hd/nladmin-system/pom.xml @@ -260,6 +260,14 @@ redisson-spring-boot-starter 3.16.4 + + + org.codehaus.groovy + groovy-all + 3.0.13 + pom + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java index 7e6388b3..d96b61ac 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java @@ -4,23 +4,30 @@ import org.nl.wms.flow_manage.flow.framework.engine.cmd.CommandExecutor; import org.nl.wms.flow_manage.flow.framework.engine.cmd.interceptor.CommandInterceptor; import org.nl.wms.flow_manage.flow.framework.engine.cmd.interceptor.impl.InvokeCommandInterceptor; import org.nl.wms.flow_manage.flow.framework.engine.cmd.interceptor.impl.ThreadCommandInterceptor; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; +import java.util.*; /* * @author ZZQ * @Date 2024/3/21 11:26 */ +@Configuration public class InitFlowConfig { - public void initConfig(){ + @Autowired + private Map handlerMap; + public void initConfig(){ CommandInterceptor first = initCommandInterceptor(); CommandExecutor commandExecutor = new CommandExecutor(); commandExecutor.setInterceptor(first); + TypeHandler.HANDLER_MAP=handlerMap; } + + public CommandInterceptor initCommandInterceptor(){ List chain = new ArrayList<>(); chain.add(new ThreadCommandInterceptor()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormTaskActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormTaskActivityBehavior.java index f3e5f027..0e4c7d52 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormTaskActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormTaskActivityBehavior.java @@ -3,8 +3,8 @@ package org.nl.wms.flow_manage.flow.framework.engine.behavior.impl; import org.nl.wms.flow_manage.flow.framework.engine.behavior.FlowNodeActivityBehavior; import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement; -import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowNode; import org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.impl.FormTask; +import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.springframework.stereotype.Service; /* @@ -13,20 +13,19 @@ import org.springframework.stereotype.Service; * 源：UserTask */ @Service -public class FormTaskActivityBehavior extends FlowNodeActivityBehavior { +public class FormTaskActivityBehavior extends FlowNodeActivityBehavior { @Override - public void execute(ExecutionEntity execution) { + public void execute(ExecutionEntity execution) { FlowElement flowElement = execution.getCurrentFlowElement(); String type = flowElement.getType(); if (flowElement instanceof FormTask){ //根据当前表单配置生成当前节点表单数据 FormTask formTask = (FormTask) flowElement; } + PmFormData sourceForm = execution.getT(); //TODO:获取不同的类型执行器.处理该节点:获取当前表单 //获取表单配置表 - super.execute(execution); - super.execute(execution); } @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java index 560a0ba5..45351e71 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java @@ -1,6 +1,5 @@ package org.nl.wms.flow_manage.flow.framework.entity; -import lombok.Data; import lombok.Getter; import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java index 56cf1f78..d3ef1f4d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java @@ -14,9 +14,10 @@ import java.util.*; @Data public class FormTask extends ExecuteTask { private String assignee; + private String task_type; private String owner; private String priority; - private String formKey; + private String form_type; private boolean sameDeployment = true; private String dueDate; private String businessCalendarName; @@ -26,7 +27,10 @@ public class FormTask extends ExecuteTask { private List candidateGroups = new ArrayList<>(); // private List formProperties = new ArrayList<>(); // private List taskListeners = new ArrayList<>(); - private String skipExpression; + /** + * 规则：支持多级别 + */ + private List skipExpression; private String validateFormFields; private String taskIdVariableName; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/TypeHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/TypeHandler.java index b8aedd31..959d3eb1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/TypeHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/TypeHandler.java @@ -1,13 +1,25 @@ package org.nl.wms.flow_manage.flow.framework.process.nodeType; -import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; +import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; + +import java.util.List; +import java.util.Map; /* * @author ZZQ * @Date 2024/3/21 15:19 */ -public abstract class TypeHandler { +public abstract class TypeHandler { - public abstract void handler(String param, ExecutionEntity entity); + public static Map HANDLER_MAP; + + /** + * 对应flownode:task_type的逻辑处理 + * @param param + * @param entity + * @param form_struc + * @return + */ + public abstract T handler(List param, P entity, BmFormStruc form_struc); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java new file mode 100644 index 00000000..6bfd44af --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java @@ -0,0 +1,22 @@ +package org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; +import org.springframework.stereotype.Service; + +import java.util.List; + +/* + * @author ZZQ + * @Date 2024/3/21 15:17 + */ +@Service +public class ClassHandler extends TypeHandler { + + + @Override + public JSONObject handler(List param, String entity, BmFormStruc form_struc) { + return null; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java new file mode 100644 index 00000000..1d0c0039 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java @@ -0,0 +1,21 @@ +package org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; +import org.springframework.stereotype.Service; + +import java.util.List; + +/* + * @author ZZQ + * @Date 2024/3/21 15:16 + */ +@Service +public class ExpressionHandler extends TypeHandler { + + @Override + public JSONObject handler(List param, String entity, BmFormStruc form_struc) { + return null; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ScriptHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ScriptHandler.java new file mode 100644 index 00000000..9bb7ad6b --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ScriptHandler.java @@ -0,0 +1,22 @@ +package org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; +import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; +import org.springframework.stereotype.Service; + +import java.util.List; + +/* + * @author ZZQ + * @Date 2024/3/21 15:16 + */ +@Service +public class ScriptHandler extends TypeHandler { + + + @Override + public JSONObject handler(List param, String entity, BmFormStruc form_struc) { + return null; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ClassHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ClassHandler.java deleted file mode 100644 index 752b2fcc..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ClassHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.wms.flow_manage.flow.framework.process.nodeType.impl; - -import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; -import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; - -/* - * @author ZZQ - * @Date 2024/3/21 15:17 - */ -public class ClassHandler extends TypeHandler { - - - @Override - public void handler(String param, ExecutionEntity entity) { - - } -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ExpressionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ExpressionHandler.java deleted file mode 100644 index 4ef7b1e9..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ExpressionHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.wms.flow_manage.flow.framework.process.nodeType.impl; - -import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; -import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; - -/* - * @author ZZQ - * @Date 2024/3/21 15:16 - */ -public class ExpressionHandler extends TypeHandler { - @Override - public void handler(String param, ExecutionEntity entity) { - - } -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ScriptHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ScriptHandler.java deleted file mode 100644 index 104428f8..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/impl/ScriptHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.flow_manage.flow.framework.process.nodeType.impl; - -import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; -import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; - -/* - * @author ZZQ - * @Date 2024/3/21 15:16 - */ -public class ScriptHandler extends TypeHandler { - @Override - public void handler(String param, ExecutionEntity entity) { - - } - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java index b248ab3f..3104e51d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java @@ -2,6 +2,7 @@ package org.nl.wms.system_manage.controller.coderule; +import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -35,7 +36,7 @@ public class SysCodeRuleController { //("查询编码") @GetMapping -// @SaCheckPermission("genCode:list") +// //SaCheckPermission("genCode:list") public ResponseEntity queryAll(CodeRuleQuery form, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(codeRuleService.queryAll(form, pageable)), HttpStatus.OK); } @@ -43,7 +44,7 @@ public class SysCodeRuleController { @Log("新增编码") //("新增编码") @PostMapping -// @SaCheckPermission("genCode:add") +// //SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody SysCodeRule codeRule) { codeRuleService.create(codeRule); return new ResponseEntity<>(HttpStatus.CREATED); @@ -52,7 +53,7 @@ public class SysCodeRuleController { @Log("删除编码") //("删除编码") @DeleteMapping -// @SaCheckPermission("genCode:del") +// //SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { codeRuleService.deleteCodeRule(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -61,7 +62,7 @@ public class SysCodeRuleController { @Log("修改编码") //("修改编码") @PutMapping -// @SaCheckPermission("genCode:edit") +// //SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRule codeRule) { codeRuleService.updateCodeRule(codeRule); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -69,9 +70,9 @@ public class SysCodeRuleController { //("导出任务数据") @GetMapping(value = "/codeDemo") -// @SaCheckPermission("genCode:list") - public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { - return new ResponseEntity<>(codeRuleService.codeDemo(form), HttpStatus.OK); +// //SaCheckPermission("genCode:list") + public ResponseEntity CodeDemo(String flag,String code) { + return new ResponseEntity<>(codeRuleService.codeDemo(flag, code), HttpStatus.OK); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java index 6914030b..9483d5e1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java @@ -31,7 +31,7 @@ public class SysCodeRuleDetailController { //("查询编码明细") @GetMapping -// @SaCheckPermission("genCode:list") +// //SaCheckPermission("genCode:list") public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(codeDetailService.queryAll(form,pageable)), HttpStatus.OK); } @@ -39,7 +39,7 @@ public class SysCodeRuleDetailController { @Log("新增编码明细") //("新增编码明细") @PostMapping -// @SaCheckPermission("genCode:add") +// //SaCheckPermission("genCode:add") public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail){ codeDetailService.create(codeRuleDetail); return new ResponseEntity<>(HttpStatus.CREATED); @@ -48,7 +48,7 @@ public class SysCodeRuleDetailController { @Log("删除编码明细") //("删除编码明细") @DeleteMapping(value = "/{id}") -// @SaCheckPermission("genCode:del") +// //SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id){ codeDetailService.delete(id); return new ResponseEntity<>(HttpStatus.OK); @@ -57,7 +57,7 @@ public class SysCodeRuleDetailController { @Log("修改编码明细") //("修改编码明细") @PutMapping -// @SaCheckPermission("genCode:edit") +// //SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRuleDetail json){ codeDetailService.update(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java index a9e00146..ae9a5a26 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java @@ -75,7 +75,7 @@ public class DeptController { //("查询部门:根据ID获取同级与上级数据") @PostMapping("/superior") - @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) + //SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { if (CollectionUtils.isEmpty(ids)){ return ResponseEntity.noContent().build(); @@ -86,7 +86,7 @@ public class DeptController { @Log("新增部门") //("新增部门") @PostMapping -// @SaCheckPermission("dept:add") +// //SaCheckPermission("dept:add") public ResponseEntity create(@Validated @RequestBody SysDept resources){ deptService.createDept(resources); return new ResponseEntity<>(HttpStatus.CREATED); @@ -95,7 +95,7 @@ public class DeptController { @Log("修改部门") //("修改部门") @PutMapping -// @SaCheckPermission("dept:edit") +// //SaCheckPermission("dept:edit") public ResponseEntity update(@Validated @RequestBody SysDept dept){ if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { throw new BadRequestException("上级不能为自己"); @@ -107,7 +107,7 @@ public class DeptController { @Log("删除部门") //("删除部门") @DeleteMapping -// @SaCheckPermission("dept:del") +// //SaCheckPermission("dept:del") public ResponseEntity delete(@RequestBody Set deptIds){ if (CollectionUtils.isEmpty(deptIds)){ return ResponseEntity.noContent().build(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java index ebffb065..4602f71f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java @@ -99,7 +99,7 @@ public class SysDictController { @Log("修改字典详情") //("修改字典详情") @PutMapping("/dictDetail") -// @SaCheckPermission("dict:edit") +// //SaCheckPermission("dict:edit") public ResponseEntity updateDetail(@RequestBody Dict resources){ dictService.updateDetail(resources); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java index 90cfc768..003c3aea 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java @@ -49,13 +49,13 @@ public class SysMenuController { //("返回全部的菜单") @GetMapping(value = "/lazy") - @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) + //SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } //("获取菜单列表") @PostMapping(value = "/getMenusByRole") - @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) + //SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { String role_id = json.getString("role_id"); String system_type = json.getString("system_type"); @@ -65,7 +65,7 @@ public class SysMenuController { //("根据菜单ID返回所有子节点ID，包含自身ID") @GetMapping(value = "/child") - @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) + //SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { Set menuSet = new HashSet<>(); List menuList = iSysMenuService.getMenus(id); @@ -77,7 +77,7 @@ public class SysMenuController { @GetMapping //("查询菜单") - @SaCheckPermission("menu:list") + //SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { page.setSize(100); List list = iSysMenuService.query(query, page); @@ -86,7 +86,7 @@ public class SysMenuController { //("查询菜单:根据ID获取同级与上级数据") @PostMapping("/superior") - @SaCheckPermission("menu:list") + //SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { Set menuDtos = new LinkedHashSet<>(); String id=param.getString("ids"); @@ -100,7 +100,7 @@ public class SysMenuController { @Log("新增菜单") //("新增菜单") @PostMapping - @SaCheckPermission("menu:add") + //SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { iSysMenuService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); @@ -109,7 +109,7 @@ public class SysMenuController { @Log("修改菜单") //("修改菜单") @PutMapping - @SaCheckPermission("menu:edit") + //SaCheckPermission("menu:edit") public ResponseEntity update( @RequestBody SysMenu form) { iSysMenuService.update(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -118,7 +118,7 @@ public class SysMenuController { @Log("删除菜单") //("删除菜单") @DeleteMapping - @SaCheckPermission("menu:del") + //SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { Set menuSet = new HashSet<>(); for (String id : ids) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java index 83ff67c3..5a475d3e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java @@ -15,8 +15,8 @@ */ package org.nl.wms.system_manage.controller.monitor; - - + + import lombok.RequiredArgsConstructor; import org.nl.wms.system_manage.service.monitor.MonitorService; import org.springframework.http.HttpStatus; @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor - + @RequestMapping("/api/monitor") public class MonitorController { @@ -39,7 +39,7 @@ public class MonitorController { @GetMapping //("查询服务监控") -// @SaCheckPermission("monitor:list") +// //SaCheckPermission("monitor:list") public ResponseEntity query() { return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java index 27d7990c..9544ba1b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java @@ -39,7 +39,7 @@ class SysParamController { @GetMapping @Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true) //("查询系统参数") - //@SaCheckPermission("param:list") + ////SaCheckPermission("param:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK); } @@ -47,7 +47,7 @@ class SysParamController { @PostMapping @Log("新增系统参数") //("新增系统参数") - //@SaCheckPermission("param:add") + ////SaCheckPermission("param:add") public ResponseEntity create(@Validated @RequestBody Param param) { paramService.create(param); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,7 +56,7 @@ class SysParamController { @PutMapping @Log("修改系统参数") //("修改系统参数") - //@SaCheckPermission("param:edit") + ////SaCheckPermission("param:edit") public ResponseEntity update(@Validated @RequestBody Param param) { paramService.update(param); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -64,7 +64,7 @@ class SysParamController { @Log("删除系统参数") //("删除系统参数") - //@SaCheckPermission("param:del") + ////SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { List Ids = Arrays.asList(ids); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java index e0107735..6607df26 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java @@ -39,7 +39,7 @@ public class SysDataPermissionController { @GetMapping @Log("查询数据权限") //("查询数据权限") - //@SaCheckPermission("@el.check('dataPermission:list')") + ////SaCheckPermission("@el.check('dataPermission:list')") public ResponseEntity query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK); } @@ -47,7 +47,7 @@ public class SysDataPermissionController { @PostMapping @Log("新增数据权限") //("新增数据权限") - //@SaCheckPermission("@el.check('dataPermission:add')") + ////SaCheckPermission("@el.check('dataPermission:add')") public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,7 +56,7 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") //("修改数据权限") - //@SaCheckPermission("@el.check('dataPermission:edit')") + ////SaCheckPermission("@el.check('dataPermission:edit')") public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -64,7 +64,7 @@ public class SysDataPermissionController { @Log("删除数据权限") //("删除数据权限") - //@SaCheckPermission("@el.check('dataPermission:del')") + ////SaCheckPermission("@el.check('dataPermission:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { dataPermissionService.deleteAll(ids); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java index 3e18717c..17d3ae4a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java @@ -41,20 +41,20 @@ public class SysQuartzJobController { private final ISysQuartzJobService quartzJobService; @GetMapping - @SaCheckPermission("timing:list") + //SaCheckPermission("timing:list") public ResponseEntity query(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK); } @GetMapping(value = "/logs") - @SaCheckPermission("timing:list") + //SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAllLog(criteria, pageable)), HttpStatus.OK); } @Log("新增定时任务") @PostMapping - @SaCheckPermission("timing:add") + //SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { if (resources.getJob_id() != null) { throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); @@ -65,7 +65,7 @@ public class SysQuartzJobController { @Log("修改定时任务") @PutMapping - @SaCheckPermission("timing:edit") + //SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { quartzJobService.updateJob(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -73,7 +73,7 @@ public class SysQuartzJobController { @Log("更改定时任务状态") @PutMapping(value = "/{id}") - @SaCheckPermission("timing:edit") + //SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { quartzJobService.updateIsPause(quartzJobService.getById(id)); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -81,7 +81,7 @@ public class SysQuartzJobController { @Log("执行定时任务") @PutMapping(value = "/exec/{id}") - @SaCheckPermission("timing:edit") + //SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { quartzJobService.execution(quartzJobService.getById(id)); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -89,7 +89,7 @@ public class SysQuartzJobController { @Log("删除定时任务") @DeleteMapping - @SaCheckPermission("timing:del") + //SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { quartzJobService.deleteJob(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java index dec7956d..11a557c0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java @@ -33,7 +33,7 @@ public class SysRoleController { //("分页查询角色") @GetMapping - @SaCheckPermission("roles:list") + //SaCheckPermission("roles:list") public ResponseEntity pageQuery(@RequestParam Map param, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK); } @@ -47,7 +47,7 @@ public class SysRoleController { @Log("新增角色") //("新增角色") @PostMapping - @SaCheckPermission("roles:add") + //SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { roleService.create(param); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,7 +56,7 @@ public class SysRoleController { @Log("修改角色") //("修改角色") @PutMapping - @SaCheckPermission("roles:edit") + //SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { roleService.update(param); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -65,7 +65,7 @@ public class SysRoleController { @Log("删除角色") //("删除角色") @DeleteMapping - @SaCheckPermission("roles:del") + //SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { roleService.deleteBatchByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -74,7 +74,7 @@ public class SysRoleController { @Log("修改角色菜单") //("修改角色菜单") @PutMapping(value = "/menu") - @SaCheckPermission("roles:edit") + //SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { roleService.updateMenu(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java index c459f260..5f82cfa5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java @@ -87,7 +87,7 @@ public class UserController { @Log("删除用户") //("删除用户") @DeleteMapping -// @SaCheckPermission("user:del") +// //SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { userService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java index 907b1067..424f3209 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java @@ -6,7 +6,6 @@ import org.nl.common.domain.entity.PageQuery; import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule; import org.nl.wms.system_manage.service.coderule.dto.CodeRuleQuery; -import java.util.Map; import java.util.Set; /** @@ -29,10 +28,11 @@ public interface ISysCodeRuleService extends IService { /** * 创建编码 - * @param form + * @param flag + * @param code * @return */ - String codeDemo(Map form); + String codeDemo(String flag,String code); /** * 添加 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java index 5589dae7..515c285a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java @@ -2,6 +2,9 @@ package org.nl.wms.system_manage.service.coderule.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule; +import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail; + +import java.util.List; /** *

@@ -13,4 +16,6 @@ import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule; */ public interface SysCodeRuleMapper extends BaseMapper { + List findBycode(String code); + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml index 481a644c..c0f9c44b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml @@ -2,4 +2,9 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java index 5c534faa..027003ba 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.system_manage.service.coderule.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.MapOf; @@ -22,10 +24,11 @@ import org.nl.wms.system_manage.service.coderule.dto.CodeRuleQuery; import org.nl.wms.system_manage.service.coderule.utils.CodeRuleTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -37,29 +40,27 @@ import java.util.Set; * @since 2022-12-19 */ @Service -@RequiredArgsConstructor public class SysCodeRuleServiceImpl extends ServiceImpl implements ISysCodeRuleService { - private final SysCodeRuleMapper codeRuleMapper; - private final SysCodeRuleDetailMapper codeRuleDetailMapper; + @Resource + private SysCodeRuleDetailMapper codeRuleDetailMapper; @Override public IPage queryAll(CodeRuleQuery form, PageQuery pageable) { IPage page = this.page(pageable.build(SysCodeRule.class), form.build()); - page.getRecords().forEach(sysCodeRule -> sysCodeRule.setDemo(codeDemo(MapOf.of("flag", "0", "code", sysCodeRule.getCode())))); + page.getRecords().forEach(sysCodeRule -> sysCodeRule.setDemo(codeDemo("0",sysCodeRule.getCode()))); return page; } @Override - public synchronized String codeDemo(Map form) { - String code = (String) form.get("code"); - String id = codeRuleMapper.selectOne(new LambdaQueryWrapper().eq(SysCodeRule::getCode, code)).getId(); - // 如果flag = 1就执行更新数据库的操作 - String flag = (String) form.get("flag"); - List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id)); + public String codeDemo(String flag, String code) { + List ruleDtl = this.baseMapper.findBycode(code); + if (CollectionUtils.isEmpty(ruleDtl)){ + throw new BadRequestException("编码规则不存在"+code); + } String demo = ""; boolean isSame = true; - for(SysCodeRuleDetail detail : ruleDetails) { + for(SysCodeRuleDetail detail : ruleDtl) { String value = ""; String type = detail.getType(); //固定直接取值 @@ -125,12 +126,11 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode())); + List sysCodeRules = this.baseMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode())); if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在"); codeRule.setId(IdUtil.getSnowflake(1,1).nextIdStr()); codeRule.setCreate_id(currentUserId); @@ -139,21 +139,20 @@ public class SysCodeRuleServiceImpl extends ServiceImpl ids) { ids.forEach(id -> { - codeRuleMapper.deleteById(id); + this.baseMapper.deleteById(id); codeRuleDetailMapper.delete(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id)); }); } @Override public void updateCodeRule(SysCodeRule codeRule) { - List sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper() + List sysCodeRules = this.baseMapper.selectList(new LambdaQueryWrapper() .eq(SysCodeRule::getCode, codeRule.getCode()) .ne(SysCodeRule::getId, codeRule.getId())); if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("该编码code已存在，请校验！"); @@ -163,7 +162,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl impl @Override public List buildTree(List menuDtos) { - List trees = new ArrayList<>(); Set ids = new HashSet<>(); List collect = menuDtos.stream().filter(a -> a.getType().equals("2")).collect(Collectors.toList()); for (MenuDto menuDTO : collect) { - if (menuDTO.getPid() == null) { - trees.add(menuDTO); - } for (MenuDto it : menuDtos) { if (menuDTO.getMenu_id().equals(it.getPid())) { if (menuDTO.getChildren() == null) { @@ -335,10 +331,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } } } - if (trees.size() == 0) { - trees = menuDtos.stream().filter(s -> !ids.contains(s.getMenu_id())).collect(Collectors.toList()); - } - return trees; + return menuDtos; } @Override @@ -414,41 +407,20 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 一级目录需要加斜杠，不然会报警告 menuVo.setPath(pid.equals(menuDTO.getPid())? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); + menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache())); // 如果不是外链 if (!menuDTO.getIframe()) { - if (pid.equals(menuDTO.getPid())) { - menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "Layout" : menuDTO.getComponent()); - //"2".equals(menuDTO.getType() 判断是不是目录 - } else if (!pid.equals(menuDTO.getPid()) && "2".equals(menuDTO.getType())) { - menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "ParentView" : menuDTO.getComponent()); - - } else if (!StrUtil.isEmpty(menuDTO.getComponent())) { + if ("2".equals(menuDTO.getType())) { + menuVo.setComponent(pid.equals(menuDTO.getPid()) ? "Layout" : "ParentView"); + } else { menuVo.setComponent(menuDTO.getComponent()); } } - menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache())); if (menuDtoList != null && menuDtoList.size() != 0) { menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); menuVo.setChildren(buildMenus(menuDtoList,pid)); // 处理是一级菜单并且没有子菜单的情况 - } else if (StrUtil.isEmpty(menuDTO.getPid())) { - MenuVo menuVo1 = new MenuVo(); - menuVo1.setMeta(menuVo.getMeta()); - // 非外链 - if (!menuDTO.getIframe()) { - menuVo1.setPath("index"); - menuVo1.setName(menuVo.getName()); - menuVo1.setComponent(menuVo.getComponent()); - } else { - menuVo1.setPath(menuDTO.getPath()); - } - menuVo.setName(null); - menuVo.setMeta(null); - menuVo.setComponent("Layout"); - List list1 = new ArrayList<>(); - list1.add(menuVo1); - menuVo.setChildren(list1); } list.add(menuVo); } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 5f2f0780..4b88e08d 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,7 +9,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:password} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 diff --git a/wms_pro/hd/nladmin-system/src/test/java/Test3.java b/wms_pro/hd/nladmin-system/src/test/java/Test3.java deleted file mode 100644 index ce19a84c..00000000 --- a/wms_pro/hd/nladmin-system/src/test/java/Test3.java +++ /dev/null @@ -1,56 +0,0 @@ -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -import java.util.*; -import java.util.stream.Collectors; - -public class Test3 { - public static void main(String[] args) { - JSONArray array = new JSONArray(); - - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("name", "小三"); - jsonObject1.put("age", "12"); - array.add(jsonObject1); - - JSONObject jsonObject2 = new JSONObject(); - jsonObject2.put("name", "小二"); - jsonObject2.put("age", "17"); - array.add(jsonObject2); - - JSONObject jsonObject3 = new JSONObject(); - jsonObject3.put("name", "小二"); - jsonObject3.put("age", "17"); - array.add(jsonObject3); - - Set name = array.stream().map(row -> ((JSONObject) row)).collect(Collectors.toSet()); - HashMap name1 = array.stream().collect(HashMap::new, (k, v) -> k.put(((JSONObject) v).getString("name"), (JSONObject) v), HashMap::putAll); - HashSet collect = array.stream().collect(HashSet::new, (k, v) -> k.add((JSONObject) v), HashSet::addAll); - collect.stream().forEach(json -> a(json.getString("name"))); - - List maps = new ArrayList<>(); - - HashMap map = new HashMap<>(); - map.put("storagevehicle_code","1"); - map.put("storagevehicle_name","sadfs"); - maps.add(map); - HashMap map2 = new HashMap<>(); - map2.put("storagevehicle_code","2"); - map2.put("storagevehicle_name","sdfd"); - maps.add(map2); - - boolean age = array.stream().filter(row -> ((JSONObject) row).getString("age").equals("18")).findAny().isPresent(); - System.out.println(age); - - - } - - public static void a(String name) { - } - - public static void b(String name) { - } - - -} -