From efe4e8e1cdd3a01a8d2873d16c7a4d101956ae58 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 07 Nov 2023 18:03:46 +0800
Subject: [PATCH] 监测预警饼图接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml | 15 +++++++++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java | 2 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 18 +++++++++++++-----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 6 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java | 7 +++----
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
index 63bcdcb..ded262c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -5,10 +5,7 @@
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.nky.vo.PageVO;
import cn.gistack.sm.damSecurity.service.IDamSecurityService;
-import cn.gistack.sm.damSecurity.vo.DamMonitor;
-import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
-import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
-import cn.gistack.sm.damSecurity.vo.DamStatisticsRes;
+import cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -60,7 +57,7 @@
}
/**
- * 监测预警分布
+ * 监测预警分布（柱状图）
* @param damMonitor
* @return
*/
@@ -71,6 +68,17 @@
}
/**
+ * 监测预警分布（饼图）
+ * @param damMonitor
+ * @return
+ */
+ @GetMapping(value = "/levelMonitorPie")
+ public R levelMonitorPie(DamMonitor damMonitor){
+ List<LevelPo> list = damSecurityService.levelMonitorPie(damMonitor);
+ return R.data(list);
+ }
+
+ /**
* 监测预警分布表格
* @param alarmGet
* @param query
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
index 2432851..5852713 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
@@ -43,4 +43,6 @@
List<AlarmGetVO> pageMonitor(@Param("page") IPage<AlarmGetVO> page, @Param("vo") AlarmGetVO alarmGet);
List<AlarmGetVO> pageMonitorWy(IPage<AlarmGetVO> page, @Param("vo") AlarmGetVO alarmGet);
+
+ List<LevelPo> levelMonitorPie(@Param("dam") DamMonitor damMonitor);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
index b5c3e45..e420853 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -1154,15 +1154,16 @@
<select id="getLevelList" resultType="cn.gistack.sm.damSecurity.vo.LevelPo">
SELECT COUNT(*) AS num ,level FROM NKY_ALARM_GET NAG
LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = NAG.DAM_ID
- left join SJZT_MD."att_ad_base" b on arb."interior_ad_guid" = b."ad_code"
- left join SJZT_MD."att_ad_base" c on b."p_ad_code" = c."ad_code"
- left join SJZT_MD."att_ad_base" d on c."p_ad_code" = d."ad_code"
+ left join SJZT_MD."att_ad_base" town on arb."interior_ad_guid" = town."ad_code"
+ left join SJZT_MD."att_ad_base" county on town."p_ad_code" = county."ad_code"
+ left join SJZT_MD."att_ad_base" city on county."p_ad_code" = city."ad_code"
+ left join SJZT_MD."att_ad_base" province on city."p_ad_code" = province."ad_code"
LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = NAG.DAM_ID
LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid"
LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code"
where 1=1
- AND (d."ad_code" = #{dam.adCode} or c."ad_code" = #{dam.adCode} or b."ad_code" = #{dam.adCode})
+ AND (province."ad_code" = #{dam.adCode} or city."ad_code" = #{dam.adCode} or county."ad_code" = #{dam.adCode} or town."ad_code" = #{dam.adCode})
<if test="dam.startTime != null and dam.startTime != ''">
AND DATE_FORMAT(time,'%Y-%m-%d') >= #{dam.startTime}
</if>
@@ -1440,4 +1441,10 @@
</select>
+
+ <select id="levelMonitorPie" resultType="cn.gistack.sm.damSecurity.vo.LevelPo">
+
+ </select>
+
+
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
index c4951b9..f513aaa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
@@ -1,10 +1,7 @@
package cn.gistack.sm.damSecurity.service;
import cn.gistack.nky.vo.AlarmGetVO;
-import cn.gistack.sm.damSecurity.vo.DamMonitor;
-import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
-import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
-import cn.gistack.sm.damSecurity.vo.DamStatisticsRes;
+import cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap;
@@ -64,4 +61,6 @@
* @return
*/
IPage<AlarmGetVO> pageMonitor(AlarmGetVO alarmGet, IPage<AlarmGetVO> page);
+
+ List<LevelPo> levelMonitorPie(DamMonitor damMonitor);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
index 7cecbdb..ddd2690 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -122,6 +122,12 @@
}
+ @Override
+ public List<LevelPo> levelMonitorPie(DamMonitor damMonitor) {
+ List<LevelPo> levelPoList = damSecurityMapper.getLevelList(damMonitor);
+ return levelPoList;
+ }
+
public List<DamMonitor> getRegionList(DamMonitor damMonitor){
return damSecurityMapper.getRegionList(damMonitor);
--
Gitblit v1.9.3