增加报警过滤接口

‘liusuyi’

2023-10-05 c58e01fe1dcc70c70a92568e5fad96cda9aed201

增加报警过滤接口

 ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java

对比新文件
@@ -0,0 +1,112 @@
package com.ruoyi.alarm.filter.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;
import com.ruoyi.alarm.filter.service.IArdAlarmFilterService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * 报警过滤Controller
 * 
 * @author ard
 * @date 2023-10-05
 */
@Api(tags = "报警过滤接口")
@RestController
@RequestMapping("/alarm/filter")
public class ArdAlarmFilterController extends BaseController
{
    @Autowired
    private IArdAlarmFilterService ardAlarmFilterService;

    /**
     * 查询报警过滤列表
     */
    @ApiOperation("查询报警过滤列表")
    @PreAuthorize("@ss.hasPermi('alarm:filter:list')")
    @GetMapping("/list")
    public AjaxResult list(ArdAlarmFilter ardAlarmFilter)
    {
        List<ArdAlarmFilter> list = ardAlarmFilterService.selectArdAlarmFilterList(ardAlarmFilter);
        return success(list);
    }

    /**
     * 导出报警过滤列表
     */
    @PreAuthorize("@ss.hasPermi('alarm:filter:export')")
    @Log(title = "报警过滤", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdAlarmFilter ardAlarmFilter)
    {
        List<ArdAlarmFilter> list = ardAlarmFilterService.selectArdAlarmFilterList(ardAlarmFilter);
        ExcelUtil<ArdAlarmFilter> util = new ExcelUtil<ArdAlarmFilter>(ArdAlarmFilter.class);
        util.exportExcel(response, list, "报警过滤数据");
    }

    /**
     * 获取报警过滤详细信息
     */
    @ApiOperation("获取报警过滤详细信息")
    @PreAuthorize("@ss.hasPermi('alarm:filter:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(ardAlarmFilterService.selectArdAlarmFilterById(id));
    }

    /**
     * 新增报警过滤
     */
    @ApiOperation("新增报警过滤")
    @PreAuthorize("@ss.hasPermi('alarm:filter:add')")
    @Log(title = "报警过滤", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdAlarmFilter ardAlarmFilter)
    {
        return toAjax(ardAlarmFilterService.insertArdAlarmFilter(ardAlarmFilter));
    }

    /**
     * 修改报警过滤
     */
    @ApiOperation("修改报警过滤")
    @PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
    @Log(title = "报警过滤", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdAlarmFilter ardAlarmFilter)
    {
        return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
    }

    /**
     * 删除报警过滤
     */
    @ApiOperation("删除报警过滤")
    @PreAuthorize("@ss.hasPermi('alarm:filter:remove')")
    @Log(title = "报警过滤", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(ardAlarmFilterService.deleteArdAlarmFilterByIds(ids));
    }
}

 ard-work/src/main/java/com/ruoyi/alarm/filter/domain/ArdAlarmFilter.java

对比新文件
@@ -0,0 +1,115 @@
package com.ruoyi.alarm.filter.domain;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * 报警过滤对象 ard_alarm_filter
 * 
 * @author ard
 * @date 2023-10-05
 */
public class ArdAlarmFilter extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** 主键 */
    private String id;

    /** 用户id */
    @Excel(name = "用户id")
    private String userId;

    /** 名称 */
    @Excel(name = "名称")
    private String name;

    /** 报警类型 */
    @Excel(name = "报警类型")
    private String alarmType;

    /** 开始时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date beginTime;

    /** 结束时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    public void setId(String id) 
    {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    }
    public void setUserId(String userId) 
    {
        this.userId = userId;
    }

    public String getUserId() 
    {
        return userId;
    }
    public void setName(String name) 
    {
        this.name = name;
    }

    public String getName() 
    {
        return name;
    }
    public void setAlarmType(String alarmType) 
    {
        this.alarmType = alarmType;
    }

    public String getAlarmType() 
    {
        return alarmType;
    }
    public void setBeginTime(Date beginTime) 
    {
        this.beginTime = beginTime;
    }

    public Date getBeginTime() 
    {
        return beginTime;
    }
    public void setEndTime(Date endTime) 
    {
        this.endTime = endTime;
    }

    public Date getEndTime() 
    {
        return endTime;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("userId", getUserId())
            .append("name", getName())
            .append("alarmType", getAlarmType())
            .append("beginTime", getBeginTime())
            .append("endTime", getEndTime())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}

 ard-work/src/main/java/com/ruoyi/alarm/filter/mapper/ArdAlarmFilterMapper.java

对比新文件
@@ -0,0 +1,61 @@
package com.ruoyi.alarm.filter.mapper;

import java.util.List;
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;

/**
 * 报警过滤Mapper接口
 * 
 * @author ard
 * @date 2023-10-05
 */
public interface ArdAlarmFilterMapper 
{
    /**
     * 查询报警过滤
     * 
     * @param id 报警过滤主键
     * @return 报警过滤
     */
    public ArdAlarmFilter selectArdAlarmFilterById(String id);

