From 123b9c58197dc02a8b0c7b281c9d51363dc01ec8 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 30 Jul 2024 08:52:40 +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 | 20 ++- .../portal/apiadmin/SysOrgRegisterRest.java | 8 ++ .../com/yxt/portal/apiadmin/SysUserRest.java | 122 ++++++++++++------ .../yxt/portal/biz/sysmenu/SysMenuMapper.java | 2 + .../yxt/portal/biz/sysmenu/SysMenuMapper.xml | 68 +++++++++- .../portal/biz/sysmenu/SysMenuService.java | 35 ++++- .../yxt/portal/biz/sysmenu/SysMenuTreeVo.java | 1 + .../biz/sysorgregister/SysOrgRegister.java | 31 +++++ .../biz/sysorgregister/SysOrgRegisterDto.java | 28 ++++ .../sysorgregister/SysOrgRegisterMapper.java | 27 ++++ .../sysorgregister/SysOrgRegisterMapper.xml | 21 +++ .../sysorgregister/SysOrgRegisterQuery.java | 19 +++ .../sysorgregister/SysOrgRegisterService.java | 32 +++++ .../biz/sysorgregister/SysOrgRegisterVo.java | 39 ++++++ .../biz/sysstaffinfo/SysStaffinfoService.java | 20 ++- .../portal/biz/sysstafforg/SysStaffOrgVo.java | 2 +- 16 files changed, 426 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.xml create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java create mode 100644 src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java index 7f50905..33833d0 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java @@ -99,7 +99,19 @@ public class SysMenuRest { List list = sysMenuService.listAllVoForSource(query); return rb.success().setData(list); } - + /** + * 权限组菜单列表：根据资源归类 + * + * @param query + * @return + */ + @ApiOperation("菜单列表：根据资源归类") + @PostMapping("/listAllVoForSourceG") + public ResultBean> listAllVoForSourceG(@RequestBody SysMenuQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuService.listAllVoForSourceG(query); + return rb.success().setData(list); + } /** * 菜单列表：根据资源归类 设置功能的url用 * @return @@ -174,13 +186,15 @@ public class SysMenuRest { return rb.setData(list); SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper().eq("sid",query.getOrgSid())); String a=""; + List userRole=new ArrayList<>(); if(!sysOrganization.getPsid().equals("0")){ a =sysOrganization.getOrgSidPath().substring(0,sysOrganization.getOrgSidPath().lastIndexOf("/")); + userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), a,""); }else{ - a=sysOrganization.getOrgSidPath(); +// a=sysOrganization.getOrgSidPath(); + userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), "",""); } //根据用户和资源查询 这个资源下的菜单 - List userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), a,""); List roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList()); if(userRole.size()==0){ return rb.success().setData(new ArrayList<>()); diff --git a/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java new file mode 100644 index 0000000..074b97e --- /dev/null +++ b/src/main/java/com/yxt/portal/apiadmin/SysOrgRegisterRest.java @@ -0,0 +1,8 @@ +package com.yxt.portal.apiadmin; + +/** + * @author wangpengfei + * @date 2024/7/26 17:26 + */ +public class SysOrgRegisterRest { +} diff --git a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index 2772946..c26d4a8 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -1,6 +1,7 @@ package com.yxt.portal.apiadmin; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.yxt.common.base.config.RedisUtil; @@ -12,6 +13,8 @@ import com.yxt.portal.biz.sysmenu.SysMenu; import com.yxt.portal.biz.sysmenu.SysMenuService; import com.yxt.portal.biz.sysorganization.SysOrganization; import com.yxt.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.sysorgregister.SysOrgRegister; +import com.yxt.portal.biz.sysorgregister.SysOrgRegisterService; import com.yxt.portal.biz.syspost.SysPost; import com.yxt.portal.biz.syspost.SysPostService; import com.yxt.portal.biz.sysrole.SysRole; @@ -19,6 +22,8 @@ import com.yxt.portal.biz.sysrole.SysRoleDto; import com.yxt.portal.biz.sysrole.SysRoleService; import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorize; import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorizeService; +import com.yxt.portal.biz.syssource.SysSource; +import com.yxt.portal.biz.syssource.SysSourceService; import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo; @@ -42,6 +47,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -86,8 +92,10 @@ public class SysUserRest { private SysRoleAuthorizeService sysRoleAuthorizeService; @Autowired private SysMenuService sysMenuService; -// @Autowired -// private SystemLogService systemLogService; + @Autowired + private SysOrgRegisterService sysOrgRegisterService; + @Autowired + SysSourceService sysSourceService; // 定义点选文字图片验证码允许的误差值 private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px @@ -442,9 +450,25 @@ public class SysUserRest { } // 根据用户信息查询用户的角色信息 ListsysStaffOrgVos= sysStaffOrgService.fetchOrgsByStaffSid(user.getStaffSid()); + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()); if (sysOrganizationOne != null) { + List sysOrgRegisters=new ArrayList<>(); + if(sysOrganizationOne.getPsid()!="0"){ + sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper() + .eq("orgSid",sysOrganizationOne.getPsid())); + }else{ + sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper() + .eq("orgSid",sysStaffOrgVo.getOrgSid())); + } + 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){ + sysOrgRegister.setRegType("1"); + } + } String psid = sysOrganizationOne.getPsid(); if(com.yxt.common.base.utils.StringUtils.isNotNull(psid)){ if(!psid.equals("0")){ @@ -454,9 +478,10 @@ public class SysUserRest { sysStaffOrgVo.setOrgName(sysStaffOrgVo.getOrgName()); } } + sysStaffOrgVo.setType(sysOrgRegisters.get(0).getRegType()); + sysOrgRegisterService.updateBatchById(sysOrgRegisters); } } - SysUserVo userInfoOneVo = new SysUserVo(); // if(sysStaffOrgVos.size()>1){ // userInfoOneVo.setSid(user.getSid()); @@ -478,10 +503,21 @@ public class SysUserRest { @ApiOperation(value = "选择所登录的组织") @ApiOperationSupport(order = 30) public ResultBean selOrganization(@RequestBody SysUserDto dto){ + SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper().eq("sid",dto.getOrgSid())); + List sysOrgRegisters=new ArrayList<>(); + if(sysOrganization.getPsid()!="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("您选择的单位在本系统的体验版已到期，请联系我们购买正式版本。"); + } SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("sid",dto.getUserSid())); sysUser.setOrgSid(dto.getOrgSid()); SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(sysUser); - sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken()); return new ResultBean<>().success().setData(userInfoOneVo); } @@ -502,9 +538,6 @@ public class SysUserRest { if (StringUtils.isBlank(mobile)) { return new ResultBean().fail().setMsg("手机号不能为空"); } -// if (userType == 0) { -// return new ResultBean().fail().setMsg("用户类型不能为空"); -// } if (StringUtils.isBlank(verificationCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } else { @@ -519,20 +552,15 @@ public class SysUserRest { String ssSid=""; SysUser one = sysUserService.fetchByUserName(mobile); if (null != one) { - userInfoOneVo.setSid(one.getSid()); - List list=sysStaffOrgService.fetchOrgsByStaffSid(one.getStaffSid()); - if(list.size()!=0){ - userInfoOneVo.setSysOrganizationVos(list); - return rb.success().setData(userInfoOneVo); - }else{ - userInfoOneVo.setSysOrganizationVos(new ArrayList<>()); - return rb.success().setData(userInfoOneVo); - } -// SysOrganization s=sysOrganizationService.getOne(new QueryWrapper().eq("name",dto.getCompanyName())); -// if(s!=null){ -// return new ResultBean().fail().setMsg("公司重复!`"); + return rb.setMsg("该账号已存在，不能重复注册。请直接登录!"); +// userInfoOneVo.setSid(one.getSid()); +// List list=sysStaffOrgService.fetchOrgsByStaffSid(one.getStaffSid()); +// if(list.size()!=0){ +// userInfoOneVo.setSysOrganizationVos(list); +// return rb.success().setData(userInfoOneVo); // }else{ -// ssSid=one.getStaffSid(); +// userInfoOneVo.setSysOrganizationVos(new ArrayList<>()); +// return rb.success().setData(userInfoOneVo); // } }else{ //"15097329653"; @@ -548,7 +576,7 @@ public class SysUserRest { su.setUserType(1); su.setAccountType("1"); sysUserService.save(su); - ssi.setName(name+"系统管理员"); + ssi.setName(name+"单位管理员"); ssi.setMobile(mobile); sysStaffinfoService.save(ssi); ssSid=ssi.getSid(); @@ -570,7 +598,17 @@ public class SysUserRest { sysOrg.setOrgSidPath(sysOrg.getSid()); sysOrg.setPsid("0"); sysOrganizationService.save(sysOrg); - + List sysSources=sysSourceService.list(); + List sysOrgRegisters=new ArrayList<>(); + for (SysSource sysSource : sysSources) { + SysOrgRegister sysOrgRegister=new SysOrgRegister(); + sysOrgRegister.setOrgSid(sysOrg.getSid()); + sysOrgRegister.setExpireDate(DateUtil.offsetDay(new Date(),7)); + sysOrgRegister.setRegType("2"); + sysOrgRegister.setSourceSid(sysSource.getSid()); + sysOrgRegisters.add(sysOrgRegister); + } + sysOrgRegisterService.saveBatch(sysOrgRegisters); SysStaffOrg sysStaffOrg=new SysStaffOrg(); sysStaffOrg.setStaffSid(sysUser.getStaffSid()); sysStaffOrg.setOrgSid(sysOrg.getSid()); @@ -578,28 +616,28 @@ public class SysUserRest { sysStaffOrg.setManageType("3"); sysStaffOrgService.save(sysStaffOrg); - SysRole sysRole=new SysRole(); - sysRole.setCode(""); - sysRole.setName("单位管理员"); - sysRole.setSort(0); - sysRole.setType(1); - sysRole.setOrgSid(sysOrg.getSid()); - sysRole.setDataRuleId("1"); - sysRoleService.save(sysRole); - List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid",dto.getSourceSid())); -// List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33")); - List sysRoleAuthorizes=new ArrayList<>(); - for (SysMenu sysMenu : sysMenus) { - SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize(); - sysRoleAuthorize.setRoleSid(sysRole.getSid()); - sysRoleAuthorize.setMenuSid(sysMenu.getSid()); - sysRoleAuthorize.setSourceSid(dto.getSourceSid()); - sysRoleAuthorizes.add(sysRoleAuthorize); - } - sysRoleAuthorizeService.saveBatch(sysRoleAuthorizes); +// SysRole sysRole=new SysRole(); +// sysRole.setCode(""); +// sysRole.setName("单位管理员"); +// sysRole.setSort(0); +// sysRole.setType(1); +// sysRole.setOrgSid(sysOrg.getSid()); +// sysRole.setDataRuleId("1"); +// sysRoleService.save(sysRole); +// List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid",dto.getSourceSid())); +//// List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33")); +// List sysRoleAuthorizes=new ArrayList<>(); +// for (SysMenu sysMenu : sysMenus) { +// SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize(); +// sysRoleAuthorize.setRoleSid("002"); +// sysRoleAuthorize.setMenuSid(sysMenu.getSid()); +// sysRoleAuthorize.setSourceSid(dto.getSourceSid()); +// sysRoleAuthorizes.add(sysRoleAuthorize); +// } +// sysRoleAuthorizeService.saveBatch(sysRoleAuthorizes); // SysUserRole sysUserRole=new SysUserRole(); - sysUserRole.setRoleSid(sysRole.getSid()); + sysUserRole.setRoleSid("002"); sysUserRole.setUserSid(sysUser.getSid()); sysUserRoleService.save(sysUserRole); SysUser user = null; 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 0bdeee9..c116793 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java @@ -61,6 +61,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); /** * 查询该资源下是否有可用的菜单 @@ -79,4 +80,5 @@ 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 ace3226..28f1b82 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml @@ -72,7 +72,39 @@ (select name from sys_menu where sid=menu.pSid) as pName FROM sys_menu menu left join sys_source source on source.sid = menu.sourceSid - where menu.pSid = #{sid} and menu.menu.menuType !='2' + where menu.pSid = #{sid} and menu.menuType !='2' + ORDER BY menu.sortNo ASC + + @@ -117,4 +149,38 @@ WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1 ORDER BY menu.sortNo ASC + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java index ceb0778..c658996 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java @@ -3,6 +3,7 @@ package com.yxt.portal.biz.sysmenu; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.portal.biz.sysorgregister.SysOrgRegisterService; import com.yxt.portal.biz.sysroleauthorize.SysMenuRoleVo; import com.yxt.portal.biz.syssource.SysSourceService; import com.yxt.common.base.service.MybatisBaseService; @@ -40,6 +41,8 @@ public class SysMenuService extends MybatisBaseService { private SysMenuService sysMenuService; @Autowired private SysSourceService sysSourceService; + @Autowired + SysOrgRegisterService sysOrgRegisterService; public PagerVo listPage(PagerQuery pq) { SysMenuQuery query = pq.getParams(); @@ -150,11 +153,38 @@ public class SysMenuService extends MybatisBaseService { } return sysSourceVos; } + public List listAllVoForSourceG(SysMenuQuery query) { + //查询所有的资源列表 + List sysSourceVos = sysSourceService.listMenuTreeVo(query.getSourceSid()); + for (SysMenuTreeVo s : sysSourceVos) { + //根据资源sid查询该资源下的所有一级菜单 + //List sysMenuVoList = sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid()); + List sysMenuVoList = sysMenuService.fetchGroupBySourceSid(s.getSourceSid(),query.getOrgSid()); + s.setChildren(sysMenuVoList); + s.setIsSource("1"); + //判断该资源下的菜单是否有可用的状态 + int isEnable = 1; + int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); + if (count == 0) { + s.setIsEnable("0"); + } else { + s.setIsEnable("1"); + } + if (!sysMenuVoList.isEmpty()) { +// sysMenuVoList = getChildrensForMenuTree(sysMenuVoList); + getChildList(sysMenuVoList); + } + } + return sysSourceVos; + } public void getChildList(List list) { list.forEach(str -> { String sid = str.getSid(); - List listChildren = baseMapper.selectChildernList(sid); + String sourceSid = str.getSourceSid(); + String orgSid = str.getOrgSid(); +// List listChildren = baseMapper.selectChildernList(sid); + List listChildren = baseMapper.selectGroupChildernList(sid,sourceSid,orgSid); str.setChildren(listChildren); getChildList(listChildren); }); @@ -425,4 +455,7 @@ public class SysMenuService extends MybatisBaseService { public List fetchRootMenuBySourceSid(String sid) { return baseMapper.fetchRootMenuBySourceSid(sid); } + public List fetchGroupBySourceSid(String sid,String orgSid) { + return baseMapper.fetchGroupBySourceSid(sid,orgSid); + } } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java index ecb5000..99fe0ba 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java @@ -60,4 +60,5 @@ public class SysMenuTreeVo implements Vo { private String cid; @ApiModelProperty("子菜单") private List children; + private String orgSid; } diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java new file mode 100644 index 0000000..49d7310 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegister.java @@ -0,0 +1,31 @@ +package com.yxt.portal.biz.sysorgregister; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +@ApiModel(value = "权限组表", description = "权限组表") +@TableName("sys_org_register") +@Data +public class SysOrgRegister extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("orgsid") + private String orgSid; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("时间") + private Date expireDate; + @ApiModelProperty("1 体验 2 正式 3过期") + private String regType; + + +} diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java new file mode 100644 index 0000000..23d49d3 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterDto.java @@ -0,0 +1,28 @@ +package com.yxt.portal.biz.sysorgregister; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + + +@ApiModel(value = "权限组表 数据传输对象", description = "权限组表 数据传输对象") +@Data +public class SysOrgRegisterDto implements Dto { + + + private static final long serialVersionUID = -8143707488992909267L; + @ApiModelProperty("orgsid") + private String orgSid; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("时间") + private String expireDate; + @ApiModelProperty("1 体验 2 正式 3过期") + private String regType; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.java new file mode 100644 index 0000000..73c6ba5 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.java @@ -0,0 +1,27 @@ +package com.yxt.portal.biz.sysorgregister; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysOrgRegisterMapper extends BaseMapper { + + List listMenuTreeVo(@Param("sourceSid") String sourceSid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.xml b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.xml new file mode 100644 index 0000000..8443d94 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterQuery.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterQuery.java new file mode 100644 index 0000000..532c99f --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterQuery.java @@ -0,0 +1,19 @@ +package com.yxt.portal.biz.sysorgregister; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +@ApiModel(value = "权限组表 查询条件 功能菜单设置查询用", description = "权限组表 查询条件 功能菜单设置查询用") +@Data +public class SysOrgRegisterQuery implements Query { + + + @ApiModelProperty("资源sid") + private String sourceSid; + private String orgSid; + +} diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java new file mode 100644 index 0000000..4641e5b --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterService.java @@ -0,0 +1,32 @@ +package com.yxt.portal.biz.sysorgregister; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuService.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuService
+ * Description: 菜单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysOrgRegisterService extends MybatisBaseService { + + + + + public List listMenuTreeVo(String sourceSid) { + return baseMapper.listMenuTreeVo(sourceSid); + } + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java new file mode 100644 index 0000000..af77b69 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysorgregister/SysOrgRegisterVo.java @@ -0,0 +1,39 @@ +package com.yxt.portal.biz.sysorgregister; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * Description: 菜单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象") +@Data +public class SysOrgRegisterVo implements Vo { + + + @ApiModelProperty("orgsid") + private String orgSid; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("时间") + private String expireDate; + @ApiModelProperty("1 体验 2 正式 3过期") + private String regType; +} diff --git a/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java index cf8ce26..c3e11c7 100644 --- a/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -1,12 +1,17 @@ package com.yxt.portal.biz.sysstaffinfo; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.portal.biz.sysorganization.AppContactSysOrganizationVo; import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysorgregister.SysOrgRegister; +import com.yxt.portal.biz.sysorgregister.SysOrgRegisterService; import com.yxt.portal.biz.syspost.SysPostService; import com.yxt.portal.biz.sysrole.SysRoleVo; +import com.yxt.portal.biz.syssource.SysSource; +import com.yxt.portal.biz.syssource.SysSourceService; import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffQuery; import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo; import com.yxt.portal.biz.sysstafforg.SysStaffOrg; @@ -79,6 +84,10 @@ public class SysStaffinfoService extends MybatisBaseService selectAppContactsList() { List list = baseMapper.selectAppContactsList(); @@ -501,7 +510,16 @@ public class SysStaffinfoService extends MybatisBaseService sysSources=sysSourceService.list(); +// List sysOrgRegisters=new ArrayList<>(); +// for (SysSource sysSource : sysSources) { +// SysOrgRegister sysOrgRegister=new SysOrgRegister(); +// sysOrgRegister.setOrgSid(dto.getOrgSid()); +// sysOrgRegister.setExpireDate(DateUtil.offsetDay(new Date(),7)); +// sysOrgRegister.setRegType("1"); +// sysOrgRegister.setSourceSid(sysSource.getSid()); +// sysOrgRegisters.add(sysOrgRegister); +// } return rb.success().setMsg("添加员工信息成功"); } diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java index 9d5d1fb..042873a 100644 --- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java @@ -45,5 +45,5 @@ public class SysStaffOrgVo implements Vo { private String staffName; @ApiModelProperty("员工手机号") private String mobile; - private String type="2"; + private String type="2";///1 体验 2 正式 3过期 }