From 79570c017c73b1d3ca2d701348257275d9587875 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 26 十二月 2023 11:39:03 +0800
Subject: [PATCH] 2023-12-26 朱宝民 县镇村获取接口、用水方式获取接口、农户增加虚拟卡号和用水方式

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 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 4d8e31c..073fe7d 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
@@ -3,8 +3,11 @@
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrBase.user.QueryVo;
 import com.dy.pipIrrGlobal.daoBa.BaRoleMapper;
+import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
 import com.dy.pipIrrGlobal.daoBa.BaRolePrivilegeMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaRole;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,16 +34,16 @@
         this.rolePrivDao = dao;
     }
 
+    @Autowired
+    private BaRolePermissionsMapper baRolePermissionsMapper;
 
     /**
      * 寰楀埌鎵�鏈夎鑹�
      * @return 鎵�鏈夎鑹查泦鍚�
      */
-    @SuppressWarnings("unchecked")
-    public QueryResultVo<List<BaRole>> selectAll(QueryVo vo){
-        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+    public QueryResultVo<List<BaRole>> selectAll(){
         QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
-        rsVo.obj = this.dao.selectAll(params) ;
+        rsVo.obj = this.dao.selectAll() ;
         return rsVo ;
     }
 
@@ -79,9 +82,15 @@
      * @param po 瀹炰綋
      * @return 褰卞搷璁板綍鏁伴噺
      */
+
+    /**
+     * 12鏈�20鏃� 鏈卞疂姘戜慨鏀硅繑鍥炲�硷紝娣诲姞瑙掕壊鍚庤繑鍥炰富閿�
+     */
     @Transactional
-    public int save(BaRole po){
-        return this.dao.insert(po) ;
+    public Long save(BaRole po){
+        //return this.dao.putin(po) ;
+        this.dao.putin(po) ;
+        return po.getId();
     }
 
     /**
@@ -95,18 +104,54 @@
     }
 
     /**
+     * 璁剧疆瑙掕壊鏉冮檺
+     * @param roleId 瑙掕壊id
+     * @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 ;
+    }
+
+    /**
      * 淇濆瓨淇敼瀹炰綋
      * @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 ;
+        //int count = this.dao.deleteLogicById(id) ;
+        //閫昏緫鍒犻櫎锛屾墍浠ヤ笉瀹為檯鍒犻櫎鍏跺叧鑱旂殑鏉冮檺
+        //if(count > 0){
+        //    this.rolePrivDao.deleteByRoleId(id) ;
+        //}
+        //return count ;
+        return this.dao.deleteLogicById(id) ;
     }
 
+    /**
+     * 娣诲姞鎺堟潈璁板綍
+     * @param po
+     * @return
+     */
+    public Integer addPermissions(BaRolePermissions po) {
+        return baRolePermissionsMapper.insert(po);
+    }
+
+    /**
+     * 渚濇嵁瑙掕壊缂栧彿鍒犻櫎鎺堟潈璁板綍
+     * @param roleid
+     * @return
+     */
+    public Integer delPermissionsByRoleId(Long roleid) {
+        return baRolePermissionsMapper.delPermissionsByRoleId(roleid);
+    }
 
 }

--
Gitblit v1.8.0