首次提交

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -19,3 +19,6 @@ public class RuoYiApplication
         System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n");
     }
 }
+
+
+

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8085
   servlet:
     # 应用的访问路径
     context-path: /
@@ -95,7 +95,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 10000
 
 # MyBatis配置
 mybatis:

ruoyi-system/src/main/resources/mapper/system/WmsImportResultHistoryMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WmsImportResultHistoryMapper">
 
     <resultMap type="WmsImportResultHistory" id="WmsImportResultHistoryResult">
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalGrossWeight"    column="total_gross_weight"    />
         <result property="type"    column="type"    />
         <result property="warningValue"    column="warning_value"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="updateTime"    column="update_time"    javaType="java.util.Date" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="selectWmsImportResultHistoryVo">
@@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalGrossWeight != null "> and total_gross_weight = #{totalGrossWeight}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="warningValue != null "> and warning_value = #{warningValue}</if>
-            <if test="updateTime != null and updateTime != ''">
-                and update_time >= #{updateTime}
-                and update_time < DATE_ADD(#{updateTime}, INTERVAL 1 MINUTE)
+            <if test="updateTime != null">
+                and update_time >= #{updateTime, javaType=java.util.Date, jdbcType=TIMESTAMP}
+                and update_time &lt; DATE_ADD(#{updateTime, javaType=java.util.Date, jdbcType=TIMESTAMP}, INTERVAL 1 MINUTE)
             </if>
         </where>
     </select>
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null">type,</if>
             <if test="warningValue != null">warning_value,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="model != null">#{model},</if>
             <if test="specification != null">#{specification},</if>
@@ -66,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalGrossWeight != null">#{totalGrossWeight},</if>
             <if test="type != null">#{type},</if>
             <if test="warningValue != null">#{warningValue},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+            <if test="updateTime != null">#{updateTime, javaType=java.util.Date, jdbcType=TIMESTAMP},</if>
+        </trim>
     </insert>
 
     <update id="updateWmsImportResultHistory" parameterType="WmsImportResultHistory">
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalGrossWeight != null">total_gross_weight = #{totalGrossWeight},</if>
             <if test="type != null">type = #{type},</if>
             <if test="warningValue != null">warning_value = #{warningValue},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime, javaType=java.util.Date, jdbcType=TIMESTAMP},</if>
         </trim>
         where id = #{id}
     </update>