Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfDriverCardDto.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
@@ -56,4 +57,12 @@ public class KwfDriverCardDto {
      */
     @Size(max=100, message = "证书反面URL地址长度不能大于1000个字符！")
     private String certificateRevolt;
+
+    public void setCertificateMain(String certificateMain) {
+        this.certificateMain = FileUtils.replaceAll(certificateMain);
+    }
+
+    public void setCertificateRevolt(String certificateRevolt) {
+        this.certificateRevolt = FileUtils.replaceAll(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfDriverLicenseDto.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,4 +61,12 @@ public class KwfDriverLicenseDto {
      */
     @Size(max=100, message = "证书反面URL地址长度不能大于1000个字符！")
     private String certificateRevolt;
+
+    public void setCertificateMain(String certificateMain) {
+        this.certificateMain = FileUtils.replaceAll(certificateMain);
+    }
+
+    public void setCertificateRevolt(String certificateRevolt) {
+        this.certificateRevolt = FileUtils.replaceAll(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfDriverQualificationDto.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,4 +61,12 @@ public class KwfDriverQualificationDto {
      */
     @Size(max=100, message = "证书反面URL地址长度不能大于100个字符！")
     private String certificateRevolt;
+
+    public void setCertificateMain(String certificateMain) {
+        this.certificateMain = FileUtils.replaceAll(certificateMain);
+    }
+
+    public void setCertificateRevolt(String certificateRevolt) {
+        this.certificateRevolt = FileUtils.replaceAll(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfTransportLicenseDto.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -74,4 +75,12 @@ public class KwfTransportLicenseDto {
      */
     @Size(max=100, message = "证书反面URL地址长度不能大于100个字符！")
     private String certificateRevolt;
+
+    public void setCertificateMain(String certificateMain) {
+        this.certificateMain = FileUtils.replaceAll(certificateMain);
+    }
+
+    public void setCertificateRevolt(String certificateRevolt) {
+        this.certificateRevolt = FileUtils.replaceAll(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfTruckLicenseDto.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -75,4 +76,12 @@ public class KwfTruckLicenseDto {
     @Size(max=100, message = "证书反面URL地址长度不能大于100个字符！")
     private String certificateRevolt;
 
+    public void setCertificateMain(String certificateMain) {
+        this.certificateMain = FileUtils.replaceAll(certificateMain);
+    }
+
+    public void setCertificateRevolt(String certificateRevolt) {
+        this.certificateRevolt = FileUtils.replaceAll(certificateRevolt);
+    }
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverCardVo.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -49,4 +50,11 @@ public class KwfDriverCardVo implements Serializable{
      */
     private Integer status;
 
+    public String getCertificateMain() {
+        return FileUtils.splice(certificateMain);
+    }
+
+    public String getCertificateRevolt() {
+        return FileUtils.splice(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverLicenseVo.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -59,4 +60,11 @@ public class KwfDriverLicenseVo implements Serializable{
      */
     private Integer status;
 
+    public String getCertificateMain() {
+        return FileUtils.splice(certificateMain);
+    }
+
+    public String getCertificateRevolt() {
+        return FileUtils.splice(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverQualificationVo.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -59,4 +60,11 @@ public class KwfDriverQualificationVo implements Serializable {
      */
     private Integer status;
 
+    public String getCertificateMain() {
+        return FileUtils.splice(certificateMain);
+    }
+
+    public String getCertificateRevolt() {
+        return FileUtils.splice(certificateRevolt);
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTransportLicenseVo.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -65,4 +66,12 @@ public class KwfTransportLicenseVo implements Serializable {
      */
     private Integer status;
 
+    public String getCertificateMain() {
+        return FileUtils.splice(certificateMain);
+    }
+
+    public String getCertificateRevolt() {
+        return FileUtils.splice(certificateRevolt);
+    }
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckLicenseVo.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.utils.FileUtils;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -65,4 +66,12 @@ public class KwfTruckLicenseVo implements Serializable {
      */
     private Integer status;
 
+    public String getCertificateMain() {
+        return FileUtils.splice(certificateMain);
+    }
+
+    public String getCertificateRevolt() {
+        return FileUtils.splice(certificateRevolt);
+    }
+
 }

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

@@ -2072,12 +2072,10 @@ public class KwtWaybillOrderService {
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(params.getType() == Global.NUMERICAL_ONE ? params.getAmount() : null);
         wOrder.setLoadTime(params.getType() == Global.NUMERICAL_ONE ? params.getOperateTime() : null);
-        wOrder.setLoadUrls(params.getType() == Global.NUMERICAL_ONE ? params.getUrls() : null);
-
+        wOrder.setLoadUrls(params.getType() == Global.NUMERICAL_ONE ? FileUtils.replaceAllBatch(params.getUrls()) : null);
         wOrder.setUnloadAmount(params.getType() == Global.NUMERICAL_TWO ? params.getAmount() : null);
         wOrder.setUnloadTime(params.getType() == Global.NUMERICAL_TWO ? params.getOperateTime() : null);
-        wOrder.setUnloadUrls(params.getType() == Global.NUMERICAL_TWO ? params.getUrls() : null);
-
+        wOrder.setUnloadUrls(params.getType() == Global.NUMERICAL_TWO ? FileUtils.replaceAllBatch(params.getUrls()) : null);
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
         editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
@@ -2126,12 +2124,12 @@ public class KwtWaybillOrderService {
         /**3更新榜单信息**/
         KwtWaybillOrderTicket loadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_ONE);
         loadTicket.setAmount(params.getLoadAmount());
-        loadTicket.setUrls(params.getLoadUrls());
+        loadTicket.setUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
         loadTicket.setOperateTime(params.getLoadOperateTime());
         waybillOrderTicketDao.updateById(loadTicket);
         KwtWaybillOrderTicket unloadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_TWO);
         unloadTicket.setAmount(params.getUnloadAmount());
-        unloadTicket.setUrls(params.getUnloadUrls());
+        unloadTicket.setUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
         unloadTicket.setOperateTime(params.getUnloadOperateTime());
         waybillOrderTicketDao.updateById(unloadTicket);
 
@@ -2144,10 +2142,10 @@ public class KwtWaybillOrderService {
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(waybillOrder.getLoadAmount());
         wOrder.setLoadTime(params.getLoadOperateTime());
-        wOrder.setLoadUrls(params.getLoadUrls());
+        wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
         wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
         wOrder.setUnloadTime(params.getUnloadOperateTime());
-        wOrder.setUnloadUrls(params.getUnloadUrls());
+        wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
         editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
@@ -2204,7 +2202,7 @@ public class KwtWaybillOrderService {
         result.put("goodsName", goods != null ? goods.getGoodsName() : null);
         result.put("loadStatus", loadTicket != null ? 0 : 1);
         result.put("loadAmount", loadTicket != null ? loadTicket.getAmount() : null);
-        result.put("loadUrls", loadTicket != null ? loadTicket.getUrls() : null);
+        result.put("loadUrls", loadTicket != null ? FileUtils.spliceBatch(loadTicket.getUrls()) : null);
         result.put("loadOperateTime", loadTicket != null ? loadTicket.getOperateTime() : null);
         result.put("loadCreateTime", loadTicket != null ? loadTicket.getCreateTime() : null);
         result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
@@ -2212,7 +2210,7 @@ public class KwtWaybillOrderService {
         result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
         result.put("unloadStatus", loadTicket != null ? 0 : 1);
         result.put("unloadAmount", unloadTicket != null ? unloadTicket.getAmount() : null);
-        result.put("unloadUrls", unloadTicket != null ? unloadTicket.getUrls() : null);
+        result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
         result.put("unloadOperateTime", unloadTicket != null ? unloadTicket.getOperateTime() : null);
         result.put("unloadCreateTime", unloadTicket != null ? unloadTicket.getCreateTime() : null);
         result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
@@ -2349,12 +2347,12 @@ public class KwtWaybillOrderService {
         /**3更新榜单信息**/
         KwtWaybillOrderTicket loadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_ONE);
         loadTicket.setAmount(params.getLoadAmount());
-        loadTicket.setUrls(params.getLoadUrls());
+        loadTicket.setUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
         loadTicket.setOperateTime(params.getLoadOperateTime());
         waybillOrderTicketDao.updateById(loadTicket);
         KwtWaybillOrderTicket unloadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_TWO);
         unloadTicket.setAmount(params.getUnloadAmount());
-        unloadTicket.setUrls(params.getUnloadUrls());
+        unloadTicket.setUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
         unloadTicket.setOperateTime(params.getUnloadOperateTime());
         waybillOrderTicketDao.updateById(unloadTicket);
 
@@ -2409,10 +2407,10 @@ public class KwtWaybillOrderService {
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(waybillOrder.getLoadAmount());
         wOrder.setLoadTime(params.getLoadOperateTime());
-        wOrder.setLoadUrls(params.getLoadUrls());
+        wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
         wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
         wOrder.setUnloadTime(params.getUnloadOperateTime());
-        wOrder.setUnloadUrls(params.getUnloadUrls());
+        wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
         editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);