From 4edf51468cab56765434797d98fae5c191d44e6c Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 27 Dec 2022 19:34:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=E7=9A=84=E5=90=8C=E6=AD=A5=E5=8F=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/TempFilterConfig.java | 5 +++++ .../src/main/java/com/xboe/data/dto/UserData.java | 8 +++++--- .../com/xboe/data/outside/OutSideDataServiceImpl.java | 9 +++++---- .../xboe/data/service/impl/DataUserSyncServiceImpl.java | 7 +++++-- .../main/java/com/xboe/school/api/PortalConsoleApi.java | 4 ++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/TempFilterConfig.java b/servers/boe-server-all/src/main/java/com/xboe/TempFilterConfig.java index 4aad3941..d588614a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/TempFilterConfig.java +++ b/servers/boe-server-all/src/main/java/com/xboe/TempFilterConfig.java @@ -15,4 +15,9 @@ public class TempFilterConfig { * 课程管理热裤机构id过滤 */ public static final boolean Manager_Course_ByOrgIds=true; + + /** + * 用户登录使用api + */ + public static final boolean Login_User_ByApi=true; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java index 870bbdd8..84331e93 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java @@ -19,10 +19,12 @@ public class UserData { /**用户工号*/ private String code; + private String mobile; + /**band的级别*/ private Integer bandLevel; - /**姓名*/ + /**姓名,对应realName*/ private String name; /**用户的头像*/ @@ -44,12 +46,12 @@ public class UserData { private String orgNamePath; /** - * 用户类型，1表学员，2表教师，3表管理员 此在这只默认只表学员 + * 用户类型，1表学员 此在这只默认只表学员 */ private Integer userType; /** - * 表教师 是为1 + * 表教师 是为1 * */ private Boolean teacher; diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index a7ba0b13..9990f65b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -111,12 +111,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService { }else { user.setBandLevel(0); } - user.setAvatar(""); + user.setAvatar(getNodeText(result.get("avatar"))); user.setCode(getNodeText(result.get("userNo"))); //user.setDeleted(result.get("deleted").asBoolean());//无此字段 user.setDeleted(false); user.setDepartId(getNodeText(result.get("departId"))); - user.setDepartName("");//无此字段 + user.setDepartName(getNodeText(result.get("departName")));//无此字段 user.setGender(1);//少此字段 user.setKid(getNodeText(result.get("kid"))); user.setLearningDuration(result.get("learningDuration").asInt()); @@ -139,6 +139,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } if(roleCode.equals("teacher")){ user.setTeacher(true);//是老师 + user.setUserType(2);//教师 } } } @@ -148,8 +149,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } } - System.out.println("用户管理员:"+user.getAdminType()); - System.out.println("老师:"+user.getTeacher()); + //System.out.println("用户管理员:"+user.getAdminType()); + //System.out.println("老师:"+user.getTeacher()); return user; } catch (Exception e) { log.error("获取当前用户信息错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index 6c6b0ea9..82ba7cc4 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -38,7 +38,10 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ @Override @Transactional public void syncUserFull(UserData user) { - + //如果删除状态为空，则设置为不删除 + if(user.getDeleted()==null) { + user.setDeleted(false); + } //先查询是否存在 Account a=accountDao.get(user.getId()); User u=userDao.get(user.getId()); @@ -48,11 +51,11 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ if(user.getDeleted()!=null) { a.setDeleted(user.getDeleted()); } - }else { //新账户 a=new Account(); a.setDeleted(user.getDeleted()); + a.setSysId(user.getKid()); a.setLoginName(user.getCode()); a.setAvatar(user.getAvatar()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index 4f94ce83..ac296821 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -68,6 +68,10 @@ public class PortalConsoleApi extends ApiBaseController{ } UserData userData = outsideDataService.getUserInfoByUserId(null); + if(userData==null) { + log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); + return error("未能获取当前用户信息"); + } User user = userService.get(getCurrent().getAccountId()); Organization org = null;