1、车队服务model字段调整

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverCard.java

@@ -39,7 +39,7 @@ public class KwfDriverCard extends BaseModel {
     /**
      * 证书正面URL地址
      */
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverLicense.java

@@ -44,7 +44,7 @@ public class KwfDriverLicense extends BaseModel {
     /**
      * 证书正面URL地址
      */
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverQualification.java

@@ -44,7 +44,7 @@ public class KwfDriverQualification extends BaseModel {
     /**
      * 证书正面URL地址
      */
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTransportLicense.java

@@ -54,7 +54,7 @@ public class KwfTransportLicense extends BaseModel {
     /**
      * 证书正面URL地址
      */
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckLicense.java

@@ -54,7 +54,7 @@ public class KwfTruckLicense extends BaseModel {
     /**
      * 证书正面URL地址
      */
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

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

@@ -46,7 +46,7 @@ public class KwfDriverCardDto {
      * 证书正面URL地址
      */
     @Size(max=100, message = "证书正面URL地址长度不能大于100个字符！")
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

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

@@ -50,7 +50,7 @@ public class KwfDriverLicenseDto {
      * 证书正面URL地址
      */
     @Size(max=100, message = "证书正面URL地址长度不能大于100个字符！")
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

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

@@ -50,7 +50,7 @@ public class KwfDriverQualificationDto {
      * 证书正面URL地址
      */
     @Size(max=100, message = "证书正面URL地址长度不能大于100个字符！")
-    private String certificateMian;
+    private String certificateMain;
 
     /**
      * 证书反面URL地址

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

@@ -0,0 +1,12 @@
+package com.sckw.fleet.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author zk
+ * @desc 车辆信息
+ * @date 2023/7/12 0012
+ */
+@Data
+public class KwfTruckDto {
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.fleet.model.vo;
+
+import com.sckw.excel.annotation.ExcelContext;
+import lombok.Data;
+
+/**
+ * @author zk
+ * @desc 车辆信息
+ * @date 2023/7/11 0011
+ */
+@Data
+@ExcelContext(fileName = "车辆信息", sheetName = "车辆信息")
+public class KwfTruckVo {
+
+}

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

@@ -1,8 +1,15 @@
 package com.sckw.fleet.service;
 
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.dao.KwfTransportLicenseMapper;
+import com.sckw.fleet.dao.KwfTruckEntMapper;
+import com.sckw.fleet.dao.KwfTruckLicenseMapper;
 import com.sckw.fleet.dao.KwfTruckMapper;
 import com.sckw.fleet.model.KwfTruck;
+import com.sckw.fleet.model.vo.KwfTruckVo;
+import com.sckw.system.api.RemoteSystemService;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -18,6 +25,16 @@ public class KwfTruckService {
 
     @Autowired
     KwfTruckMapper truckDao;
+    @Autowired
+    KwfTruckEntMapper truckEntDao;
+    @Autowired
+    KwfTruckLicenseMapper truckLicenseDao;
+    @Autowired
+    KwfTransportLicenseMapper transportLicenseDao;
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    private RemoteSystemService remoteSystemService;
+
+
 
     /**
      * @param key 主键id
@@ -35,7 +52,7 @@ public class KwfTruckService {
      * @author zk
      * @date 2023/7/6
      **/
-    public List<KwfTruck> findPage(Map<String, Object> params) {
+    public List<KwfTruckVo> findPage(Map<String, Object> params) {
         return truckDao.selectPage(null, null);
     }
 
@@ -45,7 +62,7 @@ public class KwfTruckService {
      * @author zk
      * @date 2023/7/6
      **/
-    public List<KwfTruck> findList(Map<String, Object> params) {
+    public List<KwfTruckVo> findList(Map<String, Object> params) {
         return truckDao.selectPage(null, null);
     }
 

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverCardMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="findByDriverId" resultType="com.sckw.fleet.model.KwfDriverCard" parameterType="java.lang.String" >
         SELECT
-            id, driver_id driverId, idcard, expire_time expireTime, address, certificate_mian certificateMian,
+            id, driver_id driverId, idcard, expire_time expireTime, address, certificate_main certificateMain,
             certificate_revolt certificateRevolt, remark, status, create_by createBy, create_time createTime,
             update_by updateBy, update_time updateTime
         from kwf_driver_card

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverLicenseMapper.xml

@@ -5,7 +5,7 @@
     <select id="findByDriverId" resultType="com.sckw.fleet.model.KwfDriverLicense" parameterType="java.lang.String" >
         SELECT
             id, driver_id driverId, driver_no driverNo, type, expire_time expireTime, grant_unit grantUnit,
-            certificate_mian certificateMian, certificate_revolt certificateRevolt, remark, status, create_by createBy,
+            certificate_main certificateMain, certificate_revolt certificateRevolt, remark, status, create_by createBy,
             create_time createTime, update_by updateBy, update_time updateTime
         from kwf_driver_license
         where del_flag = 0 and driver_id = #{driverId, jdbcType=VARCHAR}

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverQualificationMapper.xml

@@ -5,7 +5,7 @@
     <select id="findByDriverId" resultType="com.sckw.fleet.model.KwfDriverQualification" parameterType="java.lang.String" >
         SELECT
             id, driver_id driverId, quali_no qualiNo, type, expire_time expireTime, grant_unit grantUnit,
-            certificate_mian certificateMian, certificate_revolt certificateRevolt, remark, status, create_by createBy,
+            certificate_main certificateMain, certificate_revolt certificateRevolt, remark, status, create_by createBy,
             create_time createTime, update_by updateBy, update_time updateTime
         from kwf_driver_qualification
         where del_flag = 0 and driver_id = #{driverId, jdbcType=VARCHAR}