|
|
@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -42,6 +43,7 @@ import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
import vip.xiaonuo.common.pojo.CommonResult;
|
|
|
import vip.xiaonuo.disk.domain.CollegeUser;
|
|
|
+import vip.xiaonuo.disk.domain.Dept;
|
|
|
import vip.xiaonuo.disk.mapper.CollegeUserMapper;
|
|
|
import vip.xiaonuo.disk.param.collegeUser.CollegeUserAddParam;
|
|
|
import vip.xiaonuo.disk.param.collegeUser.CollegeUserEditParam;
|
|
|
@@ -108,83 +110,103 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
|
|
|
return this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
}
|
|
|
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
+
|
|
|
@Override
|
|
|
public void add(CollegeUserAddParam collegeUserAddParam) {
|
|
|
- int count = userAddCounter.incrementAndGet();
|
|
|
- log.info("下发用户数据========================>"+JSON.toJSONString(collegeUserAddParam));
|
|
|
- //添加用户下发日志表
|
|
|
- CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
|
|
|
- collegeUser.setCrateTime(new Date());
|
|
|
- this.save(collegeUser);
|
|
|
-
|
|
|
- //根据账号查询用户表是否存在
|
|
|
- QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().eq(SysUser::getAccount, collegeUser.getUserName());
|
|
|
- SysUser sysUser=sysUserMapper.selectOne(queryWrapper);
|
|
|
- //如果用户存在,则进行更新
|
|
|
- if(ObjectUtil.isNotEmpty(sysUser)){
|
|
|
-
|
|
|
- sysUser.setOrgId(String.valueOf(collegeUser.getDeptId())); //组织id
|
|
|
- sysUser.setPostCode(collegeUser.getPostIds()); //岗位编码
|
|
|
- sysUser.setAccount(collegeUser.getUserName()); //账号
|
|
|
- sysUser.setNickname(collegeUser.getNickName()); //昵称
|
|
|
- sysUser.setEmail(collegeUser.getEmail()); //邮箱
|
|
|
- sysUser.setPhone(collegeUser.getPhone()); //电话
|
|
|
- sysUser.setIdCardNumber(collegeUser.getPsptId()); //身份证号
|
|
|
- sysUser.setEduIdentity("1"); //身份认证
|
|
|
- if("0".equals(collegeUser.getSex())){ //性别
|
|
|
- sysUser.setGender("男");
|
|
|
- }else if("1".equals(collegeUser.getSex())){
|
|
|
- sysUser.setGender("女");
|
|
|
- }else{
|
|
|
- sysUser.setGender("未知");
|
|
|
- }
|
|
|
- sysUser.setAvatar(collegeUser.getAvatar()); //头像
|
|
|
- if("0".equals(collegeUser.getStatus())){
|
|
|
- sysUser.setUserStatus("ENABLE");
|
|
|
- }else{
|
|
|
- sysUser.setUserStatus("DISABLED");
|
|
|
+ try {
|
|
|
+ int count = userAddCounter.incrementAndGet();
|
|
|
+ log.info("下发用户数据========================>"+JSON.toJSONString(collegeUserAddParam));
|
|
|
+ //添加用户下发日志表
|
|
|
+ CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
|
|
|
+ if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
|
|
|
+ String postJson = JSON.toJSONString(collegeUserAddParam.getPost());
|
|
|
+ collegeUser.setPost(postJson);
|
|
|
}
|
|
|
- sysUser.setCode(collegeUser.getPersonCode()); //人员编码
|
|
|
- sysUser.setUserType(collegeUser.getUserType()); //账号类型
|
|
|
- sysUser.setUpdateTime(new Date());
|
|
|
-
|
|
|
- UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.eq("account", sysUser.getAccount());
|
|
|
- sysUserMapper.update(sysUser, updateWrapper);
|
|
|
- }else{
|
|
|
- //如果用户存在,进行插入
|
|
|
- SysUser user =new SysUser();
|
|
|
- user.setId(IdUtil.getSnowflakeNextIdStr());
|
|
|
- user.setOrgId(String.valueOf(collegeUser.getDeptId()));
|
|
|
- user.setPostCode(collegeUser.getPostIds());
|
|
|
- user.setAccount(collegeUser.getUserName());
|
|
|
- user.setNickname(collegeUser.getNickName());
|
|
|
- user.setEmail(collegeUser.getEmail());
|
|
|
- user.setPhone(collegeUser.getPhone());
|
|
|
- user.setIdCardNumber(collegeUser.getPsptId());
|
|
|
- user.setEduIdentity("1");
|
|
|
- if("0".equals(collegeUser.getSex())){
|
|
|
- user.setGender("男");
|
|
|
- }else if("1".equals(collegeUser.getSex())){
|
|
|
- user.setGender("女");
|
|
|
+ collegeUser.setCrateTime(new Date());
|
|
|
+ collegeUser.setIssue("1");
|
|
|
+ collegeUser.setInfo(JSON.toJSONString(collegeUserAddParam));
|
|
|
+ this.save(collegeUser);
|
|
|
+
|
|
|
+ //根据账号查询用户表是否存在
|
|
|
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.lambda().eq(SysUser::getAccount, collegeUser.getUserName());
|
|
|
+ SysUser sysUser=sysUserMapper.selectOne(queryWrapper);
|
|
|
+ //如果用户存在,则进行更新
|
|
|
+ if(ObjectUtil.isNotEmpty(sysUser)){
|
|
|
+ if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
|
|
|
+ @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
|
|
|
+ String result = String.join(",", depIds);
|
|
|
+ sysUser.setOrgId(result); //组织id
|
|
|
+ }
|
|
|
+
|
|
|
+ sysUser.setUserCode(collegeUser.getUserCode()); //岗位编码
|
|
|
+ sysUser.setAccount(collegeUser.getUserName()); //账号
|
|
|
+ sysUser.setName(collegeUser.getCallName()); //昵称
|
|
|
+ sysUser.setEmail(collegeUser.getEmail()); //邮箱
|
|
|
+ sysUser.setPhone(collegeUser.getMobile()); //电话
|
|
|
+ sysUser.setEduIdentity("1"); //身份认证
|
|
|
+ sysUser.setPassword("123456");
|
|
|
+ if("0".equals(collegeUser.getSex())){ //性别
|
|
|
+ sysUser.setGender("男");
|
|
|
+ }else if("1".equals(collegeUser.getSex())){
|
|
|
+ sysUser.setGender("女");
|
|
|
+ }else{
|
|
|
+ sysUser.setGender("未知");
|
|
|
+ }
|
|
|
+
|
|
|
+ if("0".equals(collegeUser.getStatus())){
|
|
|
+ sysUser.setUserStatus("ENABLE");
|
|
|
+ }else{
|
|
|
+ sysUser.setUserStatus("DISABLED");
|
|
|
+ }
|
|
|
+ sysUser.setUpdateTime(new Date());
|
|
|
+ UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
|
|
|
+ updateWrapper.eq("account", sysUser.getAccount());
|
|
|
+ sysUserMapper.update(sysUser, updateWrapper);
|
|
|
}else{
|
|
|
- user.setGender("未知");
|
|
|
+ //如果用户存在,进行插入
|
|
|
+ SysUser user =new SysUser();
|
|
|
+ user.setId(IdUtil.getSnowflakeNextIdStr());
|
|
|
+
|
|
|
+ if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
|
|
|
+ @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
|
|
|
+ String result = String.join(",", depIds);
|
|
|
+ user.setOrgId(result); //组织id
|
|
|
+ }
|
|
|
+ user.setUserCode(collegeUser.getUserCode());
|
|
|
+ user.setAccount(collegeUser.getUserName());
|
|
|
+ user.setName(collegeUser.getCallName());
|
|
|
+ user.setEmail(collegeUser.getEmail());
|
|
|
+ user.setPhone(collegeUser.getMobile());
|
|
|
+ user.setPassword("123456");
|
|
|
+ user.setEduIdentity("1");
|
|
|
+ if("0".equals(collegeUser.getSex())){
|
|
|
+ user.setGender("男");
|
|
|
+ }else if("1".equals(collegeUser.getSex())){
|
|
|
+ user.setGender("女");
|
|
|
+ }else{
|
|
|
+ user.setGender("未知");
|
|
|
+ }
|
|
|
+
|
|
|
+ if("0".equals(collegeUser.getStatus())){
|
|
|
+ user.setUserStatus("ENABLE");
|
|
|
+ }else{
|
|
|
+ user.setUserStatus("DISABLED");
|
|
|
+ }
|
|
|
+ user.setCreateTime(new Date());
|
|
|
+ sysUserMapper.insert(user);
|
|
|
}
|
|
|
- user.setAvatar(collegeUser.getAvatar());
|
|
|
- if("0".equals(collegeUser.getStatus())){
|
|
|
- user.setUserStatus("ENABLE");
|
|
|
- }else{
|
|
|
- user.setUserStatus("DISABLED");
|
|
|
- }
|
|
|
- user.setCode(collegeUser.getPersonCode());
|
|
|
- user.setUserType(collegeUser.getUserType());
|
|
|
- user.setCreateTime(new Date());
|
|
|
- sysUserMapper.insert(user);
|
|
|
+ log.info("用户数据下发成功:{}", JSON.toJSONString(collegeUserAddParam));
|
|
|
+ log.info("用户数据下发成功,下发条数:{}",count);
|
|
|
+ } catch (Exception e) {
|
|
|
+ CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
|
|
|
+ collegeUser.setCrateTime(new Date());
|
|
|
+ collegeUser.setIssue("0");
|
|
|
+ collegeUser.setReason(e.getMessage());
|
|
|
+ collegeUser.setInfo(JSON.toJSONString(collegeUserAddParam));
|
|
|
+ this.save(collegeUser);
|
|
|
+ throw new RuntimeException("用户数据下发失败=============================>"+e.getMessage());
|
|
|
}
|
|
|
- log.info("用户数据下发成功:{}", JSON.toJSONString(collegeUserAddParam));
|
|
|
- log.info("用户数据下发成功,下发条数:{}",count);
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@@ -249,7 +271,7 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
|
|
|
paramUser.put("token",token);
|
|
|
paramUser.put("key",key);
|
|
|
paramUser.put("secret",secret);
|
|
|
- String userUrl = ssoUrl+"/resourcesb/resources/index";
|
|
|
+ String userUrl = ssoUrl+"/oauth2/resources/index";
|
|
|
|
|
|
log.info("根据token获取用户信息请求参数============"+paramUser.toString());
|
|
|
|
|
|
@@ -257,6 +279,10 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
|
|
|
String rs = HttpRequest.sendPost(userUrl, paramUser.toString());
|
|
|
JSONObject userRs = JSONObject.parseObject(rs);
|
|
|
|
|
|
+ log.info("根据token获取用户信息结果============"+userRs.toString());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
JSONObject user=userRs.getJSONObject("data");
|
|
|
String account=user.getString("iamUserCode");
|
|
|
// String account="";
|