diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java index 5ca40239..79536191 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java @@ -1,5 +1,6 @@ package com.xboe.data.api; +import com.boe.feign.api.serverall.entity.UserData; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -12,7 +13,6 @@ import com.xboe.account.entity.Account; import com.xboe.account.service.IAccountService; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; -import com.xboe.data.dto.UserData; import com.xboe.data.service.IDataUserSyncService; import com.xboe.system.organization.service.IOrganizationService; import com.xboe.system.user.service.IUserService; @@ -40,6 +40,11 @@ public class UserDataSyncApi extends ApiBaseController { @Autowired IDataUserSyncService service; + /** + * 同步用户数据 + * @param user 用户信息 + * @return JsonResponse + */ @PostMapping("/user") public JsonResponse syncUser(@RequestBody UserData user) { @@ -56,7 +61,12 @@ public class UserDataSyncApi extends ApiBaseController { return error("同步处理用户失败", e.getMessage()); } } - + + /** + * 删除用户信息 + * @param id 用户id + * @return JsonResponse + */ @PostMapping("/deluser") public JsonResponse deleteUser(String id) { 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 deleted file mode 100644 index f7493046..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.xboe.data.dto; - -import lombok.Data; - -/** - * 用于同步的用户数据 - * @author seastar - * - */ -@Data -public class UserData { - - /**用户的id*/ - private String id; - - /**主要是为了兼容之前的使用,新用户可以为空*/ - private String kid; - - /**用户工号,用于登录名*/ - private String code; - - private String mobile; - - /**band的级别*/ - private Integer bandLevel; - - /**姓名,对应realName*/ - private String name; - - /**用户的头像*/ - private String avatar; - - /**性别 1:男 2:女*/ - private Integer gender; - - /**学习时长,秒*/ - private Integer learningDuration; - - /**部门id*/ - private String departId; - - /**部门名称*/ - private String departName; - - /**此字段主要是为了人员的显示*/ - private String orgNamePath; - - /** - * 用户类型,1表学员 此在这只默认只表学员 - */ - private Integer userType; - - /** - * 表教师 是为1 - * */ - private Boolean teacher; - - /** - * 表系统管理员 是为1 - * */ - private Boolean sysAdmin; - - /** - * 管理员类型,1表默认管理员,2表非默认管理员,0表不是管理员 - * */ - private Integer adminType; - - /** - * 是否删除的,如果是删除的,上面所有的字段可以不提供,只提供id就可以了 - */ - private Boolean deleted; -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java index 47d4c3f4..d80cd7f6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java @@ -2,8 +2,8 @@ package com.xboe.data.outside; import java.util.List; +import com.boe.feign.api.serverall.entity.UserData; import com.xboe.data.dto.AudienceUser; -import com.xboe.data.dto.UserData; import com.xboe.data.dto.UserOrgIds; import com.xboe.system.user.vo.UserSimpleVo; 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 08429761..e9c33361 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 @@ -4,6 +4,7 @@ import java.util.*; import javax.servlet.http.HttpServletRequest; +import com.boe.feign.api.serverall.entity.UserData; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +15,6 @@ import com.xboe.core.SysConstant; import com.xboe.core.api.TokenProxy; import com.xboe.core.utils.OkHttpUtil; import com.xboe.data.dto.AudienceUser; -import com.xboe.data.dto.UserData; import com.xboe.data.dto.UserOrgIds; import com.xboe.system.user.vo.UserSimpleVo; diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/IDataUserSyncService.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/IDataUserSyncService.java index 4b341411..07a8ae7e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/IDataUserSyncService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/IDataUserSyncService.java @@ -1,6 +1,7 @@ package com.xboe.data.service; -import com.xboe.data.dto.UserData; + +import com.boe.feign.api.serverall.entity.UserData; /** * 用户数据的更橷 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 12c9d72a..5fb5d042 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 @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import javax.transaction.Transactional; +import com.boe.feign.api.serverall.entity.UserData; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.retry.annotation.Recover; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import com.xboe.account.dao.AccountDao; import com.xboe.account.entity.Account; -import com.xboe.data.dto.UserData; import com.xboe.data.service.IDataUserSyncService; import com.xboe.module.teacher.dao.TeacherDao; import com.xboe.module.teacher.entity.Teacher; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index fdd6da94..866136db 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -186,7 +186,6 @@ public class CasesApi extends ApiBaseController { PageList pageList = casesService.queryList(pager.getPageIndex(), pager.getPageSize(), caseVo); return success(pageList); } - /** * 我的案例 */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java index eed615e2..c43f2a20 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java @@ -7,10 +7,10 @@ import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Opt; +import com.boe.feign.api.serverall.entity.UserData; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException; import com.xboe.api.ThirdApi; -import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.course.vo.TeacherVo; import com.xboe.school.study.entity.StudyCourse; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 873bcc5d..2ddeda77 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -16,7 +16,6 @@ import javax.management.Query; import com.xboe.api.ThirdApi; import com.xboe.core.orm.*; -import com.xboe.data.dto.UserData; import com.xboe.school.study.dao.StudyCourseDao; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; 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 6c5b4e08..d7c833e3 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 @@ -5,6 +5,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.boe.feign.api.serverall.entity.UserData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -16,7 +17,6 @@ import com.xboe.core.CurrentUser; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; import com.xboe.core.api.TokenProxy; -import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.teacher.service.ITeacherService; import com.xboe.system.organization.service.IOrganizationService; diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java index fa440344..4069796e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java @@ -10,6 +10,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.boe.feign.api.serverall.entity.UserData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,6 @@ import com.xboe.core.IAuthorizationToken; import com.xboe.core.JsonResponse; import com.xboe.core.JsonResponseStatus; import com.xboe.core.api.ApiBaseController; -import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.data.service.IDataUserSyncService; import com.xboe.externalinterface.system.service.IFwUserService;