From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整; 2.大屏得分计算;

---
 ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml |  237 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 128 insertions(+), 109 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index c967d10..c7af506 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -1,117 +1,136 @@
 <?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.SysOperLogMapper">
 
-	<resultMap type="SysOperLog" id="SysOperLogResult">
-		<id     property="operId"         column="oper_id"        />
-		<result property="title"          column="title"          />
-		<result property="businessType"   column="business_type"  />
-		<result property="method"         column="method"         />
-		<result property="requestMethod"  column="request_method" />
-		<result property="operatorType"   column="operator_type"  />
-		<result property="operName"       column="oper_name"      />
-		<result property="deptName"       column="dept_name"      />
-		<result property="operUrl"        column="oper_url"       />
-		<result property="operIp"         column="oper_ip"        />
-		<result property="operLocation"   column="oper_location"  />
-		<result property="operParam"      column="oper_param"     />
-		<result property="jsonResult"     column="json_result"    />
-		<result property="status"         column="status"         />
-		<result property="errorMsg"       column="error_msg"      />
-		<result property="operTime"       column="oper_time"      />
-		<result property="costTime"       column="cost_time"      />
-		<result property="companyName"       column="companyName"      />
-		<result property="roleName"       column="roleName"      />
-		<result property="phoneNumber"       column="phone_number"      />
-		<result property="userId"       column="userId"      />
-		<result property="nickName"       column="nickName"      />
-	</resultMap>
+  <resultMap type="SysOperLog" id="SysOperLogResult">
+    <id property="operId" column="oper_id"/>
+    <result property="title" column="title"/>
+    <result property="businessType" column="business_type"/>
+    <result property="method" column="method"/>
+    <result property="requestMethod" column="request_method"/>
+    <result property="operatorType" column="operator_type"/>
+    <result property="operName" column="oper_name"/>
+    <result property="deptName" column="dept_name"/>
+    <result property="operUrl" column="oper_url"/>
+    <result property="operIp" column="oper_ip"/>
+    <result property="operLocation" column="oper_location"/>
+    <result property="operParam" column="oper_param"/>
+    <result property="jsonResult" column="json_result"/>
+    <result property="status" column="status"/>
+    <result property="errorMsg" column="error_msg"/>
+    <result property="operTime" column="oper_time"/>
+    <result property="costTime" column="cost_time"/>
+  </resultMap>
 
