From 8a01d7f029998c6a965fa676571a128958fab8b8 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 31 Jul 2024 08:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/portal/apiadmin/SysMenuRest.java | 26 ++++++- .../com/yxt/portal/apiadmin/SysUserRest.java | 53 ++++++++------ .../yxt/portal/biz/sysmenu/SysMenuMapper.java | 4 +- .../yxt/portal/biz/sysmenu/SysMenuMapper.xml | 51 +++++--------- .../portal/biz/sysmenu/SysMenuService.java | 70 +++++++++---------- .../SysRoleAuthorizeQuery.java | 1 - .../portal/biz/syssource/SysSourceMapper.xml | 7 ++ .../portal/biz/sysuser/SysUserService.java | 7 +- .../biz/sysuserrole/SysUserRoleMapper.xml | 6 +- 9 files changed, 126 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java index 33833d0..813361a 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java @@ -71,6 +71,7 @@ public class SysMenuRest { SysOrganizationService sysOrganizationService; + @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { @@ -109,7 +110,7 @@ public class SysMenuRest { @PostMapping("/listAllVoForSourceG") public ResultBean> listAllVoForSourceG(@RequestBody SysMenuQuery query){ ResultBean rb = ResultBean.fireFail(); - List list = sysMenuService.listAllVoForSourceG(query); + List list = sysMenuService.listAllVoForSource(query); return rb.success().setData(list); } /** @@ -239,7 +240,28 @@ public class SysMenuRest { } return rb.success().setData(list); } - + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSidG") + public ResultBean> listAllByRoleSidG(@RequestBody SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + String roleSid = query.getRoleSid(); + if (StringUtils.isBlank(roleSid)) { + ResultBean> resultBean = new ResultBean>(); + return resultBean.fail().setMessage("角色sid不能为空!"); + } + List sysSourceVos = sysSourceService.listVo(query.getSourceSid()); + List list = new ArrayList<>(); + for (SysSourceVo s : sysSourceVos) { + SysMenuVo sysMenuVo = new SysMenuVo(); + sysMenuVo.setName(s.getSourceName()); + sysMenuVo.setSid(s.getSid()); + sysMenuVo.setChecked("1"); + query.setSourceSid(s.getSid()); + sysMenuVo.setChildren(sysMenuService.listAllByRoleSidG(query)); + list.add(sysMenuVo); + } + return rb.success().setData(list); + } public ResultBean> list() { ResultBean rb = ResultBean.fireFail(); diff --git a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index c26d4a8..206ee8a 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -455,7 +455,7 @@ public class SysUserRest { SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()); if (sysOrganizationOne != null) { List sysOrgRegisters=new ArrayList<>(); - if(sysOrganizationOne.getPsid()!="0"){ + if(!sysOrganizationOne.getPsid().equals("0")){ sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper() .eq("orgSid",sysOrganizationOne.getPsid())); }else{ @@ -466,7 +466,13 @@ public class SysUserRest { //1>2 1 、1<2 -1 、1=2 0 int k= DateUtil.parse(sdf.format(DateUtil.parse(sdf.format(new Date())))).compareTo(DateUtil.parse(sdf.format(sysOrgRegister.getExpireDate()))); if(k==1){ - sysOrgRegister.setRegType("1"); + sysStaffOrgVo.setType("1"); + }else{ + if(sysOrgRegister.getRegType().equals("0")){ + sysStaffOrgVo.setType("2"); + }else{ + sysStaffOrgVo.setType("3"); + } } } String psid = sysOrganizationOne.getPsid(); @@ -478,20 +484,11 @@ public class SysUserRest { sysStaffOrgVo.setOrgName(sysStaffOrgVo.getOrgName()); } } - sysStaffOrgVo.setType(sysOrgRegisters.get(0).getRegType()); - sysOrgRegisterService.updateBatchById(sysOrgRegisters); +// sysStaffOrgVo.setType(sysOrgRegisters.get(0).getRegType()); +// sysOrgRegisterService.updateBatchById(sysOrgRegisters); } } SysUserVo userInfoOneVo = new SysUserVo(); -// if(sysStaffOrgVos.size()>1){ -// userInfoOneVo.setSid(user.getSid()); -// userInfoOneVo.setSysOrganizationVos(sysStaffOrgVos); -// }else if(sysStaffOrgVos.size()==1){ -// userInfoOneVo = sysUserService.setUserRedisSessionToken(user); -// if (userInfoOneVo == null) { -// return new ResultBean().fail().setMsg("该用户不是公司员工"); -// } -// } userInfoOneVo.setSid(user.getSid()); userInfoOneVo.setSysOrganizationVos(sysStaffOrgVos); // sysStaffOrgService.get @@ -505,15 +502,20 @@ public class SysUserRest { public ResultBean selOrganization(@RequestBody SysUserDto dto){ SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper().eq("sid",dto.getOrgSid())); List sysOrgRegisters=new ArrayList<>(); - if(sysOrganization.getPsid()!="0"){ + if(!sysOrganization.getPsid().equals("0")){ sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper() .eq("orgSid",sysOrganization.getPsid())); }else { sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper() .eq("orgSid",dto.getOrgSid())); } - if(sysOrgRegisters.get(0).getRegType().equals("1")){ - return new ResultBean<>().fail().setMsg("您选择的单位在本系统的体验版已到期，请联系我们购买正式版本。"); + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + for (SysOrgRegister sysOrgRegister : sysOrgRegisters) { + //1>2 1 、1<2 -1 、1=2 0 + int k= DateUtil.parse(sdf.format(DateUtil.parse(sdf.format(new Date())))).compareTo(DateUtil.parse(sdf.format(sysOrgRegister.getExpireDate()))); + if(k==1){ + return new ResultBean<>().fail().setMsg("您选择的单位在本系统的体验版已到期，请联系我们购买正式版本。"); + } } SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("sid",dto.getUserSid())); sysUser.setOrgSid(dto.getOrgSid()); @@ -582,6 +584,11 @@ public class SysUserRest { ssSid=ssi.getSid(); userInfoOneVo.setSysOrganizationVos(new ArrayList<>()); userInfoOneVo.setSid(su.getSid()); + + SysUserRole sysUserRole=new SysUserRole(); + sysUserRole.setRoleSid("002"); + sysUserRole.setUserSid(su.getSid()); + sysUserRoleService.save(sysUserRole); } return new ResultBean<>().success().setData(userInfoOneVo); } @@ -592,6 +599,10 @@ public class SysUserRest { @ApiOperationSupport(order = 30) public ResultBean bindOrganization(@RequestBody SysUserDto dto) { SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("sid",dto.getUserSid())); + List sysOrganization=sysOrganizationService.list(new QueryWrapper().eq("name",dto.getCompanyName())); + if(sysOrganization.size()!=0){ + return new ResultBean().fail().setMsg("该单位已存在"); + } SysOrganization sysOrg=new SysOrganization(); sysOrg.setName(dto.getCompanyName()); sysOrg.setLinkPhone(dto.getContacts()); @@ -603,7 +614,7 @@ public class SysUserRest { for (SysSource sysSource : sysSources) { SysOrgRegister sysOrgRegister=new SysOrgRegister(); sysOrgRegister.setOrgSid(sysOrg.getSid()); - sysOrgRegister.setExpireDate(DateUtil.offsetDay(new Date(),7)); + sysOrgRegister.setExpireDate(DateUtil.offsetDay(new Date(),15)); sysOrgRegister.setRegType("2"); sysOrgRegister.setSourceSid(sysSource.getSid()); sysOrgRegisters.add(sysOrgRegister); @@ -636,10 +647,10 @@ public class SysUserRest { // } // sysRoleAuthorizeService.saveBatch(sysRoleAuthorizes); // - SysUserRole sysUserRole=new SysUserRole(); - sysUserRole.setRoleSid("002"); - sysUserRole.setUserSid(sysUser.getSid()); - sysUserRoleService.save(sysUserRole); +// SysUserRole sysUserRole=new SysUserRole(); +// sysUserRole.setRoleSid("002"); +// sysUserRole.setUserSid(sysUser.getSid()); +// sysUserRoleService.save(sysUserRole); SysUser user = null; user = sysUserService.selectByUserName(sysUser.getUserName()); user.setOrgSid(sysOrg.getSid()); diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java index c116793..7033979 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java @@ -38,6 +38,7 @@ public interface SysMenuMapper extends BaseMapper { List selectListVo(); List listAllParentByRoleSid(String roleSid, String sid, @Param("sourceSid") String sourceSid); + List listAllParentByRoleSidG(String roleSid, String sid, @Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid); @Select("SELECT menu.*,sourceMenu.`sourceSid` FROM sys_menu menu " + "LEFT JOIN sys_org_authorize sourceMenu ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}") @@ -61,7 +62,7 @@ public interface SysMenuMapper extends BaseMapper { * @return */ List selectChildernList(String sid); - List selectGroupChildernList(@Param("sid") String sid,@Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid); + /** * 查询该资源下是否有可用的菜单 @@ -80,5 +81,4 @@ public interface SysMenuMapper extends BaseMapper { * @return */ List fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid); - List fetchGroupBySourceSid(@Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml index 28f1b82..0ccdc5f 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml @@ -29,6 +29,18 @@ and menu.sourceSid = #{sourceSid} + - @@ -146,7 +126,10 @@ if(menu.pSid=0,'顶级菜单','' )as pName FROM sys_menu menu LEFT JOIN sys_source source ON menu.sourceSid = source.sid - WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1 + WHERE menu.psid='0' and menu.isDelete!=1 + + and source.sid=#{sourceSid} + ORDER BY menu.sortNo ASC + select distinct dataRuleId from sys_user_role a left join sys_role b on a.roleSid =b.sid - where userSid = #{userSid} and b.orgSid =#{orgSid} order by dataRuleId limit 1 + where userSid = #{userSid} + + and b.orgSid =#{orgSid} + + order by dataRuleId limit 1