From d86a4a8cd8cf271514e892e992290b4d533a24e5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 12 一月 2024 14:32:49 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java | 191 ++++++++++++++++++++++++++++++-----------------
1 files changed, 120 insertions(+), 71 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 073fe7d..be9c7e8 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,51 +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.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 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 setDao(BaRoleMapper dao){
+ // this.dao = dao;
+ //}
+ //@Autowired
+ //private void setRolePrivDao(BaRolePrivilegeMapper dao){
+ // this.rolePrivDao = dao;
+ //}
@Autowired
- private void setRolePrivDao(BaRolePrivilegeMapper dao){
- this.rolePrivDao = dao;
- }
+ private BaRoleMapper baRoleMapper;
@Autowired
private BaRolePermissionsMapper baRolePermissionsMapper;
/**
+ * 鏍规嵁鎸囧畾鏉′欢锛堣鑹茬紪鍙枫�佽鑹插悕绉帮級鑾峰彇瑙掕壊鍒楄〃
+ * 褰撹幏鍙栦竴鏉¤褰曟椂锛屼紶鍏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 鎵�鏈夎鑹查泦鍚�
*/
- public QueryResultVo<List<BaRole>> selectAll(){
- QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
- rsVo.obj = this.dao.selectAll() ;
- return rsVo ;
- }
+ //public QueryResultVo<List<BaRole>> selectAll(){
+ // QueryResultVo<List<BaRole>> rsVo = new QueryResultVo<>() ;
+ // rsVo.obj = this.dao.selectAll() ;
+ // return rsVo ;
+ //}
/**
@@ -53,54 +89,65 @@
* @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) ;
-
- 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 ;
- }
+ //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 ;
+ //}
/**
- * 淇濆瓨瀹炰綋
- * @param po 瀹炰綋
- * @return 褰卞搷璁板綍鏁伴噺
+ * 娣诲姞瑙掕壊
+ * @param po 瑙掕壊瀹炰綋
+ * @return 瑙掕壊ID
*/
-
- /**
- * 12鏈�20鏃� 鏈卞疂姘戜慨鏀硅繑鍥炲�硷紝娣诲姞瑙掕壊鍚庤繑鍥炰富閿�
- */
- @Transactional
- public Long save(BaRole po){
- //return this.dao.putin(po) ;
- this.dao.putin(po) ;
+ public Long addRole(BaRole po){
+ baRoleMapper.insert(po);
return po.getId();
}
/**
- * 淇濆瓨淇敼瀹炰綋
- * @param po 瀹炰綋
- * @return 褰卞搷璁板綍鏁伴噺
+ * 鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺锛屾坊鍔犺鑹插墠鍒ゆ柇鏄惁閲嶅悕
+ * @param roleName 瑙掕壊鍚嶇О
+ * @return 绗﹀悎鏉′欢璁板綍鏁�
*/
- @Transactional
- public int update(BaRole po){
- return this.dao.updateByPrimaryKeySelective(po) ;
+ public Integer getRecordCountByName(String roleName) {
+ return baRoleMapper.getRecordCountByName(roleName);
+ }
+
+ /**
+ * 淇敼瑙掕壊
+ * @param record
+ * @return
+ */
+ public int updateRole(BaRole record) {
+ return baRoleMapper.updateByPrimaryKeySelective(record);
+ }
+
+ /**
+ * 鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄
+ * @param roleId 瑙掕壊缂栧彿
+ * @return
+ */
+ public Integer deleteRoleById(Long roleId) {
+ return baRoleMapper.deleteRoleById(roleId);
}
/**
@@ -109,35 +156,36 @@
* @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
*/
@@ -147,6 +195,7 @@
/**
* 渚濇嵁瑙掕壊缂栧彿鍒犻櫎鎺堟潈璁板綍
+ * @Auth 鏈卞疂姘�
* @param roleid
* @return
*/
--
Gitblit v1.8.0