From a19b0999a917b0d88aec32314f92578dd27bbfda Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Wed, 21 Mar 2018 22:11:28 +0800
Subject: [PATCH] =?UTF-8?q?micro-fast-IIDYB=20=E8=A7=92=E8=89=B2=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fast/upms/dao/UpmsPermissionMapper.java      |  3 +++
 .../fast/upms/mapper/UpmsPermissionMapper.xml    | 12 ++++++++----
 .../fast/upms/service/UpmsPermissionService.java | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java b/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java
index 21bcc54..2e7de8c 100644
--- a/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java
+++ b/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java
@@ -2,6 +2,7 @@ package com.micro.fast.upms.dao;
 
 import com.micro.fast.common.dao.SsmMapper;
 import com.micro.fast.upms.pojo.UpmsPermission;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,4 +35,6 @@ public interface UpmsPermissionMapper extends SsmMapper<UpmsPermission,Integer>
 
     List<UpmsPermission> selectByUserIdAndType(@Param("userId") Integer userId, @Param("pType") Integer pType, @Param("type") Integer type);
 
+    List<UpmsPermission> selectByRoleIdAndType(@Param("roleId") Integer roleId, @Param("type") Integer type);
+
 }
diff --git a/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/mapper/UpmsPermissionMapper.xml b/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/mapper/UpmsPermissionMapper.xml
index 9b548ba..d1e1bbd 100644
--- a/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/mapper/UpmsPermissionMapper.xml
+++ b/ms/upms/ms-upms-dao/src/main/java/com/micro/fast/upms/mapper/UpmsPermissionMapper.xml
@@ -199,6 +199,7 @@
       </if>
     </trim>
   </insert>
+
   <!--自定义的sql-->
   <select id="selectByCondition" resultType="com.micro.fast.upms.pojo.UpmsPermission">
     SELECT <include refid="Base_Column_List"/> FROM  upms_permission
@@ -221,11 +222,14 @@
     </where>
   </select>
   <select id="selectByUserIdAndType" resultType="com.micro.fast.upms.pojo.UpmsPermission">
-    SELECT <include refid="Base_Column_List"/> FROM upms_permission WHERE type = #{pType}
-    and id in (select permission_id from upms_user_permission where user_id = #{userId} and type =#{type} )
+  SELECT <include refid="Base_Column_List"/> FROM upms_permission WHERE type = #{pType}
+  and id in (select permission_id from upms_user_permission where user_id = #{userId} and type =#{type} )
   </select>
-
-    <delete id="deleteByPrimaryKeys">
+  <select id="selectByRoleIdAndType" resultType="com.micro.fast.upms.pojo.UpmsPermission">
+    SELECT <include refid="Base_Column_List"/> FROM upms_permission  WHERE type = #{type}
+    and id in (select permission_id from upms_role_permission where role_id = #{roleId})
+  </select>
+  <delete id="deleteByPrimaryKeys">
     DELETE FROM upms_permission WHERE id IN
     <foreach collection="list" item="item" open="(" separator="," close=")" >
       #{item}
diff --git a/ms/upms/ms-upms-service/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java b/ms/upms/ms-upms-service/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java
index ff9d931..4937102 100644
--- a/ms/upms/ms-upms-service/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java
+++ b/ms/upms/ms-upms-service/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java
@@ -2,10 +2,26 @@ package com.micro.fast.upms.service;
 
 import com.micro.fast.boot.starter.common.response.ServerResponse;
 import com.micro.fast.common.service.SsmService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
 * @author lsy
 */
 public interface UpmsPermissionService<T,ID> extends SsmService<T,ID>{
+
+  @Deprecated
   ServerResponse getPermissionsByUserIdandPTypeandType(Integer userId, Integer type, Integer pType);
+
+
+  /**
+   * 按照类型获取角色所拥有的权限
+   * @param type 权限类型
+   * @param roleId 角色id
+   * @return
+   */
+  ServerResponse getPermissionByRoleAndType(Integer type,Integer roleId);
+
+  /**
+   * 按照类型
+   */
 }
\ No newline at end of file