    /**
     * 查询报警过滤列表
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 报警过滤集合
     */
    public List<ArdAlarmFilter> selectArdAlarmFilterList(ArdAlarmFilter ardAlarmFilter);

    /**
     * 新增报警过滤
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    public int insertArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);

    /**
     * 修改报警过滤
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    public int updateArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);

    /**
     * 删除报警过滤
     * 
     * @param id 报警过滤主键
     * @return 结果
     */
    public int deleteArdAlarmFilterById(String id);

    /**
     * 批量删除报警过滤
     * 
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteArdAlarmFilterByIds(String[] ids);
}

 ard-work/src/main/java/com/ruoyi/alarm/filter/service/IArdAlarmFilterService.java

对比新文件
@@ -0,0 +1,61 @@
package com.ruoyi.alarm.filter.service;

import java.util.List;
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;

/**
 * 报警过滤Service接口
 * 
 * @author ard
 * @date 2023-10-05
 */
public interface IArdAlarmFilterService 
{
    /**
     * 查询报警过滤
     * 
     * @param id 报警过滤主键
     * @return 报警过滤
     */
    public ArdAlarmFilter selectArdAlarmFilterById(String id);

    /**
     * 查询报警过滤列表
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 报警过滤集合
     */
    public List<ArdAlarmFilter> selectArdAlarmFilterList(ArdAlarmFilter ardAlarmFilter);

    /**
     * 新增报警过滤
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    public int insertArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);

    /**
     * 修改报警过滤
     * 
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    public int updateArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);

    /**
     * 批量删除报警过滤
     * 
     * @param ids 需要删除的报警过滤主键集合
     * @return 结果
     */
    public int deleteArdAlarmFilterByIds(String[] ids);

    /**
     * 删除报警过滤信息
     * 
     * @param id 报警过滤主键
     * @return 结果
     */
    public int deleteArdAlarmFilterById(String id);
}

 ard-work/src/main/java/com/ruoyi/alarm/filter/service/impl/ArdAlarmFilterServiceImpl.java

对比新文件
@@ -0,0 +1,104 @@
package com.ruoyi.alarm.filter.service.impl;

import java.util.Date;
import java.util.List;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.alarm.filter.mapper.ArdAlarmFilterMapper;
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;
import com.ruoyi.alarm.filter.service.IArdAlarmFilterService;

/**
 * 报警过滤Service业务层处理
 *
 * @author ard
 * @date 2023-10-05
 */
@Service
public class ArdAlarmFilterServiceImpl implements IArdAlarmFilterService {
    @Autowired
    private ArdAlarmFilterMapper ardAlarmFilterMapper;

    /**
     * 查询报警过滤
     *
     * @param id 报警过滤主键
     * @return 报警过滤
     */
    @Override
    public ArdAlarmFilter selectArdAlarmFilterById(String id) {
        return ardAlarmFilterMapper.selectArdAlarmFilterById(id);
    }

    /**
     * 查询报警过滤列表
     *
     * @param ardAlarmFilter 报警过滤
     * @return 报警过滤
     */
    @Override
    public List<ArdAlarmFilter> selectArdAlarmFilterList(ArdAlarmFilter ardAlarmFilter) {
        ardAlarmFilter.setUserId(SecurityUtils.getUserId());
        return ardAlarmFilterMapper.selectArdAlarmFilterList(ardAlarmFilter);
    }

    /**
     * 新增报警过滤
     *
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    @Override
    public int insertArdAlarmFilter(ArdAlarmFilter ardAlarmFilter) {
        ardAlarmFilter.setId(IdUtils.simpleUUID());
        ardAlarmFilter.setUserId(SecurityUtils.getUserId());
        ardAlarmFilter.setBeginTime(DateUtils.covertTime(new Date()));
        ardAlarmFilter.setCreateBy(SecurityUtils.getUsername());
        ardAlarmFilter.setCreateTime(DateUtils.getNowDate());
        return ardAlarmFilterMapper.insertArdAlarmFilter(ardAlarmFilter);
    }

    /**
     * 修改报警过滤
     *
     * @param ardAlarmFilter 报警过滤
     * @return 结果
     */
    @Override
    public int updateArdAlarmFilter(ArdAlarmFilter ardAlarmFilter) {
        ardAlarmFilter.setUpdateBy(SecurityUtils.getUsername());
        ardAlarmFilter.setUpdateTime(DateUtils.getNowDate());
        return ardAlarmFilterMapper.updateArdAlarmFilter(ardAlarmFilter);
    }

    /**
     * 批量删除报警过滤
     *
     * @param ids 需要删除的报警过滤主键
     * @return 结果
     */
    @Override
    public int deleteArdAlarmFilterByIds(String[] ids) {
        return ardAlarmFilterMapper.deleteArdAlarmFilterByIds(ids);
    }

