Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
6e7abc48 1 parent 42d329e6

common-dependencies、kafka-cndc-server、manager-server、biz-customer | 修改 | 运单提交 

mt
2024年11月11日11:20:26
Inline Side-by-side
Showing 48 changed files with 458 additions and 279 deletions
......@@ -4,10 +4,7 @@ package com.fedex.connect.customer.controller.base;
import com.fedex.connect.common.dependencies.common.BasicController;
import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
import com.fedex.connect.customer.service.biz.IAttachmentService;
import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
import com.fedex.connect.customer.service.biz.IConsignmentService;
import com.fedex.connect.customer.service.biz.*;
import com.fedex.connect.customer.validate.controller.biz.AttachmentValidate;
import com.fedex.connect.customer.validate.controller.biz.ConsignmentInfoValidate;
import com.fedex.connect.customer.validate.controller.biz.ConsignmentValidate;
......@@ -38,6 +35,10 @@ public class BaseController extends BasicController {
protected IAttachmentQueryService attachmentQueryService;
@Autowired
protected IUploadRecordService uploadRecordService;
/*********************数据校验*********************/
@Autowired
protected AttachmentValidate attachmentValidate;
@Autowired
......
package com.fedex.connect.customer.controller.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.bo.LongBo;
public interface IAttachmentQueryController {
ResponseVo findHistory(LongBo bo);
ResponseVo queryInfo(Long consignmentId);
}
......
package com.fedex.connect.customer.controller.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
public interface IConsignmentController {
ResponseVo addConsignment(@RequestBody AddBo bo);
ResponseVo addConsignment(@RequestBody ConsignmentBo bo);
ResponseVo submitConsignment(@RequestParam("fileUpload") MultipartFile[] files,
@RequestParam("consignmentJson") String consignmentJson);
}
......
......@@ -5,5 +5,5 @@ import com.fedex.connect.customer.data.query.ConsignmentQuery;
public interface IConsignmentQueryController {
ResponseVo findConsignmentList(ConsignmentQuery consignmentQuery);
ResponseVo findConsignmentInfo(Long id);
ResponseVo findConsignmentInfo(Long consignmentId);
}
\ No newline at end of file
......
package com.fedex.connect.customer.controller.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
public interface IUploadRecordController {
ResponseVo queryHistoryList(Long consignmentId);
}
package com.fedex.connect.customer.controller.biz.impl;
import com.fedex.connect.common.dependencies.date.model.LogShowModel;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.controller.base.BaseController;
import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
import com.fedex.connect.customer.data.bo.LongBo;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @Author Szl
......@@ -28,33 +23,22 @@ import org.springframework.web.bind.annotation.RestController;
@Api(value = "AttachmentQueryController", tags = {"附件查询相关"})
public class AttachmentQueryController extends BaseController implements IAttachmentQueryController {
@PostMapping("/history")
@ApiOperation(value = "历史上传记录查询")
@Override
public ResponseVo findHistory(@RequestBody LongBo bo) {
ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
if (responseResultVo != null){
return responseResultVo;
}
@PostMapping("/queryInfo/{consignmentId}")
@ApiOperation(value = "ResponseVo", notes = "根据运单ID查询用户上传记录")
public ResponseVo queryInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
/**
* 运单id非空校验
*/
consignmentInfoValidate.validateConsignmentId(consignmentId);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
return attachmentQueryService.findHistory(user.getId(),bo.getId());
/**
* 构造查询对象
*/
UserConsignmentInfoQuery userConsignmentInfoQuery = UserConsignmentInfoQuery.getInstance(user,consignmentId);
return attachmentQueryService.queryInfo(userConsignmentInfoQuery);
}
// @PostMapping("/history")
// @ApiOperation(value = "历史上传记录查询")
// @Override
// public ResponseVo findHistory(@RequestBody LongBo bo) {
// ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
// if (responseResultVo != null){
// return responseResultVo;
// }
// /**
// * 获取当前用户信息
// */
// User user = this.getCurrentUserInfo();
// return attachmentQueryService.findHistory(user.getId(),bo.getId());
// }
}
......
package com.fedex.connect.customer.controller.biz.impl;
import com.alibaba.fastjson.JSONObject;
import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.controller.base.BaseController;
import com.fedex.connect.customer.controller.biz.IConsignmentController;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
* @Author Szl
......@@ -24,13 +22,12 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value = "/consignment", name = "运单操作相关")
@Api(value = "ConsignmentController", tags = {"运单操作相关"})
public class ConsignmentController extends BaseController implements IConsignmentController {
private static final Logger logger = LoggerFactory.getLogger(ConsignmentController.class);
@Override
@PostMapping("/add")
@ApiOperation("上传运单")
@ApiOperation(value = "ResponseVo", notes = "上传运单")
@OperationMethodLog(describe = "con_add_oper")
@Override
public ResponseVo addConsignment(@RequestBody AddBo bo){
public ResponseVo addConsignment(@RequestBody ConsignmentBo bo){
ResponseVo responseResultVo = consignmentValidate.preCheckAdd(bo);
if (responseResultVo != null){
return responseResultVo;
......@@ -41,4 +38,27 @@ public class ConsignmentController extends BaseController implements IConsignmen
User user = this.getCurrentUserInfo();
return consignmentService.add(bo,user);
}
@Override
@PostMapping("/submit")
@ApiOperation(value = "ResponseVo", notes = "运单提交")
@OperationMethodLog(describe = "con_submit_oper")
public ResponseVo submitConsignment(@RequestParam("fileUpload") MultipartFile[] files,
@RequestParam("consignmentJson") String consignmentJson) {
ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class);
/**
* 运单id非空校验
*/
// consignmentValidate.validateConsignmentId(consignmentId);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
/**
* 构造查询对象
*/
// UserConsignmentInfoQuery userConsignmentInfoQuery = UserConsignmentInfoQuery.getInstance(user,consignmentId);
// return uploadRecordService.findHistory(userConsignmentInfoQuery);
return null;
}
}
......
......@@ -4,7 +4,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.controller.base.BaseController;
import com.fedex.connect.customer.controller.biz.IConsignmentQueryController;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -23,9 +23,9 @@ import org.springframework.web.bind.annotation.*;
@Api(value = "ConsignmentQueryController", tags = {"运单查询相关"})
public class ConsignmentQueryController extends BaseController implements IConsignmentQueryController {
@PostMapping("/list")
@ApiOperation(value = "运单查询")
@Override
@PostMapping("/list")
@ApiOperation(value = "ResponseVo", notes = "运单查询")
public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
/**
* 获取当前用户信息
......@@ -37,25 +37,25 @@ public class ConsignmentQueryController extends BaseController implements IConsi
return consignmentQueryService.findConsignments(query);
}
@PostMapping("/info/{id}")
@ApiOperation(value = "运单详细信息查询")
@Override
public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) {
@PostMapping("/info/{consignmentId}")
@ApiOperation(value = "ResponseVo", notes = "运单详细信息查询")
public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
/**
* 运单id校验
* 运单id非空校验
*/
consignmentInfoValidate.validateConsignmentId(id);
consignmentInfoValidate.validateConsignmentId(consignmentId);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
ConsignmentInfoQuery consignmentInfoQuery = new ConsignmentInfoQuery();
consignmentInfoQuery.setUserId(user.getId());
consignmentInfoQuery.setUserUuid(user.getUserUuid());
consignmentInfoQuery.setConsignmentId(id);
/**
* 构造查询对象
*/
UserConsignmentInfoQuery userConsignmentInfoQuery = UserConsignmentInfoQuery.getInstance(user,consignmentId);
/**
* 运单信息查询
*/
return consignmentQueryService.findConsignmentInfo(consignmentInfoQuery);
return consignmentQueryService.findConsignmentInfo(userConsignmentInfoQuery);
}
}
......
package com.fedex.connect.customer.controller.biz.impl;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.controller.base.BaseController;
import com.fedex.connect.customer.controller.biz.IUploadRecordController;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author mt
* @Description 上传记录操作类
* @Date 2024/11/8
*/
@Slf4j
@RestController
@RequestMapping(value = "/uploadRecord", name = "上传记录操作相关")
@Api(value = "UploadRecordController", tags = {"上传记录操作相关"})
public class UploadRecordController extends BaseController implements IUploadRecordController {
@Override
@PostMapping("/queryHistoryList/{consignmentId}")
@ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询")
public ResponseVo queryHistoryList(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
/**
* 运单id非空校验
*/
consignmentInfoValidate.validateConsignmentId(consignmentId);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
/**
* 构造查询对象
*/
UserConsignmentInfoQuery userConsignmentInfoQuery = UserConsignmentInfoQuery.getInstance(user,consignmentId);
return uploadRecordService.findHistory(userConsignmentInfoQuery);
}
}
package com.fedex.connect.customer.data.bo;
import lombok.Data;
@Data
public class AddBo {
private String ConsignmentCode;
private String shipperAccount;
private String shipperCountry;
private String recipientCountry;
}
package com.fedex.connect.customer.data.bo;
import lombok.Data;
@Data
public class ConsignmentBo {
//运单id
private Integer id;
//运单号
private String consignmentCode;
//用户录入shipperAccount
private String shipperAccount;
//原产国code
private String originCountryCode;
//原产国全程
private String originCountry;
//目的国code
private String destinationCountryCode;
//目的国全称
private String destinationCountry;
//文件业务类型AWB,INV,PKL,OTH(分运单，发票，箱单和其它这四种类型)
private String[] fileBizType;
}
package com.fedex.connect.customer.data.query;
import com.fedex.connect.common.model.sys.User;
import lombok.Data;
/**
......@@ -8,11 +9,27 @@ import lombok.Data;
* @Date 2024/11/6
*/
@Data
public class ConsignmentInfoQuery {
public class UserConsignmentInfoQuery {
//用户id
private Long userId;
//用户uuid
private String userUuid;
//运单id
private Long consignmentId;
/**
* @Author mt
* @Description 实例化查询对象
* @Date 2024/11/8
* @param user
* @param consignmentId
* @return com.fedex.connect.customer.data.query.UserConsignmentInfoQuery
*/
public static UserConsignmentInfoQuery getInstance(User user,Long consignmentId){
UserConsignmentInfoQuery userConsignmentInfoQuery = new UserConsignmentInfoQuery();
userConsignmentInfoQuery.setUserId(user.getId());
userConsignmentInfoQuery.setUserUuid(user.getUserUuid());
userConsignmentInfoQuery.setConsignmentId(consignmentId);
return userConsignmentInfoQuery;
}
}
......
package com.fedex.connect.customer.repository.dao;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface AttachmentExtMapper {
List<AttachmentHistoryDto> findHistory(@Param("bizId") Long bizId);
}
@Select("SELECT * FROM T_BIZ_ATTACHMENT WHERE UPLOAD_RECORD_ID = " +
"(SELECT MAX(ID) FROM T_BIZ_UPLOAD_RECORD WHERE CREATE_USER_ID = #{query.userId} " +
"AND CONSIGNMENT_ID = #{query.consignmentId}) AND STATUS = 1")
Attachment queryInfo(@Param("query") UserConsignmentInfoQuery query);
}
\ No newline at end of file
......
......@@ -2,7 +2,7 @@ package com.fedex.connect.customer.repository.dao;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -26,5 +26,5 @@ public interface ConsignmentExtMapper {
@Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC INNER JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " +
"WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} AND BUCM.USER_ID = #{query.userId})")
Consignment findConsignmentInfo(@Param("query") ConsignmentInfoQuery query);
Consignment findConsignmentInfo(@Param("query") UserConsignmentInfoQuery query);
}
......
package com.fedex.connect.customer.repository.dao;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UploadRecordExtMapper {
}
......@@ -413,6 +413,6 @@
ON
a.BIZ_ID = c.ID
WHERE
c.ID = #{bizId}
c.ID = #{consignmentId}
</select>
</mapper>
\ No newline at end of file
......
package com.fedex.connect.customer.repository.repo;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import java.util.List;
public interface IAttachmentExtRepository {
public interface IAttachmentRepository {
List<AttachmentHistoryDto> findHistory(Long bizId);
Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery);
}
\ No newline at end of file
......
......@@ -2,17 +2,17 @@ package com.fedex.connect.customer.repository.repo;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import java.util.List;
public interface IConsignmentExtRepository {
public interface IConsignmentRepository {
List<FindConsignmentsDto> findConsignments(ConsignmentQuery query);
Long findAllCount(ConsignmentQuery query);
Consignment findByConsignmentCode(String consignmentCode);
Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
Consignment findConsignmentInfo(UserConsignmentInfoQuery consignmentInfoQuery);
}
......
package com.fedex.connect.customer.repository.repo;
public interface IUploadRecordRepository {
}
package com.fedex.connect.customer.repository.repo.impl;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.customer.repository.base.BaseDao;
import com.fedex.connect.customer.repository.repo.IAttachmentExtRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class AttachmentExtRepositoryImpl extends BaseDao implements IAttachmentExtRepository {
@Override
public List<AttachmentHistoryDto> findHistory(Long bizId) {
return attachmentExtMapper.findHistory(bizId);
}
}
package com.fedex.connect.customer.repository.repo.impl;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.repository.base.BaseDao;
import com.fedex.connect.customer.repository.repo.IAttachmentRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class AttachmentRepositoryImpl extends BaseDao implements IAttachmentRepository {
@Override
public List<AttachmentHistoryDto> findHistory(Long consignmentId) {
return attachmentExtMapper.findHistory(consignmentId);
}
/**
* @Author mt
* @Description 根据运单ID查询用户上传记录
* @Date 2024/11/8
* @param userConsignmentInfoQuery
* @return com.fedex.connect.common.model.biz.Attachment
*/
@Override
public Attachment queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
return attachmentExtMapper.queryInfo(userConsignmentInfoQuery);
}
}
\ No newline at end of file
......@@ -2,16 +2,16 @@ package com.fedex.connect.customer.repository.repo.impl;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import com.fedex.connect.customer.repository.base.BaseDao;
import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository;
import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmentExtRepository {
public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRepository {
@Override
public List<FindConsignmentsDto> findConsignments(ConsignmentQuery query) {
......@@ -28,7 +28,7 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen
return consignmentExtMapper.findByConsignmentCode(consignmentCode);
}
public Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
return consignmentExtMapper.findConsignmentInfo(consignmentInfoQuery);
public Consignment findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
return consignmentExtMapper.findConsignmentInfo(userConsignmentInfoQuery);
}
}
......
package com.fedex.connect.customer.repository.repo.impl;
import com.fedex.connect.customer.repository.base.BaseDao;
import com.fedex.connect.customer.repository.repo.IUploadRecordRepository;
import org.springframework.stereotype.Repository;
@Repository
public class UploadRecordRepositoryImpl extends BaseDao implements IUploadRecordRepository {
}
package com.fedex.connect.customer.service.base;
import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
import com.fedex.connect.customer.repository.repo.IAttachmentExtRepository;
import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository;
import com.fedex.connect.customer.repository.repo.IAttachmentRepository;
import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
import com.fedex.connect.customer.repository.repo.IUploadRecordRepository;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
public class BaseService {
......@@ -14,23 +13,11 @@ public class BaseService {
protected LocaleMessageUtil localeMessageUtil;
@Autowired
protected IConsignmentExtRepository consignmentExtRepository;
protected IConsignmentRepository consignmentRepository;
@Autowired
protected IAttachmentExtRepository attachmentRepository;
/**
* repository
*/
protected IAttachmentRepository attachmentRepository;
/**
* Mapper---------------------------------------------
*/
/**
* MapperExt---------------------------------------------
*/
}
@Autowired
protected IUploadRecordRepository uploadRecordRepository;
}
\ No newline at end of file
......
package com.fedex.connect.customer.service.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
public interface IAttachmentQueryService {
ResponseVo findHistory(Long userId, Long bizId);
ResponseVo queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery);
}
......
package com.fedex.connect.customer.service.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
public interface IConsignmentQueryService {
......@@ -18,8 +18,8 @@ public interface IConsignmentQueryService {
* @Author mt
* @Description 运单信息查询
* @Date 2024/11/7
* @param consignmentInfoQuery
* @param userConsignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery);
}
......
......@@ -2,7 +2,7 @@ package com.fedex.connect.customer.service.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
public interface IConsignmentService {
......@@ -14,5 +14,5 @@ public interface IConsignmentService {
* @param user
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
ResponseVo add(AddBo bo, User user);
ResponseVo add(ConsignmentBo bo, User user);
}
......
package com.fedex.connect.customer.service.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
public interface IUploadRecordService {
ResponseVo findHistory(UserConsignmentInfoQuery userConsignmentInfoQuery);
}
package com.fedex.connect.customer.service.biz.impl;
import com.fedex.connect.common.dependencies.contants.DigitConstants;
import com.fedex.connect.common.dependencies.date.vo.PageResult;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.service.base.BaseService;
import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @Author Szl
* @Description 类说明 附件查询相关service
......@@ -18,31 +14,16 @@ import java.util.List;
*/
@Service
public class AttachmentQueryServiceImpl extends BaseService implements IAttachmentQueryService {
/**
* @Author Szl
* @Description 功能说明 查询该运单历史数据
* @Date 2024/11/5
* @param userId
* @param bizId
* @Author mt
* @Description 根据运单ID查询用户上传记录
* @Date 2024/11/8
* @param userConsignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo findHistory(Long userId, Long bizId) {
List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId);
if (history != null) {
history.forEach(attachmentHistoryDto ->
attachmentHistoryDto.setCreatorFlag(
(attachmentHistoryDto.getUploadUserId() != null &&
attachmentHistoryDto.getUploadUserId().equals(userId)) ?
DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
)
);
}
PageResult pageResult = new PageResult();
pageResult.setList(history != null ? history : Collections.emptyList());
return ResponseVo.succ(pageResult);
public ResponseVo queryInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
Attachment attachment = attachmentRepository.queryInfo(userConsignmentInfoQuery);
return ResponseVo.succ(attachment);
}
}
}
\ No newline at end of file
......
......@@ -6,7 +6,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.util.Utils;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import com.fedex.connect.customer.service.base.BaseService;
import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
......@@ -36,14 +36,14 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
}
//查询数量
Long total = consignmentExtRepository.findAllCount(query);
Long total = consignmentRepository.findAllCount(query);
PageResult pageResult = new PageResult();
pageResult.setTotal(total);
pageResult.setPage(query.getPage());
pageResult.setSize(query.getSize());
if (total != null && total > 0) {
List<FindConsignmentsDto> consignments = consignmentExtRepository.findConsignments(query);
List<FindConsignmentsDto> consignments = consignmentRepository.findConsignments(query);
pageResult.setList(consignments);
}
return ResponseVo.succ(pageResult);
......@@ -55,12 +55,12 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
* 如果运单UUID与登录账号UUID相同，则显示运单、收发件人信息
* 如果运单UUID与登录账号UUID不同，则只显示 运单号、shipperAccount、始发国、目的国
* @Date 2024/11/7
* @param consignmentInfoQuery
* @param userConsignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
Consignment consignment = consignmentExtRepository.findConsignmentInfo(consignmentInfoQuery);
if(Objects.nonNull(consignment) && !consignment.getUserUuid().equals(consignmentInfoQuery.getUserUuid())){
public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery);
if(Objects.nonNull(consignment) && !consignment.getUserUuid().equals(userConsignmentInfoQuery.getUserUuid())){
Consignment consignmentTemp = new Consignment();
consignmentTemp.setId(consignment.getId());
consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
......
......@@ -3,7 +3,7 @@ package com.fedex.connect.customer.service.biz.impl;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import com.fedex.connect.customer.service.base.BaseService;
import com.fedex.connect.customer.service.biz.IConsignmentService;
import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
......@@ -29,9 +29,9 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* @param user
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo add(AddBo bo, User user){
public ResponseVo add(ConsignmentBo bo, User user){
//查询运单表是否存在已提交的运单
Consignment consignment = consignmentExtRepository.findByConsignmentCode(bo.getConsignmentCode());
Consignment consignment = consignmentRepository.findByConsignmentCode(bo.getConsignmentCode());
if (consignment != null && consignment.getId() != null){
//如果存在则进行bo基础校验
ResponseVo responseResultVo = consignmentUtil.consignmentCreatorCheck(consignment,bo);
......
package com.fedex.connect.customer.service.biz.impl;
import com.fedex.connect.common.dependencies.contants.DigitConstants;
import com.fedex.connect.common.dependencies.date.vo.PageResult;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
import com.fedex.connect.customer.service.base.BaseService;
import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
import com.fedex.connect.customer.service.biz.IUploadRecordService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @Author Szl
* @Description 类说明 附件查询相关service
* @Date 2024/11/4
*/
@Service
public class UploadRecordServiceImpl extends BaseService implements IUploadRecordService {
/**
* @Author Szl
* @Description 功能说明 查询该运单历史数据
* @Date 2024/11/5
* @param userConsignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo findHistory(UserConsignmentInfoQuery userConsignmentInfoQuery) {
List<AttachmentHistoryDto> history = attachmentRepository.findHistory(userConsignmentInfoQuery.getConsignmentId());
if (history != null) {
history.forEach(attachmentHistoryDto ->
attachmentHistoryDto.setCreatorFlag(
(attachmentHistoryDto.getUploadUserId() != null &&
attachmentHistoryDto.getUploadUserId().equals(userConsignmentInfoQuery.getUserId())) ?
DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
)
);
}
PageResult pageResult = new PageResult();
pageResult.setList(history != null ? history : Collections.emptyList());
return ResponseVo.succ(pageResult);
}
}
......@@ -6,7 +6,7 @@ import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import com.fedex.connect.customer.data.dto.ConsignmentAddDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -31,7 +31,7 @@ public class ConsignmentUtil {
* @param consignment
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo consignmentCreatorCheck(Consignment consignment, AddBo bo) {
public ResponseVo consignmentCreatorCheck(Consignment consignment, ConsignmentBo bo) {
List<String> errList = new ArrayList<>();
// 校验字段是否匹配，并将错误信息添加到errList中
......
package com.fedex.connect.customer.validate.controller.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
import com.fedex.connect.customer.data.bo.LongBo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -17,17 +14,4 @@ public class AttachmentValidate {
@Autowired
protected LocaleMessageUtil localeMessageUtil;
/**
* @Author Szl
* @Description 功能说明 历史数据输入校验
* @Date 2024/11/5
* @param bo
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo preCheckForFindHistory(LongBo bo){
if (bo == null || bo.getId() == null){
return ResponseVo.fail(localeMessageUtil.getMessage(BaseResponseCode.REQUEST_PARAM_NULL.getMsg()));
}
return null;
}
}
......
......@@ -3,7 +3,7 @@ package com.fedex.connect.customer.validate.controller.biz;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
......@@ -25,10 +25,10 @@ public class ConsignmentValidate {
* @param bo
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo preCheckAdd(AddBo bo){
public ResponseVo preCheckAdd(ConsignmentBo bo){
if (bo == null || StringUtils.isEmpty(bo.getConsignmentCode()) ||
StringUtils.isEmpty(bo.getRecipientCountry()) || StringUtils.isEmpty(bo.getShipperAccount()) ||
StringUtils.isEmpty(bo.getShipperCountry())){
StringUtils.isEmpty(bo.getOriginCountryCode()) || StringUtils.isEmpty(bo.getShipperAccount()) ||
StringUtils.isEmpty(bo.getDestinationCountryCode())){
return ResponseVo.fail(localeMessageUtil.getMessage(BaseResponseCode.REQUEST_PARAM_NULL.getMsg()));
}
return null;
......
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
#******************系统操作日志记录，中文展示******************
con_add_oper=添加运单
con_submit_oper=提交运单
config_aspect_length_error=提示信息过长，未保存成功
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
enum_res_code_601=不正确，请重新输入
enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_add_oper=添加运单
\ No newline at end of file
......
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
#******************系统操作日志记录，中文展示******************
con_add_oper=添加运单
con_submit_oper=提交运单
config_aspect_length_error=提示信息过长，未保存成功
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
enum_res_code_601=不正确，请重新输入
enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_add_oper=添加运单
\ No newline at end of file
......
......@@ -32,5 +32,12 @@ public interface BaseConstants {
String SHIPPER_ACCOUNT = "shipperAccount";
//目的国全称
String DESTINATION_COUNTRY = "destinationCountry";
//用户录入发货人计费账号
String USER_INPUT_SHIPPER_ACCOUNT = "userInputShipperAccount";
//用户录入原产国全称ID，
//关联数据字典表。指定字典目录CODE：COUNTRY
String USER_INPUT_ORIGIN_COUNTRY_CODE = "userInputOriginCountryCode";
//用户录入原产国全称
String USER_INPUT_ORIGIN_COUNTRY = "userInputOriginCountry";
}
}
\ No newline at end of file
......
......@@ -51,10 +51,9 @@ public interface Constant {
//ceInfo转换为consignment忽略字段
interface CE_CONSIGNMENT_COPY_IGNORE_PROP_KEYS{
String[] IGNORE_PROPERTIES = {
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.SHIP_DATE,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.ORIGIN_COUNTRY,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.SHIPPER_ACCOUNT,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.DESTINATION_COUNTRY,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_SHIPPER_ACCOUNT,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY_ID,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY,
BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME,
BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID,
BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_NAME,
......
......@@ -28,7 +28,7 @@ public class KafkaController extends BaseController implements IKafkaController
private String env;
@PostMapping("/rpcKafkaReceive")
@ApiOperation(value = "重新消费dm报文", notes = "重新消费dm报文")
@ApiOperation(value = "void", notes = "重新消费dm报文")
public void rpcKafkaReceive(@RequestBody String json) {
//接收需要重新消费报文
Map<String, List<String>> map = JsonToJava.json2map(json);
......@@ -37,7 +37,7 @@ public class KafkaController extends BaseController implements IKafkaController
}
@PostMapping("/sendDm501")
@ApiOperation(value = "发送DM501", notes = "发送DM501")
@ApiOperation(value = "String", notes = "发送DM501")
public String sendDm001(@RequestBody String json) {
String result = Constant.RESULT_KEYS.SUCCESS;
try {
......@@ -62,7 +62,7 @@ public class KafkaController extends BaseController implements IKafkaController
}
@PostMapping("/sendDmJson")
@ApiOperation(value = "发送kafka报文DmJson内容到kafka", notes = "发送kafka报文DmJson内容到kafka")
@ApiOperation(value = "String", notes = "发送kafka报文DmJson内容到kafka")
public String sendDmJson(@RequestBody String json) {
String result = Constant.RESULT_KEYS.SUCCESS;
try {
......
......@@ -51,6 +51,10 @@ public class Dm501Consignments implements Serializable {
String destIataCode;
//扫描状态日期
Date scanDate;
//用户uuid
String uuid;
//发件人邮箱
String shipperEmail;
/**
* @Author mt
......
......@@ -107,6 +107,10 @@ public class Dm501Util {
}
//重量单位
ceInfo.setWeightunit(dm501Consignment.getWeightUnit());
//用户uuid
ceInfo.setUserUuid(dm501Consignment.getUuid());
//发件人邮箱
ceInfo.setShipperEmail(dm501Consignment.getShipperEmail());
/**
* 初始化表基础字段
*/
......@@ -122,16 +126,7 @@ public class Dm501Util {
*/
private void generateCeInfoShipper(CeInfo ceInfo,Dm501ConAddresses shipperAddress){
//发件人国家(二字码)
String shipperCountry = shipperAddress.getCountry();
//始发国(二字码)
ceInfo.setShipperCountry(shipperCountry);
//根据发件人国家二字码获取字典
DictionaryEntries shipperCountryEntries = cacheSystem.getDicCountryByExt1(shipperCountry);
//根据二字码能获取到二字码则赋值始发国全称
if(Objects.nonNull(shipperCountryEntries)){
//原产国全称
ceInfo.setOriginCountry(shipperCountryEntries.getEnglishName());
}
ceInfo.setShipperCountry(shipperAddress.getCountry());
//发货联系人姓名
ceInfo.setShipperContactName(shipperAddress.getContactName());
//发货人手机号
......@@ -158,17 +153,8 @@ public class Dm501Util {
* @return void
*/
private void generateCeInfoRecipient(CeInfo ceInfo,Dm501ConAddresses recipientAddress){
//收件人国家
String recipientCountry = recipientAddress.getCountry();
// //目的国家二字码
ceInfo.setRecipientCountry(recipientCountry);
//根据发件人国家二字码获取字典
DictionaryEntries countryEntries = cacheSystem.getDicCountryByExt1(recipientCountry);
//根据二字码能获取到二字码则赋值目的国全称
if(Objects.nonNull(countryEntries)){
//目的国全称
ceInfo.setDestinationCountry(countryEntries.getEnglishName());
}
//收件人国家(二字码)
ceInfo.setRecipientCountry(recipientAddress.getCountry());
//收件联系人姓名
ceInfo.setRecipientContactName(recipientAddress.getContactName());
//收件人手机号
......@@ -205,7 +191,7 @@ public class Dm501Util {
BeanUtils.copyProperties(ceInfo,resultConsignment);
//运单状态赋值为"待上传"
DictionaryEntries consignmentDicEntries = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
resultConsignment.setStatusId(consignmentDicEntries.getId());
resultConsignment.setStatusCode(consignmentDicEntries.getCode());
resultConsignment.setStatusName(consignmentDicEntries.getDescription());
/**
* 初始化表基础字段
......@@ -217,6 +203,24 @@ public class Dm501Util {
String[] ignoreProperties = Constant.CE_CONSIGNMENT_COPY_IGNORE_PROP_KEYS.IGNORE_PROPERTIES;
//字段拷贝
BeanUtils.copyProperties(ceInfo,consignment,ignoreProperties);
//根据发件人国家二字码获取字典
DictionaryEntries shipperCountryEntries = cacheSystem.getDicCountryByExt1(ceInfo.getShipperCountry());
//根据二字码能获取到二字码则赋值始发国全称
if(Objects.nonNull(shipperCountryEntries)){
//原产国全称CODE
consignment.setOriginCountryCode(shipperCountryEntries.getCode());
//原产国全称
consignment.setOriginCountry(shipperCountryEntries.getEnglishName());
}
//根据发件人国家二字码获取字典
DictionaryEntries countryEntries = cacheSystem.getDicCountryByExt1(ceInfo.getRecipientCountry());
//根据二字码能获取到二字码则赋值目的国全称
if(Objects.nonNull(countryEntries)){
//目的国全称CODE
consignment.setDestinationCountryCode(countryEntries.getCode());
//目的国全称
consignment.setDestinationCountry(countryEntries.getEnglishName());
}
rsConsignment = consignment;
}
return rsConsignment;
......
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
#******************系统操作日志记录，中文展示******************
config_aspect_length_error=提示信息过长，未保存成功
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
\ No newline at end of file
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
......
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
#******************系统操作日志记录，中文展示******************
config_aspect_length_error=提示信息过长，未保存成功
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
\ No newline at end of file
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
\ No newline at end of file
......
......@@ -18,7 +18,7 @@ import java.util.List;
public class DicEntriesController extends BaseController implements IDicEntriesController {
@GetMapping("/getCountryAll")
@ApiOperation(value = "获取所有国家字典信息")
@ApiOperation(value = "ResponseVo", notes = "获取所有国家字典信息")
public ResponseVo getCountryAll(){
List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
return ResponseVo.succ(countryList);
......
......@@ -48,14 +48,14 @@ public class SysAuthController extends BaseController implements ISysAuthControl
private String fclIndexLoginUrl;
@PostMapping("/init")
@ApiOperation(value = "初始化进入首页获取FCL登录地址")
@ApiOperation(value = "ResponseVo", notes = "初始化进入首页获取FCL登录地址")
public ResponseVo init(){
return ResponseVo.succ(fclIndexLoginUrl);
}
@RequestMapping(value = "/wlgnForward")
@ApiOperation(value = "FCL中转Cookie地址")
@GetMapping(value = "/wlgnForward")
@ApiOperation(value = "ResponseVo", notes = "FCL中转Cookie地址")
public void wlgnForward(HttpServletRequest request, HttpServletResponse res){
printRequestInfo(request);
try {
......@@ -100,7 +100,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
}
@GetMapping(value = "/wlgnLogin")
@ApiOperation(value = "FCL登录")
@ApiOperation(value = "ResponseVo", notes = "FCL登录")
public void wlgnLogin(HttpServletRequest request, HttpServletResponse res) {
log.info("wlgnLogin____________________start");
......
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
\ No newline at end of file
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
......
#******************鉴权相关提示，需要做国际化******************
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
\ No newline at end of file
auth_exc_no_auth=没有访问权限
auth_exc_no_pass_auth=没有通过权限认证
auth_filter_user_error=登录身份异常
auth_filter_timeout=登录超过8小时，请重新登录
auth_filter_stale_dated=登录已过期
enum_res_code_301=登录身份异常
enum_res_code_305=登录已过期，请重新登录
......