Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -479,7 +479,7 @@ public class AuthServiceImpl implements IAuthService {
      * @date 2023/8/18
      **/
     private String generateToken(LoginBase loginBase, Long userId) {
-        Map<String, Object> info = new HashMap();
+        Map<String, Object> info = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         info.put("userId", userId);
         info.put("account", loginBase.getAccount());
         info.put("clientType", loginBase.getClientType());

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/constant/Global.java

@@ -66,6 +66,7 @@ public class Global {
     public static final int NUMERICAL_TWO = 2;
     public static final int NUMERICAL_THREE = 3;
     public static final int NUMERICAL_TWELVE = 12;
+    public static final int NUMERICAL_SIXTEEN = 16;
 
     /**pid等于0的*/
     public static final String PID = "0";

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/BeanUtils.java

@@ -1,6 +1,7 @@
 package com.sckw.core.utils;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.sckw.core.model.constant.Global;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
@@ -243,7 +244,7 @@ public class BeanUtils extends BeanUtil {
     }
 
     public static Map<String, Object> convertToMap(Object yourObject) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         try {
             Field[] fields = yourObject.getClass().getDeclaredFields();
             for (Field field : fields) {

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/CollectionUtils.java

@@ -230,7 +230,8 @@ public class CollectionUtils extends CollectionUtil {
 		if (list.size() == 0) {
 			return null;
 		}
-		Integer count = list.size(); // 记录总数
+		// 记录总数
+		Integer count = list.size();
 		int fromIndex = Math.min((page - 1) * pageSize,count);
 		int toIndex = Math.min(fromIndex + pageSize,count);
 
@@ -391,7 +392,7 @@ public class CollectionUtils extends CollectionUtil {
 	 * @throws IllegalAccessException
 	 */
 	public static Map beanToMap(Object object) throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
 		Field[] fields = object.getClass().getDeclaredFields();
 		for (Field field : fields) {
 			field.setAccessible(true);

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -215,7 +215,8 @@ public class DateUtils extends DateUtil {
      * @return
      */
     public static String numberDateFormat(String timestamp, String simpleDateFormatType) {
-        SimpleDateFormat sdf = new SimpleDateFormat(simpleDateFormatType);//要转换的时间格式
+        //要转换的时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat(simpleDateFormatType);
         String date = null;
         if (timestamp.length() == THIRTEEN) {
             date = sdf.format(Long.parseLong(timestamp));
@@ -233,7 +234,8 @@ public class DateUtils extends DateUtil {
      * @return
      */
     public static Date numberDateFormatToDate(String timestamp, String simpleDateFormatType) {
-        SimpleDateFormat sdf = new SimpleDateFormat(simpleDateFormatType);//要转换的时间格式
+        //要转换的时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat(simpleDateFormatType);
         Date date = null;
         try {
             if (timestamp.length() == THIRTEEN) {
@@ -271,12 +273,18 @@ public class DateUtils extends DateUtil {
      * @Date: 2019/7/18 0018 16:46
      */
     public static String getTimeBySecond(long seconds) {
-        long days = seconds / 86400;//转换天数
-        seconds = seconds % 86400;//剩余秒数
-        long hours = seconds / 3600;//转换小时数
-        seconds = seconds % 3600;//剩余秒数
-        long minutes = seconds / 60;//转换分钟
-        seconds = seconds % 60;//剩余秒数
+        //转换天数
+        long days = seconds / 86400;
+        //剩余秒数
+        seconds = seconds % 86400;
+        //转换小时数
+        long hours = seconds / 3600;
+        //剩余秒数
+        seconds = seconds % 3600;
+        //转换分钟
+        long minutes = seconds / 60;
+        //剩余秒数
+        seconds = seconds % 60;
         if (0 < days) {
             return days + "天，" + hours + "小时，" + minutes + "分，" + seconds + "秒";
         } else {
@@ -428,17 +436,22 @@ public class DateUtils extends DateUtil {
             endCalendar.set(Calendar.DATE, 1);
             endCalendar.roll(Calendar.DATE, -1);
             if (day == (endCalendar.get(Calendar.DATE) - startCalendar.get(Calendar.DATE))) {
-                monthCount = 1;// 两日期间满一个月
+                // 两日期间满一个月
+                monthCount = 1;
             } else {
-                monthCount = 0;// 两日期间不足一个月
+                // 两日期间不足一个月
+                monthCount = 0;
             }
-        } else if (year != 0 && month == 0) {// 年份不同月份相同
-            if (startCalendar.get(Calendar.DATE) < endCalendar.get(Calendar.DATE)) {// 两日期间的天数，小于等于当月
+            // 年份不同月份相同
+        } else if (year != 0 && month == 0) {
+            // 两日期间的天数，小于等于当月
+            if (startCalendar.get(Calendar.DATE) < endCalendar.get(Calendar.DATE)) {
                 monthCount = 1;
             }
             monthCount += year * 12 + month;
         } else {
-            if (startCalendar.get(Calendar.DATE) >= endCalendar.get(Calendar.DATE)) {// 起始日期DATE 大于等于结束日期DATE
+            // 起始日期DATE 大于等于结束日期DATE
+            if (startCalendar.get(Calendar.DATE) >= endCalendar.get(Calendar.DATE)) {
                 monthCount = year * 12 + month;
             } else {
                 monthCount = year * 12 + month + 1;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/EncryUtil.java

@@ -260,7 +260,7 @@ public class EncryUtil {
      **/
     public static boolean checkSign(HttpServletRequest request, String accessSecret) {
         Enumeration<?> pNames = request.getParameterNames();
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         while (pNames.hasMoreElements()) {
             String pName = (String) pNames.nextElement();
             if (SIGN_KEY.equals(pName)) {

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/FileUtils.java

@@ -947,7 +947,8 @@ public class FileUtils {
         try {
             br = new BufferedReader(new StringReader(text));
             bw = new BufferedWriter(new FileWriter(file));
-            char[] buf = new char[1024 * 64];          //字符缓冲区
+            //字符缓冲区
+            char[] buf = new char[1024 * 64];
             int len;
             while ((len = br.read(buf)) != -1) {
                 bw.write(buf, 0, len);

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/ListUtils.java

@@ -1,5 +1,7 @@
 package com.sckw.core.utils;
 
+import com.sckw.core.model.constant.Global;
+
 import java.util.*;
 
 /**
@@ -46,7 +48,8 @@ public class ListUtils {
     }
 
     public static void main(String[] args) {
-        String sortTyp = "asc"; // desc-倒叙  asc-正序
+        // desc-倒叙  asc-正序
+        String sortTyp = "asc";
         // 组装测试数据
         List<Map<String, Object>> list = initMapList();
 
@@ -103,18 +106,21 @@ public class ListUtils {
     public static Map<String, Object> sortMap(Map<String, Object> map, String sortTyp) {
         try {
             if ("desc".equals(sortTyp)) {
-
-                Set<String> sortSet = new TreeSet<>(Comparator.reverseOrder()); // 定义个倒叙的set
-                sortSet.addAll(map.keySet()); // 获取全部key，添加后就自然倒序了
+                // 定义个倒叙的set
+                Set<String> sortSet = new TreeSet<>(Comparator.reverseOrder());
+                // 获取全部key，添加后就自然倒序了
+                sortSet.addAll(map.keySet());
 
                 Map<String, Object> resp = new LinkedHashMap<>();
                 for (String key : sortSet) {
-                    resp.put(key, map.get(key)); // 按顺序放入新map
+                    // 按顺序放入新map
+                    resp.put(key, map.get(key));
                 }
 
                 return resp;
             } else {
-                return new TreeMap<>(map); // TreeMap 本身就是正序的
+                // TreeMap 本身就是正序的
+                return new TreeMap<>(map);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -146,19 +152,19 @@ public class ListUtils {
     private static List<Map<String, Object>> initMapList() {
         List<Map<String, Object>> lists = new ArrayList<>();
 
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         map.put("name", "王五");
         map.put("age", 55);
         map.put("mobile", "15900001112");
         lists.add(map);
 
-        Map<String, Object> map1 = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         map1.put("name", "李四");
         map1.put("age", 18);
         map1.put("mobile", "15900001111");
         lists.add(map1);
 
-        Map<String, Object> map2 = new HashMap<>();
+        Map<String, Object> map2 = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         map2.put("name", "赵六");
         map2.put("age", 58);
         map2.put("mobile", "13700001111");

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/StringUtils.java

@@ -1,6 +1,7 @@
 package com.sckw.core.utils;
 
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
@@ -507,7 +508,7 @@ public class StringUtils {
      * @return url请求参数部分
      */
     public static Map<String, String> urlRequest(String url) {
-        Map<String, String> mapRequest = new HashMap<String, String>();
+        Map<String, String> mapRequest = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         String[] arrSplit = null;
         String strUrlParam = truncateUrlPage(url);
         if (strUrlParam == null) {
@@ -540,7 +541,7 @@ public class StringUtils {
      * @return url请求参数部分
      */
     public static Map<String, String> urlParams(String strUrlParam) {
-        Map<String, String> mapRequest = new HashMap<String, String>();
+        Map<String, String> mapRequest = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         String[] arrSplit = null;
         if (strUrlParam == null) {
             return mapRequest;
@@ -713,13 +714,15 @@ public class StringUtils {
             // already capitalized
             return str;
         }
-
-        final int newCodePoints[] = new int[strLen]; // cannot be longer than the char array
+        // cannot be longer than the char array
+        final int newCodePoints[] = new int[strLen];
         int outOffset = 0;
-        newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
+        // copy the first codepoint
+        newCodePoints[outOffset++] = newCodePoint;
         for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; ) {
             final int codepoint = str.codePointAt(inOffset);
-            newCodePoints[outOffset++] = codepoint; // copy the remaining ones
+            // copy the remaining ones
+            newCodePoints[outOffset++] = codepoint;
             inOffset += Character.charCount(codepoint);
         }
         return new String(newCodePoints, 0, outOffset);
@@ -755,7 +758,7 @@ public class StringUtils {
     }
 
     public static void main(String[] args) {
-        Map<String, Object> param = new HashMap();
+        Map<String, Object> param = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         param.put("account", "17358629955");
         param.put("pwd", "123456");
         String template = "账号创建成功，欢迎使用危品汇！登录账号:${account}，默认密码:${pwd}!";
@@ -764,7 +767,7 @@ public class StringUtils {
         }
         System.out.println(template);
 
-        Map<String, Object> m = new HashMap<>();
+        Map<String, Object> m = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         m.put("account", "han");
         m.put("pwd", "zhong");
         System.out.println(replace1(template, m));

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/workerUtils.java

@@ -121,9 +121,9 @@ public class workerUtils {
         // 上次生成ID的时间截
         lastTimestamp = timestamp;
         // 移位并通过或运算拼到一起组成64位的ID
-        return ((timestamp - twepoch) << timestampLeftShift) //
-                | (datacenterId << datacenterIdShift) //
-                | (workerId << workerIdShift) //
+        return ((timestamp - twepoch) << timestampLeftShift)
+                | (datacenterId << datacenterIdShift)
+                | (workerId << workerIdShift)
                 | sequence;
     }
 

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/ExcelUtil.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.annotation.ExcelContext;
 import com.sckw.excel.annotation.ExcelSelected;
@@ -214,7 +215,7 @@ public class ExcelUtil {
      * @return Map<下拉框列索引, 下拉框内容> map
      */
     private static <T> Map<Integer, ExcelSelectedResolve> resolveSelectedAnnotation(Class<T> head) {
-        Map<Integer, ExcelSelectedResolve> selectedMap = new HashMap<>();
+        Map<Integer, ExcelSelectedResolve> selectedMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
 
         // getDeclaredFields(): 返回全部声明的属性；getFields(): 返回public类型的属性
         Field[] fields = head.getDeclaredFields();

sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/utils/TestService.java

@@ -21,13 +21,13 @@ public class TestService {
 
         RBucket<Object> mytest = redisson.getBucket("mytest");
         mytest.set("value");
-        System.out.println(mytest.get());//value
+        System.out.println(mytest.get());
         mytest.set("value2");
-        System.out.println(mytest.get());//value2
-        boolean b = mytest.compareAndSet("value2", "value3"); //true
-        System.out.println(mytest.get());//value3
-        boolean b1 = mytest.compareAndSet("value2", "value4"); //flase
-        System.out.println(mytest.get());//value3
+        System.out.println(mytest.get());
+        boolean b = mytest.compareAndSet("value2", "value3");
+        System.out.println(mytest.get());
+        boolean b1 = mytest.compareAndSet("value2", "value4");
+        System.out.println(mytest.get());
     }
 
     public static void main(String[] args) {

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/utils/SmsUtil.java

@@ -7,13 +7,14 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
+import com.sckw.core.model.constant.Global;
 import com.sckw.stream.enums.SmsCodeEnum;
 import com.sckw.stream.model.SckwSms;
 import java.util.HashMap;
 
 public class SmsUtil {
-    //替换成自己申请的accessKeyId
-    private static String accessKeyId = "LTAI5tEyvh6N9HhxDMkW2MqT"; //替换成自己申请的accessKeySecret
+    //替换成自己申请的accessKeySecret
+    private static String accessKeyId = "LTAI5tEyvh6N9HhxDMkW2MqT";
     private static String accessKeySecret = "ClQ2q9fxytnhDraX7axAOjlK0zGJAP";
     static final String product = "Dysmsapi";
     static final String domain = "dysmsapi.aliyuncs.com";
@@ -58,7 +59,7 @@ public class SmsUtil {
         sckwSms.setPhone("17358629955");
         sckwSms.setSignName("矿拉拉");
         sckwSms.setTemplateCode(SmsCodeEnum.VERIFICATION_CODE);
-        sckwSms.setParams(new HashMap(){{put("code", "123456");}});
+        sckwSms.setParams(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("code", "123456");}});
         try {
             //发送短信 {"code":"123456"}
             SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));

sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/model/constant/ChannelEnum.java

@@ -9,8 +9,16 @@ public enum ChannelEnum {
     HF("11", "1", "huifu", "汇付渠道"),
     XS("12", "2", "newpay", "新生渠道"),
     ZX("13", "3", "citic", "中信渠道");
-    private final String code;//预付款+支付渠道
-    private final String value;//渠道对应的字典值
+
+    /**
+     * 预付款+支付渠道
+     */
+    private final String code;
+
+    /**
+     * 渠道对应的字典值
+     */
+    private final String value;
     private final String channel;
     private final String desc;
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -575,7 +575,7 @@ public class KwcContractLogisticsService {
      * @date: 2023/7/18
      */
     private List<QueryListResVo> getQueryListResVos(List<QueryListResDto> queryListResDtos) {
-        Map<Long, UserCacheResDto> longUserCacheResDtoMap = new HashMap<>();
+        Map<Long, UserCacheResDto> longUserCacheResDtoMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         List<Long> initiateByList = queryListResDtos.stream().map(QueryListResDto::getInitiateBy).toList();
         if (CollectionUtils.isNotEmpty(initiateByList)) {
             longUserCacheResDtoMap = remoteSystemService.queryUserCacheMapByIds(initiateByList);

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -3,6 +3,7 @@ package com.sckw.fleet.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
@@ -62,7 +63,7 @@ public class KwfDriverController {
 
         //获取司机信息
         Long id = null;
-        List<Map<String, Object>> drivers = driverService.findList(new HashMap(){{ put("phone", phone); }});
+        List<Map<String, Object>> drivers = driverService.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{ put("phone", phone); }});
         if (com.sckw.core.utils.CollectionUtils.isEmpty(drivers)) {
             return HttpResult.ok();
         } else {

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -84,7 +84,7 @@ public class KwfTruckController {
         }
 
         Long id = null;
-        List<Map<String, Object>> trucks = truckService.findList(new HashMap(){{ put("wholeTruckNo", truckNo); }});
+        List<Map<String, Object>> trucks = truckService.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{ put("wholeTruckNo", truckNo); }});
         if (com.sckw.core.utils.CollectionUtils.isEmpty(trucks)) {
             return HttpResult.ok();
         } else {
@@ -235,14 +235,14 @@ public class KwfTruckController {
      * @date 2023/7/26
      **/
     @PostMapping("/findTruck")
-    public HttpResult findTruck(@RequestBody Map params) {
+    public HttpResult findTruck(@RequestBody Map<String, Object> params) {
         params.put("entId", LoginUserHolder.getEntId());
         List<KwfTruckVo> trucks = truckService.findPage(params);
 
-        List data = new ArrayList();
+        List<Map<String, Object>> data = new ArrayList();
         for (KwfTruckVo truck:trucks) {
             int bbb = new Random().nextInt(10) / 4;
-            data.add(new HashMap(){{put("truckNo", truck.getTruckNo());
+            data.add(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("truckNo", truck.getTruckNo());
                 put("entId", truck.getEntId());
                 put("firmName", truck.getFirmName());
                 put("businessStatus", truck.getTruckNo().contains("1") ? 0 : 1);
@@ -264,11 +264,11 @@ public class KwfTruckController {
             return HttpResult.ok();
         }
 
-        List data = new ArrayList();
+        List<Map<String, Object>> data = new ArrayList();
         for (String truckNo:truckNos) {
             int aaa = new Random().nextInt(10) / 3;
             int bbb = new Random().nextInt(10) / 4;
-            data.add(new HashMap(){{
+            data.add(new HashMap<>(Global.NUMERICAL_SIXTEEN){{
                 put("truckNo", truckNo);
                 put("speed", new Random().nextInt(100));
                 put("lat", "29.48"+new Random().nextInt(10000));
@@ -361,7 +361,7 @@ public class KwfTruckController {
      **/
     @GetMapping("/findDetailByTruckNo")
     public HttpResult findDetailByTruckNo(String truckNo) {
-        Map detail = new HashMap();
+        Map<String, Object> detail = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         detail.put("truckNo", truckNo);
         detail.put("driverName", "赵先生");
         detail.put("driverPhone", "17358629955");

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sckw.fleet.dubbo;
 
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.fleet.api.RemoteFleetService;
@@ -41,8 +42,8 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     @Override
     public Map<Long, RDriverVo> findDriver(List<Long> driverIds) {
         /**获取数据**/
-        Map<Long, RDriverVo> driverMap = new HashMap();
-        List<Map<String, Object>> drivers = driverDao.findList(new HashMap(){{put("ids", driverIds);}});
+        Map<Long, RDriverVo> driverMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        List<Map<String, Object>> drivers = driverDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("ids", driverIds);}});
         if (CollectionUtils.isEmpty(drivers)) {
             return driverMap;
         }
@@ -85,7 +86,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
      **/
     @Override
     public RDriverDetailVo findDriverDetai(String phone) {
-        List<KwfDriver> drivers = driverDao.findDriver(new HashMap(){{put("phone", phone);}});
+        List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("phone", phone);}});
         if (CollectionUtils.isEmpty(drivers)) {
             return null;
         }
@@ -118,8 +119,8 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     @Override
     public Map<String, RTruckVo> findTruck(List<String> truckNos) {
         /**获取数据**/
-        Map<String, RTruckVo> truckMap = new HashMap();
-        List<Map<String, Object>> trucks = truckDao.findList(new HashMap(){{put("truckNos", truckNos);}});
+        Map<String, RTruckVo> truckMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        List<Map<String, Object>> trucks = truckDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("truckNos", truckNos);}});
         if (CollectionUtils.isEmpty(trucks)) {
             return truckMap;
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfFleetService.java

@@ -93,7 +93,7 @@ public class KwfFleetService {
      **/
     public HttpResult add(KwfFleetDto params) {
         /**唯一性交易**/
-        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap(){{
+        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{
             put("wholeName", params.getName()); put("entId", LoginUserHolder.getEntId());}});
         if (!CollectionUtils.isEmpty(fleets)) {
             return HttpResult.error("车队班组已存在！");
@@ -115,7 +115,7 @@ public class KwfFleetService {
      **/
     public HttpResult update(KwfFleetDto params) {
         /**唯一性交易**/
-        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap(){{
+        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{
             put("name", params.getName()); put("entId", LoginUserHolder.getEntId());}});
         //校验list中对象key值是否存在与value不一致的情况
         boolean bool = CollectionUtils.listByKeyValueV1(fleets, "id", params.getId());
@@ -166,7 +166,7 @@ public class KwfFleetService {
     public Map<String, Object> findTruckList(Map<String, Object> params) {
         //全量数据统计
         params.put("entId", LoginUserHolder.getEntId());
-        List<KwfFleetTruckCountVo> truckCounts = fleetDao.findTruckList(new HashMap(){{put("entId", LoginUserHolder.getEntId());}});
+        List<KwfFleetTruckCountVo> truckCounts = fleetDao.findTruckList(new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("entId", LoginUserHolder.getEntId());}});
         KwfFleetTruckCountVo truck = new KwfFleetTruckCountVo();
         truck.setFleetTotal(truckCounts != null ? truckCounts.size() : Global.NUMERICAL_ZERO);
         for (KwfFleetTruckCountVo truckCount:truckCounts) {
@@ -179,7 +179,7 @@ public class KwfFleetService {
         truckCounts = fleetDao.findTruckList(params);
 
         //返回数据
-        Map result = new HashMap();
+        Map<String, Object> result = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         result.put("truckCount", truck);
         result.put("truckCounts", truckCounts);
         return result;

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -97,7 +97,7 @@ public class KwfTruckReportService {
         countList.add(allCount);
 
         /**数据处理**/
-        Map<String, Integer> authStatusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
+        Map<String, Integer> authStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN){{put("正常", 1); put("临时", 2); put("异常", 3);}};
         for(Map.Entry<String, Integer> entry:authStatusMap.entrySet()){
             System.out.println(entry.getKey()+"--->"+entry.getValue());
             KwfTableTopCount count = new KwfTableTopCount();
@@ -112,7 +112,7 @@ public class KwfTruckReportService {
         }
 
         /**数据组装**/
-        Map tableCount = new HashMap();
+        Map<String, Object> tableCount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         tableCount.put("tableTop", countList);
         tableCount.put("tableBottom", tatol);
         return tableCount;
@@ -234,7 +234,7 @@ public class KwfTruckReportService {
 
             /**车辆信息**/
             //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", truckReportExcel.getTruckNo());}});
+            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
             if (CollectionUtils.isEmpty(trucks)) {
                 //车辆信息
                 KwfTruck truckParams = new KwfTruck();
@@ -251,7 +251,7 @@ public class KwfTruckReportService {
             } else {
                 //校验车辆是否已上报
                 KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("truckId", truck.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -264,7 +264,7 @@ public class KwfTruckReportService {
 
             /**档案信息**/
             //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{put("phone", truckReportExcel.getPhone());}});
+            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", truckReportExcel.getPhone());}});
             if (CollectionUtils.isEmpty(drivers)) {
                 KwfDriver driverParams = new KwfDriver();
                 driverParams.setName(truckReportExcel.getName());
@@ -281,7 +281,7 @@ public class KwfTruckReportService {
             } else {
                 //校验司机是否已上报
                 KwfDriver driver = drivers.get(0);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("driverId", driver.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -324,7 +324,7 @@ public class KwfTruckReportService {
 
             /**车辆信息**/
             //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", reportDto.getTruckNo());}});
+            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
             if (CollectionUtils.isEmpty(trucks)) {
                 //车辆信息
                 KwfTruck truckParams = new KwfTruck();
@@ -341,7 +341,7 @@ public class KwfTruckReportService {
             } else {
                 //校验车辆是否已上报
                 KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("truckId", truck.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -359,7 +359,7 @@ public class KwfTruckReportService {
 
             /**档案信息**/
             //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{put("phone", reportDto.getPhone());}});
+            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", reportDto.getPhone());}});
             if (CollectionUtils.isEmpty(drivers)) {
                 KwfDriver driverParams = new KwfDriver();
                 driverParams.setName(reportDto.getName());
@@ -376,7 +376,7 @@ public class KwfTruckReportService {
             } else {
                 //校验司机是否已上报
                 KwfDriver driver = drivers.get(0);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("driverId", driver.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -415,7 +415,7 @@ public class KwfTruckReportService {
         }
 
         /**更新**/
-        List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+        List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("driverId", params.getDriverId());
             put("entId", LoginUserHolder.getEntId());
         }});
@@ -532,11 +532,11 @@ public class KwfTruckReportService {
 
             /**车辆信息**/
             //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{put("truckNo", reportDto.getTruckNo());}});
+            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("truckNo", reportDto.getTruckNo());}});
             if (!CollectionUtils.isEmpty(trucks)) {
                 //校验车辆是否已上报
                 KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("truckId", truck.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -548,11 +548,11 @@ public class KwfTruckReportService {
 
             /**档案信息**/
             //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", reportDto.getPhone()); }});
+            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", reportDto.getPhone()); }});
             if (!CollectionUtils.isEmpty(drivers)) {
                 //校验司机是否已上报
                 KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("driverId", driver.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -566,7 +566,7 @@ public class KwfTruckReportService {
         }
 
         /**返回数据**/
-        Map<String, Object> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         resultMap.put("haveCount", haveCount);
         resultMap.put("errorCount", errorCount);
         resultMap.put("fail", haveCount + errorCount);
@@ -585,11 +585,11 @@ public class KwfTruckReportService {
     public boolean checkReport(KwfTruckReportDto reportDto) {
         /**车辆信息**/
         //校验车辆档案是否存在
-        List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", reportDto.getTruckNo());}});
+        List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
         if (!CollectionUtils.isEmpty(trucks)) {
             //校验车辆是否已上报
             KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-            List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+            List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                 put("truckId", truck.getId());
                 put("entId", LoginUserHolder.getEntId());
             }});
@@ -600,11 +600,11 @@ public class KwfTruckReportService {
 
         /**档案信息**/
         //校验司机档案是否存在
-        List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", reportDto.getPhone()); }});
+        List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", reportDto.getPhone()); }});
         if (!CollectionUtils.isEmpty(drivers)) {
             //校验司机是否已上报
             KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
-            List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+            List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                 put("driverId", driver.getId());
                 put("entId", LoginUserHolder.getEntId());
             }});
@@ -728,11 +728,11 @@ public class KwfTruckReportService {
 
             /**车辆信息**/
             //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap() {{ put("truckNo", truckReportExcel.getTruckNo());}});
+            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
             if (!CollectionUtils.isEmpty(trucks)) {
                 //校验车辆是否已上报
                 KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("truckId", truck.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});
@@ -743,11 +743,11 @@ public class KwfTruckReportService {
 
             /**档案信息**/
             //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap() {{ put("phone", truckReportExcel.getPhone()); }});
+            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("phone", truckReportExcel.getPhone()); }});
             if (!CollectionUtils.isEmpty(drivers)) {
                 //校验司机是否已上报
                 KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap() {{
+                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("driverId", driver.getId());
                     put("entId", LoginUserHolder.getEntId());
                 }});

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -166,8 +166,8 @@ public class CommonBusinessService {
         allEntIds.addAll(ourEntIds);
         List<UserCacheResDto> userCacheResDtos = remoteSystemService.queryUserCacheByIds(userIds);
         List<EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntCacheByIds(allEntIds);
-        Map<Long, String> userMap = new HashMap<>();
-        Map<Long, String> entMap = new HashMap<>();
+        Map<Long, String> userMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<Long, String> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (!CollectionUtils.isEmpty(userCacheResDtos)) {
             userMap = userCacheResDtos.stream().collect(Collectors.toMap(UserCacheResDto::getId, UserCacheResDto::getName, (oldValue, newValue) -> newValue));
         }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -102,8 +102,8 @@ public class KwmCooperateApplyService {
         allEntIds.addAll(targetEntIds);
         List<UserCacheResDto> userCacheResDtos = remoteSystemService.queryUserCacheByIds(userIds);
         List<EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntCacheByIds(allEntIds);
-        Map<Long, String> userMap = new HashMap<>();
-        Map<Long, String> entMap = new HashMap<>();
+        Map<Long, String> userMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<Long, String> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (!CollectionUtils.isEmpty(userCacheResDtos)) {
             userMap = userCacheResDtos.stream().collect(Collectors.toMap(UserCacheResDto::getId, UserCacheResDto::getName, (oldValue, newValue) -> newValue));
         }
@@ -398,7 +398,7 @@ public class KwmCooperateApplyService {
                 in(KwmCooperateType::getStatus, statusList).
                 in(KwmCooperateType::getCooperateId, kwmCooperates.stream().map(KwmCooperate::getId).toList());
         List<KwmCooperateType> kwmCooperateTypes = kwmCooperateTypeMapper.selectList(wrapper2);
-        Map<Long, List<KwmCooperateType>> map = new HashMap<>();
+        Map<Long, List<KwmCooperateType>> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(kwmCooperateTypes)) {
             map = kwmCooperateTypes.stream().collect(Collectors.groupingBy(KwmCooperateType::getCooperateId));
         }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -439,7 +439,7 @@ public class KwmCooperateManageService {
         wrapper.in(KwmCooperateType::getCooperateId, cooperateIdList);
         wrapper.eq(KwmCooperateType::getDelFlag, Global.NO);
         List<KwmCooperateType> kwmCooperateTypes = kwmCooperateTypeMapper.selectList(wrapper);
-        Map<Long, List<KwmCooperateType>> collect = new HashMap<>();
+        Map<Long, List<KwmCooperateType>> collect = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(kwmCooperateTypes)) {
             collect = kwmCooperateTypes.stream().collect(Collectors.groupingBy(KwmCooperateType::getCooperateId));
         }
@@ -452,7 +452,7 @@ public class KwmCooperateManageService {
             allEntIdList.add(item.getInviteeEntId());
         });
         List<EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntCacheByIds(allEntIdList);
-        Map<Long, EntCacheResDto> entMap = new HashMap<>();
+        Map<Long, EntCacheResDto> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(entCacheResDtos)) {
             entMap = entCacheResDtos.stream().collect(Collectors.toMap(EntCacheResDto::getId, e -> e, (n, o) -> n));
         }

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.NumberUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -49,7 +50,7 @@ public class SmsService {
         if (Boolean.TRUE.equals(RedissonUtils.exists(key))) {
             throw new BusinessException("请勿频繁获取短信验证码！");
         }
-        Map<String, Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         params.put("code", NumberUtils.createRandomVcode());
         SckwSms sckwSms = new SckwSms();
         sckwSms.setPhone(param.getPhone()).setType(type).setTemplateCode(SmsCodeEnum.VERIFICATION_CODE)

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementEnum.java

@@ -43,7 +43,8 @@ public enum SettlementEnum {
                 return settlementEnum.getDesc();
             }
         }
-        return null; // 可根据实际需求返回默认值或其他处理
+        // 可根据实际需求返回默认值或其他处理
+        return null;
     }
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementOrderTypeEnum.java

@@ -39,7 +39,8 @@ public enum SettlementOrderTypeEnum {
                     return settlementOrderTypeEnum.getDesc();
                 }
             }
-            return null; // 可根据实际需求返回默认值或其他处理
+            // 可根据实际需求返回默认值或其他处理
+            return null;
         }
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/TradingEnum.java

@@ -23,7 +23,7 @@ public enum TradingEnum {
     OFFLINE_PAY(3, "3", "线下付款");
 
     private final int status;
-    private final String value;//字典值
+    private final String value;
     private final String desc;
 
     TradingEnum(int status, String value, String desc) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/WalletChannelEnum.java

@@ -7,9 +7,12 @@ import org.apache.commons.lang3.StringUtils;
  * @date 2023-07-27 12:54
  */
 public enum WalletChannelEnum {
-    HF(1, "1", "huifu"),//汇付
-    XS(2, "2", "xinsheng"),//新生
-    ZX(3, "3", "zhongxin");//中信
+    //汇付
+    HF(1, "1", "huifu"),
+    //新生
+    XS(2, "2", "xinsheng"),
+    //中信
+    ZX(3, "3", "zhongxin");
 
     private final int status;
     private final String value;
@@ -40,7 +43,8 @@ public enum WalletChannelEnum {
                 return walletChannelEnum.getDesc();
             }
         }
-        return null; // 可根据实际需求返回默认值或其他处理
+        // 可根据实际需求返回默认值或其他处理
+        return null;
     }
 
     /**
@@ -59,7 +63,8 @@ public enum WalletChannelEnum {
                 return walletChannelEnum.getValue();
             }
         }
-        return null; // 可根据实际需求返回默认值或其他处理
+        // 可根据实际需求返回默认值或其他处理
+        return null;
     }
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -72,8 +72,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
     private void changeDict(List<ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());
-        Map<String, String> taxRateMap = new HashMap<>();
-        Map<String, String> tradingMap = new HashMap<>();
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> tradingMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
 
         if (!CollectionUtils.isEmpty(taxRateDict)) {
             taxRateMap = taxRateDict.stream().collect(Collectors.toMap(SysDictResDto::getValue, SysDictResDto::getLabel, (a, b) -> a));
@@ -219,7 +219,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setTaxRate(logisticsSendReq.getTaxRate());
         kwpLedgerLogistics.setTrading(logisticsSendReq.getTrading());
         kwpLedgerLogistics.setTotalPrice(logisticsSendReq.getTotalPrice());
-        kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        //todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());
         kwpLedgerLogistics.setSettlePrice(logisticsSendReq.getSettlePrice());
         kwpLedgerLogistics.setActualPrice(new BigDecimal("0.0"));
         kwpLedgerLogistics.setAuditUser(Global.EMPTY_STRING);
@@ -325,8 +326,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         carrierUnit.setLLedgerId(kwpLedgerLogistics.getId());
         carrierUnit.setLLedgerNo(kwpLedgerLogistics.getLLedgerNo());
         carrierUnit.setUnitType(LogisticsUnitType.CARRIER);
-        carrierUnit.setEntId(entId);//顶级企业id
-        carrierUnit.setTopEntId(entCacheResDto1.getId());//顶级企业id
+        //顶级企业id
+        carrierUnit.setEntId(entId);
+        //顶级企业id
+        carrierUnit.setTopEntId(entCacheResDto1.getId());
         carrierUnit.setFirmName(entCacheResDto1.getFirmName());
         carrierUnit.setContacts(entCacheResDto1.getContacts());
         carrierUnit.setPhone(entCacheResDto1.getPhone());
@@ -498,8 +501,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setEntId(LoginUserHolder.getEntId());
         kwpSettlementLogistics.setLLedgerId(kwpLedgerLogistics.getId());
         kwpSettlementLogistics.setSlOrderNo(OrderGenerateUtils.generateOrderNo("TP"));
-        kwpSettlementLogistics.setName(kwpLedgerLogistics.getName());//取物流对账单名称
-        kwpSettlementLogistics.setTotalPrice(kwpLedgerLogistics.getSettlePrice());//实际结算金额就是结算单实际需付金额
+        //取物流对账单名称
+        kwpSettlementLogistics.setName(kwpLedgerLogistics.getName());
+        //实际结算金额就是结算单实际需付金额
+        kwpSettlementLogistics.setTotalPrice(kwpLedgerLogistics.getSettlePrice());
         kwpSettlementLogistics.setActualPrice(kwpLedgerLogistics.getActualPrice());
         kwpSettlementLogistics.setRemark(Global.EMPTY_STRING);
         kwpSettlementLogistics.setAuditUser(kwpLedgerLogistics.getAuditUser());
@@ -507,7 +512,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementLogistics.setReceiptTime(receiptTime);
-        kwpSettlementLogistics.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());//1-待结算
+        //1-待结算
+        kwpSettlementLogistics.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
         kwpSettlementLogistics.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementLogistics.setCreateTime(LocalDateTime.now());
         kwpSettlementLogistics.setUpdateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -69,8 +69,8 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     private void changeDict(List<? extends ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());
-        Map<String, String> taxRateMap = new HashMap<>();
-        Map<String, String> tradingMap = new HashMap<>();
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> tradingMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
 
         if (!CollectionUtils.isEmpty(taxRateDict)) {
             taxRateMap = taxRateDict.stream().collect(Collectors.toMap(SysDictResDto::getValue, SysDictResDto::getLabel, (a, b) -> a));
@@ -191,7 +191,8 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setTaxRate(tradeSendReq.getTaxRate());
         kwpLedgerTrade.setTrading(tradeSendReq.getTrading());
         kwpLedgerTrade.setTotalPrice(tradeSendReq.getTotalPrice());
-        kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        //todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());
         kwpLedgerTrade.setSettlePrice(tradeSendReq.getSettlePrice());
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
         kwpLedgerTrade.setAuditUser(Global.EMPTY_STRING);
@@ -517,7 +518,8 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementTrade.setReceiptTime(receiptTime);
-        kwpSettlementTrade.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());//1-待结算
+        //1-待结算
+        kwpSettlementTrade.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
         kwpSettlementTrade.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setCreateTime(LocalDateTime.now());
         kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
@@ -615,10 +617,10 @@ public class KwpLedgerTradeService extends AbsLedger {
         ledgerTradeDetailVo.setFirmName(ledgerTradeDto.getFirmName());
         SysDictResDto trading = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRADE_TYPE.getType(), ledgerTradeDto.getTrading());
         ledgerTradeDetailVo.setTrading(ledgerTradeDto.getTrading());
-        ledgerTradeDetailVo.setTradingLabel(Objects.nonNull(trading) ? trading.getLabel() : "");//
+        ledgerTradeDetailVo.setTradingLabel(Objects.nonNull(trading) ? trading.getLabel() : "");
         SysDictResDto taxRate = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE.getType(), String.valueOf(ledgerTradeDto.getTaxRate()));
         ledgerTradeDetailVo.setTaxRate(ledgerTradeDto.getTaxRate());
-        ledgerTradeDetailVo.setTaxRateLabel(Objects.nonNull(taxRate) ? taxRate.getLabel() : "");//
+        ledgerTradeDetailVo.setTaxRateLabel(Objects.nonNull(taxRate) ? taxRate.getLabel() : "");
         ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
         ledgerTradeDetailVo.setSettlePrice(ledgerTradeDto.getSettlePrice());
         ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsService.java

@@ -302,10 +302,12 @@ public class KwpSettlementLogisticsService {
         } else {
             settlementLogisticsDto.setWaitPrice(new BigDecimal(0));
         }
-        settlementLogisticsDto.setCreateByLabel("创建人名称");//"创建人名称"
-        settlementLogisticsDto.setUpdateByLabel("更新人名称");//"更新人名称"
+        //"创建人名称"
+        settlementLogisticsDto.setCreateByLabel("创建人名称");
+        //"更新人名称"
+        settlementLogisticsDto.setUpdateByLabel("更新人名称");
 
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         Long createBy = settlementLogisticsDto.getCreateBy();
         Long updateBy = settlementLogisticsDto.getUpdateBy();
         UserCacheResDto userCacheResDto = map.get(createBy);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -90,7 +90,7 @@ public class KwpSettlementOfflineService {
             entity.setUpdateByText("更新人名称");
         }
 
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         //指定返回值
         List<SettlementOfflineVo> collect = settlementOfflineLogisticsList.stream().map(a -> {
             SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
@@ -165,11 +165,13 @@ public class KwpSettlementOfflineService {
             throw new BusinessException("该订单已结算完成，无法操作");
         }
         BigDecimal remainingReceivables = settlementLogisticsDto.getTotalPrice();
-        if (settlementLogisticsDto.getActualPrice() != null) {//剩余金额
+        if (settlementLogisticsDto.getActualPrice() != null) {
+            //剩余金额
             remainingReceivables = settlementLogisticsDto.getTotalPrice().subtract(settlementLogisticsDto.getActualPrice());
         }
 
-        if (remainingReceivables.compareTo(price) < 0) {//-1表示小于,0是等于,1是大于
+        //-1表示小于,0是等于,1是大于
+        if (remainingReceivables.compareTo(price) < 0) {
             log.error("本次结算输入金额比剩余付款金额大：ID：" + id + " 剩余金额：" + remainingReceivables + " 本次输入金额：" + price);
             throw new BusinessException("参数错误：输入金额过大 " + price + " 剩余金额最大值：" + remainingReceivables);
         }
@@ -177,10 +179,12 @@ public class KwpSettlementOfflineService {
         KwpSettlementLogistics settlementLogistics = new KwpSettlementLogistics();
         settlementLogistics.setId(settlementLogisticsDto.getId());
         settlementLogistics.setUpdateTime(LocalDateTime.now());
-        if (remainingReceivables.compareTo(price) == 0) {//全部结算
+        //全部结算
+        if (remainingReceivables.compareTo(price) == 0) {
             settlementLogistics.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
         }
-        if (remainingReceivables.compareTo(price) > 0) {//部分结算
+        //部分结算
+        if (remainingReceivables.compareTo(price) > 0) {
             settlementLogistics.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
         }
         BigDecimal actualPrice = settlementLogisticsDto.getActualPrice();
@@ -244,7 +248,7 @@ public class KwpSettlementOfflineService {
         if (CollectionUtils.isEmpty(settlementOfflineDto)) {
             return new PageRes<>();
         }
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         //指定返回值
         List<SettlementOfflineVo> collect = settlementOfflineDto.stream().map(a -> {
             SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
@@ -313,7 +317,8 @@ public class KwpSettlementOfflineService {
                 //更新结算单记录
                 KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
                 kwpSettlementTrade.setId(byId.getId());
-                kwpSettlementTrade.setActualPrice(actualPrice.add(payPrice));//已收款加本次收款
+                //已收款加本次收款
+                kwpSettlementTrade.setActualPrice(actualPrice.add(payPrice));
                 int status = 0;
                 //全部结算，修改贸易订单状态
                 if (subtract1.compareTo(new BigDecimal("0.0")) == NumberConstant.ZERO) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -101,7 +101,7 @@ public class KwpSettlementWalletService {
             entity.setUpdateByText("未知更新人");
         }
 
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         //指定返回值
         List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
             SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
@@ -174,11 +174,13 @@ public class KwpSettlementWalletService {
             throw new BusinessException("该订单已结算完成，无法操作");
         }
         BigDecimal remainingReceivables = settlementLogisticsDto.getTotalPrice();
-        if (settlementLogisticsDto.getActualPrice() != null) {//剩余金额
+        //剩余金额
+        if (settlementLogisticsDto.getActualPrice() != null) {
             remainingReceivables = settlementLogisticsDto.getTotalPrice().subtract(settlementLogisticsDto.getActualPrice());
         }
 
-        if (remainingReceivables.compareTo(price) < 0) {//-1表示小于,0是等于,1是大于
+        //-1表示小于,0是等于,1是大于
+        if (remainingReceivables.compareTo(price) < 0) {
             log.error("本次结算输入金额比剩余付款金额大：ID：" + id + " 剩余金额：" + remainingReceivables + " 本次输入金额：" + price);
             throw new BusinessException("参数错误：输入金额过大 " + price + " 剩余金额最大值：" + remainingReceivables);
         }
@@ -186,10 +188,12 @@ public class KwpSettlementWalletService {
         KwpSettlementLogistics settlementLogistics = new KwpSettlementLogistics();
         settlementLogistics.setId(settlementLogisticsDto.getId());
         settlementLogistics.setUpdateTime(LocalDateTime.now());
-        if (remainingReceivables.compareTo(price) == 0) {//全部结算
+        //全部结算
+        if (remainingReceivables.compareTo(price) == 0) {
             settlementLogistics.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
         }
-        if (remainingReceivables.compareTo(price) > 0) {//部分结算
+        //部分结算
+        if (remainingReceivables.compareTo(price) > 0) {
             settlementLogistics.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
         }
         BigDecimal actualPrice = settlementLogisticsDto.getActualPrice();
@@ -217,7 +221,8 @@ public class KwpSettlementWalletService {
             kwpSettlementWallet.setEntId(settlementLogisticsDto.getEntId());
             kwpSettlementWallet.setSettlementId(settlementLogisticsDto.getId());
             kwpSettlementWallet.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-            kwpSettlementWallet.setChannel(WalletChannelEnum.getValue(settlementLogisticsDto.getTrading()));//先用数字默认定义为1
+            //先用数字默认定义为1
+            kwpSettlementWallet.setChannel(WalletChannelEnum.getValue(settlementLogisticsDto.getTrading()));
             kwpSettlementWallet.setPayTime(LocalDateTime.now());
             kwpSettlementWallet.setPayPrice(price);
             kwpSettlementWallet.setTopayPrice(remainingReceivables);
@@ -409,7 +414,7 @@ public class KwpSettlementWalletService {
             return new PageRes<>();
         }
         //增加对应创建人和更新人名称
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletDto);
         //指定返回值
         List<SettlementWalletVo> collect = settlementWalletDto.stream().map(a -> {
@@ -451,7 +456,7 @@ public class KwpSettlementWalletService {
             return new PageRes<>(new PageInfo<>());
         }
 
-        Map<Long, UserCacheResDto> map = new HashMap<>();
+        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         //指定返回值
         List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
             SettlementWalletVo settlementWalletVo = new SettlementWalletVo();

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -55,7 +55,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         if (StringUtils.isBlank(keys)) {
             return null;
         }
-        Map<String, SysDictResDto> map = new HashMap<>();
+        Map<String, SysDictResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         String[] typeValueArr = keys.split(Global.COMMA);
         for (String typeValue : typeValueArr) {
             if (StringUtils.isNotBlank(typeValue)) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -833,14 +833,14 @@ public class KwsEnterpriseService {
             return Collections.emptyList();
         }
 
-        Map<Long, List<KwsEntType>> collect = new HashMap<>();
+        Map<Long, List<KwsEntType>> collect = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         List<KwsEntType> kwsEntTypeList = kwsEntTypeDao.findListByEntIds(kwsEnterprises.stream().map(KwsEnterprise::getId).toList());
         if (CollectionUtils.isNotEmpty(kwsEntTypeList)) {
             collect = kwsEntTypeList.stream().collect(Collectors.groupingBy(KwsEntType::getEntId));
         }
 
         List<Long> managers = kwsEnterprises.stream().map(KwsEnterprise::getManager).toList();
-        Map<Long, KwsUser> userCollect = new HashMap<>();
+        Map<Long, KwsUser> userCollect = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(managers)) {
             List<KwsUser> kwsUsers = kwsUserService.selectByKeys(managers);
             if (CollectionUtils.isNotEmpty(kwsUsers)) {
@@ -935,7 +935,7 @@ public class KwsEnterpriseService {
         enterpriseVo.setEntTypes(entTypes != null ? String.join(Global.COMMA, entTypes.stream().map(KwsEntType::getType).map(String::valueOf).distinct().toList()) : null);
         enterpriseVo.setEntTypeNames(enterpriseVo.getEntTypes() != null ? EntTypeEnum.getNames(enterpriseVo.getEntTypes()) : null);
 
-        Map<String, Object> queryParams = new HashMap() {{
+        Map<String, Object> queryParams = new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("isMain", Global.YES);
             put("entId", entId);
             put("systemType", SystemTypeEnum.COMPANY.getCode());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -927,7 +927,7 @@ public class AcceptCarriageOrderService {
         /**请求参数校验*/
         checkParam(driverParam);
         /**1 趟次 2 循环*/
-        Map<String, RTruckVo> truck = new HashMap<>();
+        Map<String, RTruckVo> truck = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (String.valueOf(NumberConstant.ONE).equals(driverParam.getType())) {
             //只展示待接单数据
             List<DriverListVo> list = logisticsOrderMapper.selectDriverListById(driverParam);
@@ -1270,7 +1270,7 @@ public class AcceptCarriageOrderService {
                 BigDecimal subtract = kwtLogisticsOrder.getAmount().subtract(kwtLogisticsOrder.getTotalLoadAmount());
                 updateLogisticOrderAndTrack(kwtLogisticsOrder.getId(), orderFinishDTO, subtract);
                 //新增mongodb要修改的数据
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
                 map.put("id", kwtLogisticsOrder.getId());
                 map.put("ignoreAmount", subtract);
                 list.add(map);
@@ -2087,7 +2087,7 @@ public class AcceptCarriageOrderService {
         Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗*/
 //        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        Map<Long, UserCacheResDto> longUserMap = new HashMap<>();
+        Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(AcceptCarriageOrderVO::getCreateBy).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -11,6 +11,7 @@ import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.*;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.page.PageResult;
@@ -471,7 +472,7 @@ public class ConsignOrderService {
             return HttpResult.ok();
         }
         List<DriverListVo> list = kwtLogisticsOrderMapper.selectLoopOrderAndDriverListByOrderIds(idsList);
-        Map<String, RTruckVo> truck = new HashMap<>();
+        Map<String, RTruckVo> truck = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<String> collect = list.stream().map(DriverListVo::getTruckNo).distinct().collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
@@ -510,7 +511,7 @@ public class ConsignOrderService {
         /**请求参数校验*/
         checkParam(driverParam);
         List<DriverListVo> list = kwtLogisticsOrderMapper.selectLoopOrderAndDriverListByOrderId(driverParam);
-        Map<String, RTruckVo> truck = new HashMap<>();
+        Map<String, RTruckVo> truck = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<String> collect = list.stream().map(DriverListVo::getTruckNo).distinct().collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
@@ -769,7 +770,7 @@ public class ConsignOrderService {
                 BigDecimal subtract = kwtLogisticsOrder.getAmount().subtract(kwtLogisticsOrder.getTotalLoadAmount());
                 updateLogisticOrderAndTrack(kwtLogisticsOrder.getId(), orderFinishDTO, subtract);
                 //新增mongodb要修改的数据
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
                 map.put("id", kwtLogisticsOrder.getId());
                 map.put("ignoreAmount", subtract);
                 list.add(map);
@@ -1570,7 +1571,7 @@ public class ConsignOrderService {
         Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗*/
 //        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        Map<Long, UserCacheResDto> longUserMap = new HashMap<>();
+        Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(AcceptCarriageOrderVO::getCreateBy).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -10,6 +10,7 @@ import com.sckw.contract.api.RemoteContractService;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.enums.OrderRuleEnum;
@@ -1477,7 +1478,7 @@ public class LogisticsConsignmentService {
 
 
     private Map countOrderNumber(Long tOrderId) {
-        Map<String, BigDecimal> map = new HashMap<>();
+        Map<String, BigDecimal> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         BigDecimal loadAmountTotal = new BigDecimal("0.00");
         BigDecimal unloadAmountTotal = new BigDecimal("0.00");
         List<KwtLogisticsOrder> kwtLogisticsOrderList = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, tOrderId));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -3,6 +3,7 @@ package com.sckw.transport.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
@@ -169,7 +170,7 @@ public class WaybillManagementService {
             List<Long> userIds = new ArrayList<>();
             kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
             List<UserCacheResDto> users = remoteSystemService.queryUserCacheByIds(userIds);
-            Map<Long, UserCacheResDto> usersMap = new HashMap<>();
+            Map<Long, UserCacheResDto> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             users.forEach(e -> usersMap.put(e.getId(), e));
             for (KwtWaybillOrderTrack kwtWaybillOrderTrack: kwtWaybillOrderTracks) {
                 for (WaybillStatusVO statusVO:statusVOS) {
@@ -250,7 +251,7 @@ public class WaybillManagementService {
             List<Long> userIds = new ArrayList<>();
             kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
             List<UserCacheResDto> users = remoteSystemService.queryUserCacheByIds(userIds);
-            Map<Long, UserCacheResDto> usersMap = new HashMap<>();
+            Map<Long, UserCacheResDto> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             users.forEach(e -> usersMap.put(e.getId(), e));
             for (KwtWaybillOrderTrack kwtWaybillOrderTrack : kwtWaybillOrderTracks) {
                 for (WaybillStatusVO statusVO : statusVOS) {
@@ -340,7 +341,7 @@ public class WaybillManagementService {
                 List<Long> userIds = new ArrayList<>();
                 kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
                 List<UserCacheResDto> users = remoteSystemService.queryUserCacheByIds(userIds);
-                Map<Long, String> usersMap = new HashMap<>();
+                Map<Long, String> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
                 users.forEach(e -> usersMap.put(e.getId(), e.getName()));
                 waybillBoardListVO.getTracks().forEach(e -> {
                     kwtWaybillOrderTracks.forEach(e2 -> {
@@ -473,7 +474,7 @@ public class WaybillManagementService {
         AggregationResults<TableTops> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwWaybillOrder.class, TableTops.class);
         List<TableTops> results = outputTypeCount.getMappedResults();
 
-        Map<String, TableTops> listMap = new HashMap<>();
+        Map<String, TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         TableTops topTotal = new TableTops();
         topTotal.setName("全部");
         topTotal.setValue("all");