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/service/IAlarmService.java | 2 +-
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 | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 25 ++++++++++++++++++++++++-
4 files changed, 27 insertions(+), 4 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 018bbbc..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
@@ -692,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);
}
/**
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 fb80f99..75ddcc4 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
@@ -97,7 +97,7 @@
List<AlarmVO> getAlarm(@Param("alarm") AlarmVO alarm);
- List<Map<String, Object>> getAlarming(@Param("alarm") AlarmVO alarm);
+ List<AlarmVO> getAlarming(@Param("alarm") AlarmVO alarm);
boolean setAlarm(@Param("alarm") AlarmVO alarm);
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 5081805..918cc02 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
@@ -88,7 +88,7 @@
List<AlarmVO> getAlarm(AlarmVO alarmVO);
- List<Map<String, Object>> getAlarming(AlarmVO alarmVO);
+ List<AlarmVO> getAlarming(AlarmVO alarmVO);
boolean setAlarm(AlarmVO alarmVO);
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 ee6c4b9..b8453e0 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
@@ -183,7 +183,7 @@
}
@Override
- public List<Map<String, Object>> getAlarming(AlarmVO alarmVO) {
+ public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
return baseMapper.getAlarming(alarmVO);
}
--
Gitblit v1.9.3