Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
1c13aedd 1 parent cdcce413

dao|初始化

Expand all
Inline Side-by-side
Showing 43 changed files with 493 additions and 205 deletions
1 +package com.fedex.connect.common.dao.biz;
2 +
3 +import com.fedex.connect.common.model.biz.CeInfo;
4 +import com.fedex.connect.common.model.biz.CeInfoExample;
5 +import org.apache.ibatis.annotations.Param;
6 +
7 +import java.util.List;
8 +
9 +public interface CeInfoMapper {
10 + long countByExample(CeInfoExample example);
11 +
12 + int deleteByExample(CeInfoExample example);
13 +
14 + int deleteByPrimaryKey(Long id);
15 +
16 + int insert(CeInfo record);
17 +
18 + int insertSelective(CeInfo record);
19 +
20 + List<CeInfo> selectByExample(CeInfoExample example);
21 +
22 + CeInfo selectByPrimaryKey(Long id);
23 +
24 + int updateByExampleSelective(@Param("record") CeInfo record, @Param("example") CeInfoExample example);
25 +
26 + int updateByExample(@Param("record") CeInfo record, @Param("example") CeInfoExample example);
27 +
28 + int updateByPrimaryKeySelective(CeInfo record);
29 +
30 + int updateByPrimaryKey(CeInfo record);
31 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 操作日志 7 * DESC: 操作日志
8 - * TABLE: T_LOG_OPERATION 8 + * TABLE: ICLEARIMP.T_LOG_OPERATION
9 */ 9 */
10 public class Operation implements Serializable { 10 public class Operation implements Serializable {
11 /** 11 /**
...@@ -19,6 +19,11 @@ public class Operation implements Serializable { ...@@ -19,6 +19,11 @@ public class Operation implements Serializable {
19 private Long userId; 19 private Long userId;
20 20
21 /** 21 /**
22 + * 操作人登录账号
23 + */
24 + private String loginName;
25 +
26 + /**
22 * 操作人名称 27 * 操作人名称
23 */ 28 */
24 private String userName; 29 private String userName;
...@@ -34,11 +39,6 @@ public class Operation implements Serializable { ...@@ -34,11 +39,6 @@ public class Operation implements Serializable {
34 private String describe; 39 private String describe;
35 40
36 /** 41 /**
37 - * 操作时间
38 - */
39 - private Date createTime;
40 -
41 - /**
42 * 请求路径 42 * 请求路径
43 */ 43 */
44 private String url; 44 private String url;
...@@ -54,11 +54,41 @@ public class Operation implements Serializable { ...@@ -54,11 +54,41 @@ public class Operation implements Serializable {
54 private String result; 54 private String result;
55 55
56 /** 56 /**
57 - * 状态 0-不展示 1-展示 57 + * 状态(0：展示、1：不展示)
58 */ 58 */
59 private Long status; 59 private Long status;
60 60
61 /** 61 /**
62 + * 创建时间
63 + */
64 + private Date createTime;
65 +
66 + /**
67 + * 创建人ID，关联用户表ID
68 + */
69 + private Long createUserId;
70 +
71 + /**
72 + * 创建人名称
73 + */
74 + private String createUserName;
75 +
76 + /**
77 + * 修改时间
78 + */
79 + private Date modifyTime;
80 +
81 + /**
82 + * 修改人ID，关联用户表ID
83 + */
84 + private Long modifyUserId;
85 +
86 + /**
87 + * 修改人名称
88 + */
89 + private String modifyUserName;
90 +
91 + /**
62 * 备注 92 * 备注
63 */ 93 */
64 private String remark; 94 private String remark;
...@@ -81,6 +111,14 @@ public class Operation implements Serializable { ...@@ -81,6 +111,14 @@ public class Operation implements Serializable {
81 this.userId = userId; 111 this.userId = userId;
82 } 112 }
83 113
114 + public String getLoginName() {
115 + return loginName;
116 + }
117 +
118 + public void setLoginName(String loginName) {
119 + this.loginName = loginName == null ? null : loginName.trim();
120 + }
121 +
84 public String getUserName() { 122 public String getUserName() {
85 return userName; 123 return userName;
86 } 124 }
...@@ -105,14 +143,6 @@ public class Operation implements Serializable { ...@@ -105,14 +143,6 @@ public class Operation implements Serializable {
105 this.describe = describe == null ? null : describe.trim(); 143 this.describe = describe == null ? null : describe.trim();
106 } 144 }
107 145
108 - public Date getCreateTime() {
109 - return createTime;
110 - }
111 -
112 - public void setCreateTime(Date createTime) {
113 - this.createTime = createTime;
114 - }
115 -
116 public String getUrl() { 146 public String getUrl() {
117 return url; 147 return url;
118 } 148 }
...@@ -145,6 +175,54 @@ public class Operation implements Serializable { ...@@ -145,6 +175,54 @@ public class Operation implements Serializable {
145 this.status = status; 175 this.status = status;
146 } 176 }
147 177
178 + public Date getCreateTime() {
179 + return createTime;
180 + }
181 +
182 + public void setCreateTime(Date createTime) {
183 + this.createTime = createTime;
184 + }
185 +
186 + public Long getCreateUserId() {
187 + return createUserId;
188 + }
189 +
190 + public void setCreateUserId(Long createUserId) {
191 + this.createUserId = createUserId;
192 + }
193 +
194 + public String getCreateUserName() {
195 + return createUserName;
196 + }
197 +
198 + public void setCreateUserName(String createUserName) {
199 + this.createUserName = createUserName == null ? null : createUserName.trim();
200 + }
201 +
202 + public Date getModifyTime() {
203 + return modifyTime;
204 + }
205 +
206 + public void setModifyTime(Date modifyTime) {
207 + this.modifyTime = modifyTime;
208 + }
209 +
210 + public Long getModifyUserId() {
211 + return modifyUserId;
212 + }
213 +
214 + public void setModifyUserId(Long modifyUserId) {
215 + this.modifyUserId = modifyUserId;
216 + }
217 +
218 + public String getModifyUserName() {
219 + return modifyUserName;
220 + }
221 +
222 + public void setModifyUserName(String modifyUserName) {
223 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
224 + }
225 +
148 public String getRemark() { 226 public String getRemark() {
149 return remark; 227 return remark;
150 } 228 }
...@@ -161,14 +239,20 @@ public class Operation implements Serializable { ...@@ -161,14 +239,20 @@ public class Operation implements Serializable {
161 sb.append("Hash = ").append(hashCode()); 239 sb.append("Hash = ").append(hashCode());
162 sb.append(", id=").append(id); 240 sb.append(", id=").append(id);
163 sb.append(", userId=").append(userId); 241 sb.append(", userId=").append(userId);
242 + sb.append(", loginName=").append(loginName);
164 sb.append(", userName=").append(userName); 243 sb.append(", userName=").append(userName);
165 sb.append(", module=").append(module); 244 sb.append(", module=").append(module);
166 sb.append(", describe=").append(describe); 245 sb.append(", describe=").append(describe);
167 - sb.append(", createTime=").append(createTime);
168 sb.append(", url=").append(url); 246 sb.append(", url=").append(url);
169 sb.append(", requestParameters=").append(requestParameters); 247 sb.append(", requestParameters=").append(requestParameters);
170 sb.append(", result=").append(result); 248 sb.append(", result=").append(result);
171 sb.append(", status=").append(status); 249 sb.append(", status=").append(status);
250 + sb.append(", createTime=").append(createTime);
251 + sb.append(", createUserId=").append(createUserId);
252 + sb.append(", createUserName=").append(createUserName);
253 + sb.append(", modifyTime=").append(modifyTime);
254 + sb.append(", modifyUserId=").append(modifyUserId);
255 + sb.append(", modifyUserName=").append(modifyUserName);
172 sb.append(", remark=").append(remark); 256 sb.append(", remark=").append(remark);
173 sb.append(", serialVersionUID=").append(serialVersionUID); 257 sb.append(", serialVersionUID=").append(serialVersionUID);
174 sb.append("]"); 258 sb.append("]");
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: KAFKA数据历史表 7 * DESC: KAFKA数据历史表
8 - * TABLE: T_SYS_KAFKA_STORAGE_HISTORY 8 + * TABLE: ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY
9 */ 9 */
10 public class KafkaStorageHistory implements Serializable { 10 public class KafkaStorageHistory implements Serializable {
11 /** 11 /**
......
1 package com.fedex.connect.common.model.sys; 1 package com.fedex.connect.common.model.sys;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 +import java.util.Date;
4 5
5 /** 6 /**
6 - * DESC: null 7 + * DESC: 系统参数配置表
7 - * TABLE: T_SYS_PARAM_CONFIG 8 + * TABLE: ICLEARIMP.T_SYS_PARAM_CONFIG
8 */ 9 */
9 public class ParamConfig implements Serializable { 10 public class ParamConfig implements Serializable {
10 /** 11 /**
11 - * ID自增 12 + * ID,主键自增
12 */ 13 */
13 private Long id; 14 private Long id;
14 15
15 /** 16 /**
16 - * 参数组KEY 17 + * 参数编码
17 */ 18 */
18 - private String codeGroup; 19 + private String code;
19 20
20 /** 21 /**
21 - * 组中对应不同分区的KEY 22 + * 参数名称
22 */ 23 */
23 - private String codeValue; 24 + private String name;
24 25
25 /** 26 /**
26 * 参数值 27 * 参数值
27 */ 28 */
28 - private String paramValue; 29 + private String value;
29 30
30 /** 31 /**
31 - * null 32 + * 参数类型ID，关联数据字典表。指定字典目录CODE：PARAM_CONFIG_TYPE
33 + */
34 + private Long typeId;
35 +
36 + /**
37 + * 参数类型名称
38 + */
39 + private String typeName;
40 +
41 + /**
42 + * 状态(0：无效、1：有效)
32 */ 43 */
33 private Long status; 44 private Long status;
34 45
46 + /**
47 + * 参数说明
48 + */
49 + private String description;
50 +
51 + /**
52 + * 创建时间
53 + */
54 + private Date createTime;
55 +
56 + /**
57 + * 创建人ID，关联用户表ID
58 + */
59 + private Long createUserId;
60 +
61 + /**
62 + * 创建人名称
63 + */
64 + private String createUserName;
65 +
66 + /**
67 + * 修改时间
68 + */
69 + private Date modifyTime;
70 +
71 + /**
72 + * 修改人ID，关联用户表ID
73 + */
74 + private Long modifyUserId;
75 +
76 + /**
77 + * 修改人名称
78 + */
79 + private String modifyUserName;
80 +
35 private static final long serialVersionUID = 1L; 81 private static final long serialVersionUID = 1L;
36 82
37 public Long getId() { 83 public Long getId() {
...@@ -42,28 +88,44 @@ public class ParamConfig implements Serializable { ...@@ -42,28 +88,44 @@ public class ParamConfig implements Serializable {
42 this.id = id; 88 this.id = id;
43 } 89 }
44 90
45 - public String getCodeGroup() { 91 + public String getCode() {
46 - return codeGroup; 92 + return code;
93 + }
94 +
95 + public void setCode(String code) {
96 + this.code = code == null ? null : code.trim();
97 + }
98 +
99 + public String getName() {
100 + return name;
47 } 101 }
48 102
49 - public void setCodeGroup(String codeGroup) { 103 + public void setName(String name) {
50 - this.codeGroup = codeGroup == null ? null : codeGroup.trim(); 104 + this.name = name == null ? null : name.trim();
51 } 105 }
52 106
53 - public String getCodeValue() { 107 + public String getValue() {
54 - return codeValue; 108 + return value;
55 } 109 }
56 110
57 - public void setCodeValue(String codeValue) { 111 + public void setValue(String value) {
58 - this.codeValue = codeValue == null ? null : codeValue.trim(); 112 + this.value = value == null ? null : value.trim();
59 } 113 }
60 114
61 - public String getParamValue() { 115 + public Long getTypeId() {
62 - return paramValue; 116 + return typeId;
63 } 117 }
64 118
65 - public void setParamValue(String paramValue) { 119 + public void setTypeId(Long typeId) {
66 - this.paramValue = paramValue == null ? null : paramValue.trim(); 120 + this.typeId = typeId;
121 + }
122 +
123 + public String getTypeName() {
124 + return typeName;
125 + }
126 +
127 + public void setTypeName(String typeName) {
128 + this.typeName = typeName == null ? null : typeName.trim();
67 } 129 }
68 130
69 public Long getStatus() { 131 public Long getStatus() {
...@@ -74,6 +136,62 @@ public class ParamConfig implements Serializable { ...@@ -74,6 +136,62 @@ public class ParamConfig implements Serializable {
74 this.status = status; 136 this.status = status;
75 } 137 }
76 138
139 + public String getDescription() {
140 + return description;
141 + }
142 +
143 + public void setDescription(String description) {
144 + this.description = description == null ? null : description.trim();
145 + }
146 +
147 + public Date getCreateTime() {
148 + return createTime;
149 + }
150 +
151 + public void setCreateTime(Date createTime) {
152 + this.createTime = createTime;
153 + }
154 +
155 + public Long getCreateUserId() {
156 + return createUserId;
157 + }
158 +
159 + public void setCreateUserId(Long createUserId) {
160 + this.createUserId = createUserId;
161 + }
162 +
163 + public String getCreateUserName() {
164 + return createUserName;
165 + }
166 +
167 + public void setCreateUserName(String createUserName) {
168 + this.createUserName = createUserName == null ? null : createUserName.trim();
169 + }
170 +
171 + public Date getModifyTime() {
172 + return modifyTime;
173 + }
174 +
175 + public void setModifyTime(Date modifyTime) {
176 + this.modifyTime = modifyTime;
177 + }
178 +
179 + public Long getModifyUserId() {
180 + return modifyUserId;
181 + }
182 +
183 + public void setModifyUserId(Long modifyUserId) {
184 + this.modifyUserId = modifyUserId;
185 + }
186 +
187 + public String getModifyUserName() {
188 + return modifyUserName;
189 + }
190 +
191 + public void setModifyUserName(String modifyUserName) {
192 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
193 + }
194 +
77 @Override 195 @Override
78 public String toString() { 196 public String toString() {
79 StringBuilder sb = new StringBuilder(); 197 StringBuilder sb = new StringBuilder();
...@@ -81,10 +199,19 @@ public class ParamConfig implements Serializable { ...@@ -81,10 +199,19 @@ public class ParamConfig implements Serializable {
81 sb.append(" ["); 199 sb.append(" [");
82 sb.append("Hash = ").append(hashCode()); 200 sb.append("Hash = ").append(hashCode());
83 sb.append(", id=").append(id); 201 sb.append(", id=").append(id);
84 - sb.append(", codeGroup=").append(codeGroup); 202 + sb.append(", code=").append(code);
85 - sb.append(", codeValue=").append(codeValue); 203 + sb.append(", name=").append(name);
86 - sb.append(", paramValue=").append(paramValue); 204 + sb.append(", value=").append(value);
205 + sb.append(", typeId=").append(typeId);
206 + sb.append(", typeName=").append(typeName);
87 sb.append(", status=").append(status); 207 sb.append(", status=").append(status);
208 + sb.append(", description=").append(description);
209 + sb.append(", createTime=").append(createTime);
210 + sb.append(", createUserId=").append(createUserId);
211 + sb.append(", createUserName=").append(createUserName);
212 + sb.append(", modifyTime=").append(modifyTime);
213 + sb.append(", modifyUserId=").append(modifyUserId);
214 + sb.append(", modifyUserName=").append(modifyUserName);
88 sb.append(", serialVersionUID=").append(serialVersionUID); 215 sb.append(", serialVersionUID=").append(serialVersionUID);
89 sb.append("]"); 216 sb.append("]");
90 return sb.toString(); 217 return sb.toString();
......
...@@ -5,36 +5,36 @@ import java.util.Date; ...@@ -5,36 +5,36 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 用户表 7 * DESC: 用户表
8 - * TABLE: T_SYS_USER 8 + * TABLE: ICLEARIMP.T_SYS_USER
9 */ 9 */
10 public class User implements Serializable { 10 public class User implements Serializable {
11 /** 11 /**
12 - * ID 12 + * ID,主键自增
13 */ 13 */
14 private Long id; 14 private Long id;
15 15
16 /** 16 /**
17 * 用户账号 17 * 用户账号
18 */ 18 */
19 - private String accNo; 19 + private String loginName;
20 20
21 /** 21 /**
22 - * 姓名 22 + * 用户姓名
23 */ 23 */
24 private String userName; 24 private String userName;
25 25
26 /** 26 /**
27 - * 密码 27 + * 用户密码
28 */ 28 */
29 private String password; 29 private String password;
30 30
31 /** 31 /**
32 - * FedEx账户 32 + * 用户UUID
33 */ 33 */
34 - private String fedexAccNo; 34 + private String userUuid;
35 35
36 /** 36 /**
37 - * 邮箱 37 + * 用户邮箱
38 */ 38 */
39 private String email; 39 private String email;
40 40
...@@ -46,7 +46,12 @@ public class User implements Serializable { ...@@ -46,7 +46,12 @@ public class User implements Serializable {
46 /** 46 /**
47 * 公司名称 47 * 公司名称
48 */ 48 */
49 - private String companyName; 49 + private String compannyName;
50 +
51 + /**
52 + * 计费账号
53 + */
54 + private String accountNo;
50 55
51 /** 56 /**
52 * 营利事业统一编号 57 * 营利事业统一编号
...@@ -59,40 +64,55 @@ public class User implements Serializable { ...@@ -59,40 +64,55 @@ public class User implements Serializable {
59 private String customsSerialNum; 64 private String customsSerialNum;
60 65
61 /** 66 /**
62 - * 创建时间 67 + * 用户类型ID。
68 +关联数据字典表。指定字典目录CODE：USER_TYPE
63 */ 69 */
64 - private Date createTime; 70 + private Long typeId;
65 71
66 /** 72 /**
67 - * 修改时间 73 + * 用户类型名称(本地账号、FCL账号)
68 */ 74 */
69 - private Date updateTime; 75 + private String typeName;
70 76
71 /** 77 /**
72 - * 密码上次修改时间 78 + * 状态(0：无效、1：有效)
73 */ 79 */
74 - private Date pwdLastUpdTime; 80 + private Long status;
75 81
76 /** 82 /**
77 - * 用户类型ID。 83 + * 备注
78 -关联数据字典表。指定KEY为：user_type
79 */ 84 */
80 - private Long typeId; 85 + private String remark;
81 86
82 /** 87 /**
83 - * 是否有效(1:有效[true]。0：无效[false]。) 88 + * 创建时间
84 */ 89 */
85 - private Long status; 90 + private Date createTime;
86 91
87 /** 92 /**
88 - * 备注 93 + * 创建人ID，关联用户表ID
89 */ 94 */
90 - private String remark; 95 + private Long createUserId;
91 96
92 /** 97 /**
93 - * 用户信息来源。1：台湾项目注册。2：FCL 98 + * 创建人名称
94 */ 99 */
95 - private Long userSource; 100 + private String createUserName;
101 +
102 + /**
103 + * 修改时间
104 + */
105 + private Date modifyTime;
106 +
107 + /**
108 + * 修改人ID，关联用户表ID
109 + */
110 + private Long modifyUserId;
111 +
112 + /**
113 + * 修改人名称
114 + */
115 + private String modifyUserName;
96 116
97 private static final long serialVersionUID = 1L; 117 private static final long serialVersionUID = 1L;
98 118
...@@ -104,12 +124,12 @@ public class User implements Serializable { ...@@ -104,12 +124,12 @@ public class User implements Serializable {
104 this.id = id; 124 this.id = id;
105 } 125 }
106 126
107 - public String getAccNo() { 127 + public String getLoginName() {
108 - return accNo; 128 + return loginName;
109 } 129 }
110 130
111 - public void setAccNo(String accNo) { 131 + public void setLoginName(String loginName) {
112 - this.accNo = accNo == null ? null : accNo.trim(); 132 + this.loginName = loginName == null ? null : loginName.trim();
113 } 133 }
114 134
115 public String getUserName() { 135 public String getUserName() {
...@@ -128,12 +148,12 @@ public class User implements Serializable { ...@@ -128,12 +148,12 @@ public class User implements Serializable {
128 this.password = password == null ? null : password.trim(); 148 this.password = password == null ? null : password.trim();
129 } 149 }
130 150
131 - public String getFedexAccNo() { 151 + public String getUserUuid() {
132 - return fedexAccNo; 152 + return userUuid;
133 } 153 }
134 154
135 - public void setFedexAccNo(String fedexAccNo) { 155 + public void setUserUuid(String userUuid) {
136 - this.fedexAccNo = fedexAccNo == null ? null : fedexAccNo.trim(); 156 + this.userUuid = userUuid == null ? null : userUuid.trim();
137 } 157 }
138 158
139 public String getEmail() { 159 public String getEmail() {
...@@ -152,12 +172,20 @@ public class User implements Serializable { ...@@ -152,12 +172,20 @@ public class User implements Serializable {
152 this.phone = phone == null ? null : phone.trim(); 172 this.phone = phone == null ? null : phone.trim();
153 } 173 }
154 174
155 - public String getCompanyName() { 175 + public String getCompannyName() {
156 - return companyName; 176 + return compannyName;
177 + }
178 +
179 + public void setCompannyName(String compannyName) {
180 + this.compannyName = compannyName == null ? null : compannyName.trim();
157 } 181 }
158 182
159 - public void setCompanyName(String companyName) { 183 + public String getAccountNo() {
160 - this.companyName = companyName == null ? null : companyName.trim(); 184 + return accountNo;
185 + }
186 +
187 + public void setAccountNo(String accountNo) {
188 + this.accountNo = accountNo == null ? null : accountNo.trim();
161 } 189 }
162 190
163 public String getUnifiedBusinessNum() { 191 public String getUnifiedBusinessNum() {
...@@ -176,30 +204,6 @@ public class User implements Serializable { ...@@ -176,30 +204,6 @@ public class User implements Serializable {
176 this.customsSerialNum = customsSerialNum == null ? null : customsSerialNum.trim(); 204 this.customsSerialNum = customsSerialNum == null ? null : customsSerialNum.trim();
177 } 205 }
178 206
179 - public Date getCreateTime() {
180 - return createTime;
181 - }
182 -
183 - public void setCreateTime(Date createTime) {
184 - this.createTime = createTime;
185 - }
186 -
187 - public Date getUpdateTime() {
188 - return updateTime;
189 - }
190 -
191 - public void setUpdateTime(Date updateTime) {
192 - this.updateTime = updateTime;
193 - }
194 -
195 - public Date getPwdLastUpdTime() {
196 - return pwdLastUpdTime;
197 - }
198 -
199 - public void setPwdLastUpdTime(Date pwdLastUpdTime) {
200 - this.pwdLastUpdTime = pwdLastUpdTime;
201 - }
202 -
203 public Long getTypeId() { 207 public Long getTypeId() {
204 return typeId; 208 return typeId;
205 } 209 }
...@@ -208,6 +212,14 @@ public class User implements Serializable { ...@@ -208,6 +212,14 @@ public class User implements Serializable {
208 this.typeId = typeId; 212 this.typeId = typeId;
209 } 213 }
210 214
215 + public String getTypeName() {
216 + return typeName;
217 + }
218 +
219 + public void setTypeName(String typeName) {
220 + this.typeName = typeName == null ? null : typeName.trim();
221 + }
222 +
211 public Long getStatus() { 223 public Long getStatus() {
212 return status; 224 return status;
213 } 225 }
...@@ -224,12 +236,52 @@ public class User implements Serializable { ...@@ -224,12 +236,52 @@ public class User implements Serializable {
224 this.remark = remark == null ? null : remark.trim(); 236 this.remark = remark == null ? null : remark.trim();
225 } 237 }
226 238
227 - public Long getUserSource() { 239 + public Date getCreateTime() {
228 - return userSource; 240 + return createTime;
241 + }
242 +
243 + public void setCreateTime(Date createTime) {
244 + this.createTime = createTime;
229 } 245 }
230 246
231 - public void setUserSource(Long userSource) { 247 + public Long getCreateUserId() {
232 - this.userSource = userSource; 248 + return createUserId;
249 + }
250 +
251 + public void setCreateUserId(Long createUserId) {
252 + this.createUserId = createUserId;
253 + }
254 +
255 + public String getCreateUserName() {
256 + return createUserName;
257 + }
258 +
259 + public void setCreateUserName(String createUserName) {
260 + this.createUserName = createUserName == null ? null : createUserName.trim();
261 + }
262 +
263 + public Date getModifyTime() {
264 + return modifyTime;
265 + }
266 +
267 + public void setModifyTime(Date modifyTime) {
268 + this.modifyTime = modifyTime;
269 + }
270 +
271 + public Long getModifyUserId() {
272 + return modifyUserId;
273 + }
274 +
275 + public void setModifyUserId(Long modifyUserId) {
276 + this.modifyUserId = modifyUserId;
277 + }
278 +
279 + public String getModifyUserName() {
280 + return modifyUserName;
281 + }
282 +
283 + public void setModifyUserName(String modifyUserName) {
284 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
233 } 285 }
234 286
235 @Override 287 @Override
...@@ -239,22 +291,26 @@ public class User implements Serializable { ...@@ -239,22 +291,26 @@ public class User implements Serializable {
239 sb.append(" ["); 291 sb.append(" [");
240 sb.append("Hash = ").append(hashCode()); 292 sb.append("Hash = ").append(hashCode());
241 sb.append(", id=").append(id); 293 sb.append(", id=").append(id);
242 - sb.append(", accNo=").append(accNo); 294 + sb.append(", loginName=").append(loginName);
243 sb.append(", userName=").append(userName); 295 sb.append(", userName=").append(userName);
244 sb.append(", password=").append(password); 296 sb.append(", password=").append(password);
245 - sb.append(", fedexAccNo=").append(fedexAccNo); 297 + sb.append(", userUuid=").append(userUuid);
246 sb.append(", email=").append(email); 298 sb.append(", email=").append(email);
247 sb.append(", phone=").append(phone); 299 sb.append(", phone=").append(phone);
248 - sb.append(", companyName=").append(companyName); 300 + sb.append(", compannyName=").append(compannyName);
301 + sb.append(", accountNo=").append(accountNo);
249 sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum); 302 sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum);
250 sb.append(", customsSerialNum=").append(customsSerialNum); 303 sb.append(", customsSerialNum=").append(customsSerialNum);
251 - sb.append(", createTime=").append(createTime);
252 - sb.append(", updateTime=").append(updateTime);
253 - sb.append(", pwdLastUpdTime=").append(pwdLastUpdTime);
254 sb.append(", typeId=").append(typeId); 304 sb.append(", typeId=").append(typeId);
305 + sb.append(", typeName=").append(typeName);
255 sb.append(", status=").append(status); 306 sb.append(", status=").append(status);
256 sb.append(", remark=").append(remark); 307 sb.append(", remark=").append(remark);
257 - sb.append(", userSource=").append(userSource); 308 + sb.append(", createTime=").append(createTime);
309 + sb.append(", createUserId=").append(createUserId);
310 + sb.append(", createUserName=").append(createUserName);
311 + sb.append(", modifyTime=").append(modifyTime);
312 + sb.append(", modifyUserId=").append(modifyUserId);
313 + sb.append(", modifyUserName=").append(modifyUserName);
258 sb.append(", serialVersionUID=").append(serialVersionUID); 314 sb.append(", serialVersionUID=").append(serialVersionUID);
259 sb.append("]"); 315 sb.append("]");
260 return sb.toString(); 316 return sb.toString();
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 用户角色表 7 * DESC: 用户角色表
8 - * TABLE: T_SYS_USER_ROLE 8 + * TABLE: ICLEARIMP.T_SYS_USER_ROLE
9 */ 9 */
10 public class UserRole implements Serializable { 10 public class UserRole implements Serializable {
11 /** 11 /**
...@@ -34,19 +34,29 @@ public class UserRole implements Serializable { ...@@ -34,19 +34,29 @@ public class UserRole implements Serializable {
34 private Date createTime; 34 private Date createTime;
35 35
36 /** 36 /**
37 - * 创建人，对应用户表id 37 + * 创建人ID，关联用户表ID
38 */ 38 */
39 - private Long createName; 39 + private Long createUserId;
40 +
41 + /**
42 + * 创建人名称
43 + */
44 + private String createUserName;
40 45
41 /** 46 /**
42 * 修改时间 47 * 修改时间
43 */ 48 */
44 - private Date updateTime; 49 + private Date modifyTime;
45 50
46 /** 51 /**
47 - * 修改人，对应用户表id 52 + * 修改人ID，关联用户表ID
48 */ 53 */
49 - private Long updateName; 54 + private Long modifyUserId;
55 +
56 + /**
57 + * 修改人名称
58 + */
59 + private String modifyUserName;
50 60
51 private static final long serialVersionUID = 1L; 61 private static final long serialVersionUID = 1L;
52 62
...@@ -90,28 +100,44 @@ public class UserRole implements Serializable { ...@@ -90,28 +100,44 @@ public class UserRole implements Serializable {
90 this.createTime = createTime; 100 this.createTime = createTime;
91 } 101 }
92 102
93 - public Long getCreateName() { 103 + public Long getCreateUserId() {
94 - return createName; 104 + return createUserId;
105 + }
106 +
107 + public void setCreateUserId(Long createUserId) {
108 + this.createUserId = createUserId;
109 + }
110 +
111 + public String getCreateUserName() {
112 + return createUserName;
113 + }
114 +
115 + public void setCreateUserName(String createUserName) {
116 + this.createUserName = createUserName == null ? null : createUserName.trim();
117 + }
118 +
119 + public Date getModifyTime() {
120 + return modifyTime;
95 } 121 }
96 122
97 - public void setCreateName(Long createName) { 123 + public void setModifyTime(Date modifyTime) {
98 - this.createName = createName; 124 + this.modifyTime = modifyTime;
99 } 125 }
100 126
101 - public Date getUpdateTime() { 127 + public Long getModifyUserId() {
102 - return updateTime; 128 + return modifyUserId;
103 } 129 }
104 130
105 - public void setUpdateTime(Date updateTime) { 131 + public void setModifyUserId(Long modifyUserId) {
106 - this.updateTime = updateTime; 132 + this.modifyUserId = modifyUserId;
107 } 133 }
108 134
109 - public Long getUpdateName() { 135 + public String getModifyUserName() {
110 - return updateName; 136 + return modifyUserName;
111 } 137 }
112 138
113 - public void setUpdateName(Long updateName) { 139 + public void setModifyUserName(String modifyUserName) {
114 - this.updateName = updateName; 140 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
115 } 141 }
116 142
117 @Override 143 @Override
...@@ -125,9 +151,11 @@ public class UserRole implements Serializable { ...@@ -125,9 +151,11 @@ public class UserRole implements Serializable {
125 sb.append(", roleId=").append(roleId); 151 sb.append(", roleId=").append(roleId);
126 sb.append(", status=").append(status); 152 sb.append(", status=").append(status);
127 sb.append(", createTime=").append(createTime); 153 sb.append(", createTime=").append(createTime);
128 - sb.append(", createName=").append(createName); 154 + sb.append(", createUserId=").append(createUserId);
129 - sb.append(", updateTime=").append(updateTime); 155 + sb.append(", createUserName=").append(createUserName);
130 - sb.append(", updateName=").append(updateName); 156 + sb.append(", modifyTime=").append(modifyTime);
157 + sb.append(", modifyUserId=").append(modifyUserId);
158 + sb.append(", modifyUserName=").append(modifyUserName);
131 sb.append(", serialVersionUID=").append(serialVersionUID); 159 sb.append(", serialVersionUID=").append(serialVersionUID);
132 sb.append("]"); 160 sb.append("]");
133 return sb.toString(); 161 return sb.toString();
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 sys：系统 系统相关表，例如kafka表 40 sys：系统 系统相关表，例如kafka表
41 log: 日志 日志记录表，例如邮件发送日志表 41 log: 日志 日志记录表，例如邮件发送日志表
42 --> 42 -->
43 - <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java"> 43 + <javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java">
44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性--> 44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
45 <property name="enableSubPackages" value="false"/> 45 <property name="enableSubPackages" value="false"/>
46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false--> 46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </javaModelGenerator> 52 </javaModelGenerator>
53 53
54 <!-- 生成映射文件*.xml的位置--> 54 <!-- 生成映射文件*.xml的位置-->
55 - <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common"> 55 + <sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common">
56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
57 <property name="enableSubPackages" value="false"/> 57 <property name="enableSubPackages" value="false"/>
58 </sqlMapGenerator> 58 </sqlMapGenerator>
59 59
60 <!-- 生成DAO的包名和位置 --> 60 <!-- 生成DAO的包名和位置 -->
61 - <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java"> 61 + <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java">
62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
63 <property name="enableSubPackages" value="false"/> 63 <property name="enableSubPackages" value="false"/>
64 </javaClientGenerator> 64 </javaClientGenerator>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 generatedKey 指定KEY，Oracle需要指定序列。 73 generatedKey 指定KEY，Oracle需要指定序列。
74 sqlStatement 指定序列名称 74 sqlStatement 指定序列名称
75 --> 75 -->
76 -<!-- <table tableName="T_LOG_OPERATION" domainObjectName="Operation"--> 76 +<!-- <table schema="ICLEARIMP" tableName="T_LOG_OPERATION" domainObjectName="Operation"-->
77 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 77 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
78 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 78 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
79 <!-- selectByExampleQueryId="true">--> 79 <!-- selectByExampleQueryId="true">-->
...@@ -91,12 +91,12 @@ ...@@ -91,12 +91,12 @@
91 <!-- selectByExampleQueryId="true">--> 91 <!-- selectByExampleQueryId="true">-->
92 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />--> 92 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />-->
93 <!-- </table>--> 93 <!-- </table>-->
94 - <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo" 94 +<!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
95 - enableCountByExample="true" enableUpdateByExample="true" 95 +<!-- enableCountByExample="true" enableUpdateByExample="true"-->
96 - enableDeleteByExample="true" enableSelectByExample="true" 96 +<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
97 - selectByExampleQueryId="true"> 97 +<!-- selectByExampleQueryId="true">-->
98 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" /> 98 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
99 - </table> 99 +<!-- </table>-->
100 <!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"--> 100 <!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
101 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 101 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
102 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 102 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...@@ -137,24 +137,24 @@ ...@@ -137,24 +137,24 @@
137 <!-- selectByExampleQueryId="true">--> 137 <!-- selectByExampleQueryId="true">-->
138 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />--> 138 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
139 <!-- </table>--> 139 <!-- </table>-->
140 -<!-- <table tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"--> 140 + <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"
141 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 141 + enableCountByExample="true" enableUpdateByExample="true"
142 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 142 + enableDeleteByExample="true" enableSelectByExample="true"
143 -<!-- selectByExampleQueryId="true">--> 143 + selectByExampleQueryId="true">
144 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />--> 144 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />
145 -<!-- </table>--> 145 + </table>
146 <!-- <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"--> 146 <!-- <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"-->
147 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 147 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
148 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 148 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
149 <!-- selectByExampleQueryId="true">--> 149 <!-- selectByExampleQueryId="true">-->
150 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />--> 150 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
151 <!-- </table>--> 151 <!-- </table>-->
152 -<!-- <table tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"--> 152 + <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
153 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 153 + enableCountByExample="true" enableUpdateByExample="true"
154 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 154 + enableDeleteByExample="true" enableSelectByExample="true"
155 -<!-- selectByExampleQueryId="true">--> 155 + selectByExampleQueryId="true">
156 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />--> 156 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
157 -<!-- </table>--> 157 + </table>
158 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"--> 158 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
159 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 159 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
160 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 160 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...@@ -173,18 +173,18 @@ ...@@ -173,18 +173,18 @@
173 <!-- selectByExampleQueryId="true">--> 173 <!-- selectByExampleQueryId="true">-->
174 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />--> 174 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
175 <!-- </table>--> 175 <!-- </table>-->
176 -<!-- <table tableName="T_SYS_USER" domainObjectName="User"--> 176 + <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
177 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 177 + enableCountByExample="true" enableUpdateByExample="true"
178 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 178 + enableDeleteByExample="true" enableSelectByExample="true"
179 -<!-- selectByExampleQueryId="true">--> 179 + selectByExampleQueryId="true">
180 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />--> 180 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
181 -<!-- </table>--> 181 + </table>
182 -<!-- <table tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"--> 182 + <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"
183 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 183 + enableCountByExample="true" enableUpdateByExample="true"
184 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 184 + enableDeleteByExample="true" enableSelectByExample="true"
185 -<!-- selectByExampleQueryId="true">--> 185 + selectByExampleQueryId="true">
186 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />--> 186 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />
187 -<!-- </table>--> 187 + </table>
188 188
189 189
190 <!-- <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"--> 190 <!-- <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->
......
1 package com.fedex.connect.common.dependencies.date.dto; 1 package com.fedex.connect.common.dependencies.date.dto;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 import org.springframework.security.core.GrantedAuthority; 3 import org.springframework.security.core.GrantedAuthority;
5 import org.springframework.security.core.userdetails.UserDetails; 4 import org.springframework.security.core.userdetails.UserDetails;
6 5
......
1 package com.fedex.connect.common.dependencies.repository.dao; 1 package com.fedex.connect.common.dependencies.repository.dao;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 import org.apache.ibatis.annotations.Mapper; 3 import org.apache.ibatis.annotations.Mapper;
5 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
6 import org.apache.ibatis.annotations.Select; 5 import org.apache.ibatis.annotations.Select;
......
1 package com.fedex.connect.common.dependencies.repository.repo.sys; 1 package com.fedex.connect.common.dependencies.repository.repo.sys;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 -
5 public interface IUserRepository { 3 public interface IUserRepository {
6 User findOne(Long id); 4 User findOne(Long id);
7 } 5 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,6 @@ package com.fedex.connect.common.dependencies.repository.repo.sys.impl; ...@@ -2,7 +2,6 @@ package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 3 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
4 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 4 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
5 -import com.fedex.connect.common.model.sys.User;
6 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
7 6
8 @Repository 7 @Repository
......
1 package com.fedex.connect.common.dependencies.util; 1 package com.fedex.connect.common.dependencies.util;
2 2
3 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails; 3 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
4 -import com.fedex.connect.common.model.sys.User;
5 import org.springframework.security.core.GrantedAuthority; 4 import org.springframework.security.core.GrantedAuthority;
6 import org.springframework.security.core.context.SecurityContextHolder; 5 import org.springframework.security.core.context.SecurityContextHolder;
7 import org.springframework.security.core.userdetails.UserDetails; 6 import org.springframework.security.core.userdetails.UserDetails;
......
...@@ -4,7 +4,6 @@ import com.fedex.connect.common.dependencies.authentication.SecurityConstants; ...@@ -4,7 +4,6 @@ import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
4 import com.fedex.connect.common.dependencies.contants.RedisConstants; 4 import com.fedex.connect.common.dependencies.contants.RedisConstants;
5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails; 5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
6 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 6 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
7 -import com.fedex.connect.common.model.sys.User;
8 import io.jsonwebtoken.Claims; 7 import io.jsonwebtoken.Claims;
9 import io.jsonwebtoken.Jwts; 8 import io.jsonwebtoken.Jwts;
10 import io.jsonwebtoken.SignatureAlgorithm; 9 import io.jsonwebtoken.SignatureAlgorithm;
......
1 package com.fedex.connect.kafka.listener.dmlistener; 1 package com.fedex.connect.kafka.listener.dmlistener;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 -import com.fedex.connect.common.model.sys.KafkaStorageHistory;
5 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 4 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
6 import com.fedex.connect.kafka.data.dto.DmProcessResults; 5 import com.fedex.connect.kafka.data.dto.DmProcessResults;
7 import com.fedex.connect.kafka.listener.DmListenerInterface; 6 import com.fedex.connect.kafka.listener.DmListenerInterface;
......
1 package com.fedex.connect.kafka.repository.base; 1 package com.fedex.connect.kafka.repository.base;
2 2
3 -import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
4 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper; 3 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
5 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt; 4 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
6 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt; 5 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;
......
1 package com.fedex.connect.kafka.repository.repo; 1 package com.fedex.connect.kafka.repository.repo;
2 2
3 -import com.fedex.connect.common.model.sys.KafkaStorageHistory;
4 -
5 import java.util.List; 3 import java.util.List;
6 4
7 /** 5 /**
......
1 package com.fedex.connect.kafka.repository.repo.impl; 1 package com.fedex.connect.kafka.repository.repo.impl;
2 2
3 -import com.fedex.connect.common.model.sys.KafkaStorageHistory;
4 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository; 3 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
5 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository; 4 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository;
6 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
......
1 package com.fedex.connect.kafka.service; 1 package com.fedex.connect.kafka.service;
2 2
3 -import com.fedex.connect.common.model.sys.KafkaStorageHistory;
4 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 3 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
5 import com.fedex.connect.kafka.data.dto.DmProcessResults; 4 import com.fedex.connect.kafka.data.dto.DmProcessResults;
6 5
......
...@@ -2,7 +2,6 @@ package com.fedex.connect.kafka.service.impl; ...@@ -2,7 +2,6 @@ package com.fedex.connect.kafka.service.impl;
2 2
3 import com.fasterxml.jackson.databind.ObjectMapper; 3 import com.fasterxml.jackson.databind.ObjectMapper;
4 import com.fasterxml.jackson.databind.node.ObjectNode; 4 import com.fasterxml.jackson.databind.node.ObjectNode;
5 -import com.fedex.connect.common.model.sys.KafkaStorageHistory;
6 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 5 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
7 import com.fedex.connect.kafka.data.dto.DmProcessResults; 6 import com.fedex.connect.kafka.data.dto.DmProcessResults;
8 import com.fedex.connect.kafka.listener.DmListenerInterface; 7 import com.fedex.connect.kafka.listener.DmListenerInterface;
......
...@@ -6,7 +6,6 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; ...@@ -6,7 +6,6 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
6 import com.fedex.connect.common.dependencies.util.GsonUtils; 6 import com.fedex.connect.common.dependencies.util.GsonUtils;
7 import com.fedex.connect.common.dependencies.util.StringExtUtil; 7 import com.fedex.connect.common.dependencies.util.StringExtUtil;
8 import com.fedex.connect.common.dependencies.util.Utils; 8 import com.fedex.connect.common.dependencies.util.Utils;
9 -import com.fedex.connect.common.model.sys.User;
10 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum; 9 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum;
11 import com.fedex.connect.manager.controller.AbstractEtController; 10 import com.fedex.connect.manager.controller.AbstractEtController;
12 import com.fedex.connect.manager.controller.system.ISysAuthController; 11 import com.fedex.connect.manager.controller.system.ISysAuthController;
......
...@@ -7,7 +7,6 @@ import com.fedex.connect.common.dependencies.enums.ResponseCode; ...@@ -7,7 +7,6 @@ import com.fedex.connect.common.dependencies.enums.ResponseCode;
7 import com.fedex.connect.common.dependencies.util.BytesUtils; 7 import com.fedex.connect.common.dependencies.util.BytesUtils;
8 import com.fedex.connect.common.dependencies.util.StringExtUtil; 8 import com.fedex.connect.common.dependencies.util.StringExtUtil;
9 import com.fedex.connect.common.dependencies.util.Utils; 9 import com.fedex.connect.common.dependencies.util.Utils;
10 -import com.fedex.connect.common.model.sys.User;
11 import io.swagger.annotations.ApiModel; 10 import io.swagger.annotations.ApiModel;
12 import org.apache.commons.lang3.StringUtils; 11 import org.apache.commons.lang3.StringUtils;
13 import org.apache.commons.lang3.math.NumberUtils; 12 import org.apache.commons.lang3.math.NumberUtils;
......
...@@ -4,8 +4,6 @@ import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper; ...@@ -4,8 +4,6 @@ import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper; 4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
5 import com.fedex.connect.common.dao.sys.RedisSlabMapper; 5 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
6 import com.fedex.connect.common.dao.sys.RoleMapper; 6 import com.fedex.connect.common.dao.sys.RoleMapper;
7 -import com.fedex.connect.common.dao.sys.UserMapper;
8 -import com.fedex.connect.common.dao.sys.UserRoleMapper;
9 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
10 8
11 public class BaseDao { 9 public class BaseDao {
......
1 package com.fedex.connect.manager.repository.repo.sys; 1 package com.fedex.connect.manager.repository.repo.sys;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 -import com.fedex.connect.common.model.sys.UserExample;
5 -
6 import java.util.List; 3 import java.util.List;
7 4
8 public interface IUserRepository { 5 public interface IUserRepository {
......
1 package com.fedex.connect.manager.repository.repo.sys; 1 package com.fedex.connect.manager.repository.repo.sys;
2 2
3 -import com.fedex.connect.common.model.sys.UserRole;
4 -import com.fedex.connect.common.model.sys.UserRoleExample;
5 -
6 import java.util.List; 3 import java.util.List;
7 4
8 public interface IUserRoleRepository { 5 public interface IUserRoleRepository {
......
1 package com.fedex.connect.manager.repository.repo.sys.impl; 1 package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 -import com.fedex.connect.common.model.sys.UserExample;
5 import com.fedex.connect.manager.repository.base.BaseDao; 3 import com.fedex.connect.manager.repository.base.BaseDao;
6 import com.fedex.connect.manager.repository.repo.sys.IUserRepository; 4 import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
7 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
......
1 package com.fedex.connect.manager.repository.repo.sys.impl; 1 package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 -import com.fedex.connect.common.model.sys.UserRole;
4 -import com.fedex.connect.common.model.sys.UserRoleExample;
5 import com.fedex.connect.manager.repository.base.BaseDao; 3 import com.fedex.connect.manager.repository.base.BaseDao;
6 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository; 4 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
7 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
......
...@@ -3,8 +3,6 @@ package com.fedex.connect.manager.service.base; ...@@ -3,8 +3,6 @@ package com.fedex.connect.manager.service.base;
3 3
4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper; 4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
5 import com.fedex.connect.common.dao.sys.RoleMapper; 5 import com.fedex.connect.common.dao.sys.RoleMapper;
6 -import com.fedex.connect.common.dao.sys.UserMapper;
7 -import com.fedex.connect.common.dao.sys.UserRoleMapper;
8 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 6 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
9 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository; 7 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
10 import com.fedex.connect.manager.repository.repo.sys.*; 8 import com.fedex.connect.manager.repository.repo.sys.*;
......
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 -import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.manager.data.dto.LoginRequest; 4 import com.fedex.connect.manager.data.dto.LoginRequest;
6 import com.google.gson.JsonObject; 5 import com.google.gson.JsonObject;
7 6
......
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 -import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.manager.data.dto.SysUserDto; 3 import com.fedex.connect.manager.data.dto.SysUserDto;
5 4
6 public interface ISysUserService { 5 public interface ISysUserService {
......
...@@ -9,7 +9,6 @@ import com.fedex.connect.common.dependencies.util.GsonUtils; ...@@ -9,7 +9,6 @@ import com.fedex.connect.common.dependencies.util.GsonUtils;
9 import com.fedex.connect.common.dependencies.util.JwtTokenUtils; 9 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
10 import com.fedex.connect.common.model.sys.RedisSlab; 10 import com.fedex.connect.common.model.sys.RedisSlab;
11 import com.fedex.connect.common.model.sys.Role; 11 import com.fedex.connect.common.model.sys.Role;
12 -import com.fedex.connect.common.model.sys.User;
13 import com.fedex.connect.manager.data.dto.LoginRequest; 12 import com.fedex.connect.manager.data.dto.LoginRequest;
14 import com.fedex.connect.manager.service.base.AbstractEtService; 13 import com.fedex.connect.manager.service.base.AbstractEtService;
15 import com.fedex.connect.manager.service.sys.IRedisUtilService; 14 import com.fedex.connect.manager.service.sys.IRedisUtilService;
......
...@@ -6,8 +6,6 @@ import com.fedex.connect.common.dependencies.util.Utils; ...@@ -6,8 +6,6 @@ import com.fedex.connect.common.dependencies.util.Utils;
6 import com.fedex.connect.common.model.bi.DictionaryEntries; 6 import com.fedex.connect.common.model.bi.DictionaryEntries;
7 import com.fedex.connect.common.model.sys.Role; 7 import com.fedex.connect.common.model.sys.Role;
8 import com.fedex.connect.common.model.sys.RoleExample; 8 import com.fedex.connect.common.model.sys.RoleExample;
9 -import com.fedex.connect.common.model.sys.UserRole;
10 -import com.fedex.connect.common.model.sys.UserRoleExample;
11 import com.fedex.connect.manager.data.model.LogShowModel; 9 import com.fedex.connect.manager.data.model.LogShowModel;
12 import com.fedex.connect.manager.service.base.AbstractEtService; 10 import com.fedex.connect.manager.service.base.AbstractEtService;
13 import com.fedex.connect.manager.service.sys.ISysRoleService; 11 import com.fedex.connect.manager.service.sys.ISysRoleService;
......
1 package com.fedex.connect.manager.service.sys.impl; 1 package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
4 -import com.fedex.connect.common.model.sys.UserRole;
5 import com.fedex.connect.manager.data.model.LogShowModel; 4 import com.fedex.connect.manager.data.model.LogShowModel;
6 import com.fedex.connect.manager.service.base.AbstractEtService; 5 import com.fedex.connect.manager.service.base.AbstractEtService;
7 import com.fedex.connect.manager.service.sys.ISysUserRoleService; 6 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
......
...@@ -7,8 +7,6 @@ import com.fedex.connect.common.dependencies.contants.DatabaseConstants; ...@@ -7,8 +7,6 @@ import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
7 import com.fedex.connect.common.dependencies.util.Utils; 7 import com.fedex.connect.common.dependencies.util.Utils;
8 import com.fedex.connect.common.model.bi.DictionaryEntries; 8 import com.fedex.connect.common.model.bi.DictionaryEntries;
9 import com.fedex.connect.common.model.sys.Role; 9 import com.fedex.connect.common.model.sys.Role;
10 -import com.fedex.connect.common.model.sys.User;
11 -import com.fedex.connect.common.model.sys.UserExample;
12 import com.fedex.connect.manager.data.dto.SysUserDto; 10 import com.fedex.connect.manager.data.dto.SysUserDto;
13 import com.fedex.connect.manager.data.model.LogShowModel; 11 import com.fedex.connect.manager.data.model.LogShowModel;
14 import com.fedex.connect.manager.service.base.AbstractEtService; 12 import com.fedex.connect.manager.service.base.AbstractEtService;
......