From 3496e5390b866618efafd56159f36c91d0d22689 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 10 一月 2024 16:32:53 +0800
Subject: [PATCH] 2024-01-10 朱宝民 重构分水房3个接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java |  192 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 129 insertions(+), 63 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
index f0b9702..af117e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
@@ -1,49 +1,87 @@
 package com.dy.pipIrrBase.role;
 
 import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrBase.user.QueryVo;
 import com.dy.pipIrrGlobal.daoBa.BaRoleMapper;
-import com.dy.pipIrrGlobal.daoBa.BaRolePrivilegeMapper;
+import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaRole;
-import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
+import com.dy.pipIrrGlobal.voBa.VoRole;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-01-10 11:00
+ * @LastEditTime 2024-01-10 11:00
+ * @Description
+ */
 
 @Slf4j
 @Service
 public class RoleSv {
 
-    private BaRoleMapper dao;
-    private BaRolePrivilegeMapper rolePrivDao ;
+    //private BaRoleMapper baRoleMapper;
+    //private BaRolePrivilegeMapper rolePrivDao ;
+
+    //@Autowired
+    //private void setDao(BaRoleMapper dao){
+    //    this.dao = dao;
+    //}
+
+    //@Autowired
+    //private void setRolePrivDao(BaRolePrivilegeMapper dao){
+    //    this.rolePrivDao = dao;
+    //}
+    @Autowired
+    private BaRoleMapper baRoleMapper;
 
     @Autowired
-    private void setDao(BaRoleMapper dao){
-        this.dao = dao;
-    }
+    private BaRolePermissionsMapper baRolePermissionsMapper;
 
-    @Autowired
-    private void setRolePrivDao(BaRolePrivilegeMapper dao){
-        this.rolePrivDao = dao;
-    }
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢锛堣鑹茬紪鍙枫�佽鑹插悕绉帮級鑾峰彇瑙掕壊鍒楄〃
+     * 褰撹幏鍙栦竴鏉¤褰曟椂锛屼紶鍏oleId鍗冲彲
+     * @param queryVo
+     * @return
+     */
+    public QueryResultVo<List<VoRole>> getRoles(QueryVo queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
 
+        Long itemTotal = baRoleMapper.getRecordCount(params);
+
+        QueryResultVo<List<VoRole>> rsVo = new QueryResultVo<>() ;
+        Integer pageCurr = 0;
+        Integer pageSize = 10000;
+        rsVo.pageCurr = 1;
+        rsVo.pageSize = 10000;
+        if(queryVo.pageSize != null && queryVo.pageCurr != null) {
+            rsVo.pageSize = queryVo.pageSize ;
+            rsVo.pageCurr = queryVo.pageCurr;
+            pageSize = queryVo.pageSize ;
+            pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+        }
+        params.put("pageCurr", pageCurr);
+        params.put("pageSize", pageSize);
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = baRoleMapper.getRoles(params);
+        return rsVo ;
+    }
 
     /**
      * 寰楀埌鎵�鏈夎鑹�
      * @return 鎵�鏈夎鑹查泦鍚�
      */
-    @SuppressWarnings("unchecked")
-    public QueryResultVo<List<BaRole>> selectAll(QueryVo vo){
-        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
-        QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
-        rsVo.obj = this.dao.selectAll(params) ;
-        return rsVo ;
-    }
+    //public QueryResultVo<List<BaRole>> selectAll(){
+    //    QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
+    //    rsVo.obj = this.dao.selectAll() ;
+    //    return rsVo ;
+    //}
 
 
     /**
@@ -51,38 +89,47 @@
      * @param id 瑙掕壊ID
      * @return 瑙掕壊瀹炰綋
      */
-    public BaRole selectById(Long id){
-        return this.dao.selectById(id) ;
-    }
+    //public BaRole selectById(Long id){
+    //    return this.dao.selectById(id) ;
+    //}
 
 
     /**
      * 寰楀埌涓�涓敤鎴�
-     * @param vo 鏌ヨ鏉′欢鍊煎璞�
+     //* @param vo 鏌ヨ鏉′欢鍊煎璞�
      * @return 鐢ㄦ埛瀹炰綋
      */
     @SuppressWarnings("unchecked")
-    public QueryResultVo<List<BaRole>> selectSome(QueryVo vo){
-        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
-        Long itemTotal = this.dao.selectTotal(params) ;
+    //public QueryResultVo<List<BaRole>> selectSome(QueryVo vo){
+    //    Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+    //    Long itemTotal = this.dao.selectTotal(params) ;
+    //
+    //    QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
+    //    rsVo.pageSize = vo.pageSize ;
+    //    rsVo.pageCurr = vo.pageCurr ;
+    //    rsVo.calculateAndSet(itemTotal, params);
+    //    rsVo.obj = this.dao.selectSome(params) ;
+    //
+    //    return rsVo ;
+    //}
 
-        QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
-        rsVo.pageSize = vo.pageSize ;
-        rsVo.pageCurr = vo.pageCurr ;
-        rsVo.calculateAndSet(itemTotal, params);
-        rsVo.obj = this.dao.selectSome(params) ;
-
-        return rsVo ;
+    /**
+     * 娣诲姞瑙掕壊
+     * @param po 瑙掕壊瀹炰綋
+     * @return 瑙掕壊ID
+     */
+    public Long addRole(BaRole po){
+        baRoleMapper.insert(po);
+        return po.getId();
     }
 
     /**
-     * 淇濆瓨瀹炰綋
-     * @param po 瀹炰綋
-     * @return 褰卞搷璁板綍鏁伴噺
+     * 鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺锛屾坊鍔犺鑹插墠鍒ゆ柇鏄惁閲嶅悕
+     * @param roleName 瑙掕壊鍚嶇О
+     * @return 绗﹀悎鏉′欢璁板綍鏁�
      */
-    @Transactional
-    public int save(BaRole po){
-        return this.dao.insert(po) ;
+    public Integer getRecordCountByName(String roleName) {
+        return baRoleMapper.getRecordCountByName(roleName);
     }
 
     /**
@@ -90,10 +137,10 @@
      * @param po 瀹炰綋
      * @return 褰卞搷璁板綍鏁伴噺
      */
-    @Transactional
-    public int update(BaRole po){
-        return this.dao.updateByPrimaryKeySelective(po) ;
-    }
+    //@Transactional
+    //public int update(BaRole po){
+    //    return this.dao.updateByPrimaryKeySelective(po) ;
+    //}
 
     /**
      * 璁剧疆瑙掕壊鏉冮檺
@@ -101,32 +148,51 @@
      * @param priviIds 閫夋嫨鐨勬潈闄恑d闆嗗悎
      * @return 鎻掑叆瑙掕壊涓庢潈闄愬叧鑱旇褰曟暟閲�
      */
-    public int setRoles(Long roleId, Long[] priviIds){
-        this.rolePrivDao.deleteByRoleId(roleId) ;
-        int count = 0 ;
-        if(priviIds != null && priviIds.length > 0){
-            for(Long privId : priviIds){
-                count += this.rolePrivDao.insertSelective(new BaRolePrivilege(roleId, privId)) ;
-            }
-        }
-        return count ;
-    }
+    //public int setRoles(Long roleId, Long[] priviIds){
+    //    this.rolePrivDao.deleteByRoleId(roleId) ;
+    //    int count = 0 ;
+    //    if(priviIds != null && priviIds.length > 0){
+    //        for(Long privId : priviIds){
+    //            count += this.rolePrivDao.insertSelective(new BaRolePrivilege(roleId, privId)) ;
+    //        }
+    //    }
+    //    return count ;
+    //}
 
     /**
      * 淇濆瓨淇敼瀹炰綋
      * @param id 瀹炰綋ID
      * @return 褰卞搷璁板綍鏁伴噺
      */
-    @Transactional
-    public int delete(Long id){
-        //int count = this.dao.deleteLogicById(id) ;
-        //閫昏緫鍒犻櫎锛屾墍浠ヤ笉瀹為檯鍒犻櫎鍏跺叧鑱旂殑鏉冮檺
-        //if(count > 0){
-        //    this.rolePrivDao.deleteByRoleId(id) ;
-        //}
-        //return count ;
-        return this.dao.deleteLogicById(id) ;
+    //@Transactional
+    //public int delete(Long id){
+    //    //int count = this.dao.deleteLogicById(id) ;
+    //    //閫昏緫鍒犻櫎锛屾墍浠ヤ笉瀹為檯鍒犻櫎鍏跺叧鑱旂殑鏉冮檺
+    //    //if(count > 0){
+    //    //    this.rolePrivDao.deleteByRoleId(id) ;
+    //    //}
+    //    //return count ;
+    //    return this.dao.deleteLogicById(id) ;
+    //}
+
+    /**
+     * 娣诲姞鎺堟潈璁板綍
+     * @Auth 鏈卞疂姘�
+     * @param po
+     * @return
+     */
+    public Integer addPermissions(BaRolePermissions po) {
+        return baRolePermissionsMapper.insert(po);
     }
 
+    /**
+     * 渚濇嵁瑙掕壊缂栧彿鍒犻櫎鎺堟潈璁板綍
+     * @Auth 鏈卞疂姘�
+     * @param roleid
+     * @return
+     */
+    public Integer delPermissionsByRoleId(Long roleid) {
+        return baRolePermissionsMapper.delPermissionsByRoleId(roleid);
+    }
 
 }

--
Gitblit v1.8.0