customer|查询数据部分

@@ -3,6 +3,8 @@ package com.fedex.connect.customer.controller;
 
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import com.fedex.connect.customer.service.biz.IConsignmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +22,9 @@ public class AbstractEtController {
     @Resource
     @Resource
     protected LocaleMessageUtil localeMessageUtil;
     protected LocaleMessageUtil localeMessageUtil;
 
 
+    @Autowired
+    protected IConsignmentService consignmentService;
+
 
 
     public <T> ResponseEntity<T> seeOther(String url) {
     public <T> ResponseEntity<T> seeOther(String url) {
         HttpHeaders httpHeaders = new HttpHeaders();
         HttpHeaders httpHeaders = new HttpHeaders();

 package com.fedex.connect.customer.controller.biz;
 package com.fedex.connect.customer.controller.biz;
 
 
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import org.springframework.web.bind.annotation.RequestBody;
+
 public interface IConsignmentController {
 public interface IConsignmentController {
+    ResponseResultVo findConsignment(@RequestBody ConsignmentQuery consignmentQuery);
 }
 }

+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.ResponseResultVo;
+import com.fedex.connect.common.dependencies.enums.ResponseCode;
+import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
+import com.fedex.connect.customer.controller.AbstractEtController;
+import com.fedex.connect.customer.controller.biz.IConsignmentController;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+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;
+
+/**
+  * @Author Szl
+  * @Description 类说明 运单相关接口
+  * @Date 2024/10/30
+  */
+@RestController
+@RequestMapping(value = "/consignment", name = "运单相关")
+@Api(value = "ConsignmentController", tags = {"运单相关"})
+public class ConsignmentControllerImpl extends AbstractEtController implements IConsignmentController {
+    private static final Logger logger = LoggerFactory.getLogger(ConsignmentControllerImpl.class);
+
+
+    @PostMapping("/find")
+    @ApiOperation(value = "运单查询")
+    public ResponseResultVo findConsignment(@RequestBody ConsignmentQuery consignmentQuery) {
+        Long userId = null;
+        try {
+            userId = CurrentUserInfo.getUserId();
+        } catch (Exception e) {
+            logger.error(LogShowModel.showException("Exception", e));
+            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
+        }
+        if (userId == null) {
+            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
+        }
+
+        ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
+        query.setUserId(userId);
+        return consignmentService.findConsignments(query);
+    }
+}

 package com.fedex.connect.customer.data.query;
 package com.fedex.connect.customer.data.query;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fedex.connect.common.dependencies.util.DateUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.customer.data.PageBase;
 import com.fedex.connect.customer.data.PageBase;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-
+/**
+  * @Author Szl
+  * @Description 类说明 查询条件对象
+  * @Date 2024/10/31
+  */
 public class ConsignmentQuery extends PageBase {
 public class ConsignmentQuery extends PageBase {
 
 
     public static ConsignmentQuery dataProcessing(ConsignmentQuery query){
     public static ConsignmentQuery dataProcessing(ConsignmentQuery query){
         //多提单号查询
         //多提单号查询
-        if (Utils.isNotEmpty(query.getDeliveryNo())) {
-            query.setDeliveryNoList(Utils.split(query.getDeliveryNo(), "[;\\n]"));
+        if (Utils.isNotEmpty(query.getConsignmentCode())) {
+            query.setConsignmentCodeList(Utils.split(query.getConsignmentCode(), "[;\\n]"));
         }
         }
-        if(!CollectionUtils.isEmpty(query.getDeliveryNoList())) {
+        if(!CollectionUtils.isEmpty(query.getConsignmentCodeList())) {
             query.setCreateTimeFrom(null);
             query.setCreateTimeFrom(null);
             query.setCreateTimeTo(null);
             query.setCreateTimeTo(null);
         }
         }
+        //如果没有输入查询条件，则默认查三天的数据
+        if (CollectionUtils.isEmpty(query.getConsignmentCodeList()) && Utils.isEmpty(query.getConsignmentCode())){
+            LocalDate localDate = LocalDate.now().minusDays(3);
+            query.setCreateTimeFrom(DateUtil.timeFormat(Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant())));
+            query.setCreateTimeTo(DateUtil.timeFormat(new Date()));
+        }
         query.setStart(query.getStart());
         query.setStart(query.getStart());
         return query;
         return query;
     }
     }
@@ -27,12 +41,12 @@ public class ConsignmentQuery extends PageBase {
 
 
     private String createTimeTo;
     private String createTimeTo;
 
 
-    private String deliveryNo;
+    private String consignmentCode;
 
 
     private Long sort;
     private Long sort;
 
 
     @JsonIgnore
     @JsonIgnore
-    private List<String> deliveryNoList;
+    private List<String> consignmentCodeList;
 
 
     @JsonIgnore
     @JsonIgnore
     private Long userId;
     private Long userId;
@@ -53,12 +67,12 @@ public class ConsignmentQuery extends PageBase {
         this.createTimeTo = createTimeTo;
         this.createTimeTo = createTimeTo;
     }
     }
 
 
-    public String getDeliveryNo() {
-        return deliveryNo;
+    public String getConsignmentCode() {
+        return consignmentCode;
     }
     }
 
 
-    public void setDeliveryNo(String deliveryNo) {
-        this.deliveryNo = deliveryNo;
+    public void setConsignmentCode(String consignmentCode) {
+        this.consignmentCode = consignmentCode;
     }
     }
 
 
     public Long getUserId() {
     public Long getUserId() {
@@ -69,12 +83,12 @@ public class ConsignmentQuery extends PageBase {
         this.userId = userId;
         this.userId = userId;
     }
     }
 
 
-    public List<String> getDeliveryNoList() {
-        return deliveryNoList;
+    public List<String> getConsignmentCodeList() {
+        return consignmentCodeList;
     }
     }
 
 
-    public void setDeliveryNoList(List<String> deliveryNoList) {
-        this.deliveryNoList = deliveryNoList;
+    public void setConsignmentCodeList(List<String> consignmentCodeList) {
+        this.consignmentCodeList = consignmentCodeList;
     }
     }
 
 
     public Long getSort() {
     public Long getSort() {

+package com.fedex.connect.customer.repository.base;
+
+import com.fedex.connect.customer.repository.mapper.ConsignmentExtMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class BaseDao {
+    @Autowired
+    public ConsignmentExtMapper consignmentExtMapper;
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fedex.connect.customer.repository.mapper.ConsignmentExtMapper">
+  <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Consignment">
+    <id column="ID" jdbcType="NUMERIC" property="id" />
+    <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
+    <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
+    <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
+    <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
+    <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
+    <result column="COUNT_ORIGIN" jdbcType="VARCHAR" property="countOrigin" />
+    <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
+    <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
+    <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
+    <result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
+    <result column="WEIGHTUNIT" jdbcType="NUMERIC" property="weightunit" />
+    <result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" />
+    <result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" />
+    <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />
+    <result column="SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="shipperAccount" />
+    <result column="SHIPPER_COMPANY" jdbcType="VARCHAR" property="shipperCompany" />
+    <result column="SHIPPER_ADDR_LINE1" jdbcType="VARCHAR" property="shipperAddrLine1" />
+    <result column="SHIPPER_ADDR_LINE2" jdbcType="VARCHAR" property="shipperAddrLine2" />
+    <result column="SHIPPER_CITY" jdbcType="VARCHAR" property="shipperCity" />
+    <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
+    <result column="RECIPIENT_CONTACT_NAME" jdbcType="VARCHAR" property="recipientContactName" />
+    <result column="RECIPIENT_PHONE" jdbcType="VARCHAR" property="recipientPhone" />
+    <result column="RECIPIENT_COMPANY" jdbcType="VARCHAR" property="recipientCompany" />
+    <result column="RECIPIENT_ADDR_LINE1" jdbcType="VARCHAR" property="recipientAddrLine1" />
+    <result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" />
+    <result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" />
+    <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
+    <result column="FIRST_COMMIT_TIME" jdbcType="TIMESTAMP" property="firstCommitTime" />
+    <result column="FIRST_SUBMITTER_ID" jdbcType="NUMERIC" property="firstSubmitterId" />
+    <result column="FIRST_SUBMITTER" jdbcType="VARCHAR" property="firstSubmitter" />
+    <result column="COMMIT_TIME" jdbcType="TIMESTAMP" property="commitTime" />
+    <result column="SUBMITTER_ID" jdbcType="NUMERIC" property="submitterId" />
+    <result column="SUBMITTER" jdbcType="VARCHAR" property="submitter" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
+    <result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
+    <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
+    <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
+    <result column="CE_INFO_ID" jdbcType="NUMERIC" property="ceInfoId" />
+  </resultMap>
+
+  <select id="findConsignments" resultType="com.fedex.connect.common.model.biz.Consignment">
+    SELECT *
+    FROM T_BIZ_CONSIGNMENT
+    WHERE CREATE_USER_ID = #{userId}
+    <if test="createTimeFrom != null and createTimeFrom != ''">
+      AND CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
+    </if>
+    <if test="createTimeTo != null and createTimeTo != ''">
+      AND CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS')
+    </if>
+    <if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
+      AND CONSIGNMENT_CODE IN
+      <foreach collection="consignmentCodeList" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
+  </select>
+
+  <select id="findAllCount" resultType="java.lang.Long">
+    SELECT COUNT(*)
+    FROM T_BIZ_CONSIGNMENT
+    WHERE CREATE_USER_ID = #{userId}
+    <if test="createTimeFrom != null and createTimeFrom != ''">
+      AND CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
+    </if>
+    <if test="createTimeTo != null and createTimeTo != ''">
+      AND CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS')
+    </if>
+    <if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
+      AND CONSIGNMENT_CODE IN
+      <foreach collection="consignmentCodeList" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
+  </select>
+
+</mapper>
\ No newline at end of file

+package com.fedex.connect.customer.repository.mapper;
+
+import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ConsignmentExtMapper {
+    List<Consignment> findConsignments(ConsignmentQuery query);
+
+    Long findAllCount(ConsignmentQuery query);
+}

+package com.fedex.connect.customer.repository.repo;
+
+import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+
+import java.util.List;
+
+public interface IConsignmentExtRepository {
+    List<Consignment> findConsignments(ConsignmentQuery query);
+
+    public Long findAllCount(ConsignmentQuery query);
+}

+package com.fedex.connect.customer.repository.repo.impl;
+
+import com.fedex.connect.common.model.biz.Consignment;
+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 org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmentExtRepository {
+
+    @Override
+    public List<Consignment> findConsignments(ConsignmentQuery query) {
+        return consignmentExtMapper.findConsignments(query);
+    }
+
+    @Override
+    public Long findAllCount(ConsignmentQuery query) {
+        return null;
+    }
+}

@@ -2,6 +2,8 @@ package com.fedex.connect.customer.service;
 
 
 
 
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import com.fedex.connect.customer.repository.repo.impl.ConsignmentExtRepositoryImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
@@ -10,6 +12,9 @@ public class AbstractEtService {
 	@Resource
 	@Resource
 	protected LocaleMessageUtil localeMessageUtil;
 	protected LocaleMessageUtil localeMessageUtil;
 
 
+	@Autowired
+	protected ConsignmentExtRepositoryImpl consignmentExtRepository;
+
 	/**
 	/**
 	 * repository
 	 * repository
 	 */
 	 */

 package com.fedex.connect.customer.service.biz;
 package com.fedex.connect.customer.service.biz;
 
 
-public interface IConsignmentService {
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
 
 
+public interface IConsignmentService {
+    ResponseResultVo findConsignments(ConsignmentQuery query);
 }
 }

 package com.fedex.connect.customer.service.biz.impl;
 package com.fedex.connect.customer.service.biz.impl;
 
 
+import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
+import com.fedex.connect.common.dependencies.date.vo.PageResult;
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.common.model.biz.Consignment;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import com.fedex.connect.customer.service.AbstractEtService;
 import com.fedex.connect.customer.service.AbstractEtService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
+/**
+  * @Author Szl
+  * @Description 类说明 运单相关service
+  * @Date 2024/10/31
+  */
 @Service
 @Service
 public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService {
 public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService {
+    public ResponseResultVo findConsignments(ConsignmentQuery query) {
+
+        List<String> consignmentCodeList = query.getConsignmentCodeList();
+        if (Utils.isNotEmpty(consignmentCodeList) && consignmentCodeList.size() > GlobalConstantFedex.DECLARE_COUNT) {
+            return ResponseResultVo.fail(localeMessageUtil.getMessage("conl_cus_declare_count_max"));
+        }
+
+        //查询数量
+        Long total = consignmentExtRepository.findAllCount(query);
+
+        PageResult pageResult = new PageResult();
+        pageResult.setTotal(total);
+        pageResult.setPage(query.getPage());
+        pageResult.setSize(query.getSize());
+        if (total > 0) {
+            List<Consignment> consignments = consignmentExtRepository.findConsignments(query);
+            pageResult.setList(consignments);
+        }
 
 
+        return ResponseResultVo.succ(pageResult);
+    }
 }
 }

+conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
+
+enum_res_code_301=登錄身份異常
+enum_res_code_305=登錄已過期，請重新登錄

+conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
+
+enum_res_code_301=登錄身份異常
+enum_res_code_305=登錄已過期，請重新登錄

@@ -2,10 +2,12 @@ package com.fedex.connect.common.dependencies.config;
 
 
 
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.service.bi.IDictionaryEntriesService;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
@@ -15,18 +17,18 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
- * 预先数据的加载
- * 有兴趣了解搜索:CommandLineRunner详解
- * @author EDY
- */
+  * @Author Szl
+  * @Description 类说明 缓存字典
+  * @Date 2024/10/31
+  */
 @Component
 @Component
 @Order(1)
 @Order(1)
 public class CacheSystem implements CommandLineRunner {
 public class CacheSystem implements CommandLineRunner {
 
 
     private static final Logger log = LoggerFactory.getLogger(CacheSystem.class);
     private static final Logger log = LoggerFactory.getLogger(CacheSystem.class);
 
 
-    // 从 DictionaryProvider 获取字典数据
-    List<DictionaryEntries> dictionaryData = DictionaryProvider.getDictionaryData();
+    @Autowired
+    IDictionaryEntriesService iDictionaryEntriesService;
 
 
 
 
     // 静态缓存数据
     // 静态缓存数据
@@ -39,6 +41,7 @@ public class CacheSystem implements CommandLineRunner {
 
 
     @Override
     @Override
     public void run(String... args) {
     public void run(String... args) {
+        List<DictionaryEntries> dictionaryData = iDictionaryEntriesService.findAll();
         if (dictionaryData == null) {
         if (dictionaryData == null) {
             log.warn("SysDictionaryService not set, skipping cache initialization.");
             log.warn("SysDictionaryService not set, skipping cache initialization.");
             return;
             return;

+
+package com.fedex.connect.common.dependencies.contants;
+
+
+
+/**
+ * 全局通用常量
+ */
+public class GlobalConstantFedex {
+
+    /**
+     * 系统CPU数量
+     */
+    public static final int DEFAULT_SIZE = Runtime.getRuntime().availableProcessors();
+
+    /**
+     * 报表的最大导出数量
+     */
+    public static final Integer EXPORT_QTY = 999999;
+
+    /**
+     * 上传Excel最大行限制数量
+     */
+    public static final int UPLOAD_EXCEL_MAX_LINE = 15000;
+
+    /**
+     * 输入字符串最大字符长度（注意是字符）
+     */
+    public static final int INPUT_CHARS_MAX_LENGTH = 1000;
+
+    /**
+     * 发送邮件标题前缀，同时也读取回执时的过滤条件
+     */
+    public static final String DECLARE_MAIL_TITLE_PREFIX = "FedEx-iClear";
+    public static final String DECLARE_MAIL_TITLE_CID = "-CID#";
+    public static final String DECLARE_MAIL_TITLE_AWB = "-AWB#";
+    public static final String DECLARE_MAIL_TITLE_SYSID = "-SYSID#";
+
+
+    public static final String SYMBOL_LINE_FEED = "</br>";
+
+    public static final String SYMBOL_FULL_HORN_COMMA = "，";
+
+    public static final String SYMBOL_HALF_HORN_COMMA = ",";
+
+    public static final String SYMBOL_HALF_HORN_LOWER_DOT = ".";
+
+    public static final String SYMBOL_HALF_HORN_MIDDLE_DOT = "·";
+
+    public static final String SYMBOL_HALF_HORN_COLON = ":";
+
+    public static final String BLANK_SPACE = "";
+
+    /**
+     * Excel xls
+     */
+    public static final String EXCEL_SUFFIX_XLS = ".XLS";
+    /**
+     * Excel xlsx
+     */
+    public static final String EXCEL_SUFFIX_XLSX = ".XLSX";
+
+    public static final String DECLARE_INFO_OPER = "0";
+
+    public static final int DECLARE_SAVE = 0;
+    public static final int DECLARE_UPDATE = 1;
+    public static final int DECLARE_COMMIT = 2;
+
+    /**
+     * 提单号长度
+     */
+    public static final int DELIVERY_NO_LENGTH = 12;
+
+    /**
+     * 联系人长度
+     */
+    public static final int LIAISONS_LENGTH = 30;
+
+    /**
+     * 货物输出人统一编号长度
+     */
+    public static final int CONSIGNEE_NO_MIN_LENGTH = 8;
+
+    /**
+     * 货物输出人统一编号最大长度
+     */
+    public static final int CONSIGNEE_NO_MAX_LENGTH = 10;
+
+    /**
+     * 监管编号长度
+     */
+    public static final int SUPERVISORY_NO_LENGTH = 5;
+
+    /**
+     * 原进口报单号码最大长度
+     */
+    public static final int ORI_IMP_ENTRY_NO_MAX_LENGTH = 14;
+
+    /**
+     * 原进口报单号码最大长度
+     */
+    public static final int TAX_RULES_MAX_LENGTH = 50;
+
+    /**
+     * 通用最大长度 100
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_ONE = 100;
+
+    /**
+     * 通用最大长度 200
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_TWO = 200;
+
+    /**
+     * 通用最大长度 255
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_THREE = 255;
+
+    /**
+     * 通用最大长度 6000
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_FOUR = 6000;
+
+    /**
+     * 通用最大长度 1500
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_FIVE = 1500;
+
+    /**
+     * 通用最大长度 18
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_SIX = 15;
+
+    /**
+     * 通用最大长度 3
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_SEVEN = 3;
+
+    /**
+     * 通用最大长度 20
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_EIGHT = 20;
+
+    /**
+     * 通用最大长度 50
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_NINE = 50;
+
+    /**
+     * 通用最大长度 300
+     */
+    public static final int COMMON_DATABASE_MAX_LENGTH_TEN = 300;
+
+
+
+    /**
+     * 多文件上传的最大个数限制
+     */
+    public static final int UPLOAD_FILE_MAX_COUNT = 100;
+
+    /**
+     * 多文件上传的最大个数限制（95M = 99,614,720 byte）
+     */
+    public static final double UPLOAD_FILE_MAX_SIZE = 95 * 1024 * 1024;
+
+
+    /**
+     * 邮件最多重试次数
+     */
+    public static final Long MAIL_MAX_RETRY_NUM = 3L;
+
+    /**
+     * 其它
+     */
+    public static final String OTHER = "其它";
+
+    /**
+     * 其它
+     */
+    public static final String PDF = ".pdf";
+
+    public static final String RESET_PWD_TYPE_KEY = "resetPwd";
+
+    public static final String COMPRESS_IMAGE_PREFIX = "COMPRESS_";
+
+    public static final Long IMAGE_SELECT = 1L;
+
+    public static final Long DECLARE_COUNT = 1000L;
+
+    public static final Long PDF_CHECK_INFO = 1L;
+    public static final Long PDF_INFO = 2L;
+
+    public static final String SIGN = "/";
+
+}

+package com.fedex.connect.common.dependencies.date.vo;
+
+import java.util.List;
+
+/**
+ * 分页返回对象
+ */
+public class PageResult<T>{
+    /**
+     * 总记录
+     */
+    private Long total;
+
+    /**
+     * 页数
+     */
+    private Integer page;
+
+    /**
+     * 每页多少条
+     */
+    private Integer size;
+
+    /**
+     * 返回数据
+     */
+    private List<T> list;
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+
+    public PageResult() {
+    }
+
+    public PageResult(Long total, Integer page, Integer size, List<T> list) {
+        this.total = total;
+        this.page = page;
+        this.size = size;
+        this.list = list;
+    }
+}

 package com.fedex.connect.common.dependencies.repository.base;
 package com.fedex.connect.common.dependencies.repository.base;
 
 
+import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
 import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt;
 import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,4 +10,6 @@ public class BaseDao {
     public UserMapperExt userMapperExt;
     public UserMapperExt userMapperExt;
     @Autowired
     @Autowired
     public RedisSlabMapper redisSlabMapper;
     public RedisSlabMapper redisSlabMapper;
+    @Autowired
+    public DictionaryEntriesMapper dictionaryEntriesMapper;
 }
 }
\ No newline at end of file

+package com.fedex.connect.common.dependencies.repository.repo.bi;
+
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
+
+import java.util.List;
+
+public interface IDictionaryEntriesRepository {
+    List<DictionaryEntries> selectByExample(DictionaryEntriesExample example);
+}

+package com.fedex.connect.common.dependencies.repository.repo.bi.impl;
+
+import com.fedex.connect.common.dependencies.repository.base.BaseDao;
+import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class DictionaryEntriesImpl extends BaseDao implements IDictionaryEntriesRepository {
+
+    @Override
+    public List<DictionaryEntries> selectByExample(DictionaryEntriesExample example) {
+        return dictionaryEntriesMapper.selectByExample(example);
+    }
+}

-package com.fedex.connect.common.dependencies.repository.repo;
+package com.fedex.connect.common.dependencies.repository.repo.sys;
 
 
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.common.model.sys.RedisSlabExample;

-package com.fedex.connect.common.dependencies.repository.repo;
+package com.fedex.connect.common.dependencies.repository.repo.sys;
 
 
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 
 

-package com.fedex.connect.common.dependencies.repository.repo.impl;
+package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
-import com.fedex.connect.common.dependencies.repository.repo.IRedisSlabRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;

-package com.fedex.connect.common.dependencies.repository.repo.impl;
+package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
-import com.fedex.connect.common.dependencies.repository.repo.IUserRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 

 package com.fedex.connect.common.dependencies.service.base;
 package com.fedex.connect.common.dependencies.service.base;
 
 
-import com.fedex.connect.common.dependencies.repository.repo.IRedisSlabRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
+import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
 /**
@@ -11,4 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class BaseService {
 public class BaseService {
     @Autowired
     @Autowired
     protected IRedisSlabRepository redisSlabRepository;
     protected IRedisSlabRepository redisSlabRepository;
+    @Autowired
+    protected IDictionaryEntriesRepository dictionaryEntriesRepository;
 }
 }
\ No newline at end of file

+package com.fedex.connect.common.dependencies.service.bi;
+
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+
+import java.util.List;
+
+public interface IDictionaryEntriesService {
+    List<DictionaryEntries> findAll();
+}

-package com.fedex.connect.manager.service.base.impl;
+package com.fedex.connect.common.dependencies.service.bi.impl;
 
 
-import com.fedex.connect.common.dependencies.config.DictionaryProvider;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
-import com.fedex.connect.common.model.base.DictionaryEntries;
-import com.fedex.connect.common.model.base.DictionaryEntriesExample;
-import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.AbstractEtService;
-import com.fedex.connect.manager.service.base.IInitDictionaryEntriesService;
+import com.fedex.connect.common.dependencies.date.model.LogShowModel;
+import com.fedex.connect.common.dependencies.service.base.BaseService;
+import com.fedex.connect.common.dependencies.service.bi.IDictionaryEntriesService;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
 
 
-@Component
-@Order(value = 1)
-public class InitInitDictionaryEntriesServiceImpl extends AbstractEtService implements IInitDictionaryEntriesService {
+@Service
+public class DictionaryEntriesServiceImpl extends BaseService implements IDictionaryEntriesService {
 
 
-    private static Logger log = LoggerFactory.getLogger(InitInitDictionaryEntriesServiceImpl.class);
+    private static Logger log = LoggerFactory.getLogger(DictionaryEntriesServiceImpl.class);
 
 
     public List<DictionaryEntries> findAll() {
     public List<DictionaryEntries> findAll() {
         try{
         try{
@@ -32,10 +29,4 @@ public class InitInitDictionaryEntriesServiceImpl extends AbstractEtService impl
             return null;
             return null;
         }
         }
     }
     }
-
-
-    public void initializeDictionary() {
-        List<DictionaryEntries> data = findAll(); // 获取字典数据
-        DictionaryProvider.setDictionaryData(data); // 将数据设置到字典提供者中
-    }
 }
 }

@@ -3,7 +3,7 @@ package com.fedex.connect.common.dependencies.util;
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
-import com.fedex.connect.common.dependencies.repository.repo.IUserRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.Jwts;

@@ -3,7 +3,7 @@ package com.fedex.connect.manager.controller.log.impl;
 import com.fedex.connect.manager.controller.log.ILogLoginService;
 import com.fedex.connect.manager.controller.log.ILogLoginService;
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

 package com.fedex.connect.manager.repository.repo.sys;
 package com.fedex.connect.manager.repository.repo.sys;
 
 
-import com.fedex.connect.common.model.base.DictionaryEntries;
-import com.fedex.connect.common.model.base.DictionaryEntriesExample;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 
 
 import java.util.List;
 import java.util.List;
 
 

 package com.fedex.connect.manager.repository.repo.sys.impl;
 package com.fedex.connect.manager.repository.repo.sys.impl;
 
 
-import com.fedex.connect.common.model.base.DictionaryEntries;
-import com.fedex.connect.common.model.base.DictionaryEntriesExample;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 import com.fedex.connect.manager.repository.base.BaseDao;
 import com.fedex.connect.manager.repository.base.BaseDao;
 import com.fedex.connect.manager.repository.repo.sys.IDictionaryEntriesRepository;
 import com.fedex.connect.manager.repository.repo.sys.IDictionaryEntriesRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;

-package com.fedex.connect.manager.service;
+package com.fedex.connect.manager.service.base;
 
 
 
 
 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;

-package com.fedex.connect.manager.service.base;
-
-import com.fedex.connect.common.model.base.DictionaryEntries;
-
-import java.util.List;
-
-public interface IInitDictionaryEntriesService {
-    List<DictionaryEntries> findAll();
-
-    void initializeDictionary();
-}

@@ -4,7 +4,7 @@ import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.manager.data.bo.RedisSlabBo;
 import com.fedex.connect.manager.data.bo.RedisSlabBo;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import org.slf4j.Logger;
 import org.slf4j.Logger;

@@ -11,7 +11,7 @@ import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
 import com.fedex.connect.manager.data.dto.LoginRequest;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.fedex.connect.manager.service.sys.ISysAuthService;
 import com.fedex.connect.manager.service.sys.ISysAuthService;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonObject;

@@ -9,7 +9,7 @@ import com.fedex.connect.common.model.sys.RoleExample;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

@@ -3,7 +3,7 @@ package com.fedex.connect.manager.service.sys.impl;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

@@ -11,7 +11,7 @@ import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.AbstractEtService;
+import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserService;
 import com.fedex.connect.manager.service.sys.ISysUserService;