From 9c3a3ac2f9ba5865098b5f19b9b0fedfc409f3d7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 28 May 2021 15:33:11 +0800
Subject: [PATCH] 视频录制问题修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 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 08555c3..04facd9 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
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -35,6 +36,8 @@
import org.springblade.jfpt.alarm.wrapper.AlarmWrapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.common.entity.AlarmExcel;
+import org.springblade.jfpt.equipment.feign.DeptFeignApi;
+import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.operation.entity.Operation;
import org.springblade.jfpt.operation.service.IOperationService;
@@ -71,6 +74,10 @@
private IhealthcodeService ihealthcodeService;
private ParcelService parcelService;
+
+ private final DeptFeignApi deptFeignApi;
+
+ private IEquipmentService iEquipmentService;
/**
* 详情
@@ -473,6 +480,11 @@
alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
alarmService.updatePoliceStatus(operation.getRid(),"0");
operationService.save(operation);
+ //如果警情处理完成，则修改设备状态为正常
+ if (null!=operation.getJtype() && operation.getJtype().equals("2")){
+ String state ="处理完成";
+ iEquipmentService.updateExstate(state,null,operation.getDeviceNumber());
+ }
return R.success("修改成功");
}
@@ -644,7 +656,29 @@
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.getAlarm(alarmVO));
+
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ List<AlarmVO> page = alarmService.getAlarm(alarmVO);
+ for (int j = 0; j < page.size(); j++) {
+ if (null!=page.get(j).getDeptId()){
+ String[] split = page.get(j).getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+ return R.data(page);
}
/**
@@ -658,7 +692,30 @@
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.getAlarming(alarmVO));
+
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ List<AlarmVO> page = alarmService.getAlarming(alarmVO);
+ for (int j = 0; j < page.size(); j++) {
+ if (null!=page.get(j).getDeptId()){
+ String[] split = page.get(j).getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
+ return R.data(page);
}
/**
--
Gitblit v1.9.3