From 965e985ceb03e53dc884037a653e0a49fef020f9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 03 Apr 2023 09:47:48 +0800
Subject: [PATCH] 恢复被覆盖代码
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml | 9 ++++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java | 10 ++++++++++
6 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
index dcee8a0..d8a0290 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
@@ -145,7 +145,7 @@
*/
@ApiOperation(value = "根据项id查询组id", notes = "根据项id查询组id")
@GetMapping(value = "/getPatrolGroupByItemId")
- public R getPatrolGroupByItemId(String itemId) {
- return R.data(patrolGroupService.getPatrolGroupByItemId(itemId));
+ public R getPatrolGroupByItemId(String itemIds) {
+ return R.data(patrolGroupService.getPatrolGroupByItemId(itemIds));
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java
index 2eb84fb..5f53c77 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java
@@ -28,5 +28,5 @@
*/
List<TreeNode> getPatrolGroupItemTree();
- List<PatrolGroup> getPatrolGroupByItemId(String itemId);
+ List<PatrolGroup> getPatrolGroupByItemId(@Param("itemIds") String itemIds);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
index 1a1b1ed..2897637 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
@@ -65,6 +65,13 @@
FROM sm_patrol_group_item spgi where spgi.is_deleted = 0
</select>
<select id="getPatrolGroupByItemId" resultType="cn.gistack.sm.patrol.entity.PatrolGroup">
-
+ SELECT distinct b.ID,b.NAME FROM
+ (
+ SELECT ID,GROUP_ID FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN
+ <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ ) a ,BLADEX.SM_PATROL_GROUP b
+ WHERE b.is_deleted = 0 AND a.group_id = b.id
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java
index b2484c4..fb013bd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java
@@ -21,5 +21,5 @@
*/
Object getPatrolGroupTree();
- List<PatrolGroup> getPatrolGroupByItemId(String itemId);
+ List<PatrolGroup> getPatrolGroupByItemId(String itemIds);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
index 17f9bab..ef9ea70 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
@@ -46,7 +46,7 @@
}
@Override
- public List<PatrolGroup> getPatrolGroupByItemId(String itemId) {
- return baseMapper.getPatrolGroupByItemId(itemId);
+ public List<PatrolGroup> getPatrolGroupByItemId(String itemIds) {
+ return baseMapper.getPatrolGroupByItemId(itemIds);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
index 938b1ed..28d04c2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
@@ -168,4 +168,14 @@
return R.data(list);
}
+ /**
+ * 获取所有角色
+ */
+ @GetMapping("/all")
+ @ApiOperation(value = "获取所有角色")
+ public R<List<Role>> getAll() {
+ List<Role> list = roleService.list();
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3