    /**
     * 删除报警过滤信息
     *
     * @param id 报警过滤主键
     * @return 结果
     */
    @Override
    public int deleteArdAlarmFilterById(String id) {
        return ardAlarmFilterMapper.deleteArdAlarmFilterById(id);
    }
}

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

对比新文件
@@ -0,0 +1,105 @@
<?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.filter.mapper.ArdAlarmFilterMapper">

    <resultMap type="ArdAlarmFilter" id="ArdAlarmFilterResult">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="name" column="name"/>
        <result property="alarmType" column="alarm_type"/>
        <result property="beginTime" column="begin_time"/>
        <result property="endTime" column="end_time"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <sql id="selectArdAlarmFilterVo">
        select id,
               user_id,
               name,
               alarm_type,
               begin_time,
               end_time,
               create_by,
               create_time,
               update_by,
               update_time
        from ard_alarm_filter
    </sql>

    <select id="selectArdAlarmFilterList" parameterType="ArdAlarmFilter" resultMap="ArdAlarmFilterResult">
        <include refid="selectArdAlarmFilterVo"/>
        <where>
            current_timestamp  BETWEEN begin_time AND end_time
            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
            <if test="name != null  and name != ''">and name = #{name}</if>
            <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
        </where>
    </select>

    <select id="selectArdAlarmFilterById" parameterType="String" resultMap="ArdAlarmFilterResult">
        <include refid="selectArdAlarmFilterVo"/>
        where id = #{id}
    </select>

    <insert id="insertArdAlarmFilter" parameterType="ArdAlarmFilter">
        insert into ard_alarm_filter
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="userId != null">user_id,</if>
            <if test="name != null">name,</if>
            <if test="alarmType != null">alarm_type,</if>
            <if test="beginTime != null">begin_time,</if>
            <if test="endTime != null">end_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="userId != null">#{userId},</if>
            <if test="name != null">#{name},</if>
            <if test="alarmType != null">#{alarmType},</if>
            <if test="beginTime != null">#{beginTime},</if>
            <if test="endTime != null">#{endTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
        </trim>
    </insert>

    <update id="updateArdAlarmFilter" parameterType="ArdAlarmFilter">
        update ard_alarm_filter
        <trim prefix="SET" suffixOverrides=",">
            <if test="userId != null">user_id = #{userId},</if>
            <if test="name != null">name = #{name},</if>
            <if test="alarmType != null">alarm_type = #{alarmType},</if>
            <if test="beginTime != null">begin_time = #{beginTime},</if>
            <if test="endTime != null">end_time = #{endTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteArdAlarmFilterById" parameterType="String">
        delete
        from ard_alarm_filter
        where id = #{id}
    </delete>

    <delete id="deleteArdAlarmFilterByIds" parameterType="String">
        delete from ard_alarm_filter where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 ruoyi-admin/src/main/resources/application-prod-druid.yml

@@ -6,7 +6,7 @@
      # 主库数据源
      master:
        driverClassName: org.postgresql.Driver
        url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified
        url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified&TimeZone=Asia/Shanghai
        username: postgres
        password: Yykj.2017
        # 从库数据源

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -39,34 +39,6 @@
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms
# 日志配置
logging:
  level:
    authorize: info
    minio: info
    hikSdk: info
    stealAlarm: info
    websocket: info
    patrolInspectionTask: info
    mqtt: info
    guideQueue: info
    rongCloud: info
    cmd: info
    uav: info
    sy: info

# webrtc-streamer配置
webrtc:
  enabled: false
  host: 192.168.5.229:8000

# minio配置
minio:
  enabled: false
  endpoint: http://192.168.5.229:9001
  accessKey: admin
  secretKey: xzx12345
  path: F:/DATA
# forest配置
forest:
  backend: okhttp3             # 后端HTTP框架（默认为 okhttp3）
@@ -85,10 +57,37 @@
  log-response-status: true    # 打开/关闭Forest响应状态日志（默认为 true）
  log-response-content: true   # 打开/关闭Forest响应内容日志（默认为 false）
  async-mode: platform         # [自v1.5.27版本起可用] 异步模式（默认为 platform）
# 日志配置
logging:
  level:
    authorize: info
    minio: info
    hikSdk: info
    stealAlarm: info
    websocket: info
    patrolInspectionTask: info
    mqtt: info
    guideQueue: info
    rongCloud: info
    cmd: info
    uav: info
    sy: info
# webrtc-streamer配置
webrtc:
  enabled: false
  host: 192.168.5.229:8000
# minio配置
minio:
  enabled: false
  endpoint: http://192.168.5.229:9001
  accessKey: admin
  secretKey: xzx12345
  path: F:/DATA
#流媒体转码服务器
mediamtx:
  enabled: true
  host: 192.168.5.229
  software_decoding: true
#mqtt
mqtt:
  host: tcp://192.168.5.229:1883

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -85,7 +85,9 @@
        }
    }


    /**
     * 转换Date去掉毫秒
     */
    public static final Date covertTime(Date date)  {
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Timestamp now = new Timestamp(date.getTime());

 ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -40,8 +40,8 @@
#if($parentheseIndex != -1)
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
#else
    @Excel(name = "${comment}")
#end