1.开锁记录增加模糊查询

adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java

@@ -14,15 +14,6 @@ public class AdminVO {
     @JSONField(format = "yyyy-MM-dd")
     private String createTime;
 
-    private String adminId;
-
-    public String getAdminId() {
-        return adminId;
-    }
-
-    public void setAdminId(String adminId) {
-        this.adminId = adminId;
-    }
 
     public String getAdminName() {
         return adminName;

adc-da-main/src/main/resources/application-dev.properties

@@ -13,6 +13,7 @@ spring.datasource.username = root
 
 #后端端口
 server.port=8888
+#server.port=${random.int(8000,9000)}
 
 useSSL = false
 

adc-da-main/src/main/resources/application-prd.properties

@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform
 spring.datasource.password = adc_platform
 
 #后端端口
-server.port=8080
+server.port=${random.int(8000,9000)}
 
 #验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1
 verifyCodeMode=1

adc-da-main/src/main/resources/application.properties

@@ -8,7 +8,6 @@
 #spring.datasource.password = root
 
 
-
 # ===============================
 # = DATA SOURCE2
 # ===============================

adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml

@@ -49,14 +49,14 @@
         lr.lock_type as lockType,lr.time as lockTime
         from tb_lock_record lr,tb_device d,tb_user u
         <where>
-            <trim suffixOverrides="and">
-                  <if test="deviceName!=null">
-                      d.deviceName = #{deviceName} and
-                  </if>
-                  <if test="telphone!=null">
-                      u.telphone = #{telphone} and
-                  </if>
-            </trim>
+            <if test="deviceName!=null and deviceName!=''">
+                <bind name="deviceNameLike" value="'%'+deviceName+'%'"/>
+                d.name LIKE #{deviceNameLike} and
+            </if>
+            <if test="telphone!=null and telphone !=''">
+                <bind name="telphoneLike" value="'%'+telphone+'%'"/>
+                u.temphone LIKE #{telphoneLike} and
+            </if>
             u.id = d.user_id and
             d.code = lr.device_id
             and lr.lock_type != ''

adc-da-main/target/classes/application-dev.properties

@@ -13,6 +13,7 @@ spring.datasource.username = root
 
 #后端端口
 server.port=8888
+#server.port=${random.int(8000,9000)}
 
 useSSL = false
 

adc-da-main/target/classes/application-prd.properties

@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform
 spring.datasource.password = adc_platform
 
 #后端端口
-server.port=8080
+server.port=${random.int(8000,9000)}
 
 #验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1
 verifyCodeMode=1

adc-da-main/target/classes/application.properties

@@ -8,7 +8,6 @@
 #spring.datasource.password = root
 
 
-
 # ===============================
 # = DATA SOURCE2
 # ===============================