Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
87969d82 1 parent 0dc4ec58

customer|上传校验

Inline Side-by-side
Showing 25 changed files with 435 additions and 37 deletions
...@@ -5,6 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; ...@@ -5,6 +5,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
5 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 5 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
6 import com.fedex.connect.customer.service.biz.IAttachmentService; 6 import com.fedex.connect.customer.service.biz.IAttachmentService;
7 import com.fedex.connect.customer.service.biz.IConsignmentService; 7 import com.fedex.connect.customer.service.biz.IConsignmentService;
8 +import com.fedex.connect.customer.validate.controller.biz.AttachmentValidate;
9 +import com.fedex.connect.customer.validate.controller.biz.ConsignmentValidate;
8 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.http.HttpHeaders; 11 import org.springframework.http.HttpHeaders;
10 import org.springframework.http.HttpStatus; 12 import org.springframework.http.HttpStatus;
...@@ -29,6 +31,12 @@ public class AbstractEtController { ...@@ -29,6 +31,12 @@ public class AbstractEtController {
29 @Autowired 31 @Autowired
30 protected IAttachmentService attachmentService; 32 protected IAttachmentService attachmentService;
31 33
34 + @Autowired
35 + protected AttachmentValidate attachmentValidate;
36 +
37 + @Autowired
38 + protected ConsignmentValidate consignmentValidate;
39 +
32 40
33 public <T> ResponseEntity<T> seeOther(String url) { 41 public <T> ResponseEntity<T> seeOther(String url) {
34 HttpHeaders httpHeaders = new HttpHeaders(); 42 HttpHeaders httpHeaders = new HttpHeaders();
......
1 package com.fedex.connect.customer.controller.biz; 1 package com.fedex.connect.customer.controller.biz;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.customer.data.bo.AddBo;
4 import com.fedex.connect.customer.data.query.ConsignmentQuery; 5 import com.fedex.connect.customer.data.query.ConsignmentQuery;
5 import org.springframework.web.bind.annotation.RequestBody; 6 import org.springframework.web.bind.annotation.RequestBody;
6 7
7 public interface IConsignmentController { 8 public interface IConsignmentController {
8 - ResponseResultVo findConsignment(@RequestBody ConsignmentQuery consignmentQuery); 9 + ResponseResultVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery);
10 +
11 + ResponseResultVo addConsignment(@RequestBody AddBo bo);
9 } 12 }
......
...@@ -30,6 +30,10 @@ public class AttachmentControllerImpl extends AbstractEtController implements IA ...@@ -30,6 +30,10 @@ public class AttachmentControllerImpl extends AbstractEtController implements IA
30 @PostMapping("/find/history") 30 @PostMapping("/find/history")
31 @ApiOperation(value = "历史上传记录查询") 31 @ApiOperation(value = "历史上传记录查询")
32 public ResponseResultVo findHistory(@RequestBody LongBo bo) { 32 public ResponseResultVo findHistory(@RequestBody LongBo bo) {
33 + ResponseResultVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
34 + if (responseResultVo != null){
35 + return responseResultVo;
36 + }
33 Long userId = null; 37 Long userId = null;
34 try { 38 try {
35 userId = CurrentUserInfo.getUserId(); 39 userId = CurrentUserInfo.getUserId();
......
...@@ -7,6 +7,7 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo; ...@@ -7,6 +7,7 @@ import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
7 import com.fedex.connect.common.model.sys.User; 7 import com.fedex.connect.common.model.sys.User;
8 import com.fedex.connect.customer.controller.AbstractEtController; 8 import com.fedex.connect.customer.controller.AbstractEtController;
9 import com.fedex.connect.customer.controller.biz.IConsignmentController; 9 import com.fedex.connect.customer.controller.biz.IConsignmentController;
10 +import com.fedex.connect.customer.data.bo.AddBo;
10 import com.fedex.connect.customer.data.query.ConsignmentQuery; 11 import com.fedex.connect.customer.data.query.ConsignmentQuery;
11 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiOperation; 13 import io.swagger.annotations.ApiOperation;
...@@ -29,27 +30,44 @@ public class ConsignmentControllerImpl extends AbstractEtController implements I ...@@ -29,27 +30,44 @@ public class ConsignmentControllerImpl extends AbstractEtController implements I
29 private static final Logger logger = LoggerFactory.getLogger(ConsignmentControllerImpl.class); 30 private static final Logger logger = LoggerFactory.getLogger(ConsignmentControllerImpl.class);
30 31
31 32
32 - @PostMapping("/find") 33 + @PostMapping("/find/list")
33 @ApiOperation(value = "运单查询") 34 @ApiOperation(value = "运单查询")
34 - public ResponseResultVo findConsignment(@RequestBody ConsignmentQuery consignmentQuery) { 35 + public ResponseResultVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
35 - Long userId = null; 36 + User user = null;
36 - String uuid = null;
37 try { 37 try {
38 - User user = CurrentUserInfo.getUser(); 38 + user = CurrentUserInfo.getUser();
39 - userId = user.getId(); 39 + //userId = 0L;
40 - uuid = user.getUserUuid();
41 - userId = 0L;
42 } catch (Exception e) { 40 } catch (Exception e) {
43 logger.error(LogShowModel.showException("Exception", e)); 41 logger.error(LogShowModel.showException("Exception", e));
44 return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg())); 42 return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
45 } 43 }
46 - if (userId == null) { 44 + if (user == null) {
47 return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg())); 45 return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
48 } 46 }
49 47
50 ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery); 48 ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
51 - query.setUserId(userId); 49 + query.setUserId(user.getId());
52 - query.setUuid(uuid); 50 + query.setUuid(user.getUserUuid());
53 return consignmentService.findConsignments(query); 51 return consignmentService.findConsignments(query);
54 } 52 }
53 +
54 + @PostMapping("/add")
55 + @ApiOperation("上传运单")
56 + public ResponseResultVo addConsignment(@RequestBody AddBo bo){
57 + ResponseResultVo responseResultVo = consignmentValidate.preCheckAdd(bo);
58 + if (responseResultVo != null){
59 + return responseResultVo;
60 + }
61 + User user = null;
62 + try {
63 + user = CurrentUserInfo.getUser();
64 + } catch (Exception e) {
65 + logger.error(LogShowModel.showException("Exception", e));
66 + return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
67 + }
68 + if (user == null) {
69 + return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
70 + }
71 + return consignmentService.add(bo,user);
72 + }
55 } 73 }
......
1 +package com.fedex.connect.customer.data.bo;
2 +
3 +import lombok.Data;
4 +
5 +@Data
6 +public class AddBo {
7 + private String ConsignmentCode;
8 +
9 + private String shipperAccount;
10 +
11 + private String shipperCountry;
12 +
13 + private String recipientCountry;
14 +}
...@@ -3,6 +3,8 @@ package com.fedex.connect.customer.repository.dao; ...@@ -3,6 +3,8 @@ package com.fedex.connect.customer.repository.dao;
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.query.ConsignmentQuery; 4 import com.fedex.connect.customer.data.query.ConsignmentQuery;
5 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
6 +import org.apache.ibatis.annotations.Param;
7 +import org.apache.ibatis.annotations.Select;
6 8
7 import java.util.List; 9 import java.util.List;
8 10
...@@ -11,4 +13,12 @@ public interface ConsignmentExtMapper { ...@@ -11,4 +13,12 @@ public interface ConsignmentExtMapper {
11 List<Consignment> findConsignments(ConsignmentQuery query); 13 List<Consignment> findConsignments(ConsignmentQuery query);
12 14
13 Long findAllCount(ConsignmentQuery query); 15 Long findAllCount(ConsignmentQuery query);
16 +
17 + @Select("SELECT * FROM ( " +
18 + "SELECT * FROM T_BIZ_CONSIGNMENT " +
19 + "WHERE CONSIGNMENT_CODE = #{consignmentCode} " +
20 + "AND CREATE_TIME >= SYSDATE - 30 " +
21 + "ORDER BY CREATE_TIME DESC" +
22 + ") WHERE ROWNUM = 1")
23 + Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
14 } 24 }
......
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.customer.repository.dao.AttachmentMapper"> 3 +<mapper namespace="com.fedex.connect.customer.repository.dao.AttachmentExtMapper">
4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Attachment"> 4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Attachment">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="BIZ_ID" jdbcType="NUMERIC" property="bizId" /> 6 <result column="BIZ_ID" jdbcType="NUMERIC" property="bizId" />
......
...@@ -9,4 +9,6 @@ public interface IConsignmentExtRepository { ...@@ -9,4 +9,6 @@ public interface IConsignmentExtRepository {
9 List<Consignment> findConsignments(ConsignmentQuery query); 9 List<Consignment> findConsignments(ConsignmentQuery query);
10 10
11 Long findAllCount(ConsignmentQuery query); 11 Long findAllCount(ConsignmentQuery query);
12 +
13 + Consignment findByConsignmentCode(String consignmentCode);
12 } 14 }
......
...@@ -20,4 +20,9 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen ...@@ -20,4 +20,9 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen
20 public Long findAllCount(ConsignmentQuery query) { 20 public Long findAllCount(ConsignmentQuery query) {
21 return consignmentExtMapper.findAllCount(query); 21 return consignmentExtMapper.findAllCount(query);
22 } 22 }
23 +
24 + @Override
25 + public Consignment findByConsignmentCode(String consignmentCode) {
26 + return consignmentExtMapper.findByConsignmentCode(consignmentCode);
27 + }
23 } 28 }
......
1 package com.fedex.connect.customer.service.biz; 1 package com.fedex.connect.customer.service.biz;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.common.model.sys.User;
5 +import com.fedex.connect.customer.data.bo.AddBo;
4 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
5 7
6 public interface IConsignmentService { 8 public interface IConsignmentService {
9 + /**
10 + * @Author Szl
11 + * @Description 功能说明 运单查询
12 + * @Date 2024/11/5
13 + * @param query
14 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
15 + */
7 ResponseResultVo findConsignments(ConsignmentQuery query); 16 ResponseResultVo findConsignments(ConsignmentQuery query);
17 +
18 + /**
19 + * @Author Szl
20 + * @Description 功能说明 新增运单
21 + * @Date 2024/11/5
22 + * @param bo
23 + * @param user
24 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
25 + */
26 + ResponseResultVo add(AddBo bo, User user);
8 } 27 }
......
...@@ -18,6 +18,14 @@ import java.util.List; ...@@ -18,6 +18,14 @@ import java.util.List;
18 */ 18 */
19 @Service 19 @Service
20 public class AttachmentServiceImpl extends AbstractEtService implements IAttachmentService { 20 public class AttachmentServiceImpl extends AbstractEtService implements IAttachmentService {
21 + /**
22 + * @Author Szl
23 + * @Description 功能说明 查询该运单历史数据
24 + * @Date 2024/11/5
25 + * @param userId
26 + * @param bizId
27 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
28 + */
21 public ResponseResultVo findHistory(Long userId, Long bizId) { 29 public ResponseResultVo findHistory(Long userId, Long bizId) {
22 List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId); 30 List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId);
23 31
......
...@@ -5,9 +5,13 @@ import com.fedex.connect.common.dependencies.date.vo.PageResult; ...@@ -5,9 +5,13 @@ import com.fedex.connect.common.dependencies.date.vo.PageResult;
5 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 5 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
6 import com.fedex.connect.common.dependencies.util.Utils; 6 import com.fedex.connect.common.dependencies.util.Utils;
7 import com.fedex.connect.common.model.biz.Consignment; 7 import com.fedex.connect.common.model.biz.Consignment;
8 +import com.fedex.connect.common.model.sys.User;
9 +import com.fedex.connect.customer.data.bo.AddBo;
8 import com.fedex.connect.customer.data.query.ConsignmentQuery; 10 import com.fedex.connect.customer.data.query.ConsignmentQuery;
9 import com.fedex.connect.customer.service.AbstractEtService; 11 import com.fedex.connect.customer.service.AbstractEtService;
10 import com.fedex.connect.customer.service.biz.IConsignmentService; 12 import com.fedex.connect.customer.service.biz.IConsignmentService;
13 +import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
14 +import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
12 16
13 import java.util.List; 17 import java.util.List;
...@@ -19,6 +23,17 @@ import java.util.List; ...@@ -19,6 +23,17 @@ import java.util.List;
19 */ 23 */
20 @Service 24 @Service
21 public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService { 25 public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService {
26 +
27 + @Autowired
28 + private ConsignmentUtil consignmentUtil;
29 +
30 + /**
31 + * @Author Szl
32 + * @Description 功能说明 运单查询
33 + * @Date 2024/11/5
34 + * @param query
35 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
36 + */
22 public ResponseResultVo findConsignments(ConsignmentQuery query) { 37 public ResponseResultVo findConsignments(ConsignmentQuery query) {
23 38
24 List<String> consignmentCodeList = query.getConsignmentCodeList(); 39 List<String> consignmentCodeList = query.getConsignmentCodeList();
...@@ -41,4 +56,28 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig ...@@ -41,4 +56,28 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig
41 pageResult.setList(consignments); 56 pageResult.setList(consignments);
42 return ResponseResultVo.succ(pageResult); 57 return ResponseResultVo.succ(pageResult);
43 } 58 }
59 +
60 + /**
61 + * @Author Szl
62 + * @Description 功能说明 新增运单
63 + * @Date 2024/11/5
64 + * @param bo
65 + * @param user
66 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
67 + */
68 + public ResponseResultVo add(AddBo bo, User user){
69 + //查询运单表是否存在已提交的运单
70 + Consignment consignment = consignmentExtRepository.findByConsignmentCode(bo.getConsignmentCode());
71 + if (consignment != null && consignment.getId() != null){
72 + //如果存在则进行bo基础校验
73 + ResponseResultVo responseResultVo = consignmentUtil.consignmentCreatorCheck(consignment,bo);
74 + if (responseResultVo != null){
75 + return responseResultVo;
76 + }
77 + //校验是否是本账号的运单
78 +
79 + }
80 + //如果不存在直接返回
81 + return ResponseResultVo.succ(null);
82 + }
44 } 83 }
......
1 +package com.fedex.connect.customer.util.service.biz;
2 +
3 +import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.common.dependencies.enums.ResponseCode;
5 +import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
6 +import com.fedex.connect.common.model.biz.Consignment;
7 +import com.fedex.connect.customer.data.bo.AddBo;
8 +import org.springframework.beans.factory.annotation.Autowired;
9 +import org.springframework.stereotype.Component;
10 +
11 +import java.util.ArrayList;
12 +import java.util.List;
13 +
14 +/**
15 + * @Author Szl
16 + * @Description 类说明 运单相关util
17 + * @Date 2024/11/5
18 + */
19 +@Component
20 +public class ConsignmentUtil {
21 + @Autowired
22 + private LocaleMessageUtil localeMessageUtil;
23 + /**
24 + * @Author Szl
25 + * @Description 功能说明 校验运单创建人
26 + * @Date 2024/11/5
27 + * @param consignment
28 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
29 + */
30 + public ResponseResultVo consignmentCreatorCheck(Consignment consignment, AddBo bo) {
31 + List<String> errList = new ArrayList<>();
32 +
33 + // 校验字段是否匹配，并将错误信息添加到errList中
34 + checkFieldMismatch(bo.getShipperAccount(), consignment.getShipperAccount(), "con_shipperAccount", errList);
35 + checkFieldMismatch(bo.getRecipientCountry(), consignment.getRecipientCountry(), "con_recipientCountry", errList);
36 + checkFieldMismatch(bo.getShipperCountry(), consignment.getShipperCountry(), "con_shipperCountry", errList);
37 +
38 + if (!errList.isEmpty()) {
39 + String enumResCode601 = localeMessageUtil.getMessage("enum_res_code_601");
40 + String errResult = String.join(",", errList) + enumResCode601;
41 + return ResponseResultVo.fail(ResponseCode.CONSIGNMENT_CREATOR_ERR.getCode(), errResult);
42 + }
43 +
44 + return null;
45 + }
46 +
47 + /**
48 + * @Author Szl
49 + * @Description 功能说明 对比是否一致
50 + * @Date 2024/11/5
51 + * @param boField
52 + * @param consignmentField
53 + * @param messageKey
54 + * @param errList
55 + * @return void
56 + */
57 + private void checkFieldMismatch(String boField, String consignmentField, String messageKey, List<String> errList) {
58 + if (!boField.equals(consignmentField)) {
59 + errList.add(localeMessageUtil.getMessage(messageKey));
60 + }
61 + }
62 +}
1 +package com.fedex.connect.customer.validate.controller.biz;
2 +
3 +import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.common.dependencies.enums.ResponseCode;
5 +import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
6 +import com.fedex.connect.customer.data.bo.LongBo;
7 +import org.springframework.stereotype.Component;
8 +
9 +import javax.annotation.Resource;
10 +
11 +/**
12 + * @Author Szl
13 + * @Description 类说明 附件校验类
14 + * @Date 2024/11/5
15 + */
16 +@Component
17 +public class AttachmentValidate {
18 + @Resource
19 + protected LocaleMessageUtil localeMessageUtil;
20 +
21 + /**
22 + * @Author Szl
23 + * @Description 功能说明 历史数据输入校验
24 + * @Date 2024/11/5
25 + * @param bo
26 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
27 + */
28 + public ResponseResultVo preCheckForFindHistory(LongBo bo){
29 + if (bo == null || bo.getId() == null){
30 + return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
31 + }
32 + return null;
33 + }
34 +}
1 +package com.fedex.connect.customer.validate.controller.biz;
2 +
3 +import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.common.dependencies.enums.ResponseCode;
5 +import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
6 +import com.fedex.connect.customer.data.bo.AddBo;
7 +import org.springframework.stereotype.Component;
8 +import org.springframework.util.StringUtils;
9 +
10 +import javax.annotation.Resource;
11 +
12 +/**
13 + * @Author Szl
14 + * @Description 类说明 运单校验类
15 + * @Date 2024/11/5
16 + */
17 +@Component
18 +public class ConsignmentValidate {
19 + @Resource
20 + protected LocaleMessageUtil localeMessageUtil;
21 +
22 + /**
23 + * @Author Szl
24 + * @Description 功能说明 添加运单校验
25 + * @Date 2024/11/5
26 + * @param bo
27 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
28 + */
29 + public ResponseResultVo preCheckAdd(AddBo bo){
30 + if (bo == null || StringUtils.isEmpty(bo.getAccountNo()) || StringUtils.isEmpty(bo.getConsignmentCode()) ||
31 + StringUtils.isEmpty(bo.getRecipientCountry()) || StringUtils.isEmpty(bo.getShipperAccount()) ||
32 + StringUtils.isEmpty(bo.getShipperCountry())){
33 + return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
34 + }
35 + return null;
36 + }
37 +}
...@@ -2,3 +2,9 @@ conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 ...@@ -2,3 +2,9 @@ conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 enum_res_code_301=登錄身份異常 3 enum_res_code_301=登錄身份異常
4 enum_res_code_305=登錄已過期，請重新登錄 4 enum_res_code_305=登錄已過期，請重新登錄
5 +
6 +enum_res_code_601 = 不正确，请重新输入
7 +
8 +con_shipperAccount = 发货人计费账号
9 +con_shipperCountry = 始发国
10 +con_recipientCountry = 目的国
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,3 +2,9 @@ conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 ...@@ -2,3 +2,9 @@ conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 enum_res_code_301=登錄身份異常 3 enum_res_code_301=登錄身份異常
4 enum_res_code_305=登錄已過期，請重新登錄 4 enum_res_code_305=登錄已過期，請重新登錄
5 +
6 +enum_res_code_601 = 不正确，请重新输入
7 +
8 +con_shipperAccount = 发货人计费账号
9 +con_shipperCountry = 始发国
10 +con_recipientCountry = 目的国
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,9 +2,10 @@ package com.fedex.connect.common.dao.biz; ...@@ -2,9 +2,10 @@ package com.fedex.connect.common.dao.biz;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.common.model.biz.ConsignmentExample; 4 import com.fedex.connect.common.model.biz.ConsignmentExample;
5 -import java.util.List;
6 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
7 6
7 +import java.util.List;
8 +
8 public interface ConsignmentMapper { 9 public interface ConsignmentMapper {
9 long countByExample(ConsignmentExample example); 10 long countByExample(ConsignmentExample example);
10 11
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
47 <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 47 <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" /> 49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
50 + <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
50 </resultMap> 51 </resultMap>
51 <sql id="Example_Where_Clause"> 52 <sql id="Example_Where_Clause">
52 <where> 53 <where>
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
115 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 116 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME,
116 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 117 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
117 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 118 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
118 - DOC_NONDOC_FLAG 119 + DOC_NONDOC_FLAG, USER_UUID
119 </sql> 120 </sql>
120 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap"> 121 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
121 <include refid="OracleDialectPrefix" /> 122 <include refid="OracleDialectPrefix" />
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
169 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 170 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
170 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, 171 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID,
171 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 172 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
172 - DOC_NONDOC_FLAG) 173 + DOC_NONDOC_FLAG, USER_UUID)
173 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 174 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
174 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 175 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR},
175 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 176 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
...@@ -185,7 +186,7 @@ ...@@ -185,7 +186,7 @@
185 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 186 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
186 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, 187 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC},
187 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 188 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR},
188 - #{docNondocFlag,jdbcType=VARCHAR}) 189 + #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR})
189 </insert> 190 </insert>
190 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment"> 191 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
191 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 192 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -326,6 +327,9 @@ ...@@ -326,6 +327,9 @@
326 <if test="docNondocFlag != null"> 327 <if test="docNondocFlag != null">
327 DOC_NONDOC_FLAG, 328 DOC_NONDOC_FLAG,
328 </if> 329 </if>
330 + <if test="userUuid != null">
331 + USER_UUID,
332 + </if>
329 </trim> 333 </trim>
330 <trim prefix="values (" suffix=")" suffixOverrides=","> 334 <trim prefix="values (" suffix=")" suffixOverrides=",">
331 #{id,jdbcType=NUMERIC}, 335 #{id,jdbcType=NUMERIC},
...@@ -461,6 +465,9 @@ ...@@ -461,6 +465,9 @@
461 <if test="docNondocFlag != null"> 465 <if test="docNondocFlag != null">
462 #{docNondocFlag,jdbcType=VARCHAR}, 466 #{docNondocFlag,jdbcType=VARCHAR},
463 </if> 467 </if>
468 + <if test="userUuid != null">
469 + #{userUuid,jdbcType=VARCHAR},
470 + </if>
464 </trim> 471 </trim>
465 </insert> 472 </insert>
466 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long"> 473 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long">
...@@ -607,6 +614,9 @@ ...@@ -607,6 +614,9 @@
607 <if test="record.docNondocFlag != null"> 614 <if test="record.docNondocFlag != null">
608 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}, 615 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
609 </if> 616 </if>
617 + <if test="record.userUuid != null">
618 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
619 + </if>
610 </set> 620 </set>
611 <if test="_parameter != null"> 621 <if test="_parameter != null">
612 <include refid="Update_By_Example_Where_Clause" /> 622 <include refid="Update_By_Example_Where_Clause" />
...@@ -658,7 +668,8 @@ ...@@ -658,7 +668,8 @@
658 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR}, 668 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
659 STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 669 STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
660 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 670 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
661 - DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR} 671 + DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
672 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR}
662 <if test="_parameter != null"> 673 <if test="_parameter != null">
663 <include refid="Update_By_Example_Where_Clause" /> 674 <include refid="Update_By_Example_Where_Clause" />
664 </if> 675 </if>
...@@ -798,6 +809,9 @@ ...@@ -798,6 +809,9 @@
798 <if test="docNondocFlag != null"> 809 <if test="docNondocFlag != null">
799 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}, 810 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
800 </if> 811 </if>
812 + <if test="userUuid != null">
813 + USER_UUID = #{userUuid,jdbcType=VARCHAR},
814 + </if>
801 </set> 815 </set>
802 where ID = #{id,jdbcType=NUMERIC} 816 where ID = #{id,jdbcType=NUMERIC}
803 </update> 817 </update>
...@@ -846,7 +860,8 @@ ...@@ -846,7 +860,8 @@
846 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR}, 860 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
847 STATUS_ID = #{statusId,jdbcType=NUMERIC}, 861 STATUS_ID = #{statusId,jdbcType=NUMERIC},
848 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 862 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
849 - DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR} 863 + DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
864 + USER_UUID = #{userUuid,jdbcType=VARCHAR}
850 where ID = #{id,jdbcType=NUMERIC} 865 where ID = #{id,jdbcType=NUMERIC}
851 </update> 866 </update>
852 <sql id="OracleDialectPrefix"> 867 <sql id="OracleDialectPrefix">
......
...@@ -235,6 +235,11 @@ public class Consignment implements Serializable { ...@@ -235,6 +235,11 @@ public class Consignment implements Serializable {
235 */ 235 */
236 private String docNondocFlag; 236 private String docNondocFlag;
237 237
238 + /**
239 + * 用户UUID
240 + */
241 + private String userUuid;
242 +
238 private static final long serialVersionUID = 1L; 243 private static final long serialVersionUID = 1L;
239 244
240 public Long getId() { 245 public Long getId() {
...@@ -597,6 +602,14 @@ public class Consignment implements Serializable { ...@@ -597,6 +602,14 @@ public class Consignment implements Serializable {
597 this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim(); 602 this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim();
598 } 603 }
599 604
605 + public String getUserUuid() {
606 + return userUuid;
607 + }
608 +
609 + public void setUserUuid(String userUuid) {
610 + this.userUuid = userUuid == null ? null : userUuid.trim();
611 + }
612 +
600 @Override 613 @Override
601 public String toString() { 614 public String toString() {
602 StringBuilder sb = new StringBuilder(); 615 StringBuilder sb = new StringBuilder();
...@@ -648,6 +661,7 @@ public class Consignment implements Serializable { ...@@ -648,6 +661,7 @@ public class Consignment implements Serializable {
648 sb.append(", statusId=").append(statusId); 661 sb.append(", statusId=").append(statusId);
649 sb.append(", statusName=").append(statusName); 662 sb.append(", statusName=").append(statusName);
650 sb.append(", docNondocFlag=").append(docNondocFlag); 663 sb.append(", docNondocFlag=").append(docNondocFlag);
664 + sb.append(", userUuid=").append(userUuid);
651 sb.append(", serialVersionUID=").append(serialVersionUID); 665 sb.append(", serialVersionUID=").append(serialVersionUID);
652 sb.append("]"); 666 sb.append("]");
653 return sb.toString(); 667 return sb.toString();
......
...@@ -3125,6 +3125,76 @@ public class ConsignmentExample { ...@@ -3125,6 +3125,76 @@ public class ConsignmentExample {
3125 addCriterion("DOC_NONDOC_FLAG not between", value1, value2, "docNondocFlag"); 3125 addCriterion("DOC_NONDOC_FLAG not between", value1, value2, "docNondocFlag");
3126 return (Criteria) this; 3126 return (Criteria) this;
3127 } 3127 }
3128 +
3129 + public Criteria andUserUuidIsNull() {
3130 + addCriterion("USER_UUID is null");
3131 + return (Criteria) this;
3132 + }
3133 +
3134 + public Criteria andUserUuidIsNotNull() {
3135 + addCriterion("USER_UUID is not null");
3136 + return (Criteria) this;
3137 + }
3138 +
3139 + public Criteria andUserUuidEqualTo(String value) {
3140 + addCriterion("USER_UUID =", value, "userUuid");
3141 + return (Criteria) this;
3142 + }
3143 +
3144 + public Criteria andUserUuidNotEqualTo(String value) {
3145 + addCriterion("USER_UUID <>", value, "userUuid");
3146 + return (Criteria) this;
3147 + }
3148 +
3149 + public Criteria andUserUuidGreaterThan(String value) {
3150 + addCriterion("USER_UUID >", value, "userUuid");
3151 + return (Criteria) this;
3152 + }
3153 +
3154 + public Criteria andUserUuidGreaterThanOrEqualTo(String value) {
3155 + addCriterion("USER_UUID >=", value, "userUuid");
3156 + return (Criteria) this;
3157 + }
3158 +
3159 + public Criteria andUserUuidLessThan(String value) {
3160 + addCriterion("USER_UUID <", value, "userUuid");
3161 + return (Criteria) this;
3162 + }
3163 +
3164 + public Criteria andUserUuidLessThanOrEqualTo(String value) {
3165 + addCriterion("USER_UUID <=", value, "userUuid");
3166 + return (Criteria) this;
3167 + }
3168 +
3169 + public Criteria andUserUuidLike(String value) {
3170 + addCriterion("USER_UUID like", value, "userUuid");
3171 + return (Criteria) this;
3172 + }
3173 +
3174 + public Criteria andUserUuidNotLike(String value) {
3175 + addCriterion("USER_UUID not like", value, "userUuid");
3176 + return (Criteria) this;
3177 + }
3178 +
3179 + public Criteria andUserUuidIn(List<String> values) {
3180 + addCriterion("USER_UUID in", values, "userUuid");
3181 + return (Criteria) this;
3182 + }
3183 +
3184 + public Criteria andUserUuidNotIn(List<String> values) {
3185 + addCriterion("USER_UUID not in", values, "userUuid");
3186 + return (Criteria) this;
3187 + }
3188 +
3189 + public Criteria andUserUuidBetween(String value1, String value2) {
3190 + addCriterion("USER_UUID between", value1, value2, "userUuid");
3191 + return (Criteria) this;
3192 + }
3193 +
3194 + public Criteria andUserUuidNotBetween(String value1, String value2) {
3195 + addCriterion("USER_UUID not between", value1, value2, "userUuid");
3196 + return (Criteria) this;
3197 + }
3128 } 3198 }
3129 3199
3130 public static class Criteria extends GeneratedCriteria { 3200 public static class Criteria extends GeneratedCriteria {
......
...@@ -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"-->
...@@ -105,12 +105,12 @@ ...@@ -105,12 +105,12 @@
105 <!-- selectByExampleQueryId="true">--> 105 <!-- selectByExampleQueryId="true">-->
106 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />--> 106 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
107 <!-- </table>--> 107 <!-- </table>-->
108 -<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"--> 108 + <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
109 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 109 + enableCountByExample="true" enableUpdateByExample="true"
110 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 110 + enableDeleteByExample="true" enableSelectByExample="true"
111 -<!-- selectByExampleQueryId="true">--> 111 + selectByExampleQueryId="true">
112 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />--> 112 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
113 -<!-- </table>--> 113 + </table>
114 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"--> 114 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
115 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 115 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
116 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 116 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
...@@ -48,15 +48,13 @@ public enum ResponseCode { ...@@ -48,15 +48,13 @@ public enum ResponseCode {
48 OVERDUE_TOKEN_CODE(305,"enum_res_code_305"), 48 OVERDUE_TOKEN_CODE(305,"enum_res_code_305"),
49 ROLE_CONFIRM_DEL(306, "enum_res_code_306"), 49 ROLE_CONFIRM_DEL(306, "enum_res_code_306"),
50 50
51 - INSERT_EXCEPITON(601,"enum_res_code_601"),
52 - RECORD_EXIST(602, "enum_res_code_602"),
53 - EXPORT_TOO_LARGE(603, "enum_res_code_603"),
54 -
55 REQUEST_PARAM_NULL(604, "enum_res_code_604"), 51 REQUEST_PARAM_NULL(604, "enum_res_code_604"),
56 REQUEST_ID_NULL(605, "enum_res_code_605"), 52 REQUEST_ID_NULL(605, "enum_res_code_605"),
57 REQUEST_OBJECT_NULL(606, "enum_res_code_606"), 53 REQUEST_OBJECT_NULL(606, "enum_res_code_606"),
58 - REQUEST_PARAM_UNREASONABLE(606, "enum_res_code_607"); 54 + REQUEST_PARAM_UNREASONABLE(606, "enum_res_code_607"),
59 55
56 + CONSIGNMENT_CREATOR_ERR(601,"enum_res_code_601")
57 +;
60 private Integer code; 58 private Integer code;
61 private String msg; 59 private String msg;
62 60
......
1 +package com.fedex.connect.common.dependencies.enums.biz;
2 +
3 +public enum ConsignmentEnum {
4 + SHIPPER_ACCOUNT(01,"con_shipperAccount"),
5 + SHIPPER_COUNTRY(02,"con_shipperCountry"),
6 + RECIPIENT_COUNTRY(03,"con_recipientCountry"),
7 + ;
8 +
9 + private Integer code;
10 + private String msg;
11 +
12 + ConsignmentEnum(Integer code, String msg) {
13 + this.code = code;
14 + this.msg = msg;
15 + }
16 +
17 + public Integer getCode() {
18 + return code;
19 + }
20 +
21 +
22 + public String getMsg() {
23 + return msg;
24 + }
25 +}
...@@ -78,7 +78,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer ...@@ -78,7 +78,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
78 * @return token key 78 * @return token key
79 */ 79 */
80 public ResponseResultVo createFclToken(JsonObject token) { 80 public ResponseResultVo createFclToken(JsonObject token) {
81 - String tokenKey = DatabaseConstants.FCL_PREFIX + UUID.randomUUID(); 81 + String tokenKey ="" + UUID.randomUUID();
82 try { 82 try {
83 /*redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), RedisConstants.REDIS_EXPRIE_TIME_1W);*/ 83 /*redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), RedisConstants.REDIS_EXPRIE_TIME_1W);*/
84 redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), 1); 84 redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), 1);
......