From 5639719879759c287a0c020818104b9e72ffc292 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 五月 2023 09:25:45 +0800
Subject: [PATCH] Merge branch 'postgresql' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java
index fb1b4e3..ae8471b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java
@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.storager.dao;
 
-import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
@@ -17,21 +16,21 @@
 @Repository
 public interface LogMapper {
 
-    @Insert("insert into log ( name, type, uri, address, result, timing, username, createTime) " +
+    @Insert("insert into wvp_log ( name,type,uri,address,result,timing,username,create_time) " +
             "values (#{name}, #{type}, #{uri}, #{address}, #{result}, #{timing}, #{username}, #{createTime})")
     int add(LogDto logDto);
 
     @Select(value = {"<script>" +
-            " SELECT * FROM log " +
+            " SELECT * FROM wvp_log " +
             " WHERE 1=1 " +
             " <if test=\"query != null\"> AND (name LIKE concat('%',#{query},'%'))</if> " +
             " <if test=\"type != null\" >  AND type = #{type}</if>" +
-            " <if test=\"startTime != null\" >  AND createTime &gt;= #{startTime} </if>" +
-            " <if test=\"endTime != null\" >  AND createTime &lt;= #{endTime} </if>" +
-            " ORDER BY createTime DESC " +
+            " <if test=\"startTime != null\" >  AND create_time &gt;= #{startTime} </if>" +
+            " <if test=\"endTime != null\" >  AND create_time &lt;= #{endTime} </if>" +
+            " ORDER BY create_time DESC " +
             " </script>"})
     List<LogDto> query(String query, String type, String startTime, String endTime);
 
-    @Delete("DELETE FROM log")
+    @Delete("DELETE FROM wvp_log")
     int clear();
 }

--
Gitblit v1.8.0