From 86dd75d7d4802c4beee3810346a5b53c7331196b Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 10 Apr 2023 18:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/BaseMenuController.java | 3 ++- .../enterprise/EntSystemDeptController.java | 11 +++----- .../government/GovSystemDeptController.java | 11 +++----- .../project/SystemDeptController.java | 11 +++----- .../modules/basicdata/dto/SystemUserDto.java | 2 +- .../modules/basicdata/entity/SystemDept.java | 4 +-- .../basicdata/entity/SystemRoleMenu.java | 23 ++++++----------- .../modules/basicdata/entity/SystemUser.java | 17 +++++++++---- .../basicdata/mapper/BaseMenuMapper.java | 2 ++ .../basicdata/mapper/xml/BaseMenuMapper.xml | 5 ++++ .../basicdata/mapper/xml/SystemUserMapper.xml | 5 ++-- .../basicdata/service/IBaseMenuService.java | 3 ++- .../basicdata/service/ISystemDeptService.java | 2 +- .../service/impl/BaseMenuServiceImpl.java | 25 ++++++------------- .../service/impl/GovernmentServiceImpl.java | 11 ++++++-- .../service/impl/SystemDeptServiceImpl.java | 8 +++--- 16 files changed, 70 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java index 086efbd..eaf4850 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java @@ -4,6 +4,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; +import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu; import com.zhgd.xmgl.modules.basicdata.service.IBaseMenuService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -198,7 +199,7 @@ public class BaseMenuController { @ApiOperation(value = "获取角色的菜单权限", notes = "获取角色的菜单权限" , httpMethod="POST") @ApiImplicitParam(name = "roleId", value = "系统角色表ID", paramType = "query", required = true, dataType = "Long") @PostMapping(value = "/queryByRole") - public Result> queryByRole(@RequestBody Map map) { + public Result> queryByRole(@RequestBody Map map) { return Result.success(baseMenuService.roleMenu(MapUtils.getString(map,"roleId"))); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java index 582d8c3..ddf1d53 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java @@ -14,10 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; @@ -63,10 +60,10 @@ public class EntSystemDeptController { * @return */ @OperLog(operModul = "部门配置", operType = "层级查询", operDesc = "层级查询政府内部部门信息") - @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="POST") - @PostMapping(value = "/tree") + @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="GET") + @GetMapping(value = "/tree") public Result> queryTreeList() { - List tree = systemDeptService.tree(0); + List tree = systemDeptService.tree(0L); return Result.success(tree); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemDeptController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemDeptController.java index 7459415..b1ead91 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemDeptController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemDeptController.java @@ -14,10 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; @@ -63,10 +60,10 @@ public class GovSystemDeptController { * @return */ @OperLog(operModul = "部门配置", operType = "层级查询", operDesc = "层级查询政府内部部门信息") - @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="POST") - @PostMapping(value = "/tree") + @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="GET") + @GetMapping(value = "/tree") public Result> queryTreeList() { - List tree = systemDeptService.tree(0); + List tree = systemDeptService.tree(0L); return Result.success(tree); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemDeptController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemDeptController.java index 9365b03..c5d7ae2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemDeptController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemDeptController.java @@ -14,10 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; @@ -63,10 +60,10 @@ public class SystemDeptController { * @return */ @OperLog(operModul = "部门配置", operType = "层级查询", operDesc = "层级查询政府内部部门信息") - @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="POST") - @PostMapping(value = "/tree") + @ApiOperation(value = " 层级查询政府内部部门信息", notes = "层级查询政府内部部门信息", httpMethod="GET") + @GetMapping(value = "/tree") public Result> queryTreeList() { - List tree = systemDeptService.tree(0); + List tree = systemDeptService.tree(0L); return Result.success(tree); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/SystemUserDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/SystemUserDto.java index f3e6e72..2b099e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/SystemUserDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/SystemUserDto.java @@ -14,5 +14,5 @@ public class SystemUserDto extends SystemUser { @ApiModelProperty(value = "用户角色") - private String roleId; + private String roleName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemDept.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemDept.java index 86ff13d..974ec30 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemDept.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemDept.java @@ -27,7 +27,7 @@ public class SystemDept implements Serializable { /** * 部门id */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "部门id(主键ID)") private Long deptId; /** @@ -35,7 +35,7 @@ public class SystemDept implements Serializable { */ @Excel(name = "父部门id", width = 15) @ApiModelProperty(value = "父部门id") - private Integer parentId; + private Long parentId; /** * 祖级列表 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java index 7e8f903..737ef16 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemRoleMenu.java @@ -35,22 +35,15 @@ public class SystemRoleMenu implements Serializable { @ApiModelProperty(value = "角色id") private Long roleId; /** - * 菜单id + * 对应权限id */ - @Excel(name = "菜单id", width = 15) - @ApiModelProperty(value = "菜单id") - private Long menuId; + @Excel(name = "对应权限id", width = 15) + @ApiModelProperty(value = "对应权限id") + private Long authorityId; /** - * 权限id + * 菜单类型,0:模块 1:菜单;2:按钮 */ - @Excel(name = "权限id", width = 15) - @ApiModelProperty(value = "权限id") - private Long actionId; - - /** - * 模块id - */ - @Excel(name = "模块id", width = 15) - @ApiModelProperty(value = "模块id") - private Long moduleId; + @Excel(name = "菜单类型,0:模块 1:菜单;2:按钮", width = 15) + @ApiModelProperty(value = "菜单类型,0:模块 1:菜单;2:按钮") + private Integer type; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java index bba4015..4d0d06c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java @@ -53,7 +53,6 @@ public class SystemUser implements Serializable { */ @Excel(name = "创建时间", width = 15) @ApiModelProperty(value = "创建时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** * 人员姓名 @@ -92,11 +91,11 @@ public class SystemUser implements Serializable { @ApiModelProperty(value = "项目子账号绑定的人员ID") private Integer workerId; /** - * 组织岗位Id + * 组织岗位 */ - @Excel(name = "组织岗位Id", width = 15) - @ApiModelProperty(value = "组织岗位Id") - private Integer jobId; + @Excel(name = "组织岗位", width = 15) + @ApiModelProperty(value = "组织岗位") + private String jobName; /** * 外部第三方账号 */ @@ -122,6 +121,14 @@ public class SystemUser implements Serializable { @ApiModelProperty(value = "邮箱") private String email; + @Excel(name = "性别(0女;1男)", width = 15) + @ApiModelProperty(value = "性别(0女;1男)") + private Integer sex; + + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + @TableField(exist = false) @ApiModelProperty(value = "token") private String token; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java index 231295d..766466a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java @@ -28,4 +28,6 @@ public interface BaseMenuMapper extends BaseMapper { List selectHeadquartersMenuList(Map param); List selectComapnyUserMenuList(Map param); + + List getMenuIdByFilter(Long roleId, Long moduleId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml index e396106..1f6f05b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml @@ -54,4 +54,9 @@ WHERE b.user_id=#{userId} and a.status=1 and m.style_type=#{styleType} order by a.parent_id,a.priority + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 37d0856..0048fcb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -13,9 +13,10 @@ \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java index 9a93dd7..a26364b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java @@ -6,6 +6,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; +import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public interface IBaseMenuService extends IService { List myTreeMenu(Long moduleId); - Set roleMenu(String roleId); + List roleMenu(String roleId); Set queryRouter(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemDeptService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemDeptService.java index 2fb83f4..4ac4b48 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemDeptService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemDeptService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface ISystemDeptService extends IService { - List tree(Integer deptId); + List tree(Long deptId); boolean saveInfo(SystemDept systemDept); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 4719ba9..d7a6129 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -99,13 +99,10 @@ public class BaseMenuServiceImpl extends ServiceImpl i // 查询相对应的菜单 baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, moduleId)); } else { - List roleIds = systemUserRoleService.list(Wrappers.lambdaQuery() - .eq(SystemUserRole::getUserId, user.getUserId())).stream().map(r -> r.getRoleId()).collect(Collectors.toList()); - if (roleIds.size() > 0) { - List menuIds = systemRoleMenuService.list(Wrappers.lambdaQuery() - .in(SystemRoleMenu::getRoleId, roleIds).eq(SystemRoleMenu::getModuleId, moduleId) - ).stream().map(r -> r.getMenuId()).collect(Collectors.toList()); - baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getMenuId, menuIds)); + Long roleId = systemUserRoleService.getOne(Wrappers.lambdaQuery() + .eq(SystemUserRole::getUserId, user.getUserId())).getRoleId(); + if (roleId != null) { + baseMenus = baseMenuMapper.getMenuIdByFilter(roleId, moduleId); } } if (baseMenus.size() == 0) { @@ -117,18 +114,10 @@ public class BaseMenuServiceImpl extends ServiceImpl i } @Override - public Set roleMenu(String roleId) { - Set ids = new HashSet<>(); + public List roleMenu(String roleId) { // 查询角色下的菜单 - List systemRoleMenus = systemRoleMenuService.list(Wrappers.lambdaQuery() - .eq(SystemRoleMenu::getRoleId, roleId)); - for (SystemRoleMenu systemRoleMenu : systemRoleMenus) { - ids.add(systemRoleMenu.getModuleId()); - ids.add(systemRoleMenu.getMenuId()); - ids.add(systemRoleMenu.getActionId()); - } - ids.remove(null); - return ids; + return systemRoleMenuService.list(Wrappers.lambdaQuery() + .eq(SystemRoleMenu::getRoleId, roleId)); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java index b61a115..d8fdbb7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java @@ -61,7 +61,9 @@ public class GovernmentServiceImpl extends ServiceImpl 0 ? between : 0); + government.setState(between > 0 ? government.getState() : 0); } government.setInstallProject(projectList.stream().filter(p -> p.getGovernmentSn().equals(government.getGovernmentSn())).count()); } @@ -131,6 +133,11 @@ public class GovernmentServiceImpl extends ServiceImpllambdaQuery().eq(Government::getGovernmentSn, govSn)); + Government government = this.getOne(Wrappers.lambdaQuery().eq(Government::getGovernmentSn, govSn)); + if (government.getExpireTime().before(new Date())) { + government.setState(0); + this.updateById(government); + } + return government; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java index acfcecb..4378f5e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java @@ -24,12 +24,12 @@ import java.util.stream.Collectors; public class SystemDeptServiceImpl extends ServiceImpl implements ISystemDeptService { @Override - public List tree(Integer deptId) { + public List tree(Long deptId) { SecurityUser user = SecurityUtil.getUser(); List list = this.list(Wrappers.lambdaQuery().eq(SystemDept::getSn, user.getSn())); List treeList = new ArrayList<>(); - if (deptId == 0) { - treeList = list.stream().filter(d -> d.getParentId().equals(0)).collect(Collectors.toList()); + if (deptId.equals(0L)) { + treeList = list.stream().filter(d -> d.getParentId().equals(0L)).collect(Collectors.toList()); getTreeList(treeList, list); } else { treeList = list.stream().filter(d -> d.getDeptId().equals(deptId)).collect(Collectors.toList()); @@ -62,7 +62,7 @@ public class SystemDeptServiceImpl extends ServiceImpl getTreeList(List treeList, List list) { for (SystemDept systemDept : treeList) { - List children = this.list(Wrappers.lambdaQuery().eq(SystemDept::getParentId, systemDept.getDeptId())); + List children = list.stream().filter(d -> d.getParentId().equals(systemDept.getDeptId())).collect(Collectors.toList()); getTreeList(children, list); systemDept.setChildren(children); }