|
|
|
@ -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 { |
|
|
|
} |
|
|
|
// 根据用户信息查询用户的角色信息
|
|
|
|
List<SysStaffOrgVo>sysStaffOrgVos= 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<SysOrgRegister> sysOrgRegisters=new ArrayList<>(); |
|
|
|
if(sysOrganizationOne.getPsid()!="0"){ |
|
|
|
sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper<SysOrgRegister>() |
|
|
|
.eq("orgSid",sysOrganizationOne.getPsid())); |
|
|
|
}else{ |
|
|
|
sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper<SysOrgRegister>() |
|
|
|
.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<SysOrganization>().eq("sid",dto.getOrgSid())); |
|
|
|
List<SysOrgRegister> sysOrgRegisters=new ArrayList<>(); |
|
|
|
if(sysOrganization.getPsid()!="0"){ |
|
|
|
sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper<SysOrgRegister>() |
|
|
|
.eq("orgSid",sysOrganization.getPsid())); |
|
|
|
}else { |
|
|
|
sysOrgRegisters=sysOrgRegisterService.list(new QueryWrapper<SysOrgRegister>() |
|
|
|
.eq("orgSid",dto.getOrgSid())); |
|
|
|
} |
|
|
|
if(sysOrgRegisters.get(0).getRegType().equals("1")){ |
|
|
|
return new ResultBean<>().fail().setMsg("您选择的单位在本系统的体验版已到期，请联系我们购买正式版本。"); |
|
|
|
} |
|
|
|
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().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<SysUserVo>().fail().setMsg("手机号不能为空"); |
|
|
|
} |
|
|
|
// if (userType == 0) {
|
|
|
|
// return new ResultBean<SysUserVo>().fail().setMsg("用户类型不能为空");
|
|
|
|
// }
|
|
|
|
if (StringUtils.isBlank(verificationCode)) { |
|
|
|
return new ResultBean<SysUserVo>().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<SysStaffOrgVo> 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<SysOrganization>().eq("name",dto.getCompanyName()));
|
|
|
|
// if(s!=null){
|
|
|
|
// return new ResultBean<SysUserVo>().fail().setMsg("公司重复!`");
|
|
|
|
return rb.setMsg("该账号已存在，不能重复注册。请直接登录!"); |
|
|
|
// userInfoOneVo.setSid(one.getSid());
|
|
|
|
// List<SysStaffOrgVo> 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<SysSource> sysSources=sysSourceService.list(); |
|
|
|
List<SysOrgRegister> 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<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid",dto.getSourceSid())); |
|
|
|
// List<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33"));
|
|
|
|
List<SysRoleAuthorize> 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<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid",dto.getSourceSid()));
|
|
|
|
//// List<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33"));
|
|
|
|
// List<SysRoleAuthorize> 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; |
|
|
|
|
