1、司机档案、车辆档案、车辆上报Excel文件存储oss；

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

@@ -122,8 +122,8 @@ public class PasswordUtils {
 
     public static void main(String[] args) {
 
-        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("17358629955"));
-        String md5 = PasswordUtils.md5("17358629955");
+        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("123456"));
+        String md5 = PasswordUtils.md5("18581845668");
         System.out.println(password);
         System.out.println(md5);
         System.out.println(validatePassword(md5, password));

sckw-modules/sckw-fleet/pom.xml

@@ -69,6 +69,11 @@
             <artifactId>sckw-fleet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-file-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -56,7 +56,7 @@ public class KwfFleetController {
         params.put("entId", LoginUserHolder.getEntId());
         // 设置分页参数
         PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
-        List<KwfFleet> list = fleetService.findPage(params);
+        List<KwfFleetVo> list = fleetService.findPage(params);
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
         return HttpResult.ok(pageResult);
     }

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

@@ -32,6 +32,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -78,6 +79,10 @@ public class KwfTruckController {
      **/
     @GetMapping("/findByTruckNo")
     public HttpResult selectByKey(String truckNo) throws SystemException {
+        if (StringUtils.isBlank(truckNo)) {
+            return HttpResult.error("车牌号不能为空！");
+        }
+
         Long id = null;
         List<Map<String, Object>> trucks = truckService.findList(new HashMap(){{ put("truckNo", truckNo); }});
         if (com.sckw.core.utils.CollectionUtils.isEmpty(trucks)) {

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
@@ -25,6 +26,12 @@ public class KwfFleetDto {
     @Size(max=20, message = "车队班组长度不能大于20个字符！")
     private String name;
 
+    /**
+     * 车队名称
+     */
+    @NotNull(message = "车队长不能为空!")
+    private Long captainId;
+
     /**
      * 车队联系人
      */

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

@@ -31,6 +31,12 @@ public class KwfFleetVo {
     @ExcelIgnore
     private Long entId;
 
+    /**
+     * 车队在id
+     */
+    @ExcelIgnore
+    private Long captainId;
+
     /**
      * 车队名称
      */

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

@@ -3,19 +3,20 @@ package com.sckw.fleet.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.fastjson.JSON;
 import com.sckw.core.common.enums.enums.DictEnum;
+import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.SystemTypeEnum;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.PasswordUtils;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.model.file.FileInfo;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.easyexcel.ExcelImportListener;
 import com.sckw.excel.utils.ExcelUtil;
+import com.sckw.file.api.dubbo.FileApiDubboService;
 import com.sckw.fleet.dao.*;
 import com.sckw.fleet.model.*;
 import com.sckw.fleet.model.dto.*;
@@ -31,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.InputStream;
+import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -55,11 +57,16 @@ public class KwfDriverService {
     @Autowired
     KwfDriverQualificationMapper KwfDriverQualificationDao;
     @Autowired
+    KwfDriverImportMapper kwfDriverImportDao;
+    @Autowired
     KwfTruckReportMapper truckReportDao;
     @Autowired
     KwfFleetDriverMapper fleetDriverDao;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private FileApiDubboService remoteFileService;
+
 
     /**
      * @param key 逐渐id
@@ -226,6 +233,9 @@ public class KwfDriverService {
      * @date 2023/07/11
      **/
     public HttpResult importExcel(MultipartFile file) {
+        /**文件存储**/
+        importFileSave(file);
+
         /**参数校验**/
         HttpResult result = this.checkParams(file);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -748,6 +758,29 @@ public class KwfDriverService {
         return count > 0 ? HttpResult.ok("密码修改成功！") : HttpResult.error("密码修改失败！");
     }
 
+    /**
+     * @param file 上传文件
+     * @desc 上传文件持久化
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public void importFileSave(MultipartFile file) {
+        FileInfo fileInfo = FileUtils.getFileDataList(file);
+        fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
+        FileInfo returnFileInfo = FileUtils.uploadFileInfo(file, fileInfo, FileEnum.FILE_STORE_TYPE_OSS);
+
+        KwfDriverImport driverImport = new KwfDriverImport();
+        driverImport.setEntId(LoginUserHolder.getEntId());
+        driverImport.setUrl(returnFileInfo.getFilePath());
+        driverImport.setRemark(JSON.toJSONString(returnFileInfo));
+        kwfDriverImportDao.insert(driverImport);
+
+        try {
+            //remoteFileService.fileInfoInsert(fileInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     /**
      * @param params 参数

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

@@ -3,9 +3,12 @@ package com.sckw.fleet.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.fastjson.JSON;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -14,10 +17,9 @@ import com.sckw.excel.easyexcel.ExcelImportListener;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.fleet.dao.KwfDriverMapper;
 import com.sckw.fleet.dao.KwfTruckMapper;
+import com.sckw.fleet.dao.KwfTruckReportImportMapper;
 import com.sckw.fleet.dao.KwfTruckReportMapper;
-import com.sckw.fleet.model.KwfDriver;
-import com.sckw.fleet.model.KwfTruck;
-import com.sckw.fleet.model.KwfTruckReport;
+import com.sckw.fleet.model.*;
 import com.sckw.fleet.model.dto.*;
 import com.sckw.fleet.model.vo.KwfTableTopCount;
 import com.sckw.fleet.model.vo.KwfTruckReportVo;
@@ -30,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -54,6 +55,8 @@ public class KwfTruckReportService {
     @Autowired
     KwfTruckReportMapper truckReportDao;
     @Autowired
+    KwfTruckReportImportMapper kwfTruckReportImportDao;
+    @Autowired
     KwfDriverService driverService;
     @Autowired
     KwfTruckService truckService;
@@ -207,7 +210,9 @@ public class KwfTruckReportService {
      * @author zk
      * @date 2023/07/11
      **/
-    public HttpResult importExcel(MultipartFile file) {
+    public HttpResult importExcel(MultipartFile file) {/**文件存储**/
+        importFileSave(file);
+
         /**参数校验**/
         HttpResult result = this.checkParams(file);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -444,6 +449,30 @@ public class KwfTruckReportService {
         return HttpResult.ok("删除成功！");
     }
 
+    /**
+     * @param file 上传文件
+     * @desc 上传文件持久化
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public void importFileSave(MultipartFile file) {
+        FileInfo fileInfo = FileUtils.getFileDataList(file);
+        fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
+        FileInfo returnFileInfo = FileUtils.uploadFileInfo(file, fileInfo, FileEnum.FILE_STORE_TYPE_OSS);
+
+        KwfTruckReportImport truckReportImport = new KwfTruckReportImport();
+        truckReportImport.setEntId(LoginUserHolder.getEntId());
+        truckReportImport.setUrl(returnFileInfo.getFilePath());
+        truckReportImport.setRemark(JSON.toJSONString(returnFileInfo));
+        kwfTruckReportImportDao.insert(truckReportImport);
+
+        try {
+            //remoteFileService.fileInfoInsert(fileInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * @param params
      * @desc 变更车队

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

@@ -3,11 +3,15 @@ package com.sckw.fleet.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.fastjson.JSON;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -54,6 +58,8 @@ public class KwfTruckService {
     @Autowired
     KwfTransportLicenseMapper transportLicenseDao;
     @Autowired
+    KwfTruckImportMapper kwfTruckImportDao;
+    @Autowired
     KwfFleetTruckMapper fleetTruckDao;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
@@ -223,7 +229,9 @@ public class KwfTruckService {
      * @author zk
      * @date 2023/07/11
      **/
-    public HttpResult importExcel(MultipartFile file) {
+    public HttpResult importExcel(MultipartFile file) {/**文件存储**/
+        importFileSave(file);
+
         /**参数校验**/
         HttpResult result = this.checkParams(file);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -555,6 +563,30 @@ public class KwfTruckService {
         return fleetTruckDao.findByFleetTruck(truckId, entId);
     }
 
+    /**
+     * @param file 上传文件
+     * @desc 上传文件持久化
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public void importFileSave(MultipartFile file) {
+        FileInfo fileInfo = FileUtils.getFileDataList(file);
+        fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
+        FileInfo returnFileInfo = FileUtils.uploadFileInfo(file, fileInfo, FileEnum.FILE_STORE_TYPE_OSS);
+
+        KwfTruckImport truckImport = new KwfTruckImport();
+        truckImport.setEntId(LoginUserHolder.getEntId());
+        truckImport.setUrl(returnFileInfo.getFilePath());
+        truckImport.setRemark(JSON.toJSONString(returnFileInfo));
+        kwfTruckImportDao.insert(truckImport);
+
+        try {
+            //remoteFileService.fileInfoInsert(fileInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * @param params 参数
      * @desc 校验车辆是否有证书