Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
67955c9f 2 parents 836ad572 1bf750a5

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

Inline Side-by-side
Showing 22 changed files with 418 additions and 57 deletions
...@@ -33,7 +33,7 @@ public enum ResponseCode { ...@@ -33,7 +33,7 @@ public enum ResponseCode {
33 MESSAGE_CODE_30013(30013,"business_exception_30013"), 33 MESSAGE_CODE_30013(30013,"business_exception_30013"),
34 MESSAGE_CODE_30014(30014,"business_exception_30014"), 34 MESSAGE_CODE_30014(30014,"business_exception_30014"),
35 MESSAGE_CODE_30015(30015,"business_success_30015"), 35 MESSAGE_CODE_30015(30015,"business_success_30015"),
36 - 36 + MESSAGE_CODE_30016(30016,"business_exception_30016"),
37 37
38 /******打个样，编写样例*****/ 38 /******打个样，编写样例*****/
39 // MESSAGE_CODE_30001(30001,"business_exception_30001"), 39 // MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
1 package com.fedex.connect.customer.repository.base; 1 package com.fedex.connect.customer.repository.base;
2 2
3 +import com.fedex.connect.common.dao.biz.AttachmentMapper;
3 import com.fedex.connect.common.dao.biz.ConsignmentMapper; 4 import com.fedex.connect.common.dao.biz.ConsignmentMapper;
5 +import com.fedex.connect.common.dao.biz.UploadRecordMapper;
6 +import com.fedex.connect.common.dao.biz.UserConsignmentMappingMapper;
4 import com.fedex.connect.customer.repository.dao.AttachmentExtMapper; 7 import com.fedex.connect.customer.repository.dao.AttachmentExtMapper;
5 import com.fedex.connect.customer.repository.dao.ConsignmentExtMapper; 8 import com.fedex.connect.customer.repository.dao.ConsignmentExtMapper;
6 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
7 10
8 public class BaseDao { 11 public class BaseDao {
9 @Autowired 12 @Autowired
10 - public ConsignmentMapper consignmentMapper; 13 + protected UploadRecordMapper uploadRecordMapper;
11 @Autowired 14 @Autowired
12 - public ConsignmentExtMapper consignmentExtMapper; 15 + protected ConsignmentMapper consignmentMapper;
13 @Autowired 16 @Autowired
14 - public AttachmentExtMapper attachmentExtMapper; 17 + protected AttachmentMapper attachmentMapper;
18 + @Autowired
19 + protected UserConsignmentMappingMapper userConsignmentMappingMapper;
20 + @Autowired
21 + protected ConsignmentExtMapper consignmentExtMapper;
22 + @Autowired
23 + protected AttachmentExtMapper attachmentExtMapper;
15 } 24 }
......
...@@ -11,4 +11,8 @@ public interface IAttachmentRepository { ...@@ -11,4 +11,8 @@ public interface IAttachmentRepository {
11 List<AttachmentHistoryDto> findHistory(AttachmentHistoryQuery attachmentHistoryQuery); 11 List<AttachmentHistoryDto> findHistory(AttachmentHistoryQuery attachmentHistoryQuery);
12 12
13 Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery); 13 Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery);
14 +
15 + Attachment save(Attachment entity);
16 +
17 + void saveAll(List<Attachment> list);
14 } 18 }
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.fedex.connect.customer.repository.repo; 1 package com.fedex.connect.customer.repository.repo;
2 2
3 -public interface IUploadRecordRepository { 3 +import com.fedex.connect.common.model.biz.UploadRecord;
4 +
5 +import java.util.List;
4 6
7 +public interface IUploadRecordRepository {
8 + /**
9 + * @Author mt
10 + * @Description 上传记录保存或更新
11 + * @Date 2024/11/19
12 + * @param entity
13 + * @return com.fedex.connect.common.model.biz.UploadRecord
14 + */
15 + UploadRecord save(UploadRecord entity);
16 + /**
17 + * @Author mt
18 + * @Description 上传记录批量保存或更新
19 + * @Date 2024/11/19
20 + * @param list
21 + * @return void
22 + */
23 + void saveAll(List<UploadRecord> list);
5 } 24 }
......
1 +package com.fedex.connect.customer.repository.repo;
2 +
3 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
4 +
5 +import java.util.List;
6 +
7 +public interface IUserConsignmentMappingRepository {
8 + /**
9 + * @Author mt
10 + * @Description 根据用户id，运单号查找用户运单关系映射记录
11 + * @Date 2024/11/19
12 + * @param userId
13 + * @param consignmentId
14 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
15 + */
16 + UserConsignmentMapping findByUserIdConsignmentId(Long userId, Long consignmentId);
17 + /**
18 + * @Author mt
19 + * @Description 用户与运单映射信息保存或更新
20 + * @Date 2024/11/19
21 + * @param entity
22 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
23 + */
24 + UserConsignmentMapping save(UserConsignmentMapping entity);
25 + /**
26 + * @Author mt
27 + * @Description 用户与运单映射信息批量保存或更新
28 + * @Date 2024/11/19
29 + * @param list
30 + * @return void
31 + */
32 + void saveAll(List<UserConsignmentMapping> list);
33 +}
1 package com.fedex.connect.customer.repository.repo.impl; 1 package com.fedex.connect.customer.repository.repo.impl;
2 2
3 import com.fedex.connect.common.model.biz.Attachment; 3 import com.fedex.connect.common.model.biz.Attachment;
4 +import com.fedex.connect.common.model.biz.UploadRecord;
4 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto; 5 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
5 import com.fedex.connect.customer.data.query.AttachmentHistoryQuery; 6 import com.fedex.connect.customer.data.query.AttachmentHistoryQuery;
6 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery; 7 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
...@@ -28,4 +29,27 @@ public class AttachmentRepositoryImpl extends BaseDao implements IAttachmentRepo ...@@ -28,4 +29,27 @@ public class AttachmentRepositoryImpl extends BaseDao implements IAttachmentRepo
28 public Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){ 29 public Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
29 return attachmentExtMapper.queryInfo(userConsignmentInfoQuery); 30 return attachmentExtMapper.queryInfo(userConsignmentInfoQuery);
30 } 31 }
32 +
33 + @Override
34 + public Attachment save(Attachment entity) {
35 + if(entity != null) {
36 + if (entity.getId() == null || entity.getId().longValue() <= 0) {
37 + attachmentMapper.insertSelective(entity);
38 + } else if (entity.getId() != null && entity.getId().longValue() > 0){
39 + attachmentMapper.updateByPrimaryKeySelective(entity);
40 + }
41 + }
42 + return entity;
43 + }
44 +
45 + @Override
46 + public void saveAll(List<Attachment> list) {
47 + list.stream().forEach(p->{
48 + if(p.getId() == null || p.getId().longValue() <=0){
49 + attachmentMapper.insertSelective(p);
50 + }else if(p.getId() != null && p.getId().longValue() >0){
51 + attachmentMapper.updateByPrimaryKeySelective(p);
52 + }
53 + });
54 + }
31 } 55 }
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.fedex.connect.customer.repository.repo.impl; 1 package com.fedex.connect.customer.repository.repo.impl;
2 2
3 +import com.fedex.connect.common.model.biz.UploadRecord;
3 import com.fedex.connect.customer.repository.base.BaseDao; 4 import com.fedex.connect.customer.repository.base.BaseDao;
4 import com.fedex.connect.customer.repository.repo.IUploadRecordRepository; 5 import com.fedex.connect.customer.repository.repo.IUploadRecordRepository;
5 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
6 7
8 +import java.util.List;
9 +
7 @Repository 10 @Repository
8 public class UploadRecordRepositoryImpl extends BaseDao implements IUploadRecordRepository { 11 public class UploadRecordRepositoryImpl extends BaseDao implements IUploadRecordRepository {
12 + @Override
13 + public UploadRecord save(UploadRecord entity) {
14 + if(entity != null) {
15 + if (entity.getId() == null || entity.getId().longValue() <= 0) {
16 + uploadRecordMapper.insertSelective(entity);
17 + } else if (entity.getId() != null && entity.getId().longValue() > 0){
18 + uploadRecordMapper.updateByPrimaryKeySelective(entity);
19 + }
20 + }
21 + return entity;
22 + }
9 23
24 + @Override
25 + public void saveAll(List<UploadRecord> list) {
26 + list.stream().forEach(p->{
27 + if(p.getId() == null || p.getId().longValue() <=0){
28 + uploadRecordMapper.insertSelective(p);
29 + }else if(p.getId() != null && p.getId().longValue() >0){
30 + uploadRecordMapper.updateByPrimaryKeySelective(p);
31 + }
32 + });
33 + }
10 } 34 }
......
1 +package com.fedex.connect.customer.repository.repo.impl;
2 +
3 +import com.fedex.connect.common.dependencies.enums.base.StatusEnum;
4 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
5 +import com.fedex.connect.common.model.biz.UserConsignmentMappingExample;
6 +import com.fedex.connect.customer.repository.base.BaseDao;
7 +import com.fedex.connect.customer.repository.repo.IUserConsignmentMappingRepository;
8 +import org.springframework.stereotype.Repository;
9 +import org.springframework.util.CollectionUtils;
10 +
11 +import java.util.List;
12 +
13 +@Repository
14 +public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUserConsignmentMappingRepository {
15 + /**
16 + * @Author mt
17 + * @Description 根据用户id，运单号查找用户运单关系映射记录
18 + * @Date 2024/11/19
19 + * @param userId
20 + * @param consignmentId
21 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
22 + */
23 + public UserConsignmentMapping findByUserIdConsignmentId(Long userId,Long consignmentId){
24 + UserConsignmentMappingExample example = new UserConsignmentMappingExample();
25 + UserConsignmentMappingExample.Criteria criteria = example.createCriteria();
26 + criteria.andUserIdEqualTo(userId);
27 + criteria.andConsignmentIdEqualTo(consignmentId);
28 + criteria.andStatusEqualTo(StatusEnum.YES.getCode());
29 + return CollectionUtils.firstElement(userConsignmentMappingMapper.selectByExample(example));
30 + }
31 +
32 + @Override
33 + public UserConsignmentMapping save(UserConsignmentMapping entity) {
34 + if(entity != null) {
35 + if (entity.getId() == null || entity.getId().longValue() <= 0) {
36 + userConsignmentMappingMapper.insertSelective(entity);
37 + } else if (entity.getId() != null && entity.getId().longValue() > 0){
38 + userConsignmentMappingMapper.updateByPrimaryKeySelective(entity);
39 + }
40 + }
41 + return entity;
42 + }
43 +
44 + @Override
45 + public void saveAll(List<UserConsignmentMapping> list) {
46 + list.stream().forEach(p->{
47 + if(p.getId() == null || p.getId().longValue() <=0){
48 + userConsignmentMappingMapper.insertSelective(p);
49 + }else if(p.getId() != null && p.getId().longValue() >0){
50 + userConsignmentMappingMapper.updateByPrimaryKeySelective(p);
51 + }
52 + });
53 + }
54 +}
...@@ -4,19 +4,18 @@ import com.fedex.connect.common.dependencies.util.ResponseUtils; ...@@ -4,19 +4,18 @@ import com.fedex.connect.common.dependencies.util.ResponseUtils;
4 import com.fedex.connect.customer.repository.repo.IAttachmentRepository; 4 import com.fedex.connect.customer.repository.repo.IAttachmentRepository;
5 import com.fedex.connect.customer.repository.repo.IConsignmentRepository; 5 import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
6 import com.fedex.connect.customer.repository.repo.IUploadRecordRepository; 6 import com.fedex.connect.customer.repository.repo.IUploadRecordRepository;
7 +import com.fedex.connect.customer.repository.repo.IUserConsignmentMappingRepository;
7 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
8 9
9 public class BaseService { 10 public class BaseService {
10 -
11 @Autowired 11 @Autowired
12 protected ResponseUtils responseUtils; 12 protected ResponseUtils responseUtils;
13 -
14 @Autowired 13 @Autowired
15 protected IConsignmentRepository consignmentRepository; 14 protected IConsignmentRepository consignmentRepository;
16 -
17 @Autowired 15 @Autowired
18 protected IAttachmentRepository attachmentRepository; 16 protected IAttachmentRepository attachmentRepository;
19 -
20 @Autowired 17 @Autowired
21 protected IUploadRecordRepository uploadRecordRepository; 18 protected IUploadRecordRepository uploadRecordRepository;
19 + @Autowired
20 + protected IUserConsignmentMappingRepository userConsignmentMappingRepository;
22 } 21 }
...\ No newline at end of file ...\ No newline at end of file
......
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;
4 import com.fedex.connect.common.dependencies.util.ResponseUtils; 6 import com.fedex.connect.common.dependencies.util.ResponseUtils;
5 import com.fedex.connect.common.model.biz.Attachment; 7 import com.fedex.connect.common.model.biz.Attachment;
6 import com.fedex.connect.common.model.biz.Consignment; 8 import com.fedex.connect.common.model.biz.Consignment;
7 import com.fedex.connect.common.model.biz.UploadRecord; 9 import com.fedex.connect.common.model.biz.UploadRecord;
10 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
8 import com.fedex.connect.common.model.sys.User; 11 import com.fedex.connect.common.model.sys.User;
9 import com.fedex.connect.customer.data.bo.AddBo; 12 import com.fedex.connect.customer.data.bo.AddBo;
10 import com.fedex.connect.customer.data.bo.ConsignmentBo; 13 import com.fedex.connect.customer.data.bo.ConsignmentBo;
...@@ -17,11 +20,15 @@ import com.fedex.connect.customer.util.service.biz.UploadRecordUtil; ...@@ -17,11 +20,15 @@ import com.fedex.connect.customer.util.service.biz.UploadRecordUtil;
17 import org.apache.commons.lang3.StringUtils; 20 import org.apache.commons.lang3.StringUtils;
18 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
19 import org.springframework.stereotype.Service; 22 import org.springframework.stereotype.Service;
23 +import org.springframework.transaction.annotation.Transactional;
20 import org.springframework.web.multipart.MultipartFile; 24 import org.springframework.web.multipart.MultipartFile;
21 25
26 +import java.io.File;
22 import java.time.LocalDate; 27 import java.time.LocalDate;
28 +import java.util.ArrayList;
23 import java.util.List; 29 import java.util.List;
24 import java.util.Objects; 30 import java.util.Objects;
31 +import java.util.Optional;
25 32
26 /** 33 /**
27 * @Author Szl 34 * @Author Szl
...@@ -95,26 +102,91 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -95,26 +102,91 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
95 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo 102 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
96 */ 103 */
97 public ResponseVo submitConsignment(MultipartFile[] files,ConsignmentBo consignmentBo,User user){ 104 public ResponseVo submitConsignment(MultipartFile[] files,ConsignmentBo consignmentBo,User user){
105 + List<Attachment> attachmentList = null;
106 + try {
107 + /**
108 + * 上传附件，并将附件信息返回
109 + */
110 + attachmentList = attachmentService.uploadAttachments(files,
111 + consignmentBo.getAttachmentBizTypeList(),
112 + user,
113 + consignmentBo.getConsignmentCode());
114 + /**
115 + * 初始化运单信息
116 + */
117 + Consignment consignment = consignmentUtil.initConsignment(consignmentBo, user);
118 + /**
119 + * 初始化上传记录信息
120 + */
121 + UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode());
122 + /**
123 + * 保存运单相关信息
124 + */
125 + this.saveSubmitInfo(consignment,attachmentList,uploadRecord,user);
126 + /**
127 + * 初始化插入预清关文件推送任务日志，szl添加
128 + */
129 + /**
130 + * 初始化插入预清关文件邮件推送日志，mt添加
131 + */
132 + }catch(Exception ex){
133 + /**
134 + * 提交异常，需要删除对应已上传附件
135 + */
136 + attachmentService.deleteAttachments(attachmentList);
137 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30016,ex);
138 + }
139 + return responseUtils.success(ResponseCode.MESSAGE_CODE_30015);
140 + }
141 +
142 + /**
143 + * @Author mt
144 + * @Description 保存运单相关信息
145 + * @Date 2024/11/19
146 + * @param consignment
147 + * @param attachmentList
148 + * @param uploadRecord
149 + * @param user
150 + * @return void
151 + */
152 + @Transactional(rollbackFor = Exception.class)
153 + public void saveSubmitInfo(Consignment consignment,
154 + List<Attachment> attachmentList,
155 + UploadRecord uploadRecord,
156 + User user) throws Exception{
98 /** 157 /**
99 - * 上传附件，并将附件信息返回 158 + * 保存或更新运单表
100 */ 159 */
101 - List<Attachment> attachmentList = attachmentService.uploadAttachments(files, 160 + consignmentRepository.save(consignment);
102 - consignmentBo.getAttachmentBizTypeList(), 161 + //设置上传记录表运单ID
103 - user, 162 + uploadRecord.setConsignmentId(consignment.getId());
104 - consignmentBo.getConsignmentCode());
105 /** 163 /**
106 - * 初始化运单信息 164 + * 保存上传记录表
107 */ 165 */
108 - Consignment consignment = consignmentUtil.initConsignment(consignmentBo,user); 166 + uploadRecordRepository.save(uploadRecord);
167 + //设置附件表运单id，上传记录表id
168 + Optional.ofNullable(attachmentList).orElse(new ArrayList<>()).stream().filter(Objects::nonNull).forEach(p->{
169 + p.setBizId(consignment.getId());
170 + p.setUploadRecordId(uploadRecord.getId());
171 + });
109 /** 172 /**
110 - * 初始化上传记录信息 173 + * 保存附件表信息
111 */ 174 */
112 -// UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode()); 175 + attachmentRepository.saveAll(attachmentList);
113 - 176 + //用户uuid与运单uuid不一致，则需要添加用户运单中间表信息
114 - return responseUtils.success(ResponseCode.MESSAGE_CODE_30015); 177 + if(!user.getUserUuid().equals(consignment.getUserUuid())){
115 - } 178 + /**
116 - 179 + * 查找用户与运单关联信息
117 - private void saveSubmitInfo(List<Attachment> attachmentList,Consignment consignment,UploadRecord uploadRecord){ 180 + */
118 - 181 + UserConsignmentMapping userConsignmentMapping = userConsignmentMappingRepository.findByUserIdConsignmentId(user.getId(),consignment.getId());
182 + if(Objects.isNull(userConsignmentMapping)){
183 + userConsignmentMapping = new UserConsignmentMapping();
184 + userConsignmentMapping.setUserId(user.getId());
185 + userConsignmentMapping.setConsignmentId(consignment.getId());
186 + userConsignmentMapping.setStatus(StatusEnum.YES.getCode());
187 + AssignmentFieldUtils.assignmentTableBaseField(userConsignmentMapping);
188 + userConsignmentMappingRepository.save(userConsignmentMapping);
189 + }
190 + }
119 } 191 }
120 } 192 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,9 +21,7 @@ import org.springframework.stereotype.Component; ...@@ -21,9 +21,7 @@ import org.springframework.stereotype.Component;
21 import org.springframework.web.multipart.MultipartFile; 21 import org.springframework.web.multipart.MultipartFile;
22 22
23 import java.io.File; 23 import java.io.File;
24 -import java.util.Date; 24 +import java.util.*;
25 -import java.util.List;
26 -import java.util.Objects;
27 25
28 /** 26 /**
29 * @Author mt 27 * @Author mt
...@@ -77,7 +75,7 @@ public class AttachmentUtil { ...@@ -77,7 +75,7 @@ public class AttachmentUtil {
77 * @return void 75 * @return void
78 */ 76 */
79 public void deleteAttachments(List<Attachment> attachmentList){ 77 public void deleteAttachments(List<Attachment> attachmentList){
80 - attachmentList.stream().forEach(p->{ 78 + Optional.ofNullable(attachmentList).orElse(new ArrayList<>()).stream().filter(Objects::nonNull).forEach(p->{
81 String filePathName = p.getFilePath() + File.separator + p.getFileName(); 79 String filePathName = p.getFilePath() + File.separator + p.getFileName();
82 try { 80 try {
83 nioFileUtils.deleteIfExists(filePathName); 81 nioFileUtils.deleteIfExists(filePathName);
...@@ -105,6 +103,8 @@ public class AttachmentUtil { ...@@ -105,6 +103,8 @@ public class AttachmentUtil {
105 String suffix = sourceFileName.substring(sourceFileName.lastIndexOf(BaseSeparatorConstants.SEPARATOR_POINT)); 103 String suffix = sourceFileName.substring(sourceFileName.lastIndexOf(BaseSeparatorConstants.SEPARATOR_POINT));
106 String filePathName = null; 104 String filePathName = null;
107 try{ 105 try{
106 + //设置运单号
107 + attachment.setConsignmentCode(consignmentCode);
108 //用户上传原文件名称 108 //用户上传原文件名称
109 attachment.setSourceFileName(sourceFileName); 109 attachment.setSourceFileName(sourceFileName);
110 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf 110 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf
......
...@@ -42,4 +42,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建 ...@@ -42,4 +42,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
42 business_exception_30012=UUID不一致 42 business_exception_30012=UUID不一致
43 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 43 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
44 business_exception_30014=运单信息加载失败，请稍后重试 44 business_exception_30014=运单信息加载失败，请稍后重试
45 -business_success_30015=提交成功
...\ No newline at end of file ...\ No newline at end of file
45 +business_success_30015=提交成功
46 +business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -42,4 +42,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建 ...@@ -42,4 +42,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
42 business_exception_30012=UUID不一致 42 business_exception_30012=UUID不一致
43 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 43 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
44 business_exception_30014=运单信息加载失败，请稍后重试 44 business_exception_30014=运单信息加载失败，请稍后重试
45 -business_success_30015=提交成功
...\ No newline at end of file ...\ No newline at end of file
45 +business_success_30015=提交成功
46 +business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 12 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
15 + <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
15 </resultMap> 16 </resultMap>
16 <sql id="Example_Where_Clause"> 17 <sql id="Example_Where_Clause">
17 <where> 18 <where>
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
73 </sql> 74 </sql>
74 <sql id="Base_Column_List"> 75 <sql id="Base_Column_List">
75 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 76 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
76 - MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 77 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE
77 </sql> 78 </sql>
78 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap"> 79 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap">
79 <include refid="OracleDialectPrefix" /> 80 <include refid="OracleDialectPrefix" />
...@@ -115,11 +116,11 @@ ...@@ -115,11 +116,11 @@
115 insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID, 116 insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID,
116 STATUS, CREATE_TIME, CREATE_USER_ID, 117 STATUS, CREATE_TIME, CREATE_USER_ID,
117 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 118 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
118 - MODIFY_USER_NAME) 119 + MODIFY_USER_NAME, CONSIGNMENT_CODE)
119 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, 120 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC},
120 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 121 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
121 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 122 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
122 - #{modifyUserName,jdbcType=VARCHAR}) 123 + #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR})
123 </insert> 124 </insert>
124 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping"> 125 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping">
125 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -155,6 +156,9 @@ ...@@ -155,6 +156,9 @@
155 <if test="modifyUserName != null"> 156 <if test="modifyUserName != null">
156 MODIFY_USER_NAME, 157 MODIFY_USER_NAME,
157 </if> 158 </if>
159 + <if test="consignmentCode != null">
160 + CONSIGNMENT_CODE,
161 + </if>
158 </trim> 162 </trim>
159 <trim prefix="values (" suffix=")" suffixOverrides=","> 163 <trim prefix="values (" suffix=")" suffixOverrides=",">
160 #{id,jdbcType=NUMERIC}, 164 #{id,jdbcType=NUMERIC},
...@@ -185,6 +189,9 @@ ...@@ -185,6 +189,9 @@
185 <if test="modifyUserName != null"> 189 <if test="modifyUserName != null">
186 #{modifyUserName,jdbcType=VARCHAR}, 190 #{modifyUserName,jdbcType=VARCHAR},
187 </if> 191 </if>
192 + <if test="consignmentCode != null">
193 + #{consignmentCode,jdbcType=VARCHAR},
194 + </if>
188 </trim> 195 </trim>
189 </insert> 196 </insert>
190 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long"> 197 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long">
...@@ -226,6 +233,9 @@ ...@@ -226,6 +233,9 @@
226 <if test="record.modifyUserName != null"> 233 <if test="record.modifyUserName != null">
227 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 234 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
228 </if> 235 </if>
236 + <if test="record.consignmentCode != null">
237 + CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
238 + </if>
229 </set> 239 </set>
230 <if test="_parameter != null"> 240 <if test="_parameter != null">
231 <include refid="Update_By_Example_Where_Clause" /> 241 <include refid="Update_By_Example_Where_Clause" />
...@@ -242,7 +252,8 @@ ...@@ -242,7 +252,8 @@
242 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 252 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
243 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 253 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
244 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 254 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
245 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 255 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
256 + CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}
246 <if test="_parameter != null"> 257 <if test="_parameter != null">
247 <include refid="Update_By_Example_Where_Clause" /> 258 <include refid="Update_By_Example_Where_Clause" />
248 </if> 259 </if>
...@@ -277,6 +288,9 @@ ...@@ -277,6 +288,9 @@
277 <if test="modifyUserName != null"> 288 <if test="modifyUserName != null">
278 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 289 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
279 </if> 290 </if>
291 + <if test="consignmentCode != null">
292 + CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
293 + </if>
280 </set> 294 </set>
281 where ID = #{id,jdbcType=NUMERIC} 295 where ID = #{id,jdbcType=NUMERIC}
282 </update> 296 </update>
...@@ -290,7 +304,8 @@ ...@@ -290,7 +304,8 @@
290 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 304 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
291 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 305 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
292 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 306 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
293 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 307 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
308 + CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}
294 where ID = #{id,jdbcType=NUMERIC} 309 where ID = #{id,jdbcType=NUMERIC}
295 </update> 310 </update>
296 <sql id="OracleDialectPrefix"> 311 <sql id="OracleDialectPrefix">
......
...@@ -58,6 +58,11 @@ public class UserConsignmentMapping implements Serializable { ...@@ -58,6 +58,11 @@ public class UserConsignmentMapping implements Serializable {
58 */ 58 */
59 private String modifyUserName; 59 private String modifyUserName;
60 60
61 + /**
62 + * 运单号
63 + */
64 + private String consignmentCode;
65 +
61 private static final long serialVersionUID = 1L; 66 private static final long serialVersionUID = 1L;
62 67
63 public Long getId() { 68 public Long getId() {
...@@ -140,6 +145,14 @@ public class UserConsignmentMapping implements Serializable { ...@@ -140,6 +145,14 @@ public class UserConsignmentMapping implements Serializable {
140 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 145 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
141 } 146 }
142 147
148 + public String getConsignmentCode() {
149 + return consignmentCode;
150 + }
151 +
152 + public void setConsignmentCode(String consignmentCode) {
153 + this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim();
154 + }
155 +
143 @Override 156 @Override
144 public String toString() { 157 public String toString() {
145 StringBuilder sb = new StringBuilder(); 158 StringBuilder sb = new StringBuilder();
...@@ -156,6 +169,7 @@ public class UserConsignmentMapping implements Serializable { ...@@ -156,6 +169,7 @@ public class UserConsignmentMapping implements Serializable {
156 sb.append(", modifyTime=").append(modifyTime); 169 sb.append(", modifyTime=").append(modifyTime);
157 sb.append(", modifyUserId=").append(modifyUserId); 170 sb.append(", modifyUserId=").append(modifyUserId);
158 sb.append(", modifyUserName=").append(modifyUserName); 171 sb.append(", modifyUserName=").append(modifyUserName);
172 + sb.append(", consignmentCode=").append(consignmentCode);
159 sb.append(", serialVersionUID=").append(serialVersionUID); 173 sb.append(", serialVersionUID=").append(serialVersionUID);
160 sb.append("]"); 174 sb.append("]");
161 return sb.toString(); 175 return sb.toString();
......
...@@ -744,6 +744,76 @@ public class UserConsignmentMappingExample { ...@@ -744,6 +744,76 @@ public class UserConsignmentMappingExample {
744 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 744 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
745 return (Criteria) this; 745 return (Criteria) this;
746 } 746 }
747 +
748 + public Criteria andConsignmentCodeIsNull() {
749 + addCriterion("CONSIGNMENT_CODE is null");
750 + return (Criteria) this;
751 + }
752 +
753 + public Criteria andConsignmentCodeIsNotNull() {
754 + addCriterion("CONSIGNMENT_CODE is not null");
755 + return (Criteria) this;
756 + }
757 +
758 + public Criteria andConsignmentCodeEqualTo(String value) {
759 + addCriterion("CONSIGNMENT_CODE =", value, "consignmentCode");
760 + return (Criteria) this;
761 + }
762 +
763 + public Criteria andConsignmentCodeNotEqualTo(String value) {
764 + addCriterion("CONSIGNMENT_CODE <>", value, "consignmentCode");
765 + return (Criteria) this;
766 + }
767 +
768 + public Criteria andConsignmentCodeGreaterThan(String value) {
769 + addCriterion("CONSIGNMENT_CODE >", value, "consignmentCode");
770 + return (Criteria) this;
771 + }
772 +
773 + public Criteria andConsignmentCodeGreaterThanOrEqualTo(String value) {
774 + addCriterion("CONSIGNMENT_CODE >=", value, "consignmentCode");
775 + return (Criteria) this;
776 + }
777 +
778 + public Criteria andConsignmentCodeLessThan(String value) {
779 + addCriterion("CONSIGNMENT_CODE <", value, "consignmentCode");
780 + return (Criteria) this;
781 + }
782 +
783 + public Criteria andConsignmentCodeLessThanOrEqualTo(String value) {
784 + addCriterion("CONSIGNMENT_CODE <=", value, "consignmentCode");
785 + return (Criteria) this;
786 + }
787 +
788 + public Criteria andConsignmentCodeLike(String value) {
789 + addCriterion("CONSIGNMENT_CODE like", value, "consignmentCode");
790 + return (Criteria) this;
791 + }
792 +
793 + public Criteria andConsignmentCodeNotLike(String value) {
794 + addCriterion("CONSIGNMENT_CODE not like", value, "consignmentCode");
795 + return (Criteria) this;
796 + }
797 +
798 + public Criteria andConsignmentCodeIn(List<String> values) {
799 + addCriterion("CONSIGNMENT_CODE in", values, "consignmentCode");
800 + return (Criteria) this;
801 + }
802 +
803 + public Criteria andConsignmentCodeNotIn(List<String> values) {
804 + addCriterion("CONSIGNMENT_CODE not in", values, "consignmentCode");
805 + return (Criteria) this;
806 + }
807 +
808 + public Criteria andConsignmentCodeBetween(String value1, String value2) {
809 + addCriterion("CONSIGNMENT_CODE between", value1, value2, "consignmentCode");
810 + return (Criteria) this;
811 + }
812 +
813 + public Criteria andConsignmentCodeNotBetween(String value1, String value2) {
814 + addCriterion("CONSIGNMENT_CODE not between", value1, value2, "consignmentCode");
815 + return (Criteria) this;
816 + }
747 } 817 }
748 818
749 public static class Criteria extends GeneratedCriteria { 819 public static class Criteria extends GeneratedCriteria {
......
...@@ -91,6 +91,8 @@ C:BRANCH 分支 ...@@ -91,6 +91,8 @@ C:BRANCH 分支
91 */ 91 */
92 private String modifyUserName; 92 private String modifyUserName;
93 93
94 + private String hidden;
95 +
94 private static final long serialVersionUID = 1L; 96 private static final long serialVersionUID = 1L;
95 97
96 public Long getId() { 98 public Long getId() {
...@@ -221,6 +223,18 @@ C:BRANCH 分支 ...@@ -221,6 +223,18 @@ C:BRANCH 分支
221 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 223 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
222 } 224 }
223 225
226 + public String getHidden() {
227 + return hidden;
228 + }
229 +
230 + public void setHidden(String hidden) {
231 + this.hidden = hidden;
232 + }
233 +
234 + public static long getSerialVersionUID() {
235 + return serialVersionUID;
236 + }
237 +
224 @Override 238 @Override
225 public String toString() { 239 public String toString() {
226 StringBuilder sb = new StringBuilder(); 240 StringBuilder sb = new StringBuilder();
......
...@@ -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"-->
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
117 <!-- selectByExampleQueryId="true">--> 117 <!-- selectByExampleQueryId="true">-->
118 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />--> 118 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
119 <!-- </table>--> 119 <!-- </table>-->
120 - <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment" 120 +<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
121 - enableCountByExample="true" enableUpdateByExample="true" 121 +<!-- enableCountByExample="true" enableUpdateByExample="true"-->
122 - enableDeleteByExample="true" enableSelectByExample="true" 122 +<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
123 - selectByExampleQueryId="true"> 123 +<!-- selectByExampleQueryId="true">-->
124 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" /> 124 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
125 - </table> 125 +<!-- </table>-->
126 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"--> 126 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
127 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 127 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
128 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 128 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
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 org.springframework.web.bind.annotation.PathVariable;
5 4
6 public interface ISysPrivilegeController { 5 public interface ISysPrivilegeController {
7 - ResponseVo getPrivilege(@PathVariable Long userId); 6 + ResponseVo getPrivilege();
8 } 7 }
......
1 package com.fedex.connect.manager.controller.sys.impl; 1 package com.fedex.connect.manager.controller.sys.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.model.sys.User;
4 import com.fedex.connect.manager.controller.base.BaseController; 5 import com.fedex.connect.manager.controller.base.BaseController;
5 import com.fedex.connect.manager.controller.sys.ISysPrivilegeController; 6 import com.fedex.connect.manager.controller.sys.ISysPrivilegeController;
6 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
8 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
9 import org.springframework.web.bind.annotation.GetMapping; 10 import org.springframework.web.bind.annotation.GetMapping;
10 -import org.springframework.web.bind.annotation.PathVariable;
11 import org.springframework.web.bind.annotation.RequestMapping; 11 import org.springframework.web.bind.annotation.RequestMapping;
12 import org.springframework.web.bind.annotation.RestController; 12 import org.springframework.web.bind.annotation.RestController;
13 13
...@@ -18,9 +18,13 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,9 +18,13 @@ import org.springframework.web.bind.annotation.RestController;
18 public class SysPrivilegeController extends BaseController implements ISysPrivilegeController { 18 public class SysPrivilegeController extends BaseController implements ISysPrivilegeController {
19 19
20 @Override 20 @Override
21 - @GetMapping(value = {"/{userId}"}) 21 + @GetMapping(value = {"/getPrivilege"})
22 - @ApiOperation(value = "根据用户ID获取菜单") 22 + @ApiOperation(value = "获取菜单")
23 - public ResponseVo getPrivilege(@PathVariable Long userId){ 23 + public ResponseVo getPrivilege(){
24 - return privilegeService.getPrivilegeByUserId(userId); 24 + /**
25 + * 获取当前用户信息
26 + */
27 + User user = this.getCurrentUserInfo();
28 + return privilegeService.getPrivilege(user);
25 } 29 }
26 } 30 }
......
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 +import com.fedex.connect.common.model.sys.User;
4 5
5 public interface IPrivilegeService { 6 public interface IPrivilegeService {
6 - ResponseVo getPrivilegeByUserId(Long id); 7 + ResponseVo getPrivilege(User user);
7 } 8 }
......
...@@ -3,6 +3,7 @@ package com.fedex.connect.manager.service.sys.impl; ...@@ -3,6 +3,7 @@ package com.fedex.connect.manager.service.sys.impl;
3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
5 import com.fedex.connect.common.model.sys.Privilege; 5 import com.fedex.connect.common.model.sys.Privilege;
6 +import com.fedex.connect.common.model.sys.User;
6 import com.fedex.connect.common.model.sys.UserRole; 7 import com.fedex.connect.common.model.sys.UserRole;
7 import com.fedex.connect.common.model.sys.UserRoleExample; 8 import com.fedex.connect.common.model.sys.UserRoleExample;
8 import com.fedex.connect.manager.service.base.BaseService; 9 import com.fedex.connect.manager.service.base.BaseService;
...@@ -18,14 +19,14 @@ import java.util.stream.Collectors; ...@@ -18,14 +19,14 @@ import java.util.stream.Collectors;
18 @Slf4j 19 @Slf4j
19 public class PrivilegeServiceImpl extends BaseService implements IPrivilegeService { 20 public class PrivilegeServiceImpl extends BaseService implements IPrivilegeService {
20 21
21 - public ResponseVo getPrivilegeByUserId(Long id){ 22 + public ResponseVo getPrivilege(User user){
22 /** 23 /**
23 * 获取到该用户的角色 24 * 获取到该用户的角色
24 */ 25 */
25 UserRoleExample example = new UserRoleExample(); 26 UserRoleExample example = new UserRoleExample();
26 UserRoleExample.Criteria criteria = example.createCriteria(); 27 UserRoleExample.Criteria criteria = example.createCriteria();
27 criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID); 28 criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
28 - criteria.andUserIdEqualTo(id); 29 + criteria.andUserIdEqualTo(user.getId());
29 List<UserRole> userRoles = userRoleRepository.selectByExample(example); 30 List<UserRole> userRoles = userRoleRepository.selectByExample(example);
30 /** 31 /**
31 * 根据角色获取菜单权限 32 * 根据角色获取菜单权限
...@@ -40,6 +41,9 @@ public class PrivilegeServiceImpl extends BaseService implements IPrivilegeServi ...@@ -40,6 +41,9 @@ public class PrivilegeServiceImpl extends BaseService implements IPrivilegeServi
40 * 获取权限 41 * 获取权限
41 */ 42 */
42 List<Privilege> privilegesByIds = privilegeRepository.findPrivilegesByIds(byRoleIds); 43 List<Privilege> privilegesByIds = privilegeRepository.findPrivilegesByIds(byRoleIds);
44 + for (Privilege privilegesById : privilegesByIds) {
45 + privilegesById.setHidden("false");
46 + }
43 return responseUtils.success(privilegesByIds); 47 return responseUtils.success(privilegesByIds);
44 } 48 }
45 49
......