-	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, `method`, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param,
-               json_result, status, error_msg, oper_time, cost_time,companyName,roleName,phoneNumber,userId,nickName
-        from sys_oper_log
-    </sql>
-    
-	<insert id="insertOperlog" parameterType="SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time,companyName,roleName,phoneNumber,userId,nickName, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime},#{companyName},#{roleName},#{phoneNumber},#{userId},#{nickName}, sysdate())
-	</insert>
-	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		<where>
-			<if test="operIp != null and operIp != ''">
-				AND oper_ip like concat('%', #{operIp}, '%')
-			</if>
-			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
-			</if>
-			<if test="businessType != null">
-				AND business_type = #{businessType}
-			</if>
-			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
-			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
-		 			#{businessType}
-		        </foreach> 
-			</if>
-			<if test="status != null">
-				AND status = #{status}
-			</if>
-			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND oper_time &gt;= #{params.beginTime}
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND oper_time &lt;= #{params.endTime}
-			</if>
-		</where>
-		order by oper_id desc
-	</select>
-	
-	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from sys_oper_log where oper_id in
- 		<foreach collection="operIds" item="operId" open="(" separator="," close=")">
- 			#{operId}
-        </foreach> 
- 	</delete>
- 	
- 	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		where oper_id = #{operId}
-	</select>
-	<select id="selectOperLogPageList" resultType="com.ruoyi.system.vo.SysOperLogVO">
-		select sol.oper_id AS operId, sol.title AS title, sol.business_type AS businessType, sol.`method` AS method, sol.request_method AS requestMethod,
-			   sol.operator_type AS operatorType,sol.oper_name AS operName,sol.dept_name AS deptName, sol.oper_url AS operUrl, sol.oper_ip AS operIp,
-			   sol.oper_location AS operLocation, sol.oper_param AS operLocation,sol.json_result AS jsonResult, sol.status AS status,sol.error_msg AS errorMsg,
-			   sol.oper_time AS operTime, sol.cost_time AS costTime,sol.companyName AS companyName,sol.roleName AS roleName,sol.phoneNumber AS phoneNumber,
-			   sol.userId AS userId,sol.nickName AS nickName
-		from sys_oper_log sol
-		<where>
-			<if test="query.companyName != null and query.companyName != ''">
-				AND sol.companyName LIKE concat('%',#{query.companyName},'%')
-			</if>
-			<if test="query.roleName != null and query.roleName != ''">
-				AND sol.roleName LIKE concat('%',#{query.roleName},'%')
-			</if>
-			<if test="query.nickName != null and query.nickName != ''">
-				AND sol.nickName LIKE concat('%',#{query.nickName},'%')
-			</if>
-			<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
-				AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') &gt;= #{query.startTime}
-				AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') &lt;= #{query.endTime}
-			</if>
-		</where>
-		ORDER BY sol.oper_time DESC
-	</select>
+  <sql id="selectOperLogVo">
+    select oper_id,
+           title,
+           business_type,
+           `method`,
+           request_method,
+           operator_type,
+           oper_name,
+           dept_name,
+           oper_url,
+           oper_ip,
+           oper_location,
+           oper_param,
+           json_result,
+           status,
+           error_msg,
+           oper_time,
+           cost_time
+    from sys_oper_log
+  </sql>
 
-	<update id="cleanOperLog">
-        truncate table sys_oper_log
-    </update>
+  <insert id="insertOperlog" parameterType="com.ruoyi.system.domain.SysOperLog">
+    insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name,
+                             dept_name, oper_url, oper_ip, oper_location, oper_param, json_result,
+                             status, error_msg, cost_time, oper_time)
+    values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName},
+            #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult},
+            #{status}, #{errorMsg}, #{costTime}, sysdate())
+  </insert>
+
+  <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+    <include refid="selectOperLogVo"/>
+    <where>
+      <if test="operIp != null and operIp != ''">
+        AND oper_ip like concat('%', #{operIp}, '%')
+      </if>
+      <if test="title != null and title != ''">
+        AND title like concat('%', #{title}, '%')
+      </if>
+      <if test="businessType != null">
+        AND business_type = #{businessType}
+      </if>
+      <if test="businessTypes != null and businessTypes.length > 0">
+        AND business_type in
+        <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+          #{businessType}
+        </foreach>
+      </if>
+      <if test="status != null">
+        AND status = #{status}
+      </if>
+      <if test="operName != null and operName != ''">
+        AND oper_name like concat('%', #{operName}, '%')
+      </if>
+      <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+        AND oper_time &gt;= #{params.beginTime}
+      </if>
+      <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+        AND oper_time &lt;= #{params.endTime}
+      </if>
+    </where>
+    order by oper_id desc
+  </select>
+
+  <delete id="deleteOperLogByIds" parameterType="Long">
+    delete from sys_oper_log where oper_id in
+    <foreach collection="operIds" item="operId" open="(" separator="," close=")">
+      #{operId}
+    </foreach>
+  </delete>
+
+  <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
+    <include refid="selectOperLogVo"/>
+    where oper_id = #{operId}
+  </select>
+  <select id="selectOperLogPageList" resultType="com.ruoyi.system.vo.SysOperLogVO">
+    select sol.oper_id AS operId, sol.title AS title, sol.business_type AS businessType,
+    sol.`method` AS method, sol.request_method AS requestMethod,
+    sol.operator_type AS operatorType,sol.oper_name AS operName,sol.dept_name AS deptName,
+    sol.oper_url AS operUrl, sol.oper_ip AS operIp,
+    sol.oper_location AS operLocation, sol.oper_param AS operLocation,sol.json_result AS jsonResult,
+    sol.status AS status,sol.error_msg AS errorMsg,
+    sol.oper_time AS operTime, sol.cost_time AS costTime,sol.companyName AS companyName,sol.roleName
+    AS roleName,sol.phoneNumber AS phoneNumber,
+    sol.userId AS userId,sol.nickName AS nickName
+    from sys_oper_log sol
+    <where>
+      <if test="query.companyName != null and query.companyName != ''">
+        AND sol.companyName LIKE concat('%',#{query.companyName},'%')
+      </if>
+      <if test="query.roleName != null and query.roleName != ''">
+        AND sol.roleName LIKE concat('%',#{query.roleName},'%')
+      </if>
+      <if test="query.nickName != null and query.nickName != ''">
+        AND sol.nickName LIKE concat('%',#{query.nickName},'%')
+      </if>
+      <if
+        test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+        AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') &gt;= #{query.startTime}
+        AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') &lt;= #{query.endTime}
+      </if>
+    </where>
+    ORDER BY sol.oper_time DESC
+  </select>
+
+  <update id="cleanOperLog">
+    truncate table sys_oper_log
+  </update>
 
 </mapper> 
\ No newline at end of file

--
Gitblit v1.7.1