mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-12 04:16:51 +08:00
用户信息地方的同步及处理
This commit is contained in:
@@ -15,4 +15,9 @@ public class TempFilterConfig {
|
|||||||
* 课程管理热裤机构id过滤
|
* 课程管理热裤机构id过滤
|
||||||
*/
|
*/
|
||||||
public static final boolean Manager_Course_ByOrgIds=true;
|
public static final boolean Manager_Course_ByOrgIds=true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户登录使用api
|
||||||
|
*/
|
||||||
|
public static final boolean Login_User_ByApi=true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,10 +19,12 @@ public class UserData {
|
|||||||
/**用户工号*/
|
/**用户工号*/
|
||||||
private String code;
|
private String code;
|
||||||
|
|
||||||
|
private String mobile;
|
||||||
|
|
||||||
/**band的级别*/
|
/**band的级别*/
|
||||||
private Integer bandLevel;
|
private Integer bandLevel;
|
||||||
|
|
||||||
/**姓名*/
|
/**姓名,对应realName*/
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
/**用户的头像*/
|
/**用户的头像*/
|
||||||
@@ -44,12 +46,12 @@ public class UserData {
|
|||||||
private String orgNamePath;
|
private String orgNamePath;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户类型,1表学员,2表教师,3表管理员 此在这只默认只表学员
|
* 用户类型,1表学员 此在这只默认只表学员
|
||||||
*/
|
*/
|
||||||
private Integer userType;
|
private Integer userType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 表教师 是为1
|
* 表教师 是为1
|
||||||
* */
|
* */
|
||||||
private Boolean teacher;
|
private Boolean teacher;
|
||||||
|
|
||||||
|
|||||||
@@ -111,12 +111,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
|
|||||||
}else {
|
}else {
|
||||||
user.setBandLevel(0);
|
user.setBandLevel(0);
|
||||||
}
|
}
|
||||||
user.setAvatar("");
|
user.setAvatar(getNodeText(result.get("avatar")));
|
||||||
user.setCode(getNodeText(result.get("userNo")));
|
user.setCode(getNodeText(result.get("userNo")));
|
||||||
//user.setDeleted(result.get("deleted").asBoolean());//无此字段
|
//user.setDeleted(result.get("deleted").asBoolean());//无此字段
|
||||||
user.setDeleted(false);
|
user.setDeleted(false);
|
||||||
user.setDepartId(getNodeText(result.get("departId")));
|
user.setDepartId(getNodeText(result.get("departId")));
|
||||||
user.setDepartName("");//无此字段
|
user.setDepartName(getNodeText(result.get("departName")));//无此字段
|
||||||
user.setGender(1);//少此字段
|
user.setGender(1);//少此字段
|
||||||
user.setKid(getNodeText(result.get("kid")));
|
user.setKid(getNodeText(result.get("kid")));
|
||||||
user.setLearningDuration(result.get("learningDuration").asInt());
|
user.setLearningDuration(result.get("learningDuration").asInt());
|
||||||
@@ -139,6 +139,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
|
|||||||
}
|
}
|
||||||
if(roleCode.equals("teacher")){
|
if(roleCode.equals("teacher")){
|
||||||
user.setTeacher(true);//是老师
|
user.setTeacher(true);//是老师
|
||||||
|
user.setUserType(2);//教师
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,8 +149,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
System.out.println("用户管理员:"+user.getAdminType());
|
//System.out.println("用户管理员:"+user.getAdminType());
|
||||||
System.out.println("老师:"+user.getTeacher());
|
//System.out.println("老师:"+user.getTeacher());
|
||||||
return user;
|
return user;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取当前用户信息错误",e);
|
log.error("获取当前用户信息错误",e);
|
||||||
|
|||||||
@@ -38,7 +38,10 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public void syncUserFull(UserData user) {
|
public void syncUserFull(UserData user) {
|
||||||
|
//如果删除状态为空,则设置为不删除
|
||||||
|
if(user.getDeleted()==null) {
|
||||||
|
user.setDeleted(false);
|
||||||
|
}
|
||||||
//先查询是否存在
|
//先查询是否存在
|
||||||
Account a=accountDao.get(user.getId());
|
Account a=accountDao.get(user.getId());
|
||||||
User u=userDao.get(user.getId());
|
User u=userDao.get(user.getId());
|
||||||
@@ -48,11 +51,11 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
|
|||||||
if(user.getDeleted()!=null) {
|
if(user.getDeleted()!=null) {
|
||||||
a.setDeleted(user.getDeleted());
|
a.setDeleted(user.getDeleted());
|
||||||
}
|
}
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
//新账户
|
//新账户
|
||||||
a=new Account();
|
a=new Account();
|
||||||
a.setDeleted(user.getDeleted());
|
a.setDeleted(user.getDeleted());
|
||||||
|
|
||||||
a.setSysId(user.getKid());
|
a.setSysId(user.getKid());
|
||||||
a.setLoginName(user.getCode());
|
a.setLoginName(user.getCode());
|
||||||
a.setAvatar(user.getAvatar());
|
a.setAvatar(user.getAvatar());
|
||||||
|
|||||||
@@ -68,6 +68,10 @@ public class PortalConsoleApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
UserData userData = outsideDataService.getUserInfoByUserId(null);
|
UserData userData = outsideDataService.getUserInfoByUserId(null);
|
||||||
|
if(userData==null) {
|
||||||
|
log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户");
|
||||||
|
return error("未能获取当前用户信息");
|
||||||
|
}
|
||||||
|
|
||||||
User user = userService.get(getCurrent().getAccountId());
|
User user = userService.get(getCurrent().getAccountId());
|
||||||
Organization org = null;
|
Organization org = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user