1.运营端导出增加字段处理

2.文件服务新增md5加密数据存储以及数据查询接口
3.修复承运订单-分包托运接口-待分配量计算

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/FileDisposeLayoutEnum.java

@@ -25,7 +25,7 @@ public enum FileDisposeLayoutEnum {
     /**
      * oss按照比例缩放
      */
-    OSS_LESSEN(FileEnum.FILE_STORE_TYPE_OSS.getFileType(), "?x-oss-process=image/resize,p_12", "按百分比缩放"),
+    OSS_LESSEN(FileEnum.FILE_STORE_TYPE_OSS.getFileType(), "?x-oss-process=image/resize,p_", "按百分比缩放"),
     /**
      * 七牛云缩略图
      */

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportDubboService.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportService.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @company sckw
  * @date 2023-07-17 10:06:27
  */
-public interface TransportDubboService {
+public interface TransportService {
 
     /**
      * 根据id 获取主表详情

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

@@ -27,7 +27,7 @@ import com.sckw.order.api.model.ContractSignCompletedParam;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.param.ContractSignLogisticsParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -58,7 +58,7 @@ public class CommonBusinessService {
     private TradeOrderInfoService tradeOrderInfoService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     @Autowired
     private KwcContractTradeMapper kwcContractTradeMapper;

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -1,15 +1,18 @@
 package com.sckw.file.controller;
 
+import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.dubbo.FileDubboApiServiceImpl;
+import com.sckw.file.model.param.FileImageParam;
 import com.sckw.file.service.FileService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
@@ -181,6 +184,16 @@ public class FileApiController {
         }
     }
 
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
+    @RequestMapping(name = "通过key获取地址",value = "/getImage",method = RequestMethod.POST)
+    public HttpResult getImage(@RequestBody @Valid FileImageParam fileImageParam){
+        try {
+            return fileService.getImage(fileImageParam);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * dubbo接收文件信息保存至数据库
      *

sckw-modules/sckw-file/src/main/java/com/sckw/file/model/param/FileImageParam.java

@@ -0,0 +1,41 @@
+package com.sckw.file.model.param;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 文件查询图片数据
+ * @date 2023-10-08 09:10:00
+ */
+@Data
+public class FileImageParam {
+
+    /**
+     * 文件key
+     */
+    @NotBlank(message = "文件key不能为空")
+    private String fileKey;
+
+    /**
+     * 指定目标缩放图的宽度
+     */
+    private String fileWidth;
+
+    /**
+     * 指定目标缩放图的高度
+     */
+    private String fileHeight;
+
+    /**
+     * 是否缩放展示
+     */
+    @NotNull(message = "是否缩放展示不能为空")
+    private boolean isLessen;
+
+    /**
+     * 是否缩放展示
+     */
+    private String lessenRatio;
+}

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -2,6 +2,7 @@ package com.sckw.file.service;
 
 
 import com.aliyun.oss.model.OSSObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.FileDisposeLayoutEnum;
@@ -21,6 +22,7 @@ import com.sckw.file.dao.KwsFileEncryptDao;
 import com.sckw.file.dao.KwsFileInfoDao;
 import com.sckw.file.model.kwfFileEncrypt;
 import com.sckw.file.model.kwfFileInfo;
+import com.sckw.file.model.param.FileImageParam;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +59,8 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class FileService {
 
+    final static String IMG_FORMAT = "png_jpg_bmp_gif_tif_jpeg_PNG_JPG_BMP_GIF_TIF_JPEG_HEIC_heic";
+
     @Autowired
     KwsFileInfoDao fileInfoDao;
 
@@ -254,7 +258,7 @@ public class FileService {
         return null;
     }
 
-    public HttpResult uploadFileInfo(MultipartFile file){
+    public HttpResult uploadFileInfo(MultipartFile file) {
         boolean flag = checkFileFormat(file);
         if (!flag) {
             throw new RuntimeException("上传文件格式错误!");
@@ -410,4 +414,44 @@ public class FileService {
         vo.setFilePath(filePath);
         return HttpResult.ok(Status.SUCCESS.getCode(), "", vo);
     }
+
+    public HttpResult getImage(FileImageParam fileImageParam) {
+        String lessenRatio = fileImageParam.getLessenRatio();
+        String fileHeight = fileImageParam.getFileHeight();
+        String fileWidth = fileImageParam.getFileWidth();
+        boolean flag = true;
+        if (fileImageParam.isLessen()) {
+            if (org.apache.commons.lang3.StringUtils.isBlank(lessenRatio)) {
+                lessenRatio = String.valueOf(NumberConstant.TWELVE);
+            }
+        } else {
+            flag = false;
+            if (org.apache.commons.lang3.StringUtils.isBlank(fileHeight)) {
+                fileHeight = String.valueOf(NumberConstant.TWO_HUNDRED);
+
+            }
+            if (org.apache.commons.lang3.StringUtils.isBlank(fileWidth)) {
+                fileWidth = String.valueOf(NumberConstant.TWO_HUNDRED);
+            }
+        }
+        String returnImageAddress = FileUtils.getOSSAddressPrefix();
+        LambdaQueryWrapper<kwfFileInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(com.sckw.file.model.kwfFileInfo::getMd5, fileImageParam.getFileKey())
+                .orderByDesc(kwfFileInfo::getCreateTime);
+        kwfFileInfo kwfFileInfo = fileInfoDao.selectList(
+                wrapper).get(0);
+        if (IMG_FORMAT.indexOf(kwfFileInfo.getFileSuffix()) == -1) {
+            returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath();
+        } else {
+            if (flag) {
+                returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath()
+                        + FileDisposeLayoutEnum.OSS_LESSEN.getParameter() + lessenRatio;
+            } else {
+                returnImageAddress = returnImageAddress + kwfFileInfo.getFilePath()
+                        + FileDisposeLayoutEnum.OSS_ABBREVIATE_LEFT.getParameter() + fileHeight
+                        + FileDisposeLayoutEnum.OSS_ABBREVIATE_RIGHT.getParameter() + fileWidth;
+            }
+        }
+        return HttpResult.ok(returnImageAddress);
+    }
 }

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

@@ -29,7 +29,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.RWaybillOrderDto;
 import com.sckw.transport.api.model.vo.RTruckMonitorVo;
 import com.sckw.transport.api.model.vo.RWaybillOrderVo;
@@ -71,7 +71,7 @@ public class KwfTruckService {
     @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     /**
      * @param key 主键id

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

@@ -1,12 +1,8 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CooperateStatusEnum;
@@ -25,29 +21,26 @@ import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.dao.KwmCooperateTypeMapper;
 import com.sckw.manage.model.dto.req.CooperateManageQueryReqDto;
 import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
-import com.sckw.manage.model.entity.KwmAddress;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
-import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.report.CooperateManageExport;
 import com.sckw.manage.model.report.QueryAllCooperateInfoExcel;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.model.vo.res.*;
+import com.sckw.order.api.dubbo.TradeOrderInfoService;
+import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.payment.api.model.constant.OrderEnum;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
-import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.FindEntUserResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
-import com.sckw.payment.api.dubbo.PaymentDubboService;
-import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.transport.api.dubbo.TransportService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -84,7 +77,7 @@ public class KwmCooperateManageService {
     private TradeOrderInfoService tradeOrderInfoService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private PaymentDubboService paymentDubboService;

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -49,7 +49,7 @@ import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -91,7 +91,7 @@ public class KwoTradeOrderService {
     private PaymentDubboService paymentDubboService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private final KwoTradeOrderMapper kwoTradeOrderMapper;
     private final StreamBridge streamBridge;

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

@@ -32,7 +32,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -72,7 +72,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private void changeDict(List<? extends ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());

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

@@ -41,7 +41,7 @@ import com.sckw.redis.constant.RedisConstant;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
@@ -90,7 +90,7 @@ public class KwpSettlementWalletService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
     private final KwpSettlementLogisticsTrackMapper kwpSettlementLogisticsTrackMapper;
     @Resource
     private KwpLedgerTradeService kwpLedgerTradeService;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerLogisticsService.java

@@ -23,7 +23,7 @@ import com.sckw.payment.service.KwpLedgerLogisticsOrderService;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,7 @@ public class LedgerLogisticsService extends AbsLedger {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
 
     private void changeDict(List<? extends ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/SettlementWalletService.java

@@ -12,7 +12,7 @@ import com.sckw.payment.model.vo.req.SettlementWalletReq;
 import com.sckw.payment.model.vo.res.SettlementWalletVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -42,7 +42,7 @@ public class SettlementWalletService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private TransportDubboService transportDubboService;
+    private TransportService transportDubboService;
     private final KwpSettlementLogisticsTrackMapper kwpSettlementLogisticsTrackMapper;
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportDubboServiceImpl.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -28,7 +28,7 @@ import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.transport.api.dubbo.TransportDubboService;
+import com.sckw.transport.api.dubbo.TransportService;
 import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.AddressResDTO;
 import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
@@ -49,6 +49,7 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -61,9 +62,9 @@ import java.util.stream.Collectors;
  * @date 2023-07-11 14:07:28
  */
 @Slf4j
-//@Service
+@Service
 @DubboService(group = "design", version = "1.0.0", timeout = 50000)
-public class TransportDubboServiceImpl implements TransportDubboService {
+public class TransportServiceImpl implements TransportService {
 
     @Autowired
     public CommonService commonService;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportStatisticsServiceImpl.java

@@ -9,6 +9,7 @@ import com.sckw.transport.dao.KwtWaybillOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -20,6 +21,7 @@ import java.util.List;
  * @date 2023-09-08 11:09:34
  */
 @Slf4j
+@Service
 @DubboService(group = "design", version = "1.0.0")
 public class TransportStatisticsServiceImpl implements TransportStatisticsService {
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddOrderDTO.java

@@ -113,7 +113,7 @@ public class AddOrderDTO {
      */
     @NotNull(message = "运价方式不能为空")
     @Min(value = 0, message = "必须大于等于{value}")
-    @Max(value = 6, message = "必须小于等于{value}")
+    @Max(value = 10, message = "必须小于等于{value}")
     private Long priceType;
 
     /**
@@ -222,7 +222,7 @@ public class AddOrderDTO {
      */
     @NotNull(message = "签约方式不能为空")
     @Min(value = 0, message = "签约方式必须大于等于{value}")
-    @Max(value = 4, message = "签约方式必须小于等于{value}")
+    @Max(value = 10, message = "签约方式必须小于等于{value}")
     private String signingWay;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/ConsignOrderExcelVo.java

@@ -54,7 +54,7 @@ public class ConsignOrderExcelVo implements Serializable {
      * 任务总量
      */
     @ExcelProperty(value = "任务总量")
-    private BigDecimal carryingCapacity;
+    private String carryingCapacity;
 
     /**
      * 待分配量(amount-subcontract_amount-entrust_amount)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/ManagementLogisticsOrderExcelVo.java

@@ -42,12 +42,6 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "托运订单号")
     private String lOrderNo;
 
-    /**
-     * 订单来源
-     */
-    @ExcelProperty(value = "订单来源")
-    private String orderSourceLabel;
-
     /**
      * 托运单位
      */
@@ -126,6 +120,12 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "地址明细")
     private String unloadAddress;
 
+    /**
+     * 订单来源
+     */
+    @ExcelProperty(value = "订单来源")
+    private String orderSourceLabel;
+
     /**
      * 发货单位
      */

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

@@ -2006,6 +2006,7 @@ public class ConsignOrderService {
         for (ConsignOrderVO vo : list) {
             ConsignOrderExcelVo consignOrderExcelVo = new ConsignOrderExcelVo();
             BeanUtils.copyProperties(vo, consignOrderExcelVo);
+            consignOrderExcelVo.setCarryingCapacity(vo.getCarryingCapacity().toString());
             consignOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
             consignOrderExcelVo.setPriceLabel(vo.getPrice() == null ? null : vo.getPrice().toString() + priceType.get(vo.getPriceType()));
             consignOrderExcelVo.setLossUnitLabel(vo.getLoss() == null ? null : vo.getLoss().toString() + taxRate.get(vo.getLossUnit()));