From 54370bca059e5e12e45f8e8de50b5b1d49c0cac1 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Jun 2021 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java | 2
src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java | 10 +++++
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 38 ++++++++++++++++--
src/main/java/org/springblade/modules/wj/service/IWjService.java | 6 +++
src/main/java/org/springblade/modules/wj/mapper/WjMapper.java | 6 +++
src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml | 4 ++
src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java | 44 +++++++++++++++++++++-
7 files changed, 102 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
index f40c026..94a268a 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
@@ -162,7 +162,7 @@
/**
* 查询当前保安需要处理和未处理以及处理完成的警情信息
- * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的警情和已接收的警情,已处理完成的 2：未接收的 3：处理完成的
+ * @param alarmVO 需包含保安人员id 2：未接收的 3：处理完成的 4.处理中
* @return
*/
List<AlarmVO> getAlarmList(@Param("alarm")AlarmVO alarmVO);
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index efc8c38..0867835 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -667,17 +667,37 @@
</sql>
<!--查询当前保安所有警情信息-->
+<!-- <select id="getAllAlarmList" resultMap="alarmResultMap">-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId = "" or securityId IS NULL-->
+<!-- AND securityArr LIKE concat('%',#{alarm.securityId},'%')-->
+<!-- order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- </select>-->
+
+ <!--查询当前保安所有警情信息-->
<select id="getAllAlarmList" resultMap="alarmResultMap">
- (select * from (
- <include refid="getAlarmListSqlParam"/>
- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
- )a)
- union
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId = "" or securityId IS NULL
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
+ )a)
+ union
+ (select * from (
+ <include refid="getAlarmListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
union
(select * from (
@@ -698,6 +718,10 @@
and securityId =#{alarm.securityId} and jtype = 2
order by alarmTime desc
</if>
+ <if test="alarm.status==4">
+ and securityId =#{alarm.securityId} and jtype = 1
+ order by alarmTime desc
+ </if>
</select>
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
@@ -715,6 +739,10 @@
union
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId} and jtype = 2)
+
+ union
+ (select ifnull(count(*),0) number from sys_alarm
+ where securityId =#{alarm.securityId} and jtype = 1)
</select>
<update id="setAlarm">
diff --git a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
index 993de0b..e9b8338 100644
--- a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
+++ b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
@@ -297,10 +297,8 @@
*/
@PostMapping("/saves")
public R saves(FeedbackVO feedback) {
-
//插入数据,并返回id
Integer id = feedbackService.insert(feedback);
- System.out.println("id = " + id);
if (feedback.getStatus()==0) {
SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
@@ -372,4 +370,46 @@
return R.success("新增成功");
}
+
+ /**
+ * 取证上报修改
+ * @param feedback 取证对象
+ */
+ @PostMapping("/updates")
+ public R updates(FeedbackVO feedback) {
+
+ //修改数据,并返回id
+ feedbackService.updateById(feedback);
+ if (feedback.getStatus()==1){
+ Wj wj = new Wj();
+ if (feedback.getSpaddress().length()>0) {
+ //先删除原有的数据
+ iWjService.deleteBySid(feedback.getId());
+ //获取视频地址
+ String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
+ for (String string2 : splitsp) {
+ wj.setSnumber(feedback.getSnumber());
+ wj.setAddress(string2);
+ wj.setSid(feedback.getId());
+ wj.setType(2);
+ iWjService.insertfeed(wj);
+ }
+ }
+ if (feedback.getTpaddress().length()>0) {
+ //先删除原有的数据
+ iWjService.deleteBySid(feedback.getId());
+ //图片
+ String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
+ for (String string3 : splittp) {
+ wj.setSnumber(feedback.getSnumber());
+ wj.setAddress(string3);
+ wj.setSid(feedback.getId());
+ wj.setType(1);
+ iWjService.insertfeed(wj);
+ }
+ }
+ }
+
+ return R.success("新增成功");
+ }
}
diff --git a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
index e396400..9ce1ce9 100644
--- a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
+++ b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.java
@@ -53,4 +53,10 @@
* @return
*/
List<String> selectResouces(@Param("wj") Wj wj);
+
+ /**
+ * 根据sid 删除数据
+ * @param id 上报id
+ */
+ void deleteBySid(@Param("id") Integer id);
}
diff --git a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
index cf7800c..b4df713 100644
--- a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
+++ b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
@@ -54,4 +54,8 @@
and type = #{wj.type}
</if>
</select>
+
+ <delete id="deleteBySid">
+ delete from sys_wj where sid=#{id}
+ </delete>
</mapper>
diff --git a/src/main/java/org/springblade/modules/wj/service/IWjService.java b/src/main/java/org/springblade/modules/wj/service/IWjService.java
index 720747f..174abbc 100644
--- a/src/main/java/org/springblade/modules/wj/service/IWjService.java
+++ b/src/main/java/org/springblade/modules/wj/service/IWjService.java
@@ -53,4 +53,10 @@
* @return
*/
List<String> selectResouces(Wj wj);
+
+ /**
+ * 根据sid 删除数据
+ * @param id 上报id
+ */
+ void deleteBySid(Integer id);
}
diff --git a/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java b/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
index ee038ee..20d69fb 100644
--- a/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
+++ b/src/main/java/org/springblade/modules/wj/service/impl/WjServiceImpl.java
@@ -81,4 +81,14 @@
public List<String> selectResouces(Wj wj) {
return baseMapper.selectResouces(wj);
}
+
+
+ /**
+ * 根据sid 删除数据
+ * @param id 上报id
+ */
+ @Override
+ public void deleteBySid(Integer id) {
+ baseMapper.deleteBySid(id);
+ }
}
--
Gitblit v1.9.3