From e2fda8f4f705f6636fcf51e4c11a78a2b1f5f3b5 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 07 Mar 2024 13:54:00 +0800
Subject: [PATCH] 雨水情告警增加行政区划过滤
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
index 66c8748..b20e36f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -9,12 +9,17 @@
import cn.gistack.alerts.alarmRule.vo.StatisticAlarmRecord;
import cn.gistack.alerts.sms.vo.Temp;
import cn.gistack.sm.intelligentCall.entity.Scene;
+import cn.gistack.sm.patrol.feign.PatrolTaskClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,6 +38,9 @@
@Autowired
private AlarmRuleService alarmRuleService;
+ @Autowired
+ private PatrolTaskClient patrolTaskClient;
+
/**
* 自定义分页列表查询
* @param page
@@ -41,10 +49,40 @@
*/
@Override
public Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
+ if (!Strings.isBlank(alarmRecord.getAdCode())){
+ alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
+ }
if (null != alarmRecord.getIsExport()){
return baseMapper.selectAlarmRecordPage(null,alarmRecord);
}
return page.setRecords(baseMapper.selectAlarmRecordPage(page,alarmRecord));
+ }
+
+ /**
+ * 按行政区统计告警-按三大类
+ * @param alarmRecord
+ * @return
+ */
+ @Override
+ public Object statisticAlarmRecordByType(AlarmRecordVO alarmRecord) {
+ if (!Strings.isBlank(alarmRecord.getAdCode())){
+ alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
+ }
+ // 查询统计数据
+ List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecordByType(alarmRecord);
+ // 返回数据
+ return list;
+ }
+
+ @Override
+ public Object statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord) {
+ if (!Strings.isBlank(alarmRecord.getAdCode())){
+ alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
+ }
+ // 查询统计数据
+ List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecordByAlarmRuleType(alarmRecord);
+ // 返回数据
+ return list;
}
/**
@@ -54,16 +92,26 @@
*/
@Override
public Object statisticAlarmRecord(AlarmRecordVO alarmRecord) {
- // 获取当前用户的行政区划
- String adCode = "420000000000";
+ if (Strings.isBlank(alarmRecord.getAdCode())){
+ // 获取当前用户的行政区划
+ alarmRecord.setAdCode("420000000000");
+ }
// 查询所有的市级行政区
- List<String> adNameList = baseMapper.getAdNameList(adCode);
+ List<String> adNameList = baseMapper.getAdNameList(alarmRecord.getAdCode());
+
+ if (alarmRecord.getAdLevel().equals("4")) {
+ adNameList = baseMapper.getAdNameListByAdCode(alarmRecord.getAdCode());
+ }
+
// 查询符合条件的告警类型
List<AlarmRule> alarmRuleList = baseMapper.listAlarmRule(alarmRecord);
// 查询统计数据
+ if (!Strings.isBlank(alarmRecord.getAdCode())){
+ alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
+ }
List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecord(alarmRecord);
// 按行政区分组
- Map<String, List<StatisticAlarmRecord>> listMap = list.stream().collect(Collectors.groupingBy(StatisticAlarmRecord::getAdName));
+ Map<String, List<StatisticAlarmRecord>> listMap = list.stream().filter(item->null!=item.getAdName()).collect(Collectors.groupingBy(StatisticAlarmRecord::getAdName));
// 补全行政区
for (String adName : adNameList) {
if (!listMap.containsKey(adName)){
@@ -96,4 +144,32 @@
// 返回数据
return objects;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateStatus(AlarmRecord alarmRecord) {
+
+ AlarmRecordVO vo = baseMapper.getVODetail(alarmRecord.getId());
+ String processDefinitionId = "c2d5326e-e27b-11ed-a04e-00ff0b362ee4";
+
+ //日常巡查
+ String taskType = "1641037874390999041";
+ String title = StringUtil.format("{}{}巡查",
+ vo.getReservoirName(),vo.getAlarmRuleType());
+
+ String tm = DateUtil.format(vo.getCreateTime(),"MM月dd日HH时mm分");
+
+ //杨树堰水库在20231206 080005时近1h水位陡降
+ String content = StringUtil.format("{}在{}时{}",
+ vo.getReservoirName(),tm,vo.getRuleName());
+
+ //创建新任务
+ String taskId = patrolTaskClient.createTask(processDefinitionId, taskType, title, content, vo.getReservoirNumber());
+
+ //更新状态
+ alarmRecord.setTaskId(taskId);
+ boolean b = updateById(alarmRecord);
+
+ return b;
+ }
}
--
Gitblit v1.9.3