From 7aa5bfad46a4496bed2df8109ee2dc1479f2a697 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 19 Apr 2021 17:45:22 +0800
Subject: [PATCH] 设备管理支持选择处警员接口调整
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java | 8 ++++
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java | 5 ++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 3 +
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 17 ++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java | 18 +++++++++
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 | 8 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java | 11 -----
8 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
index 9d9d198..c35ab2f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
@@ -118,5 +118,23 @@
@TableField("deptId")
private String deptId;
+ @TableField("onePhone")
+ private String onePhone;
+ @TableField("twoPhone")
+ private String twoPhone;
+ @TableField("ThreePhone")
+ private String ThreePhone;
+ @TableField("oneId")
+ private String oneId;
+ @TableField("twoId")
+ private String twoId;
+ @TableField("threeId")
+ private String threeId;
+ @TableField("oneContacts")
+ private String oneContacts;
+ @TableField("twoContacts")
+ private String twoContacts;
+ @TableField("ThreeContacts")
+ private String ThreeContacts;
}
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 0f99250..588eff6 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
@@ -38,17 +38,6 @@
private String beginTime;
private String endTime;
private String pid;
-
- private String oneContacts;
- private String twoContacts;
- private String ThreeContacts;
- private String onePhone;
- private String twoPhone;
- private String ThreePhone;
- private String oneId;
- private String twoId;
- private String threeId;
-
private String onlineStatus;
//设备是否处于报警状态
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 3758114..d5416f6 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
@@ -131,6 +131,17 @@
}
/**
+ * 获取处警员树形结构
+ */
+ @GetMapping("/Batrees")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> Batrees(String tenantId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.Batrees();
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
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 15ae267..8d846f9 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
@@ -57,6 +57,14 @@
List<DeptVO> trees();
/**
+ * 获取保安树形节点
+ *
+ * @param
+ * @return
+ */
+ List<DeptVO> Batrees();
+
+ /**
* 懒加载获取树形节点
*
* @param tenantId
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 0283fc8..9519faa 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
@@ -79,6 +79,23 @@
ORDER BY sort
</select>
+ <select id="Batrees" resultMap="treeNodeResultMap">
+ SELECT
+ bu.id,
+ 0 as parent_id,
+ bu.name AS title,
+ bu.id AS "value",
+ bu.id AS "key"
+ FROM
+ blade_user bu
+ LEFT JOIN blade_role br ON bu.role_id = br.id
+ WHERE
+ br.role_alias = '处警员'
+ AND bu.is_deleted = 0
+ ORDER BY
+ sort
+ </select>
+
<select id="lazyTree" resultMap="treeNodeResultMap" >
SELECT
dept.id,
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 918c143..09fbc9b 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
@@ -56,6 +56,14 @@
*/
List<DeptVO> trees();
+ /**
+ * 保安树形结构
+ *
+ * @param
+ * @return
+ */
+ List<DeptVO> Batrees();
+
/**
* 懒加载树形结构
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 98f969e..e5233d1 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
@@ -87,6 +87,11 @@
}
@Override
+ public List<DeptVO> Batrees() {
+ return ForestNodeMerger.merge(baseMapper.Batrees());
+ }
+
+ @Override
public List<DeptVO> lazyTree(String tenantId, Long parentId) {
if (AuthUtil.isAdministrator()) {
tenantId = StringPool.EMPTY;
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 71dbaea..7c7f9ae 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -100,6 +100,9 @@
<if test="user.account!=null and user.account != ''">
and s.account = #{user.account}
</if>
+ <if test="user.id!=null and user.id != ''">
+ and s.id = #{user.id}
+ </if>
<if test="user.realName!=null and user.realName != ''">
and s.real_name = #{user.realName}
</if>
--
Gitblit v1.9.3