From c1cfccbf877e5748bb09098858cf4cc3ba68afe4 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 15:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeLostController.java | 35 +++++ .../controller/inout/IoOrderController.java | 17 +++ .../purchase/SupCompanyController.java | 1 - .../system/SysMenuHelpController.java | 126 ++++++++++++++++++ .../com/glxp/api/dao/auth/SysMenuDao.java | 2 + .../api/dao/system/SysMenuHelpMapper.java | 16 +++ .../api/entity/system/SysMenuHelpEntity.java | 46 +++++++ .../basic/CompanyProductRelevanceRequest.java | 3 + .../api/req/system/SysMenuHelpRequest.java | 42 ++++++ .../api/service/auth/ISysMenuService.java | 2 + .../service/auth/impl/SysMenuServiceImpl.java | 5 + .../service/system/SysMenuHelpService.java | 22 +++ .../system/impl/SysMenuHelpServiceImpl.java | 42 ++++++ .../mybatis/mapper/auth/InvWarehouseDao.xml | 2 +- .../mybatis/mapper/auth/SysMenuDao.xml | 9 ++ .../mapper/system/SysMenuHelpMapper.xml | 26 ++++ 16 files changed, 394 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java create mode 100644 src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java create mode 100644 src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java create mode 100644 src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java create mode 100644 src/main/java/com/glxp/api/service/system/SysMenuHelpService.java create mode 100644 src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/system/SysMenuHelpMapper.xml diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index dc95649bf..483cfd805 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +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; @@ -11,15 +12,19 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.AcceptOrderResponse; +import com.glxp.api.res.inout.IoCodeLostResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.inout.IoCodeLostService; +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.Date; import java.util.List; @@ -30,6 +35,36 @@ public class IoCodeLostController extends BaseController { @Resource IoCodeLostService codeLostService; + + + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/getCodeLost") + public BaseResponse getCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = codeLostService.selectLost(ioCodeLostEntity); + PageInfo pageInfo; + pageInfo= new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/updateCodeLost") + public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + codeLostService.update(ioCodeLostEntity); + + return ResultVOUtils.success("成功"); + } + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveTabCode") public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index b54a077c7..d592f06f6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @@ -72,6 +73,22 @@ public class IoOrderController extends BaseController { return ResultVOUtils.page(pageInfo); } + @GetMapping("/udiwms/inout/order/filterInvoice") + public BaseResponse filterInvoice(FilterOrderRequest filterOrderRequest) { + filterOrderRequest.setDealStatuses(Arrays.asList(2,3)); + filterOrderRequest.setStatuses(Arrays.asList(7,5,8)); + String customerId = getCustomerId(); + if (!customerId.equals("110")) { + filterOrderRequest.setFromCorp(customerId); + } + List list = orderService.filterList(filterOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + + + //新增业务-立即提交 @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 35d788fd1..b6584ea13 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -316,7 +316,6 @@ public class SupCompanyController { } } - public String getCustomerId() { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); if (attributes == null) { 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 000000000..66816c73b --- /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 2bdfcbcd7..48bf49aff 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -54,6 +54,8 @@ public interface SysMenuDao { */ List selectMenuPermsByRoleId(Long roleId); + 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 new file mode 100644 index 000000000..0992d13c0 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 new file mode 100644 index 000000000..4abefe05b --- /dev/null +++ b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java @@ -0,0 +1,46 @@ +package com.glxp.api.entity.system; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "sys_menu_help") +public class SysMenuHelpEntity { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "menuKey") + private String menuKey; + + @TableField(value = "menuName") + private String menuName; + + @TableField(value = "`status`") + private Byte status; + + @TableField(value = "filePath") + private String filePath; + + @TableField(value = "remark") + private String remark; + + @TableField(value = "updateTime") + 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/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index ad8001d4d..4e38ef619 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 000000000..d6c6409b0 --- /dev/null +++ b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java @@ -0,0 +1,42 @@ +package com.glxp.api.req.system; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * @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/service/auth/ISysMenuService.java b/src/main/java/com/glxp/api/service/auth/ISysMenuService.java index a4bd102c5..be08459ae 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,8 @@ 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 303f831f8..fa240ced9 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 new file mode 100644 index 000000000..67912694a --- /dev/null +++ b/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.system; + +import com.glxp.api.entity.system.SysMenuHelpEntity; +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 new file mode 100644 index 000000000..e386a754a --- /dev/null +++ b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java @@ -0,0 +1,42 @@ +package com.glxp.api.service.system.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.system.SysMenuHelpMapper; +import com.glxp.api.entity.system.SysMenuHelpEntity; +import com.glxp.api.req.system.SysMenuHelpRequest; +import com.glxp.api.service.system.SysMenuHelpService; +import org.springframework.stereotype.Service; + +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/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 38b8a4c56..06b68c6a5 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -351,7 +351,7 @@ auth_dept.name warehouseName from auth_warehouse inner join auth_dept on auth_warehouse.parentId = auth_dept.code - inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code + LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code AND auth_warehouse_user.userId = #{userId} diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 2a3ea5a0e..aceaec650 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -88,6 +88,15 @@ + + + + select * from sys_menu_help + + + AND id = #{id} + + + AND menuKey like concat('%',#{menuKey},'%') + + + AND menuName like concat('%',#{menuName},'%') + + + AND status= #{status} + + + + + + +