Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
48d33d25 2 parents 7581d373 6a53fe16

Merge branch 'master' of http://118.178.128.178/Fedex/iClear-Connect-Pre-Clearance

Inline Side-by-side
Showing 71 changed files with 1104 additions and 134 deletions
...@@ -11,7 +11,7 @@ public class FindConsignmentsDto { ...@@ -11,7 +11,7 @@ public class FindConsignmentsDto {
11 11
12 private String recipientCompany; 12 private String recipientCompany;
13 13
14 - private String shipperCountry; 14 + private String originCountry;
15 15
16 private String docNondocFlag; 16 private String docNondocFlag;
17 17
...@@ -19,7 +19,7 @@ public class FindConsignmentsDto { ...@@ -19,7 +19,7 @@ public class FindConsignmentsDto {
19 19
20 private Date createTime; 20 private Date createTime;
21 21
22 - private Date commitTime; 22 + private Date modifyTime;
23 23
24 private String statusName; 24 private String statusName;
25 } 25 }
......
...@@ -51,4 +51,6 @@ public class ConsignmentQuery extends PageBase { ...@@ -51,4 +51,6 @@ public class ConsignmentQuery extends PageBase {
51 private Long userId; 51 private Long userId;
52 52
53 private String uuid; 53 private String uuid;
54 +
55 + private String statusCode;
54 } 56 }
......
...@@ -20,4 +20,6 @@ public class BaseDao { ...@@ -20,4 +20,6 @@ public class BaseDao {
20 protected ConsignmentExtMapper consignmentExtMapper; 20 protected ConsignmentExtMapper consignmentExtMapper;
21 @Autowired 21 @Autowired
22 protected AttachmentExtMapper attachmentExtMapper; 22 protected AttachmentExtMapper attachmentExtMapper;
23 + @Autowired
24 + protected EmailMapper emailMapper;
23 } 25 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 c.CONSIGNMENT_CODE, 18 c.CONSIGNMENT_CODE,
19 c.RECIPIENT_CONTACT_NAME, 19 c.RECIPIENT_CONTACT_NAME,
20 c.RECIPIENT_COMPANY, 20 c.RECIPIENT_COMPANY,
21 - c.SHIPPER_COUNTRY, 21 + c.ORIGIN_COUNTRY,
22 CASE 22 CASE
23 WHEN c.DOC_NONDOC_FLAG = 'Y' THEN 'ITEM' 23 WHEN c.DOC_NONDOC_FLAG = 'Y' THEN 'ITEM'
24 WHEN c.DOC_NONDOC_FLAG = 'N' THEN 'DOC' 24 WHEN c.DOC_NONDOC_FLAG = 'N' THEN 'DOC'
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 END AS DOC_NONDOC_FLAG, 26 END AS DOC_NONDOC_FLAG,
27 c.CREATE_USER_NAME, 27 c.CREATE_USER_NAME,
28 c.CREATE_TIME, 28 c.CREATE_TIME,
29 - c.COMMIT_TIME, 29 + c.MODIFY_TIME,
30 c.STATUS_NAME 30 c.STATUS_NAME
31 </sql> 31 </sql>
32 32
...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
41 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL) 41 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
42 OR c.user_uuid = #{uuid,jdbcType=VARCHAR} 42 OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
43 ) 43 )
44 + <if test="statusCode != null and statusCode != ''">
45 + AND c.STATUS_CODE = #{statusCode}
46 + </if>
44 <if test="createTimeFrom != null and createTimeFrom != ''"> 47 <if test="createTimeFrom != null and createTimeFrom != ''">
45 AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS') 48 AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
46 </if> 49 </if>
......
1 +package com.fedex.connect.customer.repository.repo;
2 +
3 +import com.fedex.connect.common.model.biz.Email;
4 +
5 +public interface IEmailRepository {
6 + void save(Email entity);
7 +}
1 +package com.fedex.connect.customer.repository.repo.impl;
2 +
3 +import com.fedex.connect.common.model.biz.Email;
4 +import com.fedex.connect.customer.repository.base.BaseDao;
5 +import com.fedex.connect.customer.repository.repo.IEmailRepository;
6 +import org.springframework.stereotype.Repository;
7 +
8 +@Repository
9 +public class EmailRepositoryImpl extends BaseDao implements IEmailRepository {
10 +
11 + public void save(Email entity){
12 + if(entity != null) {
13 + if (entity.getId() == null || entity.getId() <= 0) {
14 + emailMapper.insertSelective(entity);
15 + } else if (entity.getId() != null && entity.getId() > 0){
16 + emailMapper.updateByPrimaryKeySelective(entity);
17 + }
18 + }
19 + }
20 +
21 +}
...@@ -30,7 +30,7 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs ...@@ -30,7 +30,7 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs
30 } 30 }
31 31
32 @Override 32 @Override
33 - public UserConsignmentMapping save(UserConsignmentMapping entity) { 33 + public UserConsignmentMapping saveOrUpdate(UserConsignmentMapping entity) {
34 if(entity != null) { 34 if(entity != null) {
35 if (entity.getId() == null || entity.getId().longValue() <= 0) { 35 if (entity.getId() == null || entity.getId().longValue() <= 0) {
36 userConsignmentMappingMapper.insertSelective(entity); 36 userConsignmentMappingMapper.insertSelective(entity);
......
...@@ -16,5 +16,7 @@ public class BaseService { ...@@ -16,5 +16,7 @@ public class BaseService {
16 @Autowired 16 @Autowired
17 protected IUserConsignmentMappingRepository userConsignmentMappingRepository; 17 protected IUserConsignmentMappingRepository userConsignmentMappingRepository;
18 @Autowired 18 @Autowired
19 + protected IEmailRepository emailRepository;
20 + @Autowired
19 protected IPushObRepository pushObRepository; 21 protected IPushObRepository pushObRepository;
20 } 22 }
...\ No newline at end of file ...\ No newline at end of file
......
1 +package com.fedex.connect.customer.service.biz;
2 +
3 +import com.fedex.connect.common.model.biz.Consignment;
4 +import com.fedex.connect.common.model.sys.User;
5 +
6 +public interface IEmailService {
7 + void saveNotificationEmail(Consignment consignment, User user) throws Exception;
8 +}
1 package com.fedex.connect.customer.service.biz.impl; 1 package com.fedex.connect.customer.service.biz.impl;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 -import com.fedex.connect.common.dependencies.enums.base.StatusEnum;
5 -import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
6 -import com.fedex.connect.common.dependencies.util.ResponseUtils;
7 import com.fedex.connect.common.model.biz.*; 4 import com.fedex.connect.common.model.biz.*;
8 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
9 import com.fedex.connect.customer.data.bo.AddBo; 6 import com.fedex.connect.customer.data.bo.AddBo;
...@@ -12,6 +9,7 @@ import com.fedex.connect.customer.enums.ResponseCode; ...@@ -12,6 +9,7 @@ import com.fedex.connect.customer.enums.ResponseCode;
12 import com.fedex.connect.customer.service.base.BaseService; 9 import com.fedex.connect.customer.service.base.BaseService;
13 import com.fedex.connect.customer.service.biz.IAttachmentService; 10 import com.fedex.connect.customer.service.biz.IAttachmentService;
14 import com.fedex.connect.customer.service.biz.IConsignmentService; 11 import com.fedex.connect.customer.service.biz.IConsignmentService;
12 +import com.fedex.connect.customer.service.biz.IEmailService;
15 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil; 13 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
16 import com.fedex.connect.customer.util.service.biz.PushObUtil; 14 import com.fedex.connect.customer.util.service.biz.PushObUtil;
17 import com.fedex.connect.customer.util.service.biz.UploadRecordUtil; 15 import com.fedex.connect.customer.util.service.biz.UploadRecordUtil;
...@@ -22,7 +20,6 @@ import org.springframework.stereotype.Service; ...@@ -22,7 +20,6 @@ import org.springframework.stereotype.Service;
22 import org.springframework.transaction.annotation.Transactional; 20 import org.springframework.transaction.annotation.Transactional;
23 import org.springframework.web.multipart.MultipartFile; 21 import org.springframework.web.multipart.MultipartFile;
24 22
25 -import java.io.File;
26 import java.time.LocalDate; 23 import java.time.LocalDate;
27 import java.util.ArrayList; 24 import java.util.ArrayList;
28 import java.util.List; 25 import java.util.List;
...@@ -46,6 +43,8 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -46,6 +43,8 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
46 private PushObUtil pushObUtil; 43 private PushObUtil pushObUtil;
47 @Autowired 44 @Autowired
48 private IAttachmentService attachmentService; 45 private IAttachmentService attachmentService;
46 + @Autowired
47 + private IEmailService emailService;
49 48
50 /** 49 /**
51 * @Author Szl 50 * @Author Szl
...@@ -154,13 +153,13 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -154,13 +153,13 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
154 /** 153 /**
155 * 保存或更新运单表 154 * 保存或更新运单表
156 */ 155 */
157 - consignmentRepository.save(consignment); 156 + consignmentRepository.saveOrUpdate(consignment);
158 //设置上传记录表运单ID 157 //设置上传记录表运单ID
159 uploadRecord.setConsignmentId(consignment.getId()); 158 uploadRecord.setConsignmentId(consignment.getId());
160 /** 159 /**
161 * 保存上传记录表 160 * 保存上传记录表
162 */ 161 */
163 - uploadRecordRepository.save(uploadRecord); 162 + uploadRecordRepository.saveOrUpdate(uploadRecord);
164 //设置附件表运单id，上传记录表id 163 //设置附件表运单id，上传记录表id
165 Optional.ofNullable(attachmentList).orElse(new ArrayList<>()).stream().filter(Objects::nonNull).forEach(p->{ 164 Optional.ofNullable(attachmentList).orElse(new ArrayList<>()).stream().filter(Objects::nonNull).forEach(p->{
166 p.setBizId(consignment.getId()); 165 p.setBizId(consignment.getId());
...@@ -169,7 +168,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -169,7 +168,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
169 /** 168 /**
170 * 保存附件表信息 169 * 保存附件表信息
171 */ 170 */
172 - attachmentRepository.saveAll(attachmentList); 171 + attachmentRepository.saveOrUpdateAll(attachmentList);
173 //用户uuid与运单uuid不一致，则需要添加用户运单中间表信息 172 //用户uuid与运单uuid不一致，则需要添加用户运单中间表信息
174 if(!user.getUserUuid().equals(consignment.getUserUuid())){ 173 if(!user.getUserUuid().equals(consignment.getUserUuid())){
175 /** 174 /**
...@@ -184,7 +183,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -184,7 +183,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
184 /** 183 /**
185 * 初始化插入预清关文件推送任务日志 184 * 初始化插入预清关文件推送任务日志
186 */ 185 */
187 - userConsignmentMappingRepository.save(userConsignmentMapping); 186 + userConsignmentMappingRepository.saveOrUpdate(userConsignmentMapping);
188 } 187 }
189 } 188 }
190 /** 189 /**
...@@ -196,8 +195,12 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -196,8 +195,12 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
196 */ 195 */
197 PushOb pushOb = pushObUtil.initPushOb(consignment,user); 196 PushOb pushOb = pushObUtil.initPushOb(consignment,user);
198 /** 197 /**
198 + * 初始化插入提醒发件人邮件日志
199 + */
200 + emailService.saveNotificationEmail(consignment,user);
201 + /**
199 * 推送进口文件主表 202 * 推送进口文件主表
200 */ 203 */
201 - pushObRepository.save(pushOb); 204 + pushObRepository.saveOrUpdate(pushOb);
202 } 205 }
203 } 206 }
...\ No newline at end of file ...\ No newline at end of file
......
1 +package com.fedex.connect.customer.service.biz.impl;
2 +
3 +import com.fedex.connect.common.model.biz.Consignment;
4 +import com.fedex.connect.common.model.biz.Email;
5 +import com.fedex.connect.common.model.sys.User;
6 +import com.fedex.connect.customer.service.base.BaseService;
7 +import com.fedex.connect.customer.service.biz.IEmailService;
8 +import com.fedex.connect.customer.util.service.biz.EmailUtil;
9 +import org.apache.commons.lang3.StringUtils;
10 +import org.springframework.beans.factory.annotation.Autowired;
11 +import org.springframework.stereotype.Service;
12 +
13 +@Service
14 +public class EmailServiceImpl extends BaseService implements IEmailService {
15 +
16 + @Autowired
17 + private EmailUtil emailUtil;
18 +
19 + /**
20 + * @Author Szl
21 + * @Description 功能说明 如果新建运单不是该账号UUID下的运单，则发邮件通知到该运单所属用户，告知运单已被其他用户创建上传。
22 + * @Date 2024/11/20
23 + * @param consignment
24 + * @param user
25 + * @return void
26 + */
27 + @Override
28 + public void saveNotificationEmail(Consignment consignment, User user) throws Exception {
29 + if (!StringUtils.isEmpty(consignment.getUserUuid()) && consignment.getUserUuid().equals(user.getUserUuid())){
30 + return;
31 + }
32 + /**
33 + * 初始化Email对象
34 + */
35 + Email email = new Email();
36 + emailUtil.initNotificationEmail(email,consignment);
37 + /**
38 + * 保存入库
39 + */
40 + emailRepository.save(email);
41 + }
42 +}
1 +package com.fedex.connect.customer.util.service.biz;
2 +
3 +import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
4 +import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
5 +import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
6 +import com.fedex.connect.common.model.biz.Consignment;
7 +import com.fedex.connect.common.model.biz.Email;
8 +import org.springframework.stereotype.Component;
9 +
10 +@Component
11 +public class EmailUtil {
12 + public void initNotificationEmail(Email email, Consignment consignment) throws Exception{
13 + email.setBizId(consignment.getId());
14 + email.setBizCode(consignment.getConsignmentCode());
15 + email.setToAddress(consignment.getShipperEmail());
16 + email.setSubject("");
17 + email.setSubject("");
18 + email.setTypeName(EmailTypeEnum.NOTIFICATION_SENDER.getMsg());
19 + email.setTypeCode(EmailTypeEnum.NOTIFICATION_SENDER.getCode());
20 + email.setStatusName(EmailStatusEnum.PENDING.getMsg());
21 + email.setStatusCode(EmailStatusEnum.PENDING.getCode());
22 + AssignmentFieldUtils.assignmentTableBaseField(email);
23 + }
24 +}
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
16 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 16 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
17 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 17 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
18 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 18 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
19 + <result column="EXT1" jdbcType="VARCHAR" property="ext1" />
20 + <result column="EXT2" jdbcType="NUMERIC" property="ext2" />
21 + <result column="EXT3" jdbcType="TIMESTAMP" property="ext3" />
19 </resultMap> 22 </resultMap>
20 <sql id="Example_Where_Clause"> 23 <sql id="Example_Where_Clause">
21 <where> 24 <where>
...@@ -77,7 +80,7 @@ ...@@ -77,7 +80,7 @@
77 </sql> 80 </sql>
78 <sql id="Base_Column_List"> 81 <sql id="Base_Column_List">
79 ID, CODE, NAME, VALUE, TYPE_CODE, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID, 82 ID, CODE, NAME, VALUE, TYPE_CODE, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID,
80 - CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 83 + CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, EXT1, EXT2, EXT3
81 </sql> 84 </sql>
82 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultMap="BaseResultMap"> 85 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultMap="BaseResultMap">
83 <include refid="OracleDialectPrefix" /> 86 <include refid="OracleDialectPrefix" />
...@@ -120,12 +123,14 @@ ...@@ -120,12 +123,14 @@
120 VALUE, TYPE_CODE, TYPE_NAME, 123 VALUE, TYPE_CODE, TYPE_NAME,
121 STATUS, DESCRIPTION, CREATE_TIME, 124 STATUS, DESCRIPTION, CREATE_TIME,
122 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 125 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
123 - MODIFY_USER_ID, MODIFY_USER_NAME) 126 + MODIFY_USER_ID, MODIFY_USER_NAME, EXT1,
127 + EXT2, EXT3)
124 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 128 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
125 #{value,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, 129 #{value,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR},
126 #{status,jdbcType=NUMERIC}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 130 #{status,jdbcType=NUMERIC}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
127 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 131 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
128 - #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) 132 + #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR},
133 + #{ext2,jdbcType=NUMERIC}, #{ext3,jdbcType=TIMESTAMP})
129 </insert> 134 </insert>
130 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.ParamConfig"> 135 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.ParamConfig">
131 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 136 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -173,6 +178,15 @@ ...@@ -173,6 +178,15 @@
173 <if test="modifyUserName != null"> 178 <if test="modifyUserName != null">
174 MODIFY_USER_NAME, 179 MODIFY_USER_NAME,
175 </if> 180 </if>
181 + <if test="ext1 != null">
182 + EXT1,
183 + </if>
184 + <if test="ext2 != null">
185 + EXT2,
186 + </if>
187 + <if test="ext3 != null">
188 + EXT3,
189 + </if>
176 </trim> 190 </trim>
177 <trim prefix="values (" suffix=")" suffixOverrides=","> 191 <trim prefix="values (" suffix=")" suffixOverrides=",">
178 #{id,jdbcType=NUMERIC}, 192 #{id,jdbcType=NUMERIC},
...@@ -215,6 +229,15 @@ ...@@ -215,6 +229,15 @@
215 <if test="modifyUserName != null"> 229 <if test="modifyUserName != null">
216 #{modifyUserName,jdbcType=VARCHAR}, 230 #{modifyUserName,jdbcType=VARCHAR},
217 </if> 231 </if>
232 + <if test="ext1 != null">
233 + #{ext1,jdbcType=VARCHAR},
234 + </if>
235 + <if test="ext2 != null">
236 + #{ext2,jdbcType=NUMERIC},
237 + </if>
238 + <if test="ext3 != null">
239 + #{ext3,jdbcType=TIMESTAMP},
240 + </if>
218 </trim> 241 </trim>
219 </insert> 242 </insert>
220 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultType="java.lang.Long"> 243 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultType="java.lang.Long">
...@@ -268,6 +291,15 @@ ...@@ -268,6 +291,15 @@
268 <if test="record.modifyUserName != null"> 291 <if test="record.modifyUserName != null">
269 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 292 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
270 </if> 293 </if>
294 + <if test="record.ext1 != null">
295 + EXT1 = #{record.ext1,jdbcType=VARCHAR},
296 + </if>
297 + <if test="record.ext2 != null">
298 + EXT2 = #{record.ext2,jdbcType=NUMERIC},
299 + </if>
300 + <if test="record.ext3 != null">
301 + EXT3 = #{record.ext3,jdbcType=TIMESTAMP},
302 + </if>
271 </set> 303 </set>
272 <if test="_parameter != null"> 304 <if test="_parameter != null">
273 <include refid="Update_By_Example_Where_Clause" /> 305 <include refid="Update_By_Example_Where_Clause" />
...@@ -288,7 +320,10 @@ ...@@ -288,7 +320,10 @@
288 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 320 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
289 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 321 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
290 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 322 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
291 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 323 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
324 + EXT1 = #{record.ext1,jdbcType=VARCHAR},
325 + EXT2 = #{record.ext2,jdbcType=NUMERIC},
326 + EXT3 = #{record.ext3,jdbcType=TIMESTAMP}
292 <if test="_parameter != null"> 327 <if test="_parameter != null">
293 <include refid="Update_By_Example_Where_Clause" /> 328 <include refid="Update_By_Example_Where_Clause" />
294 </if> 329 </if>
...@@ -335,6 +370,15 @@ ...@@ -335,6 +370,15 @@
335 <if test="modifyUserName != null"> 370 <if test="modifyUserName != null">
336 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 371 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
337 </if> 372 </if>
373 + <if test="ext1 != null">
374 + EXT1 = #{ext1,jdbcType=VARCHAR},
375 + </if>
376 + <if test="ext2 != null">
377 + EXT2 = #{ext2,jdbcType=NUMERIC},
378 + </if>
379 + <if test="ext3 != null">
380 + EXT3 = #{ext3,jdbcType=TIMESTAMP},
381 + </if>
338 </set> 382 </set>
339 where ID = #{id,jdbcType=NUMERIC} 383 where ID = #{id,jdbcType=NUMERIC}
340 </update> 384 </update>
...@@ -352,7 +396,10 @@ ...@@ -352,7 +396,10 @@
352 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 396 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
353 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 397 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
354 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 398 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
355 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 399 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
400 + EXT1 = #{ext1,jdbcType=VARCHAR},
401 + EXT2 = #{ext2,jdbcType=NUMERIC},
402 + EXT3 = #{ext3,jdbcType=TIMESTAMP}
356 where ID = #{id,jdbcType=NUMERIC} 403 where ID = #{id,jdbcType=NUMERIC}
357 </update> 404 </update>
358 <sql id="OracleDialectPrefix"> 405 <sql id="OracleDialectPrefix">
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
24 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 24 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
25 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 25 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
26 <result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" /> 26 <result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" />
27 + <result column="addflag1" jdbcType="NUMERIC" property="addflag1" />
28 + <result column="addflag2" jdbcType="NUMERIC" property="addflag2" />
27 </resultMap> 29 </resultMap>
28 <sql id="Example_Where_Clause"> 30 <sql id="Example_Where_Clause">
29 <where> 31 <where>
...@@ -87,7 +89,7 @@ ...@@ -87,7 +89,7 @@
87 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 89 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO,
88 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 90 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME,
89 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 91 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
90 - CONFIRM_PROMPTS 92 + CONFIRM_PROMPTS, addflag1, addflag2
91 </sql> 93 </sql>
92 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap"> 94 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap">
93 <include refid="OracleDialectPrefix" /> 95 <include refid="OracleDialectPrefix" />
...@@ -133,7 +135,8 @@ ...@@ -133,7 +135,8 @@
133 TYPE_NAME, STATUS, REMARK, 135 TYPE_NAME, STATUS, REMARK,
134 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 136 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
135 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 137 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
136 - CONFIRM_PROMPTS) 138 + CONFIRM_PROMPTS, addflag1, addflag2
139 + )
137 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 140 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
138 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 141 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
139 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 142 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
...@@ -141,7 +144,8 @@ ...@@ -141,7 +144,8 @@
141 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 144 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR},
142 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 145 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
143 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 146 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
144 - #{confirmPrompts,jdbcType=NUMERIC}) 147 + #{confirmPrompts,jdbcType=NUMERIC}, #{addflag1,jdbcType=NUMERIC}, #{addflag2,jdbcType=NUMERIC}
148 + )
145 </insert> 149 </insert>
146 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User"> 150 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User">
147 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 151 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -213,6 +217,12 @@ ...@@ -213,6 +217,12 @@
213 <if test="confirmPrompts != null"> 217 <if test="confirmPrompts != null">
214 CONFIRM_PROMPTS, 218 CONFIRM_PROMPTS,
215 </if> 219 </if>
220 + <if test="addflag1 != null">
221 + addflag1,
222 + </if>
223 + <if test="addflag2 != null">
224 + addflag2,
225 + </if>
216 </trim> 226 </trim>
217 <trim prefix="values (" suffix=")" suffixOverrides=","> 227 <trim prefix="values (" suffix=")" suffixOverrides=",">
218 #{id,jdbcType=NUMERIC}, 228 #{id,jdbcType=NUMERIC},
...@@ -279,6 +289,12 @@ ...@@ -279,6 +289,12 @@
279 <if test="confirmPrompts != null"> 289 <if test="confirmPrompts != null">
280 #{confirmPrompts,jdbcType=NUMERIC}, 290 #{confirmPrompts,jdbcType=NUMERIC},
281 </if> 291 </if>
292 + <if test="addflag1 != null">
293 + #{addflag1,jdbcType=NUMERIC},
294 + </if>
295 + <if test="addflag2 != null">
296 + #{addflag2,jdbcType=NUMERIC},
297 + </if>
282 </trim> 298 </trim>
283 </insert> 299 </insert>
284 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long"> 300 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long">
...@@ -356,6 +372,12 @@ ...@@ -356,6 +372,12 @@
356 <if test="record.confirmPrompts != null"> 372 <if test="record.confirmPrompts != null">
357 CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC}, 373 CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
358 </if> 374 </if>
375 + <if test="record.addflag1 != null">
376 + addflag1 = #{record.addflag1,jdbcType=NUMERIC},
377 + </if>
378 + <if test="record.addflag2 != null">
379 + addflag2 = #{record.addflag2,jdbcType=NUMERIC},
380 + </if>
359 </set> 381 </set>
360 <if test="_parameter != null"> 382 <if test="_parameter != null">
361 <include refid="Update_By_Example_Where_Clause" /> 383 <include refid="Update_By_Example_Where_Clause" />
...@@ -384,7 +406,9 @@ ...@@ -384,7 +406,9 @@
384 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 406 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
385 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 407 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
386 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 408 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
387 - CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC} 409 + CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
410 + addflag1 = #{record.addflag1,jdbcType=NUMERIC},
411 + addflag2 = #{record.addflag2,jdbcType=NUMERIC}
388 <if test="_parameter != null"> 412 <if test="_parameter != null">
389 <include refid="Update_By_Example_Where_Clause" /> 413 <include refid="Update_By_Example_Where_Clause" />
390 </if> 414 </if>
...@@ -455,6 +479,12 @@ ...@@ -455,6 +479,12 @@
455 <if test="confirmPrompts != null"> 479 <if test="confirmPrompts != null">
456 CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC}, 480 CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
457 </if> 481 </if>
482 + <if test="addflag1 != null">
483 + addflag1 = #{addflag1,jdbcType=NUMERIC},
484 + </if>
485 + <if test="addflag2 != null">
486 + addflag2 = #{addflag2,jdbcType=NUMERIC},
487 + </if>
458 </set> 488 </set>
459 where ID = #{id,jdbcType=NUMERIC} 489 where ID = #{id,jdbcType=NUMERIC}
460 </update> 490 </update>
...@@ -480,7 +510,9 @@ ...@@ -480,7 +510,9 @@
480 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 510 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
481 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 511 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
482 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 512 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
483 - CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC} 513 + CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
514 + addflag1 = #{addflag1,jdbcType=NUMERIC},
515 + addflag2 = #{addflag2,jdbcType=NUMERIC}
484 where ID = #{id,jdbcType=NUMERIC} 516 where ID = #{id,jdbcType=NUMERIC}
485 </update> 517 </update>
486 <sql id="OracleDialectPrefix"> 518 <sql id="OracleDialectPrefix">
......
...@@ -78,6 +78,21 @@ public class ParamConfig implements Serializable { ...@@ -78,6 +78,21 @@ public class ParamConfig implements Serializable {
78 */ 78 */
79 private String modifyUserName; 79 private String modifyUserName;
80 80
81 + /**
82 + * 扩展字段1字符串
83 + */
84 + private String ext1;
85 +
86 + /**
87 + * 扩展字段2数字
88 + */
89 + private Long ext2;
90 +
91 + /**
92 + * 扩展字段3日期
93 + */
94 + private Date ext3;
95 +
81 private static final long serialVersionUID = 1L; 96 private static final long serialVersionUID = 1L;
82 97
83 public Long getId() { 98 public Long getId() {
...@@ -192,6 +207,30 @@ public class ParamConfig implements Serializable { ...@@ -192,6 +207,30 @@ public class ParamConfig implements Serializable {
192 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 207 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
193 } 208 }
194 209
210 + public String getExt1() {
211 + return ext1;
212 + }
213 +
214 + public void setExt1(String ext1) {
215 + this.ext1 = ext1 == null ? null : ext1.trim();
216 + }
217 +
218 + public Long getExt2() {
219 + return ext2;
220 + }
221 +
222 + public void setExt2(Long ext2) {
223 + this.ext2 = ext2;
224 + }
225 +
226 + public Date getExt3() {
227 + return ext3;
228 + }
229 +
230 + public void setExt3(Date ext3) {
231 + this.ext3 = ext3;
232 + }
233 +
195 @Override 234 @Override
196 public String toString() { 235 public String toString() {
197 StringBuilder sb = new StringBuilder(); 236 StringBuilder sb = new StringBuilder();
...@@ -212,6 +251,9 @@ public class ParamConfig implements Serializable { ...@@ -212,6 +251,9 @@ public class ParamConfig implements Serializable {
212 sb.append(", modifyTime=").append(modifyTime); 251 sb.append(", modifyTime=").append(modifyTime);
213 sb.append(", modifyUserId=").append(modifyUserId); 252 sb.append(", modifyUserId=").append(modifyUserId);
214 sb.append(", modifyUserName=").append(modifyUserName); 253 sb.append(", modifyUserName=").append(modifyUserName);
254 + sb.append(", ext1=").append(ext1);
255 + sb.append(", ext2=").append(ext2);
256 + sb.append(", ext3=").append(ext3);
215 sb.append(", serialVersionUID=").append(serialVersionUID); 257 sb.append(", serialVersionUID=").append(serialVersionUID);
216 sb.append("]"); 258 sb.append("]");
217 return sb.toString(); 259 return sb.toString();
......
...@@ -1044,6 +1044,196 @@ public class ParamConfigExample { ...@@ -1044,6 +1044,196 @@ public class ParamConfigExample {
1044 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 1044 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
1045 return (Criteria) this; 1045 return (Criteria) this;
1046 } 1046 }
1047 +
1048 + public Criteria andExt1IsNull() {
1049 + addCriterion("EXT1 is null");
1050 + return (Criteria) this;
1051 + }
1052 +
1053 + public Criteria andExt1IsNotNull() {
1054 + addCriterion("EXT1 is not null");
1055 + return (Criteria) this;
1056 + }
1057 +
1058 + public Criteria andExt1EqualTo(String value) {
1059 + addCriterion("EXT1 =", value, "ext1");
1060 + return (Criteria) this;
1061 + }
1062 +
1063 + public Criteria andExt1NotEqualTo(String value) {
1064 + addCriterion("EXT1 <>", value, "ext1");
1065 + return (Criteria) this;
1066 + }
1067 +
1068 + public Criteria andExt1GreaterThan(String value) {
1069 + addCriterion("EXT1 >", value, "ext1");
1070 + return (Criteria) this;
1071 + }
1072 +
1073 + public Criteria andExt1GreaterThanOrEqualTo(String value) {
1074 + addCriterion("EXT1 >=", value, "ext1");
1075 + return (Criteria) this;
1076 + }
1077 +
1078 + public Criteria andExt1LessThan(String value) {
1079 + addCriterion("EXT1 <", value, "ext1");
1080 + return (Criteria) this;
1081 + }
1082 +
1083 + public Criteria andExt1LessThanOrEqualTo(String value) {
1084 + addCriterion("EXT1 <=", value, "ext1");
1085 + return (Criteria) this;
1086 + }
1087 +
1088 + public Criteria andExt1Like(String value) {
1089 + addCriterion("EXT1 like", value, "ext1");
1090 + return (Criteria) this;
1091 + }
1092 +
1093 + public Criteria andExt1NotLike(String value) {
1094 + addCriterion("EXT1 not like", value, "ext1");
1095 + return (Criteria) this;
1096 + }
1097 +
1098 + public Criteria andExt1In(List<String> values) {
1099 + addCriterion("EXT1 in", values, "ext1");
1100 + return (Criteria) this;
1101 + }
1102 +
1103 + public Criteria andExt1NotIn(List<String> values) {
1104 + addCriterion("EXT1 not in", values, "ext1");
1105 + return (Criteria) this;
1106 + }
1107 +
1108 + public Criteria andExt1Between(String value1, String value2) {
1109 + addCriterion("EXT1 between", value1, value2, "ext1");
1110 + return (Criteria) this;
1111 + }
1112 +
1113 + public Criteria andExt1NotBetween(String value1, String value2) {
1114 + addCriterion("EXT1 not between", value1, value2, "ext1");
1115 + return (Criteria) this;
1116 + }
1117 +
1118 + public Criteria andExt2IsNull() {
1119 + addCriterion("EXT2 is null");
1120 + return (Criteria) this;
1121 + }
1122 +
1123 + public Criteria andExt2IsNotNull() {
1124 + addCriterion("EXT2 is not null");
1125 + return (Criteria) this;
1126 + }
1127 +
1128 + public Criteria andExt2EqualTo(Long value) {
1129 + addCriterion("EXT2 =", value, "ext2");
1130 + return (Criteria) this;
1131 + }
1132 +
1133 + public Criteria andExt2NotEqualTo(Long value) {
1134 + addCriterion("EXT2 <>", value, "ext2");
1135 + return (Criteria) this;
1136 + }
1137 +
1138 + public Criteria andExt2GreaterThan(Long value) {
1139 + addCriterion("EXT2 >", value, "ext2");
1140 + return (Criteria) this;
1141 + }
1142 +
1143 + public Criteria andExt2GreaterThanOrEqualTo(Long value) {
1144 + addCriterion("EXT2 >=", value, "ext2");
1145 + return (Criteria) this;
1146 + }
1147 +
1148 + public Criteria andExt2LessThan(Long value) {
1149 + addCriterion("EXT2 <", value, "ext2");
1150 + return (Criteria) this;
1151 + }
1152 +
1153 + public Criteria andExt2LessThanOrEqualTo(Long value) {
1154 + addCriterion("EXT2 <=", value, "ext2");
1155 + return (Criteria) this;
1156 + }
1157 +
1158 + public Criteria andExt2In(List<Long> values) {
1159 + addCriterion("EXT2 in", values, "ext2");
1160 + return (Criteria) this;
1161 + }
1162 +
1163 + public Criteria andExt2NotIn(List<Long> values) {
1164 + addCriterion("EXT2 not in", values, "ext2");
1165 + return (Criteria) this;
1166 + }
1167 +
1168 + public Criteria andExt2Between(Long value1, Long value2) {
1169 + addCriterion("EXT2 between", value1, value2, "ext2");
1170 + return (Criteria) this;
1171 + }
1172 +
1173 + public Criteria andExt2NotBetween(Long value1, Long value2) {
1174 + addCriterion("EXT2 not between", value1, value2, "ext2");
1175 + return (Criteria) this;
1176 + }
1177 +
1178 + public Criteria andExt3IsNull() {
1179 + addCriterion("EXT3 is null");
1180 + return (Criteria) this;
1181 + }
1182 +
1183 + public Criteria andExt3IsNotNull() {
1184 + addCriterion("EXT3 is not null");
1185 + return (Criteria) this;
1186 + }
1187 +
1188 + public Criteria andExt3EqualTo(Date value) {
1189 + addCriterion("EXT3 =", value, "ext3");
1190 + return (Criteria) this;
1191 + }
1192 +
1193 + public Criteria andExt3NotEqualTo(Date value) {
1194 + addCriterion("EXT3 <>", value, "ext3");
1195 + return (Criteria) this;
1196 + }
1197 +
1198 + public Criteria andExt3GreaterThan(Date value) {
1199 + addCriterion("EXT3 >", value, "ext3");
1200 + return (Criteria) this;
1201 + }
1202 +
1203 + public Criteria andExt3GreaterThanOrEqualTo(Date value) {
1204 + addCriterion("EXT3 >=", value, "ext3");
1205 + return (Criteria) this;
1206 + }
1207 +
1208 + public Criteria andExt3LessThan(Date value) {
1209 + addCriterion("EXT3 <", value, "ext3");
1210 + return (Criteria) this;
1211 + }
1212 +
1213 + public Criteria andExt3LessThanOrEqualTo(Date value) {
1214 + addCriterion("EXT3 <=", value, "ext3");
1215 + return (Criteria) this;
1216 + }
1217 +
1218 + public Criteria andExt3In(List<Date> values) {
1219 + addCriterion("EXT3 in", values, "ext3");
1220 + return (Criteria) this;
1221 + }
1222 +
1223 + public Criteria andExt3NotIn(List<Date> values) {
1224 + addCriterion("EXT3 not in", values, "ext3");
1225 + return (Criteria) this;
1226 + }
1227 +
1228 + public Criteria andExt3Between(Date value1, Date value2) {
1229 + addCriterion("EXT3 between", value1, value2, "ext3");
1230 + return (Criteria) this;
1231 + }
1232 +
1233 + public Criteria andExt3NotBetween(Date value1, Date value2) {
1234 + addCriterion("EXT3 not between", value1, value2, "ext3");
1235 + return (Criteria) this;
1236 + }
1047 } 1237 }
1048 1238
1049 public static class Criteria extends GeneratedCriteria { 1239 public static class Criteria extends GeneratedCriteria {
......
...@@ -119,6 +119,16 @@ public class User implements Serializable { ...@@ -119,6 +119,16 @@ public class User implements Serializable {
119 */ 119 */
120 private Long confirmPrompts; 120 private Long confirmPrompts;
121 121
122 + /**
123 + * ADD时弹出提示1
124 + */
125 + private Integer addflag1;
126 +
127 + /**
128 + * ADD时弹出提示2
129 + */
130 + private Integer addflag2;
131 +
122 private static final long serialVersionUID = 1L; 132 private static final long serialVersionUID = 1L;
123 133
124 public Long getId() { 134 public Long getId() {
...@@ -297,6 +307,22 @@ public class User implements Serializable { ...@@ -297,6 +307,22 @@ public class User implements Serializable {
297 this.confirmPrompts = confirmPrompts; 307 this.confirmPrompts = confirmPrompts;
298 } 308 }
299 309
310 + public Integer getAddflag1() {
311 + return addflag1;
312 + }
313 +
314 + public void setAddflag1(Integer addflag1) {
315 + this.addflag1 = addflag1;
316 + }
317 +
318 + public Integer getAddflag2() {
319 + return addflag2;
320 + }
321 +
322 + public void setAddflag2(Integer addflag2) {
323 + this.addflag2 = addflag2;
324 + }
325 +
300 @Override 326 @Override
301 public String toString() { 327 public String toString() {
302 StringBuilder sb = new StringBuilder(); 328 StringBuilder sb = new StringBuilder();
...@@ -325,6 +351,8 @@ public class User implements Serializable { ...@@ -325,6 +351,8 @@ public class User implements Serializable {
325 sb.append(", modifyUserId=").append(modifyUserId); 351 sb.append(", modifyUserId=").append(modifyUserId);
326 sb.append(", modifyUserName=").append(modifyUserName); 352 sb.append(", modifyUserName=").append(modifyUserName);
327 sb.append(", confirmPrompts=").append(confirmPrompts); 353 sb.append(", confirmPrompts=").append(confirmPrompts);
354 + sb.append(", addflag1=").append(addflag1);
355 + sb.append(", addflag2=").append(addflag2);
328 sb.append(", serialVersionUID=").append(serialVersionUID); 356 sb.append(", serialVersionUID=").append(serialVersionUID);
329 sb.append("]"); 357 sb.append("]");
330 return sb.toString(); 358 return sb.toString();
......
...@@ -1594,6 +1594,126 @@ public class UserExample { ...@@ -1594,6 +1594,126 @@ public class UserExample {
1594 addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts"); 1594 addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts");
1595 return (Criteria) this; 1595 return (Criteria) this;
1596 } 1596 }
1597 +
1598 + public Criteria andAddflag1IsNull() {
1599 + addCriterion("addflag1 is null");
1600 + return (Criteria) this;
1601 + }
1602 +
1603 + public Criteria andAddflag1IsNotNull() {
1604 + addCriterion("addflag1 is not null");
1605 + return (Criteria) this;
1606 + }
1607 +
1608 + public Criteria andAddflag1EqualTo(Long value) {
1609 + addCriterion("addflag1 =", value, "addflag1");
1610 + return (Criteria) this;
1611 + }
1612 +
1613 + public Criteria andAddflag1NotEqualTo(Long value) {
1614 + addCriterion("addflag1 <>", value, "addflag1");
1615 + return (Criteria) this;
1616 + }
1617 +
1618 + public Criteria andAddflag1GreaterThan(Long value) {
1619 + addCriterion("addflag1 >", value, "addflag1");
1620 + return (Criteria) this;
1621 + }
1622 +
1623 + public Criteria andAddflag1GreaterThanOrEqualTo(Long value) {
1624 + addCriterion("addflag1 >=", value, "addflag1");
1625 + return (Criteria) this;
1626 + }
1627 +
1628 + public Criteria andAddflag1LessThan(Long value) {
1629 + addCriterion("addflag1 <", value, "addflag1");
1630 + return (Criteria) this;
1631 + }
1632 +
1633 + public Criteria andAddflag1LessThanOrEqualTo(Long value) {
1634 + addCriterion("addflag1 <=", value, "addflag1");
1635 + return (Criteria) this;
1636 + }
1637 +
1638 + public Criteria andAddflag1In(List<Long> values) {
1639 + addCriterion("addflag1 in", values, "addflag1");
1640 + return (Criteria) this;
1641 + }
1642 +
1643 + public Criteria andAddflag1NotIn(List<Long> values) {
1644 + addCriterion("addflag1 not in", values, "addflag1");
1645 + return (Criteria) this;
1646 + }
1647 +
1648 + public Criteria andAddflag1Between(Long value1, Long value2) {
1649 + addCriterion("addflag1 between", value1, value2, "addflag1");
1650 + return (Criteria) this;
1651 + }
1652 +
1653 + public Criteria andAddflag1NotBetween(Long value1, Long value2) {
1654 + addCriterion("addflag1 not between", value1, value2, "addflag1");
1655 + return (Criteria) this;
1656 + }
1657 +
1658 + public Criteria andAddflag2IsNull() {
1659 + addCriterion("addflag2 is null");
1660 + return (Criteria) this;
1661 + }
1662 +
1663 + public Criteria andAddflag2IsNotNull() {
1664 + addCriterion("addflag2 is not null");
1665 + return (Criteria) this;
1666 + }
1667 +
1668 + public Criteria andAddflag2EqualTo(Long value) {
1669 + addCriterion("addflag2 =", value, "addflag2");
1670 + return (Criteria) this;
1671 + }
1672 +
1673 + public Criteria andAddflag2NotEqualTo(Long value) {
1674 + addCriterion("addflag2 <>", value, "addflag2");
1675 + return (Criteria) this;
1676 + }
1677 +
1678 + public Criteria andAddflag2GreaterThan(Long value) {
1679 + addCriterion("addflag2 >", value, "addflag2");
1680 + return (Criteria) this;
1681 + }
1682 +
1683 + public Criteria andAddflag2GreaterThanOrEqualTo(Long value) {
1684 + addCriterion("addflag2 >=", value, "addflag2");
1685 + return (Criteria) this;
1686 + }
1687 +
1688 + public Criteria andAddflag2LessThan(Long value) {
1689 + addCriterion("addflag2 <", value, "addflag2");
1690 + return (Criteria) this;
1691 + }
1692 +
1693 + public Criteria andAddflag2LessThanOrEqualTo(Long value) {
1694 + addCriterion("addflag2 <=", value, "addflag2");
1695 + return (Criteria) this;
1696 + }
1697 +
1698 + public Criteria andAddflag2In(List<Long> values) {
1699 + addCriterion("addflag2 in", values, "addflag2");
1700 + return (Criteria) this;
1701 + }
1702 +
1703 + public Criteria andAddflag2NotIn(List<Long> values) {
1704 + addCriterion("addflag2 not in", values, "addflag2");
1705 + return (Criteria) this;
1706 + }
1707 +
1708 + public Criteria andAddflag2Between(Long value1, Long value2) {
1709 + addCriterion("addflag2 between", value1, value2, "addflag2");
1710 + return (Criteria) this;
1711 + }
1712 +
1713 + public Criteria andAddflag2NotBetween(Long value1, Long value2) {
1714 + addCriterion("addflag2 not between", value1, value2, "addflag2");
1715 + return (Criteria) this;
1716 + }
1597 } 1717 }
1598 1718
1599 public static class Criteria extends GeneratedCriteria { 1719 public static class Criteria extends GeneratedCriteria {
......
...@@ -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,12 +73,12 @@ ...@@ -73,12 +73,12 @@
73 generatedKey 指定KEY，Oracle需要指定序列。 73 generatedKey 指定KEY，Oracle需要指定序列。
74 sqlStatement 指定序列名称 74 sqlStatement 指定序列名称
75 --> 75 -->
76 - <table schema="ICLEARIMP" tableName="T_BIZ_USER_CONSIGNMENT_MAPPING" domainObjectName="UserConsignmentMapping" 76 +<!-- <table schema="ICLEARIMP" tableName="T_BIZ_USER_CONSIGNMENT_MAPPING" domainObjectName="UserConsignmentMapping"-->
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">-->
80 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL" /> 80 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL" />-->
81 - </table> 81 +<!-- </table>-->
82 82
83 83
84 <!-- <table schema="ICLEARIMP" tableName="T_LOG_OPERATION" domainObjectName="Operation"--> 84 <!-- <table schema="ICLEARIMP" tableName="T_LOG_OPERATION" domainObjectName="Operation"-->
...@@ -169,12 +169,12 @@ ...@@ -169,12 +169,12 @@
169 <!-- selectByExampleQueryId="true">--> 169 <!-- selectByExampleQueryId="true">-->
170 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />--> 170 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
171 <!-- </table>--> 171 <!-- </table>-->
172 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"--> 172 + <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
173 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 173 + enableCountByExample="true" enableUpdateByExample="true"
174 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 174 + enableDeleteByExample="true" enableSelectByExample="true"
175 -<!-- selectByExampleQueryId="true">--> 175 + selectByExampleQueryId="true">
176 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />--> 176 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
177 -<!-- </table>--> 177 + </table>
178 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"--> 178 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
179 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 179 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
180 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 180 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...@@ -193,12 +193,12 @@ ...@@ -193,12 +193,12 @@
193 <!-- selectByExampleQueryId="true">--> 193 <!-- selectByExampleQueryId="true">-->
194 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />--> 194 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
195 <!-- </table>--> 195 <!-- </table>-->
196 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"--> 196 + <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
197 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 197 + enableCountByExample="true" enableUpdateByExample="true"
198 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 198 + enableDeleteByExample="true" enableSelectByExample="true"
199 -<!-- selectByExampleQueryId="true">--> 199 + selectByExampleQueryId="true">
200 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />--> 200 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
201 -<!-- </table>--> 201 + </table>
202 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"--> 202 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
203 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 203 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
204 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 204 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
...@@ -21,6 +21,13 @@ public interface ParamConfigConstants { ...@@ -21,6 +21,13 @@ public interface ParamConfigConstants {
21 * @Date 2024/11/20 21 * @Date 2024/11/20
22 */ 22 */
23 interface TASK_PARAM_KEYS{ 23 interface TASK_PARAM_KEYS{
24 - 24 + //推送TW001间隔配置key
25 + String PUSH_IMP001_INTERVAL = "push_imp001_interval";
26 + //推送进口文件定时任务处理数量
27 + String PUSH_CON_NUMBER = "push_con_number";
28 + //通知发件人定时任务处理数量
29 + String NOTIFICATION_SENDER_NUMBER = "notification_sender_number";
30 + //通知发件人邮件定时任务处理数量
31 + String NOTIFICATION_SENDER_EMAIL_NUMBER = "notification_sender_email_number";
25 } 32 }
26 } 33 }
......
...@@ -6,26 +6,27 @@ package com.fedex.connect.common.dependencies.enums.biz; ...@@ -6,26 +6,27 @@ package com.fedex.connect.common.dependencies.enums.biz;
6 * @Date 2024/11/19 6 * @Date 2024/11/19
7 */ 7 */
8 public enum EmailStatusEnum { 8 public enum EmailStatusEnum {
9 - PENDING(0L,"pending","待发送"), 9 + PENDING("emailStatus_01","pending","待发送"),
10 - SUCCESS(1L,"success","发送成功"), 10 + SUCCESS("emailStatus_02","success","发送成功"),
11 - FAILED(2L,"failed","发送失败"), 11 + FAILED("emailStatus_03","failed","发送失败"),
12 +
12 ; 13 ;
13 14
14 - private Long code; 15 + private String code;
15 private String enMsg; 16 private String enMsg;
16 private String msg; 17 private String msg;
17 18
18 - EmailStatusEnum(Long code, String enMsg,String msg) { 19 + EmailStatusEnum(String code, String enMsg,String msg) {
19 this.code = code; 20 this.code = code;
20 this.enMsg = enMsg; 21 this.enMsg = enMsg;
21 this.msg = msg; 22 this.msg = msg;
22 } 23 }
23 24
24 - public Long getCode() { 25 + public String getCode() {
25 return code; 26 return code;
26 } 27 }
27 28
28 - public void setCode(Long code) { 29 + public void setCode(String code) {
29 this.code = code; 30 this.code = code;
30 } 31 }
31 32
......
...@@ -6,24 +6,26 @@ package com.fedex.connect.common.dependencies.enums.biz; ...@@ -6,24 +6,26 @@ package com.fedex.connect.common.dependencies.enums.biz;
6 * @Date 2024/11/19 6 * @Date 2024/11/19
7 */ 7 */
8 public enum EmailTypeEnum { 8 public enum EmailTypeEnum {
9 - PUSH_CON_FILE(0L,"pushConFile","推送预清关文件"), 9 + PUSH_CON_FILE("emailType_01","pushConFile","推送预清关文件"),
10 + NOTIFICATION_SENDER("emailType_02","notificationSender","提醒发件人"),
11 +
10 ; 12 ;
11 13
12 - private Long code; 14 + private String code;
13 private String enMsg; 15 private String enMsg;
14 private String msg; 16 private String msg;
15 17
16 - EmailTypeEnum(Long code, String enMsg,String msg) { 18 + EmailTypeEnum(String code, String enMsg,String msg) {
17 this.code = code; 19 this.code = code;
18 this.enMsg = enMsg; 20 this.enMsg = enMsg;
19 this.msg = msg; 21 this.msg = msg;
20 } 22 }
21 23
22 - public Long getCode() { 24 + public String getCode() {
23 return code; 25 return code;
24 } 26 }
25 27
26 - public void setCode(Long code) { 28 + public void setCode(String code) {
27 this.code = code; 29 this.code = code;
28 } 30 }
29 31
......
...@@ -2,17 +2,18 @@ package com.fedex.connect.common.dependencies.repository.base; ...@@ -2,17 +2,18 @@ package com.fedex.connect.common.dependencies.repository.base;
2 2
3 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper; 3 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
4 import com.fedex.connect.common.dao.log.OperationMapper; 4 import com.fedex.connect.common.dao.log.OperationMapper;
5 +import com.fedex.connect.common.dao.sys.ParamConfigMapper;
5 import com.fedex.connect.common.dao.sys.RedisSlabMapper; 6 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
6 import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt; 7 import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt;
7 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
8 9
9 public class BaseDao { 10 public class BaseDao {
10 @Autowired 11 @Autowired
11 - public UserMapperExt userMapperExt; 12 + protected UserMapperExt userMapperExt;
12 @Autowired 13 @Autowired
13 - public RedisSlabMapper redisSlabMapper; 14 + protected RedisSlabMapper redisSlabMapper;
14 @Autowired 15 @Autowired
15 - public DictionaryEntriesMapper dictionaryEntriesMapper; 16 + protected DictionaryEntriesMapper dictionaryEntriesMapper;
16 @Autowired 17 @Autowired
17 - public OperationMapper operationMapper; 18 + protected OperationMapper operationMapper;
18 } 19 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -134,9 +134,13 @@ public class DateUtil { ...@@ -134,9 +134,13 @@ public class DateUtil {
134 } 134 }
135 135
136 public static void main(String[] args){ 136 public static void main(String[] args){
137 - String prematchFltDate = "2019-06-11 15:52:52"; 137 + String ddd = "2024-11-20 16:00:00";
138 - prematchFltDate = prematchFltDate.length()>10 ? prematchFltDate.substring(10): prematchFltDate; 138 + Date beginDate = parse(ddd,PATTERN_DATE_TIME);
139 - logger.info(prematchFltDate); 139 + Date endDate = new Date();
140 + long diffInMilliseconds = Math.abs(endDate.getTime() - beginDate.getTime());
141 + // 引用形式的描述信息
142 + long diffInMinutes = diffInMilliseconds / (60 * 1000); // 将毫秒差值转换为分钟数
143 + System.out.println(diffInMinutes);
140 } 144 }
141 145
142 /** 146 /**
......
...@@ -23,4 +23,11 @@ public class DicEntriesController extends BaseController implements IDicEntriesC ...@@ -23,4 +23,11 @@ public class DicEntriesController extends BaseController implements IDicEntriesC
23 List<DictionaryEntries> countryList = dicEntriesService.getCountryAll(); 23 List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
24 return responseUtils.success(countryList); 24 return responseUtils.success(countryList);
25 } 25 }
26 +
27 + @GetMapping("/getConsStatus")
28 + @ApiOperation(value = "ResponseVo", notes = "获取运单状态")
29 + public ResponseVo getConsStatus(){
30 + List<DictionaryEntries> countryList = dicEntriesService.getConsStatus();
31 + return responseUtils.success(countryList);
32 + }
26 } 33 }
......
1 package com.fedex.connect.manager.controller.sys; 1 package com.fedex.connect.manager.controller.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 +import com.fedex.connect.manager.data.bo.AddFlagBo;
4 5
5 public interface ISysUserController { 6 public interface ISysUserController {
6 ResponseVo getUser(); 7 ResponseVo getUser();
8 +
9 + ResponseVo updateAddFlag(AddFlagBo bo);
7 } 10 }
......
...@@ -3,9 +3,9 @@ package com.fedex.connect.manager.controller.sys.impl; ...@@ -3,9 +3,9 @@ package com.fedex.connect.manager.controller.sys.impl;
3 3
4 import com.fedex.connect.common.dependencies.authentication.SecurityConstants; 4 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
5 import com.fedex.connect.common.dependencies.cache.CacheSystem; 5 import com.fedex.connect.common.dependencies.cache.CacheSystem;
6 +import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
6 import com.fedex.connect.common.dependencies.contants.RedisConstants; 7 import com.fedex.connect.common.dependencies.contants.RedisConstants;
7 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 8 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
8 -import com.fedex.connect.common.dependencies.enums.sys.ParamConfigEnum;
9 import com.fedex.connect.common.dependencies.enums.sys.UserLoginTypeEnum; 9 import com.fedex.connect.common.dependencies.enums.sys.UserLoginTypeEnum;
10 import com.fedex.connect.common.dependencies.util.GsonUtils; 10 import com.fedex.connect.common.dependencies.util.GsonUtils;
11 import com.fedex.connect.common.dependencies.util.JwtTokenUtils; 11 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
...@@ -91,7 +91,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl ...@@ -91,7 +91,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
91 ResponseVo tokenResult = sysAuthService.createFclToken(jsonObject); 91 ResponseVo tokenResult = sysAuthService.createFclToken(jsonObject);
92 if (tokenResult.isSuccess()){ 92 if (tokenResult.isSuccess()){
93 String fcl_token_key = String.valueOf(tokenResult.getData()); 93 String fcl_token_key = String.valueOf(tokenResult.getData());
94 - String redirectUrl = String.format("%s?token=%s", paramConfigUtil.getParamValue(ParamConfigEnum.FCL_LOGIN_URL.getEnMsg()), fcl_token_key); 94 + String redirectUrl = String.format("%s?token=%s", paramConfigUtil.getParamValue(ParamConfigConstants.FCL_PARAM_KEYS.FCL_LOGIN_URL), fcl_token_key);
95 System.out.println(redirectUrl); 95 System.out.println(redirectUrl);
96 res.sendRedirect(redirectUrl); 96 res.sendRedirect(redirectUrl);
97 } 97 }
......
...@@ -5,13 +5,12 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo; ...@@ -5,13 +5,12 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
5 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
6 import com.fedex.connect.manager.controller.base.BaseController; 6 import com.fedex.connect.manager.controller.base.BaseController;
7 import com.fedex.connect.manager.controller.sys.ISysUserController; 7 import com.fedex.connect.manager.controller.sys.ISysUserController;
8 +import com.fedex.connect.manager.data.bo.AddFlagBo;
8 import com.fedex.connect.manager.enums.ResponseCode; 9 import com.fedex.connect.manager.enums.ResponseCode;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
11 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
12 -import org.springframework.web.bind.annotation.GetMapping; 13 +import org.springframework.web.bind.annotation.*;
13 -import org.springframework.web.bind.annotation.RequestMapping;
14 -import org.springframework.web.bind.annotation.RestController;
15 14
16 @Slf4j 15 @Slf4j
17 @RestController 16 @RestController
...@@ -41,4 +40,24 @@ public class SysUserController extends BaseController implements ISysUserControl ...@@ -41,4 +40,24 @@ public class SysUserController extends BaseController implements ISysUserControl
41 } 40 }
42 return success; 41 return success;
43 } 42 }
43 +
44 + @Override
45 + @PostMapping("/updateAddFlag")
46 + @ApiOperation(value = "更新ADD标记")
47 + public ResponseVo updateAddFlag(@RequestBody AddFlagBo bo){
48 + ResponseVo success = responseUtils.success();
49 + try{
50 + User sysUser = this.getCurrentUserInfo();
51 + /**
52 + * 更新ADD标记
53 + */
54 + sysUserService.updateAddFlag(sysUser,bo);
55 + //返回用户信息
56 + return responseUtils.success(sysUser);
57 + } catch (Exception e){
58 + log.error("获取用户信息失败",e);
59 + responseUtils.fail(ResponseCode.MESSAGE_CODE_40006);
60 + }
61 + return success;
62 + }
44 } 63 }
......
1 +package com.fedex.connect.manager.data.bo;
2 +
3 +import lombok.Data;
4 +
5 +@Data
6 +public class AddFlagBo {
7 + private Integer addFlag1;
8 + private Integer addFlag2;
9 +}
...@@ -12,7 +12,7 @@ import com.fedex.connect.manager.repository.dao.RoleExtMapper; ...@@ -12,7 +12,7 @@ import com.fedex.connect.manager.repository.dao.RoleExtMapper;
12 import com.fedex.connect.manager.repository.dao.RolePrivilegeExtMapper; 12 import com.fedex.connect.manager.repository.dao.RolePrivilegeExtMapper;
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 14
15 -public class BaseDao { 15 +public class AbstractDaoRepository {
16 @Autowired 16 @Autowired
17 public UserLoginInfoMapper userLoginInfoMapper; 17 public UserLoginInfoMapper userLoginInfoMapper;
18 @Autowired 18 @Autowired
......
...@@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Select; ...@@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Select;
5 5
6 public interface ParamConfigExtMapper { 6 public interface ParamConfigExtMapper {
7 7
8 - @Select("SELECT VALUE FROM T_SYS_PARAM_CONFIG WHERE CODE = #{code}") 8 + @Select("SELECT VALUE FROM T_SYS_PARAM_CONFIG WHERE CODE = #{code} AND STATUS = 1")
9 String findValueByCode(@Param("code") String code); 9 String findValueByCode(@Param("code") String code);
10 } 10 }
......
...@@ -6,4 +6,6 @@ import java.util.List; ...@@ -6,4 +6,6 @@ import java.util.List;
6 6
7 public interface IDicEntriesRepository { 7 public interface IDicEntriesRepository {
8 List<DictionaryEntries> getCountryAll(); 8 List<DictionaryEntries> getCountryAll();
9 +
10 + List<DictionaryEntries> getConsStatus();
9 } 11 }
......
...@@ -3,7 +3,7 @@ package com.fedex.connect.manager.repository.repo.bi.impl; ...@@ -3,7 +3,7 @@ package com.fedex.connect.manager.repository.repo.bi.impl;
3 import com.fedex.connect.common.dependencies.cache.CacheSystem; 3 import com.fedex.connect.common.dependencies.cache.CacheSystem;
4 import com.fedex.connect.common.dependencies.contants.DictionaryConstants; 4 import com.fedex.connect.common.dependencies.contants.DictionaryConstants;
5 import com.fedex.connect.common.model.bi.DictionaryEntries; 5 import com.fedex.connect.common.model.bi.DictionaryEntries;
6 -import com.fedex.connect.manager.repository.base.BaseDao; 6 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
7 import com.fedex.connect.manager.repository.repo.bi.IDicEntriesRepository; 7 import com.fedex.connect.manager.repository.repo.bi.IDicEntriesRepository;
8 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.stereotype.Repository; 9 import org.springframework.stereotype.Repository;
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
16 * @Date 2024/11/6 16 * @Date 2024/11/6
17 */ 17 */
18 @Repository 18 @Repository
19 -public class DicEntriesRepositoryImpl extends BaseDao implements IDicEntriesRepository { 19 +public class DicEntriesRepositoryImpl extends AbstractDaoRepository implements IDicEntriesRepository {
20 @Autowired 20 @Autowired
21 CacheSystem cacheSystem; 21 CacheSystem cacheSystem;
22 22
...@@ -30,4 +30,9 @@ public class DicEntriesRepositoryImpl extends BaseDao implements IDicEntriesRepo ...@@ -30,4 +30,9 @@ public class DicEntriesRepositoryImpl extends BaseDao implements IDicEntriesRepo
30 public List<DictionaryEntries> getCountryAll(){ 30 public List<DictionaryEntries> getCountryAll(){
31 return cacheSystem.getDictionarysByDicCode(DictionaryConstants.COUNTRY); 31 return cacheSystem.getDictionarysByDicCode(DictionaryConstants.COUNTRY);
32 } 32 }
33 +
34 + @Override
35 + public List<DictionaryEntries> getConsStatus() {
36 + return cacheSystem.getDictionarysByDicCode(DictionaryConstants.CONSIGNMENT_STATUS);
37 + }
33 } 38 }
......
1 package com.fedex.connect.manager.repository.repo.log.impl; 1 package com.fedex.connect.manager.repository.repo.log.impl;
2 2
3 import com.fedex.connect.common.model.log.UserLoginInfo; 3 import com.fedex.connect.common.model.log.UserLoginInfo;
4 -import com.fedex.connect.manager.repository.base.BaseDao; 4 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
5 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository; 5 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
7 7
8 @Repository 8 @Repository
9 -public class UserLoginLogRepositoryImpl extends BaseDao implements IUserLoginLogRepository { 9 +public class UserLoginLogRepositoryImpl extends AbstractDaoRepository implements IUserLoginLogRepository {
10 10
11 @Override 11 @Override
12 public int insert(UserLoginInfo userLoginInfo) { 12 public int insert(UserLoginInfo userLoginInfo) {
......
1 package com.fedex.connect.manager.repository.repo.sys; 1 package com.fedex.connect.manager.repository.repo.sys;
2 2
3 -public interface IParamConfigExtRepository { 3 +public interface IParamConfigRepository {
4 String findValueByCode(String code); 4 String findValueByCode(String code);
5 } 5 }
......
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.manager.repository.base.BaseDao; 3 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
4 -import com.fedex.connect.manager.repository.repo.sys.IParamConfigExtRepository; 4 +import com.fedex.connect.manager.repository.repo.sys.IParamConfigRepository;
5 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
6 6
7 @Repository 7 @Repository
8 -public class ParamConfigExtRepositoryImpl extends BaseDao implements IParamConfigExtRepository { 8 +public class ParamConfigRepositoryImpl extends AbstractDaoRepository implements IParamConfigRepository {
9 9
10 @Override 10 @Override
11 public String findValueByCode(String code) { 11 public String findValueByCode(String code) {
......
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.Privilege; 3 import com.fedex.connect.common.model.sys.Privilege;
4 -import com.fedex.connect.manager.repository.base.BaseDao; 4 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
5 import com.fedex.connect.manager.repository.repo.sys.IPrivilegeRepository; 5 import com.fedex.connect.manager.repository.repo.sys.IPrivilegeRepository;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
7 7
8 import java.util.List; 8 import java.util.List;
9 9
10 @Repository 10 @Repository
11 -public class PrivilegeRepositoryImpl extends BaseDao implements IPrivilegeRepository { 11 +public class PrivilegeRepositoryImpl extends AbstractDaoRepository implements IPrivilegeRepository {
12 12
13 @Override 13 @Override
14 public List<Privilege> findPrivilegesByIds(List<Long> ids) { 14 public List<Privilege> findPrivilegesByIds(List<Long> ids) {
......
...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl; ...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.RedisSlab; 3 import com.fedex.connect.common.model.sys.RedisSlab;
4 import com.fedex.connect.common.model.sys.RedisSlabExample; 4 import com.fedex.connect.common.model.sys.RedisSlabExample;
5 -import com.fedex.connect.manager.repository.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
6 import com.fedex.connect.manager.repository.repo.sys.IRedisSlabRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IRedisSlabRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
10 10
11 @Repository 11 @Repository
12 -public class RedisSlabExtImpl extends BaseDao implements IRedisSlabRepository { 12 +public class RedisSlabExtImpl extends AbstractDaoRepository implements IRedisSlabRepository {
13 13
14 @Override 14 @Override
15 public int insert(RedisSlab record) { 15 public int insert(RedisSlab record) {
......
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.manager.repository.base.BaseDao; 3 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
4 import com.fedex.connect.manager.repository.repo.sys.IRolePrivilegeRepository; 4 import com.fedex.connect.manager.repository.repo.sys.IRolePrivilegeRepository;
5 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
...@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; ...@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
8 import java.util.List; 8 import java.util.List;
9 9
10 @Repository 10 @Repository
11 -public class RolePrivilegeRepositoryImpl extends BaseDao implements IRolePrivilegeRepository { 11 +public class RolePrivilegeRepositoryImpl extends AbstractDaoRepository implements IRolePrivilegeRepository {
12 public List<Long> findByRoleIds(@Param("roleIds") List<Long> roleIds){ 12 public List<Long> findByRoleIds(@Param("roleIds") List<Long> roleIds){
13 return rolePrivilegeExtMapper.findByRoleIds(roleIds); 13 return rolePrivilegeExtMapper.findByRoleIds(roleIds);
14 } 14 }
......
...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl; ...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.Role; 3 import com.fedex.connect.common.model.sys.Role;
4 import com.fedex.connect.common.model.sys.RoleExample; 4 import com.fedex.connect.common.model.sys.RoleExample;
5 -import com.fedex.connect.manager.repository.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
6 import com.fedex.connect.manager.repository.repo.sys.IRoleRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IRoleRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
10 10
11 @Repository 11 @Repository
12 -public class RoleRepositoryImpl extends BaseDao implements IRoleRepository { 12 +public class RoleRepositoryImpl extends AbstractDaoRepository implements IRoleRepository {
13 13
14 @Override 14 @Override
15 public List<Role> selectByExample(RoleExample example) { 15 public List<Role> selectByExample(RoleExample example) {
......
...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl; ...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.common.model.sys.UserExample; 4 import com.fedex.connect.common.model.sys.UserExample;
5 -import com.fedex.connect.manager.repository.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
6 import com.fedex.connect.manager.repository.repo.sys.IUserRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
10 10
11 @Repository 11 @Repository
12 -public class UserExtRepositoryImpl extends BaseDao implements IUserRepository { 12 +public class UserExtRepositoryImpl extends AbstractDaoRepository implements IUserRepository {
13 13
14 @Override 14 @Override
15 public List<User> selectByExample(UserExample example) { 15 public List<User> selectByExample(UserExample example) {
......
...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl; ...@@ -2,14 +2,14 @@ package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.model.sys.UserRole; 3 import com.fedex.connect.common.model.sys.UserRole;
4 import com.fedex.connect.common.model.sys.UserRoleExample; 4 import com.fedex.connect.common.model.sys.UserRoleExample;
5 -import com.fedex.connect.manager.repository.base.BaseDao; 5 +import com.fedex.connect.manager.repository.base.AbstractDaoRepository;
6 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
9 import java.util.List; 9 import java.util.List;
10 10
11 @Repository 11 @Repository
12 -public class UserRoleRepositoryImpl extends BaseDao implements IUserRoleRepository { 12 +public class UserRoleRepositoryImpl extends AbstractDaoRepository implements IUserRoleRepository {
13 13
14 @Override 14 @Override
15 public List<UserRole> selectByExample(UserRoleExample example) { 15 public List<UserRole> selectByExample(UserRoleExample example) {
......
...@@ -5,4 +5,6 @@ import java.util.List; ...@@ -5,4 +5,6 @@ import java.util.List;
5 5
6 public interface IDicEntriesService { 6 public interface IDicEntriesService {
7 List<DictionaryEntries> getCountryAll(); 7 List<DictionaryEntries> getCountryAll();
8 +
9 + List<DictionaryEntries> getConsStatus();
8 } 10 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,4 +14,9 @@ public class DicEntriesServiceImpl extends BaseService implements IDicEntriesSer ...@@ -14,4 +14,9 @@ public class DicEntriesServiceImpl extends BaseService implements IDicEntriesSer
14 public List<DictionaryEntries> getCountryAll() { 14 public List<DictionaryEntries> getCountryAll() {
15 return dicEntriesRepository.getCountryAll(); 15 return dicEntriesRepository.getCountryAll();
16 } 16 }
17 +
18 + @Override
19 + public List<DictionaryEntries> getConsStatus() {
20 + return dicEntriesRepository.getConsStatus();
21 + }
17 } 22 }
......
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; 3 import com.fedex.connect.common.model.sys.User;
4 +import com.fedex.connect.manager.data.bo.AddFlagBo;
4 import com.fedex.connect.manager.data.dto.SysUserDto; 5 import com.fedex.connect.manager.data.dto.SysUserDto;
5 6
6 import javax.servlet.http.HttpServletRequest; 7 import javax.servlet.http.HttpServletRequest;
...@@ -16,4 +17,6 @@ public interface ISysUserService { ...@@ -16,4 +17,6 @@ public interface ISysUserService {
16 void getFclData(HttpServletRequest request,List<String> cookiesList,List<String> saveKeyList); 17 void getFclData(HttpServletRequest request,List<String> cookiesList,List<String> saveKeyList);
17 18
18 User findById(Long id); 19 User findById(Long id);
20 +
21 + void updateAddFlag(User user, AddFlagBo bo);
19 } 22 }
......
...@@ -11,6 +11,7 @@ import com.fedex.connect.common.model.sys.Role; ...@@ -11,6 +11,7 @@ import com.fedex.connect.common.model.sys.Role;
11 import com.fedex.connect.common.model.sys.User; 11 import com.fedex.connect.common.model.sys.User;
12 import com.fedex.connect.common.model.sys.UserExample; 12 import com.fedex.connect.common.model.sys.UserExample;
13 import com.fedex.connect.manager.config.PropertiesConfig; 13 import com.fedex.connect.manager.config.PropertiesConfig;
14 +import com.fedex.connect.manager.data.bo.AddFlagBo;
14 import com.fedex.connect.manager.data.dto.SysUserDto; 15 import com.fedex.connect.manager.data.dto.SysUserDto;
15 import com.fedex.connect.manager.data.model.LogShowModel; 16 import com.fedex.connect.manager.data.model.LogShowModel;
16 import com.fedex.connect.manager.service.base.BaseService; 17 import com.fedex.connect.manager.service.base.BaseService;
...@@ -195,5 +196,26 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService { ...@@ -195,5 +196,26 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
195 return userRepository.findById(id); 196 return userRepository.findById(id);
196 } 197 }
197 198
199 + /**
200 + * @Author Szl
201 + * @Description 功能说明 更新用户ADD提示标记
202 + * @Date 2024/11/20
203 + * @param user
204 + * @param bo
205 + * @return void
206 + */
207 + @Override
208 + public void updateAddFlag(User user, AddFlagBo bo) {
209 + if (bo.getAddFlag1() != null){
210 + user.setAddflag1(bo.getAddFlag1());
211 + }
212 +
213 + if (bo.getAddFlag2() != null){
214 + user.setAddflag2(bo.getAddFlag2());
215 + }
216 +
217 + userRepository.updateByPrimaryKeySelective(user);
218 + }
219 +
198 220
199 } 221 }
......
1 package com.fedex.connect.manager.util; 1 package com.fedex.connect.manager.util;
2 2
3 -import com.fedex.connect.manager.repository.repo.sys.IParamConfigExtRepository; 3 +import com.fedex.connect.manager.repository.repo.sys.IParamConfigRepository;
4 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
...@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; ...@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
13 public class ParamConfigUtil { 13 public class ParamConfigUtil {
14 14
15 @Autowired 15 @Autowired
16 - private IParamConfigExtRepository paramConfigExtRepository; 16 + private IParamConfigRepository paramConfigExtRepository;
17 17
18 /** 18 /**
19 * @Author Szl 19 * @Author Szl
......
...@@ -50,7 +50,7 @@ url: ...@@ -50,7 +50,7 @@ url:
50 fcl: 50 fcl:
51 login: 51 login:
52 url: http://exportdeclarationuat-tw.dmz.apac.fedex.com/icleartw/auth/wlgnLogin 52 url: http://exportdeclarationuat-tw.dmz.apac.fedex.com/icleartw/auth/wlgnLogin
53 - redjrectLogin: http://localhost:8080/ImpPer/#/redjrectLogin 53 + redjrectLogin: http://192.168.1.251/time.html
54 twidx: 54 twidx:
55 url: http://exportdeclarationuat-tw.apac.fedex.com 55 url: http://exportdeclarationuat-tw.apac.fedex.com
56 interface: 56 interface:
......
1 package com.fedex.connect.task.aspect; 1 package com.fedex.connect.task.aspect;
2 2
3 +import com.fedex.connect.common.dependencies.util.DateUtil;
4 +import com.fedex.connect.common.model.sys.ParamConfig;
3 import com.fedex.connect.task.annotation.ProcessingInterval; 5 import com.fedex.connect.task.annotation.ProcessingInterval;
6 +import com.fedex.connect.task.repository.repo.sys.IParamConfigRepository;
4 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
5 import org.aspectj.lang.ProceedingJoinPoint; 8 import org.aspectj.lang.ProceedingJoinPoint;
6 import org.aspectj.lang.Signature; 9 import org.aspectj.lang.Signature;
...@@ -10,9 +13,14 @@ import org.aspectj.lang.annotation.Pointcut; ...@@ -10,9 +13,14 @@ import org.aspectj.lang.annotation.Pointcut;
10 import org.aspectj.lang.reflect.MethodSignature; 13 import org.aspectj.lang.reflect.MethodSignature;
11 import org.slf4j.Logger; 14 import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 15 import org.slf4j.LoggerFactory;
16 +import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 17 import org.springframework.stereotype.Component;
18 +import org.springframework.util.StringUtils;
14 19
15 import java.lang.reflect.Method; 20 import java.lang.reflect.Method;
21 +import java.time.temporal.ChronoUnit;
22 +import java.util.Date;
23 +import java.util.Objects;
16 24
17 /** 25 /**
18 * @Author mt 26 * @Author mt
...@@ -23,7 +31,8 @@ import java.lang.reflect.Method; ...@@ -23,7 +31,8 @@ import java.lang.reflect.Method;
23 @Slf4j 31 @Slf4j
24 @Component 32 @Component
25 public class ExecuteAspect { 33 public class ExecuteAspect {
26 - private Logger log = LoggerFactory.getLogger(ExecuteAspect.class); 34 + @Autowired
35 + IParamConfigRepository paramConfigRepository;
27 36
28 @Pointcut("@annotation(com.fedex.connect.task.annotation.ProcessingInterval)") 37 @Pointcut("@annotation(com.fedex.connect.task.annotation.ProcessingInterval)")
29 public void executePointCut() 38 public void executePointCut()
...@@ -42,14 +51,51 @@ public class ExecuteAspect { ...@@ -42,14 +51,51 @@ public class ExecuteAspect {
42 Signature signature = pjp.getSignature(); 51 Signature signature = pjp.getSignature();
43 MethodSignature methodSignature = (MethodSignature) signature; 52 MethodSignature methodSignature = (MethodSignature) signature;
44 Method method = methodSignature.getMethod(); 53 Method method = methodSignature.getMethod();
54 + //判断该定时任务是否执行
55 + boolean execute = this.isExecute(processingTime);
56 + if(execute) {
45 long begin = System.currentTimeMillis(); 57 long begin = System.currentTimeMillis();
46 log.info("{} Job Task Start......", method.getName()); 58 log.info("{} Job Task Start......", method.getName());
47 obj = pjp.proceed(); 59 obj = pjp.proceed();
48 long end = System.currentTimeMillis(); 60 long end = System.currentTimeMillis();
49 - log.info("{} Job Task end......execution time--{}ms", method.getName(),(end-begin)); 61 + log.info("{} Job Task end......execution time--{}ms", method.getName(), (end - begin));
62 + }
50 }catch(Throwable throwable){ 63 }catch(Throwable throwable){
51 log.error("ExecuteAspect.executeAround error : " + throwable.getMessage() , throwable); 64 log.error("ExecuteAspect.executeAround error : " + throwable.getMessage() , throwable);
52 } 65 }
53 return obj; 66 return obj;
54 } 67 }
68 +
69 + /**
70 + * @Author mt
71 + * @Description 判断定时任务是否执行
72 + * @Date 2024/11/20
73 + * @param processingInterval
74 + * @return boolean
75 + */
76 + private boolean isExecute(ProcessingInterval processingInterval){
77 + boolean execute = true;
78 + if(Objects.nonNull(processingInterval)){
79 + String paramCode = processingInterval.paramCode();
80 + if(StringUtils.hasText(paramCode)){
81 + ParamConfig paramConfig = paramConfigRepository.findValueByCode(paramCode);
82 + if(Objects.nonNull(paramConfig)
83 + && Objects.nonNull(paramConfig.getValue())
84 + && Objects.nonNull(paramConfig.getExt3())){
85 + //任务执行间隔
86 + Long interval = Long.valueOf(paramConfig.getValue());
87 + Date lastExecutionTime = paramConfig.getExt3();
88 + Date endDate = new Date();
89 + long diffInMilliseconds = Math.abs(endDate.getTime() - lastExecutionTime.getTime());
90 + // 将毫秒差值转换为分钟数
91 + long diffInMinutes = diffInMilliseconds / (60 * 1000);
92 + //上次执行时间小于间隔时间，则本次任务不进行执行
93 + if(diffInMinutes < interval){
94 + execute = false;
95 + }
96 + }
97 + }
98 + }
99 + return execute;
100 + }
55 } 101 }
...\ No newline at end of file ...\ No newline at end of file
......
1 +package com.fedex.connect.task.job;
2 +
3 +import com.fedex.connect.task.annotation.ProcessingInterval;
4 +import com.fedex.connect.task.service.biz.IDuplicateConsignmentEmailService;
5 +import org.springframework.beans.factory.annotation.Autowired;
6 +import org.springframework.scheduling.annotation.Scheduled;
7 +import org.springframework.stereotype.Component;
8 +
9 +/**
10 + * @Author Szl
11 + * @Description 类说明 发邮件通知到该运单所属用户，告知运单已被其他用户创建上传
12 + * @Date 2024/11/20
13 + */
14 +@Component
15 +public class DuplicateConsignmentEmailJob {
16 +
17 + @Autowired
18 + private IDuplicateConsignmentEmailService duplicateConsignmentEmailService;
19 +
20 + @ProcessingInterval
21 + @Scheduled(cron = "${export.task.allocation.pushConFile}")
22 + public void pushConsignmentFileTask() {
23 + duplicateConsignmentEmailService.duplicateConsignmentEmail();
24 + }
25 +
26 +}
1 package com.fedex.connect.task.job; 1 package com.fedex.connect.task.job;
2 2
3 +import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
3 import com.fedex.connect.task.annotation.ProcessingInterval; 4 import com.fedex.connect.task.annotation.ProcessingInterval;
4 import com.fedex.connect.task.service.biz.IPushObService; 5 import com.fedex.connect.task.service.biz.IPushObService;
5 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,10 +21,9 @@ public class Imp001Job { ...@@ -20,10 +21,9 @@ public class Imp001Job {
20 /** 21 /**
21 * 推送Imp001数据给到进口组 22 * 推送Imp001数据给到进口组
22 */ 23 */
23 - @ProcessingInterval 24 + @ProcessingInterval(paramCode = ParamConfigConstants.TASK_PARAM_KEYS.PUSH_IMP001_INTERVAL)
24 @Scheduled(cron = "${export.task.allocation.sendOb}") 25 @Scheduled(cron = "${export.task.allocation.sendOb}")
25 public void sendObTask() { 26 public void sendObTask() {
26 -
27 sendObService.sendOb(); 27 sendObService.sendOb();
28 } 28 }
29 29
......
...@@ -5,6 +5,7 @@ import com.fedex.connect.common.dao.biz.PushObMapper; ...@@ -5,6 +5,7 @@ import com.fedex.connect.common.dao.biz.PushObMapper;
5 import com.fedex.connect.common.dao.log.EmailHistoryMapper; 5 import com.fedex.connect.common.dao.log.EmailHistoryMapper;
6 import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper; 6 import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
7 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper; 7 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
8 +import com.fedex.connect.common.dao.sys.ParamConfigMapper;
8 import com.fedex.connect.task.repository.dao.*; 9 import com.fedex.connect.task.repository.dao.*;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 11
...@@ -31,4 +32,6 @@ public class AbstractDaoRepository { ...@@ -31,4 +32,6 @@ public class AbstractDaoRepository {
31 protected PortclearEmailMappingExtMapper portclearEmailMappingExtMapper; 32 protected PortclearEmailMappingExtMapper portclearEmailMappingExtMapper;
32 @Autowired 33 @Autowired
33 protected PushObMapperExt pushObMapperExt; 34 protected PushObMapperExt pushObMapperExt;
35 + @Autowired
36 + protected ParamConfigMapper paramConfigMapper;
34 } 37 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
9 9
10 @Mapper 10 @Mapper
11 public interface EmailExtMapper { 11 public interface EmailExtMapper {
12 - List<Email> findConPushEmails(String typeCode,String statusCode); 12 + List<Email> findEmailsByDic(String typeCode,String statusCode,String rowLimit);
13 13
14 @Delete("DELETE FROM T_BIZ_EMAIL WHERE ID = #{id}") 14 @Delete("DELETE FROM T_BIZ_EMAIL WHERE ID = #{id}")
15 void deleteById(@Param("id") Long id); 15 void deleteById(@Param("id") Long id);
......
1 +package com.fedex.connect.task.repository.dao;
2 +
3 +import com.fedex.connect.common.model.sys.ParamConfig;
4 +import org.apache.ibatis.annotations.Mapper;
5 +import org.apache.ibatis.annotations.Param;
6 +import org.apache.ibatis.annotations.Select;
7 +
8 +@Mapper
9 +public interface ParamConfigExtMapper {
10 +
11 + @Select("SELECT * FROM T_SYS_PARAM_CONFIG WHERE CODE = #{code}")
12 + ParamConfig findByCode(@Param("code") String code);
13 +}
...@@ -11,18 +11,18 @@ import java.util.List; ...@@ -11,18 +11,18 @@ import java.util.List;
11 public interface PushObMapperExt { 11 public interface PushObMapperExt {
12 12
13 @Select( "<script>" + 13 @Select( "<script>" +
14 - "SELECT * FROM T_PUSH_OB_LOG WHERE PUSH_STATUS = #{pushStatus,jdbcType=NUMERIC} AND ROWNUM &lt;= 500" + 14 + "SELECT * FROM T_PUSH_OB_LOG WHERE STATUS_CODE = #{statusCode,jdbcType=VARCHAR} AND ROWNUM &lt;= 500" +
15 "</script>") 15 "</script>")
16 - List<PushOb> findPushObByStatus(@Param("pushStatus") Long pushStatus); 16 + List<PushOb> findPushObByStatus(@Param("statusCode") String statusCode);
17 17
18 @Select( "<script>" + 18 @Select( "<script>" +
19 - "SELECT * FROM T_PUSH_OB_LOG WHERE PUSH_NUM &lt; #{pushNum,jdbcType=NUMERIC} AND PUSH_STATUS = #{pushStatus,jdbcType=NUMERIC} AND ROWNUM &lt;= 500" + 19 + "SELECT * FROM T_PUSH_OB_LOG WHERE PUSH_NUM &lt; #{pushNum,jdbcType=NUMERIC} AND STATUS_CODE = #{statusCode,jdbcType=VARCHAR} AND ROWNUM &lt;= 500" +
20 "</script>") 20 "</script>")
21 - List<PushOb> findPushObByStatusAndNum(@Param("pushNum") Long pushNum, @Param("pushStatus") Long pushStatus); 21 + List<PushOb> findPushObByStatusAndNum(@Param("pushNum") Long pushNum, @Param("statusCode") String statusCode);
22 22
23 @Select( "<script>" + 23 @Select( "<script>" +
24 - "SELECT count(*) FROM T_PUSH_OB_LOG WHERE PUSH_NUM &gt;= #{pushNum,jdbcType=NUMERIC} AND PUSH_STATUS = #{pushStatus,jdbcType=NUMERIC} " + 24 + "SELECT count(*) FROM T_PUSH_OB_LOG WHERE PUSH_NUM &gt;= #{pushNum,jdbcType=NUMERIC} AND PUSH_STATUS = #{statusCode,jdbcType=VARCHAR} " +
25 "AND TRUNC(CREATE_TIME) = TRUNC(TO_DATE(#{date,jdbcType=VARCHAR}, 'YYYY-MM-DD'))" + 25 "AND TRUNC(CREATE_TIME) = TRUNC(TO_DATE(#{date,jdbcType=VARCHAR}, 'YYYY-MM-DD'))" +
26 "</script>") 26 "</script>")
27 - Integer findErrPushForEmail(@Param("pushNum") Long pushNum, @Param("pushStatus") Long pushStatus, @Param("date") String date); 27 + Integer findErrPushForEmail(@Param("pushNum") Long pushNum, @Param("statusCode") String statusCode, @Param("date") String date);
28 } 28 }
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.fedex.connect.task.repository.dao.EmailExtMapper"> 3 <mapper namespace="com.fedex.connect.task.repository.dao.EmailExtMapper">
4 -<select id="findConPushEmails" resultType="com.fedex.connect.common.model.biz.Email"> 4 +<select id="findEmailsByDic" resultType="com.fedex.connect.common.model.biz.Email">
5 SELECT * 5 SELECT *
6 FROM ( 6 FROM (
7 SELECT * 7 SELECT *
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
10 AND STATUS_CODE = #{statusCode} 10 AND STATUS_CODE = #{statusCode}
11 ORDER BY CREATED_DATE DESC 11 ORDER BY CREATED_DATE DESC
12 ) 12 )
13 - WHERE ROWNUM &lt; 500 13 + WHERE ROWNUM &lt; #{rowLimit}
14 </select> 14 </select>
15 </mapper> 15 </mapper>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,7 +5,7 @@ import com.fedex.connect.common.model.biz.Email; ...@@ -5,7 +5,7 @@ import com.fedex.connect.common.model.biz.Email;
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface IEmailRepository { 7 public interface IEmailRepository {
8 - List<Email> findConPushEmails(String typeCode,String statusCode); 8 + List<Email> findEmailsByDic(String typeCode,String statusCode,String configCode);
9 9
10 void deleteById(Long id); 10 void deleteById(Long id);
11 11
......
...@@ -27,20 +27,20 @@ public interface IPushObRepository { ...@@ -27,20 +27,20 @@ public interface IPushObRepository {
27 * @Author mt 27 * @Author mt
28 * @Description 根据推送次数，推送状态查找需要推送记录 28 * @Description 根据推送次数，推送状态查找需要推送记录
29 * @Date 2024/11/20 29 * @Date 2024/11/20
30 - * @param pushStatus 30 + * @param statusCode
31 * @return java.util.List<com.fedex.connect.common.model.biz.PushOb> 31 * @return java.util.List<com.fedex.connect.common.model.biz.PushOb>
32 */ 32 */
33 - List<PushOb> findPushOb(Long pushStatus); 33 + List<PushOb> findPushOb(String statusCode);
34 34
35 /** 35 /**
36 * @Author mt 36 * @Author mt
37 * @Description 根据推送次数，推送状态查找需要推送记录 37 * @Description 根据推送次数，推送状态查找需要推送记录
38 * @Date 2024/11/20 38 * @Date 2024/11/20
39 * @param pushNum 39 * @param pushNum
40 - * @param pushStatus 40 + * @param statusCode
41 * @return java.util.List<com.fedex.connect.common.model.biz.PushOb> 41 * @return java.util.List<com.fedex.connect.common.model.biz.PushOb>
42 */ 42 */
43 - List<PushOb> findErrPushOb(Long pushNum,Long pushStatus); 43 + List<PushOb> findErrPushOb(Long pushNum,String statusCode);
44 44
45 - Integer findErrPushForEmail(Long pushNum,Long pushStatus,String date); 45 + Integer findErrPushForEmail(Long pushNum,String statusCode,String date);
46 } 46 }
......
1 package com.fedex.connect.task.repository.repo.biz.impl; 1 package com.fedex.connect.task.repository.repo.biz.impl;
2 2
3 import com.fedex.connect.common.model.biz.Email; 3 import com.fedex.connect.common.model.biz.Email;
4 +import com.fedex.connect.common.model.sys.ParamConfig;
4 import com.fedex.connect.task.repository.base.AbstractDaoRepository; 5 import com.fedex.connect.task.repository.base.AbstractDaoRepository;
5 import com.fedex.connect.task.repository.repo.biz.IEmailRepository; 6 import com.fedex.connect.task.repository.repo.biz.IEmailRepository;
6 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
...@@ -9,8 +10,12 @@ import java.util.List; ...@@ -9,8 +10,12 @@ import java.util.List;
9 10
10 @Repository 11 @Repository
11 public class EmailRepositoryImpl extends AbstractDaoRepository implements IEmailRepository { 12 public class EmailRepositoryImpl extends AbstractDaoRepository implements IEmailRepository {
12 - public List<Email> findConPushEmails(String typeCode,String statusCode){ 13 + public List<Email> findEmailsByDic(String typeCode,String statusCode,String configCode){
13 - return emailExtMapper.findConPushEmails(typeCode,statusCode); 14 + /**
15 + * 获取查询数量
16 + */
17 + ParamConfig paramConfig = paramConfigExtMapper.findByCode(configCode);
18 + return emailExtMapper.findEmailsByDic(typeCode,statusCode,paramConfig.getValue());
14 } 19 }
15 20
16 @Override 21 @Override
......
...@@ -36,30 +36,30 @@ public class PushObRepositoryImpl extends AbstractDaoRepository implements IPush ...@@ -36,30 +36,30 @@ public class PushObRepositoryImpl extends AbstractDaoRepository implements IPush
36 /** 36 /**
37 * @Author mt 37 * @Author mt
38 * @Description 根据推送次数，推送状态查找需要推送记录 38 * @Description 根据推送次数，推送状态查找需要推送记录
39 - * @Date 2024/5/24 39 + * @Date 2024/11/20
40 - * @param pushStatus 40 + * @param statusCode
41 - * @return java.util.List<com.fedex.export.repository.entity.PushOb> 41 + * @return java.util.List<com.fedex.connect.common.model.biz.PushOb>
42 */ 42 */
43 @Override 43 @Override
44 - public List<PushOb> findPushOb(Long pushStatus) { 44 + public List<PushOb> findPushOb(String statusCode) {
45 - return pushObMapperExt.findPushObByStatus(pushStatus); 45 + return pushObMapperExt.findPushObByStatus(statusCode);
46 } 46 }
47 47
48 /** 48 /**
49 * @Author mt 49 * @Author mt
50 * @Description 根据推送次数，推送状态查找需要推送记录 50 * @Description 根据推送次数，推送状态查找需要推送记录
51 - * @Date 2024/5/24 51 + * @Date 2024/11/20
52 * @param pushNum 52 * @param pushNum
53 - * @param pushStatus 53 + * @param statusCode
54 - * @return java.util.List<com.fedex.export.repository.entity.PushOb> 54 + * @return java.util.List<com.fedex.connect.common.model.biz.PushOb>
55 */ 55 */
56 @Override 56 @Override
57 - public List<PushOb> findErrPushOb(Long pushNum, Long pushStatus) { 57 + public List<PushOb> findErrPushOb(Long pushNum, String statusCode) {
58 - return pushObMapperExt.findPushObByStatusAndNum(pushNum,pushStatus); 58 + return pushObMapperExt.findPushObByStatusAndNum(pushNum,statusCode);
59 } 59 }
60 60
61 @Override 61 @Override
62 - public Integer findErrPushForEmail(Long pushNum, Long pushStatus, String date) { 62 + public Integer findErrPushForEmail(Long pushNum, String statusCode, String date) {
63 - return pushObMapperExt.findErrPushForEmail(pushNum,pushStatus,date); 63 + return pushObMapperExt.findErrPushForEmail(pushNum,statusCode,date);
64 } 64 }
65 } 65 }
......
1 package com.fedex.connect.task.repository.repo.log.impl; 1 package com.fedex.connect.task.repository.repo.log.impl;
2 2
3 +import com.fedex.connect.common.model.biz.Email;
3 import com.fedex.connect.common.model.log.EmailHistory; 4 import com.fedex.connect.common.model.log.EmailHistory;
4 import com.fedex.connect.task.repository.base.AbstractDaoRepository; 5 import com.fedex.connect.task.repository.base.AbstractDaoRepository;
5 import com.fedex.connect.task.repository.repo.log.IEmailHistoryRepository; 6 import com.fedex.connect.task.repository.repo.log.IEmailHistoryRepository;
6 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
7 8
9 +import java.util.List;
10 +
8 @Repository 11 @Repository
9 public class EmailHistoryRepositoryImpl extends AbstractDaoRepository implements IEmailHistoryRepository { 12 public class EmailHistoryRepositoryImpl extends AbstractDaoRepository implements IEmailHistoryRepository {
10 13
......
1 +package com.fedex.connect.task.repository.repo.sys;
2 +
3 +import com.fedex.connect.common.model.sys.ParamConfig;
4 +
5 +public interface IParamConfigRepository {
6 + ParamConfig findValueByCode(String code);
7 +}
1 +package com.fedex.connect.task.repository.repo.sys.impl;
2 +
3 +import com.fedex.connect.common.dependencies.enums.base.StatusEnum;
4 +import com.fedex.connect.common.model.sys.ParamConfig;
5 +import com.fedex.connect.common.model.sys.ParamConfigExample;
6 +import com.fedex.connect.task.repository.base.AbstractDaoRepository;
7 +import com.fedex.connect.task.repository.repo.sys.IParamConfigRepository;
8 +import org.springframework.stereotype.Repository;
9 +import org.springframework.util.CollectionUtils;
10 +
11 +@Repository
12 +public class ParamConfigRepositoryImpl extends AbstractDaoRepository implements IParamConfigRepository {
13 +
14 + @Override
15 + public ParamConfig findValueByCode(String code) {
16 + ParamConfigExample example = new ParamConfigExample();
17 + ParamConfigExample.Criteria criteria = example.createCriteria();
18 + criteria.andCodeEqualTo(code);
19 + criteria.andStatusEqualTo(StatusEnum.YES.getCode());
20 + return CollectionUtils.firstElement(paramConfigMapper.selectByExample(example));
21 + }
22 +}
...\ No newline at end of file ...\ No newline at end of file
1 +package com.fedex.connect.task.service.biz;
2 +
3 +public interface IDuplicateConsignmentEmailService {
4 + void duplicateConsignmentEmail();
5 +}
1 +package com.fedex.connect.task.service.biz.impl;
2 +
3 +import com.fedex.connect.common.dependencies.cache.CacheSystem;
4 +import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
5 +import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
6 +import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
7 +import com.fedex.connect.common.model.biz.Email;
8 +import com.fedex.connect.task.data.dto.MailConfigDto;
9 +import com.fedex.connect.task.service.base.BaseService;
10 +import com.fedex.connect.task.service.biz.IDuplicateConsignmentEmailService;
11 +import com.fedex.connect.task.utils.sys.DuplicateEmailUtil;
12 +import com.fedex.connect.task.utils.sys.EmailUtil;
13 +import org.springframework.beans.factory.annotation.Autowired;
14 +import org.springframework.stereotype.Service;
15 +
16 +import java.util.List;
17 +
18 +/**
19 + * @Author Szl
20 + * @Description 类说明 发送邮件通知用户
21 + * @Date 2024/11/20
22 + */
23 +@Service
24 +public class DuplicateConsignmentEmailServiceImpl extends BaseService implements IDuplicateConsignmentEmailService {
25 +
26 + @Autowired
27 + private CacheSystem cacheSystem;
28 +
29 + @Autowired
30 + private EmailUtil emailUtil;
31 +
32 + @Autowired
33 + private DuplicateEmailUtil duplicateEmailUtil;
34 +
35 + @Override
36 + public void duplicateConsignmentEmail(){
37 + /**
38 + * 查询邮件发送日志表中状态为待推送且类型为“提醒发件人”的数据
39 + */
40 + List<Email> emails = iEmailExtRepository.findEmailsByDic(cacheSystem.getDicEmailType(EmailTypeEnum.NOTIFICATION_SENDER.getEnMsg()).getCode(),
41 + cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(), ParamConfigConstants.TASK_PARAM_KEYS.NOTIFICATION_SENDER_EMAIL_NUMBER);
42 + /**
43 + * 发送邮件
44 + */
45 + for (Email email : emails) {
46 + /**
47 + * 构造邮件dto
48 + */
49 + MailConfigDto mailConfigDto = new MailConfigDto();
50 + duplicateEmailUtil.createMailConfigDto(mailConfigDto);
51 + /**
52 + * 发送邮件
53 + */
54 + boolean result = emailUtil.sendMail(mailConfigDto);
55 + /**
56 + * 更新邮件实体
57 + */
58 + duplicateEmailUtil.updateEmail(result,email,cacheSystem);
59 + /**
60 + * 更新数据库
61 + */
62 + duplicateEmailUtil.saveEmail(email);
63 + }
64 + }
65 +}
1 package com.fedex.connect.task.service.biz.impl; 1 package com.fedex.connect.task.service.biz.impl;
2 2
3 import com.fedex.connect.common.dependencies.cache.CacheSystem; 3 import com.fedex.connect.common.dependencies.cache.CacheSystem;
4 +import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
4 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum; 5 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
5 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum; 6 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
6 import com.fedex.connect.common.dependencies.util.NIOFileUtils; 7 import com.fedex.connect.common.dependencies.util.NIOFileUtils;
...@@ -55,8 +56,8 @@ public class PushConsignmentFileServiceImpl extends BaseService implements IPush ...@@ -55,8 +56,8 @@ public class PushConsignmentFileServiceImpl extends BaseService implements IPush
55 String tempPath = ""; 56 String tempPath = "";
56 String finalPath = ""; 57 String finalPath = "";
57 //查询需要发送的数据 58 //查询需要发送的数据
58 - List<Email> conPushEmails = iEmailExtRepository.findConPushEmails(cacheSystem.getDicEmailType(EmailTypeEnum.PUSH_CON_FILE.getEnMsg()).getCode(), 59 + List<Email> conPushEmails = iEmailExtRepository.findEmailsByDic(cacheSystem.getDicEmailType(EmailTypeEnum.PUSH_CON_FILE.getEnMsg()).getCode(),
59 - cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode()); 60 + cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg()).getCode(),ParamConfigConstants.TASK_PARAM_KEYS.PUSH_CON_NUMBER);
60 61
61 for (Email conPushEmail : conPushEmails) { 62 for (Email conPushEmail : conPushEmails) {
62 //获取待发送的文件并打zip包 63 //获取待发送的文件并打zip包
......
1 package com.fedex.connect.task.service.biz.impl; 1 package com.fedex.connect.task.service.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.enums.biz.PushObStatusEnum;
3 import com.fedex.connect.common.model.biz.Consignment; 4 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.common.model.biz.PushOb; 5 import com.fedex.connect.common.model.biz.PushOb;
5 import com.fedex.connect.task.service.base.BaseService; 6 import com.fedex.connect.task.service.base.BaseService;
...@@ -28,7 +29,7 @@ public class PushObServiceImpl extends BaseService implements IPushObService { ...@@ -28,7 +29,7 @@ public class PushObServiceImpl extends BaseService implements IPushObService {
28 @Override 29 @Override
29 public void sendOb() { 30 public void sendOb() {
30 //获取需要处理的记录 31 //获取需要处理的记录
31 -// List<PushObLog> pushObLogList = pushObLogRepository.findPushObLog(Constant.SEND_TW001_KEYS.PUSH_OB_STATUS_WAIT); 32 + List<PushOb> pushObLogList = pushObRepository.findPushOb(PushObStatusEnum.TO_BE_SENT.getCode());
32 } 33 }
33 34
34 /** 35 /**
......
...@@ -29,7 +29,6 @@ import java.io.File; ...@@ -29,7 +29,6 @@ import java.io.File;
29 import java.io.FileOutputStream; 29 import java.io.FileOutputStream;
30 import java.io.IOException; 30 import java.io.IOException;
31 import java.nio.file.Paths; 31 import java.nio.file.Paths;
32 -import java.text.SimpleDateFormat;
33 import java.util.ArrayList; 32 import java.util.ArrayList;
34 import java.util.Date; 33 import java.util.Date;
35 import java.util.List; 34 import java.util.List;
...@@ -244,7 +243,7 @@ public class ConFileEmailUtil { ...@@ -244,7 +243,7 @@ public class ConFileEmailUtil {
244 String fileName = String.format("%s%s%s%s", 243 String fileName = String.format("%s%s%s%s",
245 "", 244 "",
246 "", 245 "",
247 - new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()), 246 + DateUtil.yyyyMMddHHmmss(new Date()),
248 extension 247 extension
249 ); 248 );
250 String basePath = ""; 249 String basePath = "";
......
1 +package com.fedex.connect.task.utils.sys;
2 +
3 +import com.fedex.connect.common.dependencies.cache.CacheSystem;
4 +import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
5 +import com.fedex.connect.common.model.bi.DictionaryEntries;
6 +import com.fedex.connect.common.model.biz.Email;
7 +import com.fedex.connect.common.model.log.EmailHistory;
8 +import com.fedex.connect.task.data.dto.MailConfigDto;
9 +import com.fedex.connect.task.repository.repo.biz.IEmailRepository;
10 +import com.fedex.connect.task.repository.repo.log.IEmailHistoryRepository;
11 +import org.springframework.beans.BeanUtils;
12 +import org.springframework.beans.factory.annotation.Autowired;
13 +import org.springframework.stereotype.Component;
14 +import org.springframework.transaction.annotation.Transactional;
15 +
16 +import java.util.Date;
17 +
18 +@Component
19 +public class DuplicateEmailUtil {
20 +
21 + @Autowired
22 + private IEmailRepository emailRepository;
23 +
24 + @Autowired
25 + private IEmailHistoryRepository emailHistoryRepository;
26 +
27 + /**
28 + * @Author Szl
29 + * @Description 功能说明 初始化邮件dto
30 + * @Date 2024/11/20
31 + * @param mailConfigDto
32 + * @return com.fedex.connect.task.data.dto.MailConfigDto
33 + */
34 + public MailConfigDto createMailConfigDto(MailConfigDto mailConfigDto){
35 + mailConfigDto.setHost("");
36 + mailConfigDto.setPort("");
37 + mailConfigDto.setAuth("");
38 + //设置代理
39 + mailConfigDto.setProxyStartFlag("");
40 + mailConfigDto.setProxyHost("");
41 + mailConfigDto.setProxyPort("");
42 + //发件人
43 + mailConfigDto.setFrom("");
44 + //发件人密码
45 + mailConfigDto.setPassword("");
46 + //ce接收人
47 + mailConfigDto.setTo("");
48 + //设置邮件标题
49 + mailConfigDto.setSubject("");
50 + //设置邮件内容
51 + mailConfigDto.setContent("");
52 + return mailConfigDto;
53 + }
54 +
55 + /**
56 + * @Author Szl
57 + * @Description 功能说明 更新Email状态
58 + * @Date 2024/11/20
59 + * @param result
60 + * @param email
61 + * @param cacheSystem
62 + * @return com.fedex.connect.common.model.biz.Email
63 + */
64 + public void updateEmail(boolean result, Email email, CacheSystem cacheSystem){
65 + DictionaryEntries pending = cacheSystem.getDicEmailStatus(EmailStatusEnum.PENDING.getEnMsg());
66 + DictionaryEntries success = cacheSystem.getDicEmailStatus(EmailStatusEnum.SUCCESS.getEnMsg());
67 + DictionaryEntries failed = cacheSystem.getDicEmailStatus(EmailStatusEnum.FAILED.getEnMsg());
68 + email.setSendTime(new Date());
69 + if (result){
70 + email.setTypeCode(success.getCode());
71 + email.setTypeName(success.getEnglishName());
72 + }else {
73 + if (email.getSendNum()<3){
74 + email.setTypeCode(pending.getCode());
75 + email.setTypeName(pending.getEnglishName());
76 + email.setSendNum(email.getSendNum()+1);
77 + }else {
78 + email.setTypeCode(failed.getCode());
79 + email.setTypeName(failed.getEnglishName());
80 + }
81 + }
82 + }
83 +
84 + /**
85 + * @Author Szl
86 + * @Description 功能说明 保存email信息入库
87 + * @Date 2024/11/20
88 + * @param email
89 + * @return void
90 + */
91 + @Transactional
92 + public void saveEmail(Email email){
93 + if (EmailStatusEnum.PENDING.getCode().equals(email.getTypeCode())){
94 + emailRepository.saveOrUpdate(email);
95 + }else {
96 + EmailHistory emailHistory = new EmailHistory();
97 + BeanUtils.copyProperties(email, emailHistory);
98 + emailRepository.deleteById(email.getId());
99 + emailHistoryRepository.saveOrUpdate(emailHistory);
100 + }
101 + }
102 +}
...@@ -18,6 +18,13 @@ import java.util.Properties; ...@@ -18,6 +18,13 @@ import java.util.Properties;
18 @Slf4j 18 @Slf4j
19 @Component 19 @Component
20 public class EmailUtil { 20 public class EmailUtil {
21 + /**
22 + * @Author Szl
23 + * @Description 功能说明 发送邮件
24 + * @Date 2024/11/20
25 + * @param mailConfig
26 + * @return boolean
27 + */
21 public static boolean sendMail(MailConfigDto mailConfig) { 28 public static boolean sendMail(MailConfigDto mailConfig) {
22 System.setProperty("mail.mime.splitlongparameters","false"); 29 System.setProperty("mail.mime.splitlongparameters","false");
23 try { 30 try {
......
...@@ -58,7 +58,7 @@ public class KafkaDmUtil { ...@@ -58,7 +58,7 @@ public class KafkaDmUtil {
58 //kafka临时表转历史表，并且将临时表id置空 58 //kafka临时表转历史表，并且将临时表id置空
59 List<KafkaStorageHistory> kafKaStorageHistoryList = this.convertTempToHis(backHisList); 59 List<KafkaStorageHistory> kafKaStorageHistoryList = this.convertTempToHis(backHisList);
60 //保存至历史表 60 //保存至历史表
61 - kafkaStorageHistoryRepository.saveAll(kafKaStorageHistoryList); 61 + kafkaStorageHistoryRepository.saveOrUpdateAll(kafKaStorageHistoryList);
62 } 62 }
63 /***更新临时表状态，并实体数据转换为json字符串进行数据下发***/ 63 /***更新临时表状态，并实体数据转换为json字符串进行数据下发***/
64 if(issuedList.size() > 0) { 64 if(issuedList.size() > 0) {
......