From 57c72c8438ccb461d5d2f751f710d6908f0e0d32 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 04 Nov 2021 14:59:20 +0800
Subject: [PATCH] 版本修复
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 158 +++++++++++++++++++++++++++-------------------------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 7 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 5 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 1
7 files changed, 99 insertions(+), 78 deletions(-)
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 997d27b..18afadc 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
@@ -243,38 +243,44 @@
SELECT
*
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
- <if test="alarm.district!=null">
- and district like concat('%',#{alarm.district},'%')
- </if>
- <if test="alarm.province!=null">
- and province like concat('%',#{alarm.province},'%')
- </if>
- <if test="alarm.city!=null">
- and city like concat('%',#{alarm.city},'%')
- </if>
- <if test="alarm.alarmPeople!=null">
- and alarmPeople like concat('%',#{alarm.alarmPeople},'%')
- </if>
- <if test="alarm.jtype!=null">
- and jtype = #{alarm.jtype}
- </if>
- AND waringType IN ( "安装任务" )
+ 1 = 1
+ <if test="alarm.district!=null">
+ and district like concat('%',#{alarm.district},'%')
+ </if>
+ <if test="alarm.province!=null">
+ and province like concat('%',#{alarm.province},'%')
+ </if>
+ <if test="alarm.city!=null">
+ and city like concat('%',#{alarm.city},'%')
+ </if>
+ <if test="alarm.alarmPeople!=null">
+ and alarmPeople like concat('%',#{alarm.alarmPeople},'%')
+ </if>
+ <if test="alarm.jtype!=null">
+ and jtype = #{alarm.jtype}
+ </if>
+ <if test="alarm.rname!=null">
+ and rname like concat('%',#{alarm.rname},'%')
+ </if>
+ <if test="alarm.deviceNumber!=null">
+ and deviceNumber like concat('%',#{alarm.deviceNumber},'%')
+ </if>
+ AND waringType IN ( "安装任务" )
ORDER BY
- jtype ASC,
- alarmTime DESC
+ jtype ASC,
+ alarmTime DESC
</select>
<select id="getChartData" resultType="java.util.Map">
SELECT
- COUNT( * ) AS value,
- "未安装" as name
+ COUNT( * ) AS value,
+ "未安装" as name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -283,15 +289,15 @@
and alarmTime<=#{endTime}
</if>
- AND jtype = 0
- AND waringType IN ( "安装任务" ) UNION ALL
+ AND jtype = 0
+ AND waringType IN ( "安装任务" ) UNION ALL
SELECT
- COUNT( * ) AS value,
- "已安装" as name
+ COUNT( * ) AS value,
+ "已安装" as name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -300,19 +306,19 @@
and alarmTime<=#{endTime}
</if>
- AND jtype = 2
- AND waringType IN ( "安装任务" )
+ AND jtype = 2
+ AND waringType IN ( "安装任务" )
</select>
<select id="getChartDataAlarm" resultType="java.util.Map">
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "未处理" AS name
+ ,
+ "未处理" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -321,17 +327,17 @@
and alarmTime<=#{endTime}
</if>
- AND jtype = 0
- AND waringType IN ( "紧急求救" ) UNION ALL
+ AND jtype = 0
+ AND waringType IN ( "紧急求救" ) UNION ALL
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "处理中" AS name
+ ,
+ "处理中" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -340,18 +346,18 @@
and alarmTime<=#{endTime}
</if>
- AND jtype = 1
- AND waringType IN ( "紧急求救" )
- UNION ALL
+ AND jtype = 1
+ AND waringType IN ( "紧急求救" )
+ UNION ALL
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "已处理" AS name
+ ,
+ "已处理" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -360,19 +366,19 @@
and alarmTime<=#{endTime}
</if>
- AND jtype = 2
- AND waringType IN ( "紧急求救" )
+ AND jtype = 2
+ AND waringType IN ( "紧急求救" )
</select>
<select id="getChartDataAlarmBs" resultType="java.util.Map">
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "一般警情" AS name
+ ,
+ "一般警情" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -381,17 +387,17 @@
and alarmTime<=#{endTime}
</if>
- AND alarmbs = 0
- AND waringType IN ( "紧急求救" ) UNION ALL
+ AND alarmbs = 0
+ AND waringType IN ( "紧急求救" ) UNION ALL
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "误报警情" AS name
+ ,
+ "误报警情" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -400,18 +406,18 @@
and alarmTime<=#{endTime}
</if>
- AND alarmbs = 1
- AND waringType IN ( "紧急求救" )
- UNION ALL
+ AND alarmbs = 1
+ AND waringType IN ( "紧急求救" )
+ UNION ALL
SELECT
- COUNT( * ) AS
+ COUNT( * ) AS
value
- ,
- "严重警情" AS name
+ ,
+ "严重警情" AS name
FROM
- sys_alarm
+ sys_alarm
WHERE
- 1 = 1
+ 1 = 1
<if test="beginTime!=null and beginTime!=''">
and alarmTime>=#{beginTime}
@@ -420,8 +426,8 @@
and alarmTime<=#{endTime}
</if>
- AND alarmbs = 2
- AND waringType IN ( "紧急求救" )
+ AND alarmbs = 2
+ AND waringType IN ( "紧急求救" )
</select>
<select id="listAll" resultMap="alarmResultMap">
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index ee036e6..bf08144 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -462,6 +462,8 @@
equipmentService.saveImg(equipment);
}
+ equipmentService.updateRW(equipment);
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 35d3fe0..2267eb2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -43,6 +43,7 @@
void s(Equipment equipment);
void updateOne(Equipment equipment);
void saveImg(EquipmentVO equipment);
+ void updateRW(EquipmentVO equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index f838826..f29ec2a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -365,6 +365,11 @@
where id=#{id}
</update>
+ <update id="updateRW">
+ update sys_alarm SET jtype= 1
+ where id=#{rwid}
+ </update>
+
<update id="updataType">
update sys_equipment SET devicestate = 1 where id in (${arr})
</update>
@@ -454,7 +459,7 @@
</update>
<!--查询设备在线数量-->
- <select id="selectEqCz" resultType="Integer">
+ <select id="selectEqCz" resultType="Integer">
select COUNT(*) from sys_equipment where dtype=1
</select>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
index f5978f2..78cb51b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -55,6 +55,8 @@
void saveImg(EquipmentVO equipment);
+ void updateRW(EquipmentVO equipment);
+
void s(Equipment equipment);
void updataType(String arr);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index afa4666..6c59405 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -104,6 +104,11 @@
}
@Override
+ public void updateRW(EquipmentVO equipment) {
+ baseMapper.updateRW(equipment);
+ }
+
+ @Override
public void s(Equipment equipment) {
baseMapper.s(equipment);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index 3707015..c3f0e08 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -50,7 +50,7 @@
String call;
String paddress;
String deploymentTime;
-
+ String rwid;
--
Gitblit v1.9.3