From 5f3684985585bfd1b466dfe6e7cf7b03a17bceab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 05 Jun 2021 10:38:11 +0800
Subject: [PATCH] 1.新增行政区域--》医院--》分院--》保安 2.警情实体类新增字段
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java | 6 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 13 ++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java | 9 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml | 39 +++++++++++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java | 13 +++++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java | 6 +++
6 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index 16724a1..940a703 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -162,8 +162,17 @@
private String aaddress;
private String uids;
-// @TableLogic
-// private Integer isDeleted;
+ /**
+ * 接警的保安人员 id
+ */
+ @TableField("securityId")
+ private String securityId;
+
+ /**
+ * 通知的保安人员的 id 字符串，多个连接
+ */
+ @TableField("securityArr")
+ private String securityArr;
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
index 3be319f..5e5a2c5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -364,4 +364,17 @@
return R.data(tree);
}
+
+ /**
+ * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
+ * @return
+ */
+ @GetMapping("/getBigTree")
+ public R<List<catalogVO>> getBigTree() {
+ List<catalogVO> tree = catalogService.getBigTree();
+ return R.data(tree);
+ }
+
+
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
index 4216884..8ac996b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -44,4 +44,10 @@
void addCatalog(String name, String eqid,String pid);
List<catalogVO> tree();
+
+ /**
+ * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
+ * @return
+ */
+ List<catalogVO> getBigTree();
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index 2b558e4..1e7eb62 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -125,4 +125,43 @@
INSERT INTO sys_catalog (name,eqid,pId) VALUES (#{name},#{eqid},#{pid})
</insert>
+ <!--获取行政区-》客户-》部门机构 -》安保人员 树形数据-->
+ <select id="getBigTree" resultMap="treeNodeResultMap">
+ (
+ SELECT
+ id,
+ pId as parent_id,
+ name AS title,
+ id AS "value",
+ id AS "key"
+ FROM
+ sys_catalog
+ )
+
+ union all
+
+ (
+ select
+ bu.id,
+ sc.id as parent_id,
+ bu.real_name AS title,
+ bu.id AS "value",
+ bu.id AS "key"
+ from
+ jfpthpublicsecurity.blade_user bu
+ left join
+ sys_catalog sc
+ on
+ sc.dept_id = SUBSTRING(bu.dept_id,-19)
+ left join
+ jfpthpublicsecurity.blade_role br
+ on
+ bu.role_id = br.id
+ where
+ br.role_alias = '处警员'
+ and
+ bu.is_deleted=0
+ )
+ </select>
+
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
index b994453..aa162d5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
@@ -42,4 +42,10 @@
void addCatalog(String name, String eqid,String pid);
List<catalogVO> tree();
+
+ /**
+ * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
+ * @return
+ */
+ List<catalogVO> getBigTree();
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
index da08684..53e811f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
@@ -87,4 +87,13 @@
public void addCatalog(String name, String eqid,String pid) {
baseMapper.addCatalog(name, eqid,pid);
}
+
+ /**
+ * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
+ * @return
+ */
+ @Override
+ public List<catalogVO> getBigTree() {
+ return ForestNodeMerger.merge(baseMapper.getBigTree());
+ }
}
--
Gitblit v1.9.3