From 9bbb34239f62fd6e40d7b507672fd68b5289c1ba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 00:55:46 +0800
Subject: [PATCH] 设备列表接口修改，新增部门信息接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
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 f12bb88..8422b26 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
@@ -21,6 +21,7 @@
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.omg.PortableInterceptor.INACTIVE;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -31,6 +32,7 @@
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.deploy.service.IDeployService;
import org.springblade.jfpt.equipment.entity.Equipment;
+import org.springblade.jfpt.equipment.feign.DeptFeignApi;
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
@@ -46,7 +48,7 @@
import java.util.*;
/**
- * 控制器
+ * 设备管理控制器
*
* @author BladeX
* @since 2020-07-01
@@ -60,6 +62,8 @@
private final IEquipmentService equipmentService;
private final IDeployService iDeployService;
private final org.springblade.jfpt.catalog.service.catalogService catalogService;
+
+ private final DeptFeignApi deptFeignApi;
/**
* 详情
@@ -208,10 +212,27 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
-
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+ //获取设备数据信息
IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid, dxtype);
-
+ //遍历数据
for (int j = 0; j < page.getRecords().size(); j++) {
+ if (null!=page.getRecords().get(j).getDeptId()){
+ String[] split = page.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(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.getRecords().get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+
String expireTime = page.getRecords().get(j).getExpireTime();
//1.获取当前时间
Date dd = new Date();
--
Gitblit v1.9.3