Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2400238fd8ae34a2f10a4ea35db9b1739c534a7e

 ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml

@@ -1,6 +1,6 @@
<?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.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper">
<mapper namespace="com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper">
    <resultMap id="BaseResultMap" type="ArdAlarmStealelec">
        <id column="id" property="id"/>
        <result column="name" property="name"/>
@@ -16,8 +16,23 @@
        <result column="dept_id" property="deptId"/>
    </resultMap>
    <sql id="Base_Column_List">
        id, name, describe, catalog_text, description, start_time, end_time,view_time,longitude,latitude,altitude,create_by,create_time,user_id,dept_id
        id
        , name, describe, catalog_text, description, start_time, end_time,view_time,longitude,latitude,altitude,create_by,create_time,user_id,dept_id
    </sql>
    <select id="selectArdAlarmStealelecList" parameterType="ArdAlarmStealelec" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from ard_alarm_stealelec
        <where>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND start_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND start_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
        order by start_time desc
    </select>
    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
@@ -79,7 +94,10 @@
        ORDER BY aas.start_time DESC LIMIT 50
    </select>
    <select id="selectCountByStartTime" resultType="Integer">
        select count(DISTINCT aas."describe") from ard_alarm_stealelec aas where aas.start_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
        select count(DISTINCT aas."describe")
        from ard_alarm_stealelec aas
        where aas.start_time >= (CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE)
        and aas.view_time is null
    </select>
    <update id="updateViewTimeByDescribe" parameterType="String">
        update ard_alarm_stealelec
@@ -110,4 +128,16 @@
        values (#{id}, #{name},#{describe},#{catalogText},#{description}, #{startTime}, #{endTime},
        #{viewTime},#{longitude},#{latitude},#{altitude},#{createBy},#{createTime},#{userId},#{deptId})
    </insert>

    <select id="stealelecYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(start_time::DATE, 'MM') as date,count(id)
        from ard_alarm_stealelec
        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
    </select>

    <select id="stealelecMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(start_time::DATE, 'dd') as date,count(id)
        from ard_alarm_stealelec
        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
    </select>
</mapper>