From 4a32b418982d9ff409d5d3222b67b6c875a3563b Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期三, 24 四月 2024 14:14:03 +0800
Subject: [PATCH] 日志管理--service名冲突修改

---
 pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml |   60 +++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 48010d6..f02960f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -7,12 +7,12 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="content" jdbcType="VARCHAR" property="content" />
-    <result column="res_ip" jdbcType="VARCHAR" property="resIp" />
-    <result column="create_dt" jdbcType="TIMESTAMP" property="createDt" />
+    <result column="ip" jdbcType="VARCHAR" property="ip" />
+    <result column="dt" jdbcType="TIMESTAMP" property="dt" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, user_id, content, create_dt,res_ip
+    id, user_id, content, dt,ip
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -23,10 +23,10 @@
   </select>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
     <!--@mbg.generated-->
-    insert into ba_log (user_id, content, create_dt,res_ip
+    insert into ba_log (user_id, content, dt,ip
       )
-    values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP}
-    , #{resIp,jdbcType=VARCHAR}
+    values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}
+    , #{ip,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
@@ -39,11 +39,11 @@
       <if test="content != null">
         content,
       </if>
-      <if test="createDt != null">
-        create_dt,
+      <if test="dt != null">
+        dt,
       </if>
-      <if test="resIp != null">
-        res_ip,
+      <if test="ip != null">
+        ip,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -53,11 +53,11 @@
       <if test="content != null">
         #{content,jdbcType=VARCHAR},
       </if>
-      <if test="createDt != null">
-        #{createDt,jdbcType=TIMESTAMP},
+      <if test="dt != null">
+        #{dt,jdbcType=TIMESTAMP},
       </if>
-      <if test="resIp != null">
-        #{resIp,jdbcType=VARCHAR},
+      <if test="ip != null">
+        #{ip,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -68,26 +68,44 @@
       <property name="alias" value="r"/>
     </include>
     from ba_log r
-    where
-    <trim prefix="and" suffixOverrides="and">
+    <trim prefix="where " suffixOverrides="and">
       <if test="userId != null and userId != ''">
         user_id = #{userId,jdbcType=BIGINT} and
       </if>
       <if test="content != null  and content != '' ">
         content like concat('%', #{content}, '%') and
       </if>
-      <if test="createDt != null and createDt != '' ">
-        create_dt = #{createDt,jdbcType=TIMESTAMP} and
+      <if test="dt != null and dt != '' ">
+        dt = #{dt,jdbcType=TIMESTAMP} and
       </if>
-      <if test="resIp != null and resIp != '' ">
-        res_ip =#{resIp,jdbcType=VARCHAR} and
+      <if test="ip != null and ip != '' ">
+        ip =#{ip,jdbcType=VARCHAR} and
       </if>
     </trim>
-    order by id DESC
+    order by id desc
     <trim prefix="limit " >
       <if test="start != null and count != null">
         #{start}, #{count}
       </if>
     </trim>
   </select>
+
+  <select id="selectSomeCount" resultType="java.lang.Long">
+    select count(1)
+    from ba_log r
+    <trim prefix="where " suffixOverrides="and">
+      <if test="userId != null and userId != ''">
+        user_id = #{userId,jdbcType=BIGINT} and
+      </if>
+      <if test="content != null  and content != '' ">
+        content like concat('%', #{content}, '%') and
+      </if>
+      <if test="dt != null and dt != '' ">
+        dt = #{dt,jdbcType=TIMESTAMP} and
+      </if>
+      <if test="ip != null and ip != '' ">
+        ip =#{ip,jdbcType=VARCHAR} and
+      </if>
+    </trim>
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0