From b83f8d8fd9f53e9fb4af44c07281cebc93481022 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 18 Sep 2023 09:50:40 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=8C=89=E7=85=A7CodeReview=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/ResultCommon.java | 4 + .../EnterpriseStandardDeclareController.java | 4 +- .../EnterpriseStandardInspectController.java | 13 +- .../EnterpriseStandardPlanController.java | 13 +- ...terpriseStandardRecheckPlanController.java | 4 +- ...rpriseStandardReviewMeetingController.java | 97 ++--- .../controller/LawsTreeNodeController.java | 367 ++++++------------ .../service/ILawsTreeNodeService.java | 6 +- .../service/impl/LawsTreeNodeServiceImpl.java | 10 +- .../main/resources/i18n/messages.properties | 4 + .../resources/i18n/messages_en.properties | 6 + .../resources/i18n/messages_zh.properties | 6 +- 12 files changed, 226 insertions(+), 308 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index a80f8317..8601d113 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -37,9 +37,13 @@ public class ResultCommon { public static final String JOB_NUMBER_DOES_NOT_EXIST_EXPORT = "job.number.does.not.exist.export"; // 第{0}行,工号不存在 public static final String DUPLICATE_JOB_NUMBER_EXPORT = "duplicate.job.number.export"; // 第{0}行,工号重复 + public static final String NO_CORRESPONDING_RECORD_FOUND = "no.corresponding.record.found"; // 没有找到对应的记录 + public static final String PARAMETERS_CANNOT_BE_NULL = "parameters.cannot.be.null"; // 参数不能为空 + public static final String ROOT_NODE_CANNOT_BE_EDITED = "root.node.cannot.be.edited"; // 根节点不能编辑 + public static final String HORIZONTAL_TRANSGRESSION = "horizontal.transgression"; // 水平越权 } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java index 2246d670..bf62eae6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java @@ -13,6 +13,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -38,6 +39,7 @@ public class EnterpriseStandardDeclareController extends JeroController pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + return Result.OK(pageList); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index 0dbb156d..02662ddb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -19,6 +19,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -56,6 +57,7 @@ public class EnterpriseStandardInspectController extends JeroController pageList = esInspectService.queryPageList(esInspect, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + return Result.OK(pageList); } /** @@ -71,12 +73,13 @@ public class EnterpriseStandardInspectController extends JeroController delayInspect(@RequestParam("id") String inspectId) { EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), esInspectDelay); + return Result.OK(esInspectDelay); } /** @@ -84,6 +87,7 @@ public class EnterpriseStandardInspectController extends JeroController pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + return Result.OK(pageList); } /** @@ -99,6 +103,7 @@ public class EnterpriseStandardInspectController extends JeroController pageList = esInspectRectifyPlanService.getRectifyPlan(inspectId, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + return Result.OK(pageList); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index e8b0d39d..c839d7cd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -3,7 +3,10 @@ package com.jero.modules.laws.enterprise.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; @@ -13,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +41,7 @@ public class EnterpriseStandardPlanController extends JeroController deleteEN(String id) { if (StringUtils.isBlank(id)) { - return Result.error("参数不识别！"); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PARAMETERS_CANNOT_BE_NULL)); } EnterpriseStandardPlan esPlan = esPlanService.getById(id); if (esPlan == null) { - return Result.error("未找到对应实体"); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.NO_CORRESPONDING_RECORD_FOUND)); } else { esPlanService.deleteById(id); } - return Result.OK(); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java index afcbcbf0..7ac822bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -13,6 +13,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanSer import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -41,6 +42,7 @@ public class EnterpriseStandardRecheckPlanController extends JeroController pageList= recheckPlanService.queryPageList(esDeclare, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + return Result.OK(pageList); } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java index bda4dfb5..28bbfe4c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; @@ -14,6 +15,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingR import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,60 +27,63 @@ import java.util.Map; /** * @Description: 企标宣贯 * @Author: jero-boot - * @Date: 2022-02-12 + * @Date: 2022-02-12 * @Version: V1.0 */ -@Api(tags="企标评审会") +@Api(tags = "企标评审会") @RestController @RequestMapping("/enterprise/reviewMeeting") @Slf4j public class EnterpriseStandardReviewMeetingController extends JeroController { - @Resource - private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; + @Resource + private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; - /** - * 分页列表查询 - * - * @return - */ - @AutoLog(value = "企标评审会-分页列表查询") - @ApiOperation(value="企标评审会-分页列表查询", notes="企标评审会-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(ESQueryCommonDTO esReviewMeeting, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); - } + /** + * 分页列表查询 + * + * @return + */ + @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:search") + @AutoLog(value = "企标评审会-分页列表查询") + @ApiOperation(value = "企标评审会-分页列表查询", notes = "企标评审会-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ESQueryCommonDTO esReviewMeeting, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); + return Result.OK(pageList); + } - /** - * 分页列表查询 - * - * @return - */ - @AutoLog(value = "企标评审会-评分详情") - @ApiOperation(value="企标评审会-评分详情", notes="企标评审会-评分详情") - @GetMapping(value = "/evaluateDetail/{id}") - public Result evaluateDetail(@PathVariable("id") String id) { - Map> resultMap = esReviewMeetingService.evaluateDetail(id); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), resultMap); - } + /** + * 评分详情 + * + * @return + */ + @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:reviewDetail") + @AutoLog(value = "企标评审会-评分详情") + @ApiOperation(value = "企标评审会-评分详情", notes = "企标评审会-评分详情") + @GetMapping(value = "/evaluateDetail/{id}") + public Result evaluateDetail(@PathVariable("id") String id) { + Map> resultMap = esReviewMeetingService.evaluateDetail(id); + return Result.OK(resultMap); + } - /** - * 分页列表查询 - * - * @return - */ - @AutoLog(value = "企标评审会-设置优质标准") - @ApiOperation(value="企标评审会-设置优质标准", notes="企标评审会-设置优质标准") - @GetMapping(value = "/setQualityStandards") - public Result setQualityStandards(@RequestParam String standardNos) { - List standardNoList = Arrays.asList(standardNos.split(",")); - if (standardNoList.size() > 10) { - return Result.error(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN)); - } - esReviewMeetingService.setQualityStandards(standardNoList); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 设置优质标准 + * + * @return + */ + @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:setQualityStandard") + @AutoLog(value = "企标评审会-设置优质标准") + @ApiOperation(value = "企标评审会-设置优质标准", notes = "企标评审会-设置优质标准") + @GetMapping(value = "/setQualityStandards") + public Result setQualityStandards(@RequestParam String standardNos) { + List standardNoList = Arrays.asList(standardNos.split(",")); + if (standardNoList.size() > 10) { + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN)); + } + esReviewMeetingService.setQualityStandards(standardNoList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java index 19d628cb..d764eb22 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java @@ -4,13 +4,18 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; + import com.jero.common.api.vo.Result; -import com.jero.common.system.util.JwtUtil; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel; import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.service.ILawsTreeNodeService; +import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -37,285 +42,165 @@ public class LawsTreeNodeController extends JeroController> queryENTreeList(@RequestParam(required = false) String nodeName, @RequestParam(required = false) String option) { - String moduleCode = "EN"; - Result> result = new Result<>(); - try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); - result.setResult(list); - result.setSuccess(true); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; - } - - /** - * 添加 - * - * @param lawsTreeNode - * @return - */ - @AutoLog(value = "企业标准-添加") - @ApiOperation(value = "企业标准-添加", notes = "企业标准-添加") - @PostMapping(value = "/enterprise/add") - public Result addEN(@RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - try { - String moduleCode = "EN"; - lawsTreeNode.setModuleCode(moduleCode); - lawsTreeNode.setCreateBy(username); - lawsTreeNodeService.saveTreeNodeData(lawsTreeNode, username); - return Result.OK("操作成功!"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("操作失败"); - } - } - - /** - * 编辑 - * - * @param lawsTreeNode - * @return - */ - @AutoLog(value = "企业标准-编辑") - @ApiOperation(value = "企业标准-编辑", notes = "企业标准-编辑") - @PostMapping(value = "/enterprise/edit") - public Result editEN(@Validated @RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - lawsTreeNode.setUpdateBy(username); - LawsTreeNode lawsTreeNodeEntity = lawsTreeNodeService.getById(lawsTreeNode.getId()); - if (lawsTreeNodeEntity == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNodeEntity.getNodeType()) { - return Result.error("根节点无法编辑"); - } else { - boolean ok = lawsTreeNodeService.updateTreeNodeDataById(lawsTreeNode, username); - if (ok) { - return Result.OK("操作成功!"); - } - } - return Result.OK(); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企业标准-通过id删除") - @ApiOperation(value = "企业标准-通过id删除", notes = "企业标准-通过id删除") - @PostMapping(value = "/enterprise/delete") - public Result deleteEN(@RequestBody Map map) { - String id = map.get("id"); - if (StringUtils.isBlank(id)) { - return Result.error("参数不识别！"); - } - LawsTreeNode lawsTreeNode = lawsTreeNodeService.getById(id); - if (lawsTreeNode == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNode.getNodeType()) { - return Result.error("根节点无法删除"); - } else { - boolean ok = lawsTreeNodeService.delete(id, lawsTreeNode.getNodeCode()); - if (ok) { - return Result.OK("删除成功!"); - } - } - return Result.OK(); + String moduleCode = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); + return Result.OK(list); } + @RequiresPermissions("domesticStandard:tree:search") @AutoLog(value = "国内标准-体系树") @ApiOperation(value = "国内标准-体系树", notes = "国内标准-体系树") @GetMapping("/domestic") public Result> queryGBTreeList(@RequestParam(required = false) String nodeName, @RequestParam(required = false) String option) { - String moduleCode = "GB"; - Result> result = new Result<>(); - try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); - result.setResult(list); - result.setSuccess(true); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; - } - - /** - * 添加 - * - * @param lawsTreeNode - * @return - */ - @AutoLog(value = "国内标准-添加") - @ApiOperation(value = "国内标准-添加", notes = "国内标准-添加") - @PostMapping(value = "/domestic/add") - public Result addGB(@RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - try { - String moduleCode = "GB"; - lawsTreeNode.setModuleCode(moduleCode); - lawsTreeNode.setCreateBy(username); - lawsTreeNodeService.saveTreeNodeData(lawsTreeNode, username); - return Result.OK("操作成功!"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("操作失败"); - } - } - - /** - * 编辑 - * - * @param lawsTreeNode - * @return - */ - @AutoLog(value = "国内标准-编辑") - @ApiOperation(value = "国内标准-编辑", notes = "国内标准-编辑") - @PostMapping(value = "/domestic/edit") - public Result editGB(@Validated @RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - lawsTreeNode.setUpdateBy(username); - LawsTreeNode lawsTreeNodeEntity = lawsTreeNodeService.getById(lawsTreeNode.getId()); - if (lawsTreeNodeEntity == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNodeEntity.getNodeType()) { - return Result.error("根节点无法编辑"); - } else { - boolean ok = lawsTreeNodeService.updateTreeNodeDataById(lawsTreeNode, username); - if (ok) { - return Result.OK("操作成功!"); - } - } - return Result.OK(); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "国内标准-通过id删除") - @ApiOperation(value = "国内标准-通过id删除", notes = "国内标准-通过id删除") - @PostMapping(value = "/domestic/delete") - public Result deleteGB(@RequestBody Map map) { - String id = map.get("id"); - if (StringUtils.isBlank(id)) { - return Result.error("参数不识别！"); - } - LawsTreeNode lawsTreeNode = lawsTreeNodeService.getById(id); - if (lawsTreeNode == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNode.getNodeType()) { - return Result.error("根节点无法删除"); - } else { - boolean ok = lawsTreeNodeService.delete(id, lawsTreeNode.getNodeCode()); - if (ok) { - return Result.OK("删除成功!"); - } - } - return Result.OK(); + String moduleCode = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); + return Result.OK(list); } + @RequiresPermissions("overseasStandard:tree:search") @AutoLog(value = "海外标准-体系树") @ApiOperation(value = "海外标准-体系树", notes = "海外标准-体系树") @GetMapping("/overseas") public Result> queryFBTreeList(@RequestParam(required = false) String nodeName, @RequestParam(required = false) String option) { - String moduleCode = "FB"; - Result> result = new Result<>(); - try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); - result.setResult(list); - result.setSuccess(true); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; + String moduleCode = TableNameEnum.FOREIGN_REGULATIONS.getValue(); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); + return Result.OK(list); } - /** - * 添加 - * - * @param lawsTreeNode - * @return - */ + + @RequiresPermissions("enterpriseStandard:tree:add") + @AutoLog(value = "企业标准-添加") + @ApiOperation(value = "企业标准-添加", notes = "企业标准-添加") + @PostMapping(value = "/enterprise/add") + public Result addEN(@RequestBody LawsTreeNode lawsTreeNode) { + lawsTreeNode.setModuleCode(TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + lawsTreeNodeService.saveTreeNodeData(lawsTreeNode); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + @RequiresPermissions("domesticStandard:tree:add") + @AutoLog(value = "国内标准-添加") + @ApiOperation(value = "国内标准-添加", notes = "国内标准-添加") + @PostMapping(value = "/domestic/add") + public Result addGB(@RequestBody LawsTreeNode lawsTreeNode) { + lawsTreeNode.setModuleCode(TableNameEnum.DOMESTIC_REGULATIONS.getValue()); + lawsTreeNodeService.saveTreeNodeData(lawsTreeNode); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + @RequiresPermissions("overseasStandard:tree:add") @AutoLog(value = "海外标准-添加") @ApiOperation(value = "海外标准-添加", notes = "海外标准-添加") @PostMapping(value = "/overseas/add") - public Result addFB(@RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - try { - String moduleCode = "FB"; - lawsTreeNode.setModuleCode(moduleCode); - lawsTreeNode.setCreateBy(username); - lawsTreeNodeService.saveTreeNodeData(lawsTreeNode, username); - return Result.OK("操作成功!"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("操作失败"); - } + public Result addFB(@RequestBody LawsTreeNode lawsTreeNode) { + lawsTreeNode.setModuleCode(TableNameEnum.FOREIGN_REGULATIONS.getValue()); + lawsTreeNodeService.saveTreeNodeData(lawsTreeNode); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 编辑 - * - * @param lawsTreeNode - * @return + * 通用编辑方法 + * @param lawsTreeNode 实体 + * @param moduleCode 所属模块 + * @return 结果 */ + private Result commonEdit(LawsTreeNode lawsTreeNode, String moduleCode) { + LawsTreeNode lawsTreeNodeEntity = lawsTreeNodeService.getById(lawsTreeNode.getId()); + if (lawsTreeNodeEntity == null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_RECORD_FOUND); + } else if (LAWS_TREE_ROOT_NODE == lawsTreeNodeEntity.getNodeType()) { + throw new JeroBootException(ResultCommon.ROOT_NODE_CANNOT_BE_EDITED); + } else if (!moduleCode.equals(lawsTreeNodeEntity.getModuleCode())) { + throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); + } else { + boolean ok = lawsTreeNodeService.updateTreeNodeDataById(lawsTreeNode); + if (ok) { + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + } + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + @RequiresPermissions("enterpriseStandard:tree:edit") + @AutoLog(value = "企业标准-编辑") + @ApiOperation(value = "企业标准-编辑", notes = "企业标准-编辑") + @PostMapping(value = "/enterprise/edit") + public Result editEN(@Validated @RequestBody LawsTreeNode lawsTreeNode) { + return this.commonEdit(lawsTreeNode, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + } + + @RequiresPermissions("domesticStandard:tree:edit") + @AutoLog(value = "国内标准-编辑") + @ApiOperation(value = "国内标准-编辑", notes = "国内标准-编辑") + @PostMapping(value = "/domestic/edit") + public Result editGB(@Validated @RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { + return this.commonEdit(lawsTreeNode, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); + } + + @RequiresPermissions("overseasStandard:tree:edit") @AutoLog(value = "海外标准-编辑") @ApiOperation(value = "海外标准-编辑", notes = "海外标准-编辑") @PostMapping(value = "/overseas/edit") public Result editFB(@Validated @RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - String username = JwtUtil.getUserNameByToken(request); - lawsTreeNode.setUpdateBy(username); - LawsTreeNode lawsTreeNodeEntity = lawsTreeNodeService.getById(lawsTreeNode.getId()); - if (lawsTreeNodeEntity == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNodeEntity.getNodeType()) { - return Result.error("根节点无法编辑"); - } else { - boolean ok = lawsTreeNodeService.updateTreeNodeDataById(lawsTreeNode, username); - if (ok) { - return Result.OK("操作成功!"); - } - } - return Result.OK(); + return this.commonEdit(lawsTreeNode, TableNameEnum.FOREIGN_REGULATIONS.getValue()); } /** - * 通过id删除 - * - * @param map - * @return + * 通用删除方法 + * @param map 参数Map + * @param moduleCode 所属模块 + * @return 结果 */ + private Result commonDelete(Map map, String moduleCode) { + String id = map.get("id"); + if (StringUtils.isBlank(id)) { + throw new JeroBootException(ResultCommon.PARAMETERS_CANNOT_BE_NULL); + } + LawsTreeNode lawsTreeNode = lawsTreeNodeService.getById(id); + if (lawsTreeNode == null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_RECORD_FOUND); + } else if (LAWS_TREE_ROOT_NODE == lawsTreeNode.getNodeType()) { + throw new JeroBootException(ResultCommon.ROOT_NODE_CANNOT_BE_EDITED); + } else if (!moduleCode.equals(lawsTreeNode.getModuleCode())) { + throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); + } else { + boolean ok = lawsTreeNodeService.delete(id, lawsTreeNode.getNodeCode()); + if (ok) { + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + } + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + @RequiresPermissions("enterpriseStandard:tree:delete") + @AutoLog(value = "企业标准-通过id删除") + @ApiOperation(value = "企业标准-通过id删除", notes = "企业标准-通过id删除") + @PostMapping(value = "/enterprise/delete") + public Result deleteEN(@RequestBody Map map) { + return this.commonDelete(map, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + } + + @RequiresPermissions("domesticStandard:tree:delete") + @AutoLog(value = "国内标准-通过id删除") + @ApiOperation(value = "国内标准-通过id删除", notes = "国内标准-通过id删除") + @PostMapping(value = "/domestic/delete") + public Result deleteGB(@RequestBody Map map) { + return this.commonDelete(map, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); + } + + @RequiresPermissions("overseasStandard:tree:delete") @AutoLog(value = "海外标准-通过id删除") @ApiOperation(value = "海外标准-通过id删除", notes = "海外标准-通过id删除") @PostMapping(value = "/overseas/delete") public Result deleteFB(@RequestBody Map map) { - String id = map.get("id"); - if (StringUtils.isBlank(id)) { - return Result.error("参数不识别！"); - } - LawsTreeNode lawsTreeNode = lawsTreeNodeService.getById(id); - if (lawsTreeNode == null) { - return Result.error("未找到对应实体"); - } else if (LAWS_TREE_ROOT_NODE == lawsTreeNode.getNodeType()) { - return Result.error("根节点无法删除"); - } else { - boolean ok = lawsTreeNodeService.delete(id, lawsTreeNode.getNodeCode()); - if (ok) { - return Result.OK("删除成功!"); - } - } - return Result.OK(); + return this.commonDelete(map, TableNameEnum.FOREIGN_REGULATIONS.getValue()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java index 4aac1c79..6ed4addf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java @@ -24,17 +24,15 @@ public interface ILawsTreeNodeService extends IService { /** * 新增 * @param lawsTreeNode - * @param username */ - void saveTreeNodeData(LawsTreeNode lawsTreeNode, String username); + void saveTreeNodeData(LawsTreeNode lawsTreeNode); /** * 更新 * @param lawsTreeNode - * @param username * @return */ - boolean updateTreeNodeDataById(LawsTreeNode lawsTreeNode, String username); + boolean updateTreeNodeDataById(LawsTreeNode lawsTreeNode); /** * 删除 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index 19aa396f..d8fa456b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -106,8 +106,8 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl