Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 504ee492 504ee4920d6cc74902433f413572f4f469bacf66 by xianghan
Options

1.添加UserTvBuilder中platform字段

1 parent b3ece12e
Inline Side-by-side
Showing 1 changed file with 8 additions and 16 deletions
...@@ -24,28 +24,17 @@ public class UserTvBuilder { ...@@ -24,28 +24,17 @@ public class UserTvBuilder {
24 private static final String DEFAULT_CREATE_BY = "system"; 24 private static final String DEFAULT_CREATE_BY = "system";
25 private static final String DEFAULT_UPDATE_BY = "system"; 25 private static final String DEFAULT_UPDATE_BY = "system";
26 26
27 public static UserTv build(UserTv userTv){ 27
28 return build(userTv.getMemberId(),userTv.getMemberCode(),userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(),
29 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId());
30 }
31 28
32 public static UserTv build(Long memberId, String memberCode , UserTv userTv){ 29 public static UserTv build(Long memberId, String memberCode , UserTv userTv){
33 return build(memberId,memberCode,userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(), 30 return build(memberId,memberCode,userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(),
34 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId()); 31 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId(),
35 } 32 userTv.getPlatform(), userTv.getPassword(), userTv.getGroups());
36
37 public static UserTv build(String memberCode, UserTv userTv){
38 return build(null,memberCode,userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(),
39 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId());
40 }
41
42 public static UserTv build(Member member, UserTv userTv){
43 return build(member.getId() , member.getCode(),userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(),
44 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId());
45 } 33 }
46 34
47 public static UserTv build(Long memberId , String memberCode , Long id , String platformAccount , String nickname , String username, 35 public static UserTv build(Long memberId , String memberCode , Long id , String platformAccount , String nickname , String username,
48 Integer loginDays , Integer status ,Integer continueDays , String createBy , String updateBy,Long visUserId){ 36 Integer loginDays , Integer status ,Integer continueDays , String createBy , String updateBy,Long visUserId,
37 String platform, String password, String groups){
49 Assert.notNull(memberId,GlobeExceptionMsg.MEMBER_ID_IS_NULL); 38 Assert.notNull(memberId,GlobeExceptionMsg.MEMBER_ID_IS_NULL);
50 Assert.notNull(memberCode,GlobeExceptionMsg.MEMBER_CODE_IS_NULL); 39 Assert.notNull(memberCode,GlobeExceptionMsg.MEMBER_CODE_IS_NULL);
51 Assert.notNull(platformAccount,GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL); 40 Assert.notNull(platformAccount,GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL);
...@@ -55,10 +44,13 @@ public class UserTvBuilder { ...@@ -55,10 +44,13 @@ public class UserTvBuilder {
55 UserTv userTv = new UserTv(); 44 UserTv userTv = new UserTv();
56 userTv.setId(id); 45 userTv.setId(id);
57 userTv.setPlatformAccount(platformAccount); 46 userTv.setPlatformAccount(platformAccount);
47 userTv.setPlatform(platform);
58 userTv.setMemberCode(memberCode); 48 userTv.setMemberCode(memberCode);
59 userTv.setMemberId(memberId); 49 userTv.setMemberId(memberId);
60 userTv.setNickname(StringUtils.isBlank(nickname)?platformAccount:nickname); 50 userTv.setNickname(StringUtils.isBlank(nickname)?platformAccount:nickname);
61 userTv.setUsername(StringUtils.isBlank(username)?platformAccount:username); 51 userTv.setUsername(StringUtils.isBlank(username)?platformAccount:username);
52 userTv.setPassword(password);
53 userTv.setGroups(groups);
62 userTv.setLoginDays(Objects.nonNull(loginDays)?loginDays:DEFAULT_VALUE); 54 userTv.setLoginDays(Objects.nonNull(loginDays)?loginDays:DEFAULT_VALUE);
63 userTv.setLoginType(DEFAULT_VALUE); 55 userTv.setLoginType(DEFAULT_VALUE);
64 userTv.setStatus(Objects.nonNull(status)?status:DEFAULT_VALUE); 56 userTv.setStatus(Objects.nonNull(status)?status:DEFAULT_VALUE);
......