zhongrj
2023-05-23 0c5aa7fe1a0345162d8f18bb59aa552c4fe5cc29
中台接口ip修改,告警记录基础接口新增
2 files modified
7 files added
304 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java 115 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java 80 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java 24 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java 22 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java 29 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java 13 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
New file
@@ -0,0 +1,115 @@
package cn.gistack.sm.alarmRule.controller;
import cn.gistack.sm.alarmRule.entity.AlarmRecord;
import cn.gistack.sm.alarmRule.service.AlarmRecordService;
import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
/**
 * 告警记录控制层
 * @author zhongrj
 * @date 2023-05-23
 */
@RestController
@AllArgsConstructor
@RequestMapping("/alarmRecord/alarmRecord")
public class AlarmRecordController extends BladeController {
    private final AlarmRecordService alarmRecordService;
    /**
     * 分页列表查询
     *
     * @param alarmRecord
     * @return
     */
    @ApiOperation(value="告警记录-分页列表查询", notes="告警记录-分页列表查询")
    @GetMapping(value = "/list")
    public R queryPageList(AlarmRecord alarmRecord, Query query) {
        IPage<AlarmRecord> pageList = alarmRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(alarmRecord));
        return R.data(pageList);
    }
    /**
     * 自定义分页列表查询
     * @param query
     * @param alarmRecord
     * @return
     */
    @ApiOperation(value="告警记录-自定义分页列表查询", notes="告警记录-自定义分页列表查询")
    @GetMapping(value = "/page")
    public R page(AlarmRecordVO alarmRecord, Query query) {
        return R.data( alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
    }
    /**
     * 添加
     *
     * @param alarmRecord
     * @return
     */
    @ApiOperation(value="告警记录-添加", notes="告警记录-添加")
    @PostMapping(value = "/add")
    public R add(@RequestBody AlarmRecord alarmRecord) {
        return R.data(alarmRecordService.save(alarmRecord));
    }
    /**
     * 编辑
     *
     * @param alarmRecord
     * @return
     */
    @ApiOperation(value="告警记录-编辑", notes="告警记录-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public R edit(@RequestBody AlarmRecord alarmRecord) {
        return R.data(alarmRecordService.updateById(alarmRecord));
    }
    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value="告警记录-通过id删除", notes="告警记录-通过id删除")
    @DeleteMapping(value = "/delete")
    public R delete(@RequestParam(name="id",required=true) String id) {
        return R.data(alarmRecordService.removeById(id));
    }
    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @ApiOperation(value="告警记录-批量删除", notes="告警记录-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        return R.data(this.alarmRecordService.removeByIds(Arrays.asList(ids.split(","))));
    }
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    @ApiOperation(value="告警记录-通过id查询", notes="告警记录-通过id查询")
    @GetMapping(value = "/queryById")
    public R queryById(@RequestParam(name="id",required=true) String id) {
        AlarmRecord alarmRecord = alarmRecordService.getById(id);
        return R.data(alarmRecord);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
New file
@@ -0,0 +1,80 @@
package cn.gistack.sm.alarmRule.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springblade.core.mp.base.BaseEntity;
/**
 * 告警记录
 * @author zhongrj
 * @date 2023-05-23
 */
@Data
@TableName("sm_alarm_record")
public class AlarmRecord extends BaseEntity {
    /**
     * 告警分类
     */
    private String type;
    /**
     * 告警规则类型
     */
    private String alarmRuleType;
    /**
     * 生成告警类型
     */
    private String createAlarmType;
    /**
     * 校验规则名称
     */
    private String ruleName;
    /**
     * 校验规则描述
     */
    private String ruleRemark;
    /**
     * 指标
     */
    private String target;
    /**
     * 阀值
     */
    private String threshold;
    /**
     * 告警级别
     */
    private String alarmLevel;
    /**
     * 告警方式
     */
    private String alarmMode;
    /**
     * 告警频次
     */
    private String alarmFrequency;
    /**
     * 告警人
     */
    private String alarmPerson;
    /**
     * 告警内容
     */
    private String alarmContent;
    /**
     * 备注
     */
    private String alarmRemark;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
New file
@@ -0,0 +1,24 @@
package cn.gistack.sm.alarmRule.mapper;
import cn.gistack.sm.alarmRule.entity.AlarmRecord;
import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/**
 * 告警记录mapper映射层
 * @author zhongrj
 * @date 2023-05-23
 */
public interface AlarmRecordMapper extends BaseMapper<AlarmRecord> {
    /**
     * 自定义分页列表查询
     * @param page
     * @param alarmRecord
     * @return
     */
    List<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
New file
@@ -0,0 +1,10 @@
<?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="cn.gistack.sm.alarmRule.mapper.AlarmRecordMapper">
    <!--自定义分页列表查询-->
    <select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO">
        select * from sm_alarm_record where is_deleted = 0
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
@@ -4,22 +4,21 @@
import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * 告警规则mapper映射层
 * @author zhongrj
 * @date 2023-05-55
 * @date 2023-05-23
 */
public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
    /**
     * 自定义分页列表查询
     * @param page
     * @param alarmRule
     * @param alarmRecord
     * @return
     */
    List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, @Param("alarmRule") AlarmRuleVO alarmRule);
    List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java
New file
@@ -0,0 +1,22 @@
package cn.gistack.sm.alarmRule.service;
import cn.gistack.sm.alarmRule.entity.AlarmRecord;
import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
/**
 * 告警记录服务层
 * @author zhongrj
 * @date 2023-05-23
 */
public interface AlarmRecordService extends BaseService<AlarmRecord> {
    /**
     * 自定义分页列表查询
     * @param page
     * @param alarmRecord
     * @return
     */
    IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java
New file
@@ -0,0 +1,29 @@
package cn.gistack.sm.alarmRule.service.impl;
import cn.gistack.sm.alarmRule.entity.AlarmRecord;
import cn.gistack.sm.alarmRule.mapper.AlarmRecordMapper;
import cn.gistack.sm.alarmRule.service.AlarmRecordService;
import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
/**
 * 告警记录服务实现层
 * @author zhongrj
 * @date 2023-05-23
 */
@Service
public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecordMapper, AlarmRecord> implements AlarmRecordService {
    /**
     * 自定义分页列表查询
     * @param page
     * @param alarmRecord
     * @return
     */
    @Override
    public IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
        return page.setRecords(baseMapper.selectAlarmRecordPage(page,alarmRecord));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java
New file
@@ -0,0 +1,13 @@
package cn.gistack.sm.alarmRule.vo;
import cn.gistack.sm.alarmRule.entity.AlarmRecord;
import lombok.Data;
/**
 * 告警记录vo
 * @author zhongrj
 * @date 2023-05-23
 */
@Data
public class AlarmRecordVO extends AlarmRecord {
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
@@ -8,9 +8,9 @@
public class ZtConstant {
    /**
     * 查询水库对应超汛巡查信息url
     * 查询水库对应超汛巡查信息url(内网ip)
     */
    public static final String patr_person_api = "http://10.10.2.192/services/1234567890ABCDEFGHIJKLMN/over_z_last/patr_person/api";
    public static final String patr_person_api = "http://10.42.6.192/services/1234567890ABCDEFGHIJKLMN/over_z_last/patr_person/api";
    /**
     * 请求头 key