From 0c5aa7fe1a0345162d8f18bb59aa552c4fe5cc29 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 23 May 2023 16:34:06 +0800
Subject: [PATCH] 中台接口ip修改，告警记录基础接口新增
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java | 22 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java | 29 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml | 10 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java | 13 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java | 115 +++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java | 80 +++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java | 7
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java | 24 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java | 4
9 files changed, 298 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
new file mode 100644
index 0000000..f09afeb
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
@@ -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);
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
new file mode 100644
index 0000000..5cc7ebe
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
@@ -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;
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
new file mode 100644
index 0000000..b66824a
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
@@ -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);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
new file mode 100644
index 0000000..53cdfda
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
@@ -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>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
index 6219469..9b68c3c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
+++ b/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);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java
new file mode 100644
index 0000000..11783fc
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java
@@ -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);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java
new file mode 100644
index 0000000..1a4770b
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -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));
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java
new file mode 100644
index 0000000..e1a9bf8
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java
@@ -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 {
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
index 39a5547..985ef97 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
+++ b/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
--
Gitblit v1.9.3