From f525a1e8a15491e82b8cb30e031bb081ffa2817c Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 29 Jan 2021 11:58:56 +0800
Subject: [PATCH] 警情
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 9 +++------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 4 ++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 4 ++--
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index ea74c75..92b0b47 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -152,11 +152,11 @@
* @return
*/
@PostMapping("/selectList")
- public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String addvcd, String waringType, String beginTime, String endTime, HttpServletResponse response) {
+ public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String district, String waringType, String beginTime, String endTime, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(alarmService.selectList(jtype,addvcd,waringType,beginTime,endTime));
+ return R.data(alarmService.selectList(jtype,district,waringType,beginTime,endTime));
}
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 9e17c8e..792c3c6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -40,7 +40,7 @@
* @return
*/
List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
- List<AlarmVO> selectList(String jtype, String addvcd, String waringType, String beginTime, String endTime);
+ List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> selectListSe(String beginTime, String endTime);
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 1c16a1e..33fb909 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -93,17 +93,16 @@
a.czTime,
a.bz,
a.LEVEL,
- ST_ASTEXT (a.coordinate ) AS coordinate,
a.jd,
a.wd,
a.jtype,
a.rname,
- d.addvnm,
+ jfpth.blade_region.name as addvnm,
e.serialNumber,
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+ sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where 1=1
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
@@ -142,7 +141,6 @@
a.alarmId,
a.rname,
a.LEVEL,
- ST_ASTEXT(a.coordinate) AS coordinate,
a.jd,
a.wd,
a.jtype,
@@ -173,7 +171,6 @@
a.alarmId,
a.rname,
a.LEVEL,
- ST_ASTEXT (a.coordinate ) AS coordinate,
a.jd,
a.wd,
a.jtype,
@@ -238,7 +235,7 @@
e.serialNumber,
e.stype,
e.channelNumber,
- jfpth.blade_region.`name`
+ jfpth.blade_region.`name` as addvnm
FROM
sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
DATE_FORMAT(alarmTime,'%Y-%m-%d') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} ORDER BY alarmTime desc
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index 08bd6c0..3481b20 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -40,7 +40,7 @@
* @return
*/
IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm);
- List<AlarmVO> selectList(String jtype, String addvcd, String waringType, String beginTime, String endTime);
+ List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
void deletejj(String id);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 3aaec12..58c6022 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -43,8 +43,8 @@
}
@Override
- public List<AlarmVO> selectList(String jtype,String addvcd,String waringType,String beginTime,String endTime) {
- return baseMapper.selectList(jtype,addvcd,waringType,beginTime,endTime);
+ public List<AlarmVO> selectList(String jtype,String district,String waringType,String beginTime,String endTime) {
+ return baseMapper.selectList(jtype,district,waringType,beginTime,endTime);
}
@Override
--
Gitblit v1.9.3