From 2deeeb8b1e671cfeb421f973c644ffc2d3182841 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 26 Jul 2021 15:36:00 +0800
Subject: [PATCH] 修改意见问题修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 139 insertions(+), 3 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..75b3105 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;
@@ -72,6 +75,10 @@
private ParcelService parcelService;
+ private final DeptFeignApi deptFeignApi;
+
+ private IEquipmentService iEquipmentService;
+
/**
* 详情
*/
@@ -102,8 +109,52 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入alarm")
public R<IPage<AlarmVO>> page(AlarmVO alarm, Query query) {
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
IPage<AlarmVO> pages = alarmService.selectAlarmPage(Condition.getPage(query), alarm);
+
+ //遍历数据
+ for (int j = 0; j < pages.getRecords().size(); j++) {
+ if (null!=pages.getRecords().get(j).getDeptId()){
+ String[] split = pages.getRecords().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(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ pages.getRecords().get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
return R.data(pages);
+ }
+
+ /**
+ * 自定义分页
+ */
+ @GetMapping("/page_az")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<IPage<AlarmVO>> page_az(AlarmVO alarm, Query query) {
+ IPage<AlarmVO> pages = alarmService.selectazPage(Condition.getPage(query), alarm);
+ return R.data(pages);
+ }
+
+ /**
+ * 安装任务图表接口
+ */
+ @GetMapping("/getChartData")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<List> getChartData(AlarmVO alarm) {
+ List<Map<String,Object>> list = alarmService.getChartData(alarm);
+ return R.data(list);
}
/**
@@ -458,6 +509,29 @@
String time = df.format(new Date());// new Date()为获取当前系统时间
String pastDate = getPastDate(7);
List<AlarmVO> alarmVOS = alarmService.selectListSe(pastDate, time);
+
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ //遍历数据
+ for (int j = 0; j < alarmVOS.size(); j++) {
+ if (null!=alarmVOS.get(j).getDeptId()){
+ String[] split = alarmVOS.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(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ alarmVOS.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
return R.data(alarmVOS);
}
@@ -470,9 +544,26 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
+
+ String bs = null;
+ if (operation.getZc() !=null && operation.getZc() !=""){
+ if (operation.getZc().equals("派送保安")){
+ bs = "0";
+ }else if(operation.getZc().equals("办结")){
+ bs = "1";
+ }else if(operation.getZc().equals("推送110")){
+ bs = "2";
+ }
+ }
+
+ alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr(),bs);
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 +735,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 +771,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