Pārlūkot izejas kodu

1、新增各个终端短信登录接口;

zk 2 gadi atpakaļ
vecāks
revīzija
24144a69eb

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

@@ -51,7 +51,7 @@ public class KwfDriverService {
     KwfDriverQualificationMapper KwfDriverQualificationDao;
     @Autowired
     KwfFleetDriverMapper fleetDriverDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

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

@@ -34,7 +34,7 @@ public class KwfFleetService {
 
     @Autowired
     KwfFleetMapper fleetDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

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

@@ -53,7 +53,7 @@ public class KwfTruckReportService {
     KwfDriverService driverService;
     @Autowired
     KwfTruckService truckService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**
@@ -503,8 +503,8 @@ public class KwfTruckReportService {
         }
         //字符截取-英文逗号/中文逗号
         String[] strArray = str.split(Global.COMMA1);
-        strArray = (strArray == null || strArray.length == 0) ? str.split(Global.COMMA) : strArray;
-        if (strArray == null || strArray.length == 0 || strArray.length != 5 ) {
+        strArray = (strArray == null || strArray.length <= 1) ? str.split(Global.COMMA) : strArray;
+        if (strArray == null || strArray.length <= 1 || strArray.length != 5 ) {
             return null;
         }
 

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

@@ -46,7 +46,7 @@ public class KwfTruckService {
     KwfTransportLicenseMapper transportLicenseDao;
     @Autowired
     KwfFleetTruckMapper fleetTruckDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

+ 2 - 2
sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -102,7 +102,7 @@
             and DATE( dr.create_time ) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
         <choose>
-            <when test="ids != null">
+            <when test="ids != null and ids != '' ">
                 and dr.id in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id,jdbcType=BIGINT}
@@ -152,7 +152,7 @@
             )
         </if>
         <choose>
-            <when test="ids != null">
+            <when test="ids != null and ids != '' ">
                 and dr.id in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id,jdbcType=BIGINT}

+ 1 - 1
sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -157,7 +157,7 @@
             and DATE( tr.create_time ) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
         <choose>
-            <when test="truckNos != null">
+            <when test="truckNos != null and truckNos != ''">
                 and tr.truck_no in
                 <foreach collection="truckNos" item="truckNo" open="(" close=")" separator=",">
                     #{truckNo,jdbcType=VARCHAR}