From e240730eaf42b6cdc2773e510cb2c9fa0b350b18 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 21 Mar 2023 15:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../system/SysMenuHelpController.java | 126 ++++++++++++++++++ .../com/glxp/api/dao/auth/SysMenuDao.java | 5 + .../api/dao/system/SysMenuHelpMapper.java | 8 +- .../api/entity/system/SysMenuHelpEntity.java | 5 +- .../basic/CompanyProductRelevanceRequest.java | 3 + .../api/req/system/SysMenuHelpRequest.java | 45 +++++++ .../api/res/system/SysMenuHelpResponse.java | 42 ++++++ .../api/service/auth/ISysMenuService.java | 4 + .../service/auth/impl/SysMenuServiceImpl.java | 5 + .../service/system/SysMenuHelpService.java | 17 ++- .../system/impl/SysMenuHelpServiceImpl.java | 32 +++++ .../mybatis/mapper/auth/SysMenuDao.xml | 10 ++ .../mapper/system/SysMenuHelpMapper.xml | 22 +++ 14 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java create mode 100644 src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java create mode 100644 src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 1b6e3423..db66960b 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -456,7 +456,7 @@ public class InvWarehouseController extends BaseController { filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode()); filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions()); List invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest); - if (CollUtil.isNotEmpty(invBusUserEntities)) + if (CollUtil.isNotEmpty(invBusUserEntities) ) return ResultVOUtils.error(999, "请先移除用户关联单据类型！"); } diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java new file mode 100644 index 00000000..66816c73 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -0,0 +1,126 @@ +package com.glxp.api.controller.system; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.auth.SysMenu; +import com.glxp.api.entity.system.SysMenuHelpEntity; +import com.glxp.api.req.system.SysMenuHelpRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.ISysMenuService; +import com.glxp.api.service.system.SysMenuHelpService; +import com.glxp.api.util.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * @author : zhangsan + * @date : 2023/3/20 13:58 + * @modyified By : + */ +@RestController +public class SysMenuHelpController { + + @Resource + private SysMenuHelpService sysMenuHelpService; + @Resource + private ISysMenuService iSysMenuService; + + + + @AuthRuleAnnotation("system/param/help/list") + @GetMapping("/system/param/help/list") + public BaseResponse list(@Valid SysMenuHelpRequest sysMenuHelpRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + List list = sysMenuHelpService.MenuHelpList(sysMenuHelpRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("system/param/help/insertMenuHelp") + @PostMapping("/system/param/help/insertMenuHelp") + public BaseResponse insertMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, + BindingResult bindingResult ) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); + BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + sysMenuHelpService.insertMenuHelp(sysMenuHelpEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("system/param/help/updateMenuHelp") + @PostMapping("/system/param/help/updateMenuHelp") + public BaseResponse updateMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, + BindingResult bindingResult ) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); + BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + sysMenuHelpService.updateMenuHelp(sysMenuHelpEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("system/param/help/deleteMenuHelp") + @GetMapping("/system/param/help/deleteMenuHelp") + public BaseResponse deleteMenuHelp( String id) { + if(!StringUtils.isNotBlank(id)){ + return ResultVOUtils.error(999,"参数错误"); + } + sysMenuHelpService.deleteMenuHelp(id); + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("system/param/help/selectAuthMenu") + @GetMapping("/system/param/help/selectAuthMenu") + + public BaseResponse selectAuthMenu( String menuName + ) { + if(!StringUtils.isNotBlank(menuName)){ + return ResultVOUtils.error(999,"参数错误"); + } + SysMenu sysMenu = iSysMenuService.selectMenuByName(menuName); + SysMenuHelpRequest sysMenuHelpRequest = new SysMenuHelpRequest(); + List list= sysMenuHelpService.MenuHelpList(sysMenuHelpRequest); + SysMenuHelpEntity entity=null; + for (SysMenuHelpEntity sysMenuHelpEntity : list) { + if(sysMenuHelpEntity.getMenuKey().equals(sysMenu.getComponent())){ + entity=sysMenuHelpEntity; + break; + } + } + return ResultVOUtils.success(entity); + } + + +} + + + + + + + + diff --git a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java index 2bdfcbcd..7b4bdc67 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -46,6 +46,11 @@ public interface SysMenuDao { */ List selectMenuPermsByUserId(Long userId); + + SysMenu selectMenuByName(String menuName); + + + /** * 根据角色ID查询权限 * diff --git a/src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java b/src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java index 9ea3298a..82e899c6 100644 --- a/src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java @@ -1,10 +1,16 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.system.SysMenuHelpEntity; +import com.glxp.api.req.system.SysMenuHelpRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface SysMenuHelpMapper extends BaseMapper { + + List selectMenuHelpList(SysMenuHelpRequest sysMenuHelpRequest); + + } diff --git a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java index 3501f26e..d3d67d38 100644 --- a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; @Data @TableName(value = "sys_menu_help") @@ -29,7 +32,7 @@ public class SysMenuHelpEntity { private String remark; @TableField(value = "updateTime") - private Date updateTime; + private String updateTime; public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index ad8001d4..4e38ef61 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -3,6 +3,8 @@ package com.glxp.api.req.basic; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + @Data public class CompanyProductRelevanceRequest extends ListPageRequest { private String ylqxzcrbarmc; @@ -46,4 +48,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String corpId; private String billType; + private List uuids; } diff --git a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java new file mode 100644 index 00000000..5d5509a7 --- /dev/null +++ b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java @@ -0,0 +1,45 @@ +package com.glxp.api.req.system; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhangsan + * @date : 2023/3/20 14:03 + * @modyified By : + */ + +@Data +public class SysMenuHelpRequest extends ListPageRequest { + + + private Integer id; + + private String menuKey; + + private String menuName; + + private Byte status; + + private String filePath; + + private String remark; + + private String updateTime; + + public static final String COL_ID = "id"; + + public static final String COL_MENUKEY = "menuKey"; + + public static final String COL_MENUNAME = "menuName"; + + public static final String COL_STATUS = "status"; + + public static final String COL_FILEPATH = "filePath"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_UPDATETIME = "updateTime"; +} diff --git a/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java b/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java new file mode 100644 index 00000000..93cbb853 --- /dev/null +++ b/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java @@ -0,0 +1,42 @@ +package com.glxp.api.res.system; + +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhangsan + * @date : 2023/3/20 14:23 + * @modyified By : + */ +@Data +public class SysMenuHelpResponse { + + private Integer id; + + private String menuKey; + + private String menuName; + + private Byte status; + + private String filePath; + + private String remark; + + private Date updateTime; + + public static final String COL_ID = "id"; + + public static final String COL_MENUKEY = "menuKey"; + + public static final String COL_MENUNAME = "menuName"; + + public static final String COL_STATUS = "status"; + + public static final String COL_FILEPATH = "filePath"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_UPDATETIME = "updateTime"; +} diff --git a/src/main/java/com/glxp/api/service/auth/ISysMenuService.java b/src/main/java/com/glxp/api/service/auth/ISysMenuService.java index a4bd102c..d8250966 100644 --- a/src/main/java/com/glxp/api/service/auth/ISysMenuService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysMenuService.java @@ -34,6 +34,10 @@ public interface ISysMenuService { */ Set selectMenuPermsByUserId(Long userId); + + SysMenu selectMenuByName(String menuName); + + /** * 根据角色ID查询权限 * diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index 303f831f..fa240ced 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java @@ -82,6 +82,11 @@ public class SysMenuServiceImpl implements ISysMenuService { return permsSet; } + @Override + public SysMenu selectMenuByName(String menuName) { + return sysMenuDao.selectMenuByName(menuName); + } + /** * 根据角色ID查询权限 * diff --git a/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java b/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java index b77b87fe..e2b5a09b 100644 --- a/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java +++ b/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java @@ -1,9 +1,24 @@ package com.glxp.api.service.system; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; +import com.glxp.api.entity.monitor.SysOperLog; import com.glxp.api.entity.system.SysMenuHelpEntity; -import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.req.system.SysMenuHelpRequest; + +import java.util.List; public interface SysMenuHelpService { + List MenuHelpList(SysMenuHelpRequest sysMenuHelpRequest); + + boolean insertMenuHelp(SysMenuHelpEntity sysMenuHelpEntity); + + boolean updateMenuHelp(SysMenuHelpEntity sysMenuHelpEntity); + + boolean deleteMenuHelp(String id); + + + + } diff --git a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java index 8afbd586..f85ddb08 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java @@ -1,12 +1,44 @@ package com.glxp.api.service.system.impl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.monitor.SysOperLogMapper; +import com.glxp.api.req.system.SysMenuHelpRequest; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysMenuHelpMapper; import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.service.system.SysMenuHelpService; +import javax.annotation.Resource; +import java.util.List; + @Service public class SysMenuHelpServiceImpl implements SysMenuHelpService { + @Resource + private SysMenuHelpMapper sysMenuHelpMapper; + + @Override + public List MenuHelpList(SysMenuHelpRequest sysMenuHelpRequest) { + if (sysMenuHelpRequest.getPage() != null) { + int offset = (sysMenuHelpRequest.getPage() - 1) * sysMenuHelpRequest.getLimit(); + PageHelper.offsetPage(offset, sysMenuHelpRequest.getLimit()); + } + return sysMenuHelpMapper.selectMenuHelpList(sysMenuHelpRequest); + } + + @Override + public boolean insertMenuHelp(SysMenuHelpEntity sysMenuHelpEntity) { + return sysMenuHelpMapper.insert(sysMenuHelpEntity)>0; + } + + @Override + public boolean updateMenuHelp(SysMenuHelpEntity sysMenuHelpEntity) { + return sysMenuHelpMapper.updateById(sysMenuHelpEntity)>0; + } + + @Override + public boolean deleteMenuHelp(String id) { + return sysMenuHelpMapper.deleteById(id)>0; + } } diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 2a3ea5a0..b3b3b5bb 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -88,6 +88,16 @@ + + + + + select * from sys_menu_help + + + AND id = #{id} + + + AND menuKey like concat('%',#{menuKey},'%') + + + AND menuName like concat('%',#{menuName},'%') + + + AND status= #{status} + + + + + +