Commit 650ef5bd 650ef5bddbe588f0936cb3ea748adc67b7ea4dca by xianghan

1.添加UserTvBuilder中platform字段

1 parent d51e654c
...@@ -24,28 +24,13 @@ public class UserTvBuilder { ...@@ -24,28 +24,13 @@ 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 public static UserTv build(Long memberId, String memberCode, UserTv userTv){
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
32 public static UserTv build(Long memberId, String memberCode , UserTv userTv){
33 return build(memberId,memberCode,userTv.getId(),userTv.getPlatformAccount(),userTv.getNickname(),userTv.getUsername(), 28 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()); 29 userTv.getLoginDays(),userTv.getStatus(),userTv.getContinueDays(),userTv.getCreateBy(),userTv.getUpdateBy(), userTv.getVisUserId(), userTv.getPlatform());
35 }
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 } 30 }
46 31
47 public static UserTv build(Long memberId , String memberCode , Long id , String platformAccount , String nickname , String username, 32 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){ 33 Integer loginDays , Integer status ,Integer continueDays , String createBy , String updateBy,Long visUserId, String platform){
49 Assert.notNull(memberId,GlobeExceptionMsg.MEMBER_ID_IS_NULL); 34 Assert.notNull(memberId,GlobeExceptionMsg.MEMBER_ID_IS_NULL);
50 Assert.notNull(memberCode,GlobeExceptionMsg.MEMBER_CODE_IS_NULL); 35 Assert.notNull(memberCode,GlobeExceptionMsg.MEMBER_CODE_IS_NULL);
51 Assert.notNull(platformAccount,GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL); 36 Assert.notNull(platformAccount,GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL);
...@@ -55,6 +40,7 @@ public class UserTvBuilder { ...@@ -55,6 +40,7 @@ public class UserTvBuilder {
55 UserTv userTv = new UserTv(); 40 UserTv userTv = new UserTv();
56 userTv.setId(id); 41 userTv.setId(id);
57 userTv.setPlatformAccount(platformAccount); 42 userTv.setPlatformAccount(platformAccount);
43 userTv.setPlatform(platform);
58 userTv.setMemberCode(memberCode); 44 userTv.setMemberCode(memberCode);
59 userTv.setMemberId(memberId); 45 userTv.setMemberId(memberId);
60 userTv.setNickname(StringUtils.isBlank(nickname)?platformAccount:nickname); 46 userTv.setNickname(StringUtils.isBlank(nickname)?platformAccount:nickname);
......