fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

New file
@@ -0,0 +1,102 @@
<?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">
<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="phonenumber"      />
      <result property="userId"       column="userId"      />
      <result property="nickName"       column="nickName"      />
   </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
      ORDER BY sol.oper_time DESC
   </select>

   <update id="cleanOperLog">
        truncate table sys_oper_log
    </update>

</mapper>