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-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 3 +
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java | 7 +++
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java | 9 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/DeptFeignApi.java | 20 ++++++++++
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 5 ++
blade-common/src/main/java/org/springblade/common/vo/DeptVo.java | 15 +++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 27 ++++++++++++-
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java | 11 +++++
blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java | 7 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java | 6 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java | 2
11 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/vo/DeptVo.java b/blade-common/src/main/java/org/springblade/common/vo/DeptVo.java
new file mode 100644
index 0000000..83dd00e
--- /dev/null
+++ b/blade-common/src/main/java/org/springblade/common/vo/DeptVo.java
@@ -0,0 +1,15 @@
+package org.springblade.common.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部门
+ */
+@Data
+public class DeptVo implements Serializable {
+
+ private Long id;
+ private String deptName;
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
index f6a4e85..4c916ee 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
@@ -38,7 +38,7 @@
import javax.validation.constraints.NotNull;
/**
- * 控制器
+ * 电子围栏控制器
*
* @author BladeX
* @since 2020-07-15
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();
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/DeptFeignApi.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/DeptFeignApi.java
new file mode 100644
index 0000000..b6b7a2e
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/DeptFeignApi.java
@@ -0,0 +1,20 @@
+package org.springblade.jfpt.equipment.feign;
+
+
+import org.springblade.common.entity.ReportReturnData;
+import org.springblade.common.vo.DeptVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(value = "blade-system")
+public interface DeptFeignApi {
+
+
+ @GetMapping("/dept/selDeptList")
+ List<DeptVo> selDeptList();
+
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index f6dfea9..3707015 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -39,10 +39,13 @@
private String endTime;
private String pid;
private String onlineStatus;
+ /**
+ * 部门名称集
+ */
+ private String deptName;
//设备是否处于报警状态
String jtype;
-
String contacts;
String call;
String paddress;
@@ -50,4 +53,5 @@
+
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index d5416f6..ad81681 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -20,6 +20,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.ApiLog;
@@ -126,6 +127,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
public R<List<DeptVO>> trees(String tenantId, BladeUser bladeUser) {
+ System.out.println("tenantId = " + tenantId);
List<DeptVO> tree = deptService.trees();
return R.data(tree);
}
@@ -197,4 +199,13 @@
public R selectInfo() {
return R.data(deptService.selectInfo());
}
+
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ @GetMapping("/selDeptList")
+ public List<DeptVo> selDeptList() {
+ return deptService.selDeptList();
+ }
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
index 8d846f9..7341310 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
@@ -17,6 +17,7 @@
package org.springblade.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.common.vo.DeptVo;
import org.springblade.system.entity.Dept;
import org.springblade.system.vo.DeptVO;
@@ -83,4 +84,10 @@
*/
List<String> getDeptNames(Long[] ids);
List selectInfo();
+
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ List<DeptVo> selDeptList();
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index 9519faa..810b31b 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
@@ -161,4 +161,9 @@
select id as deptid,dept_name from blade_dept where is_deleted=0
</select>
+ <!--查询所有的部门信息-->
+ <select id="selDeptList" resultType="org.springblade.common.vo.DeptVo">
+ select id ,dept_name deptName from blade_dept where is_deleted=0
+ </select>
+
</mapper>
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
index 09fbc9b..207e915 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
@@ -17,6 +17,7 @@
package org.springblade.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.common.vo.DeptVo;
import org.springblade.system.entity.Dept;
import org.springblade.system.vo.DeptVO;
@@ -117,4 +118,10 @@
*/
boolean submit(Dept dept);
List selectInfo();
+
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ List<DeptVo> selDeptList();
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index e5233d1..e68a7c7 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
@@ -159,4 +160,12 @@
return baseMapper.selectInfo();
}
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ @Override
+ public List<DeptVo> selDeptList() {
+ return baseMapper.selDeptList();
+ }
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 73d0910..892455b 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -143,7 +143,8 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<User> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ return page.setRecords(users);
}
@Override
--
Gitblit v1.9.3