From a60332d51fec0ae9f1afecc8c7a018c77e4ac101 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 27 二月 2024 10:03:29 +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/user/UserSv.java | 245 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 210 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 5a9b75e..9dce98e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -1,88 +1,263 @@
package com.dy.pipIrrBase.user;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
-import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
+import com.dy.pipIrrGlobal.daoBa.BaUserRoleMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
+import com.dy.pipIrrGlobal.pojoBa.BaUserRole;
+import com.dy.pipIrrGlobal.voBa.VoUserInfo;
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 java.util.List;
-import java.util.Map;
-
-import org.apache.dubbo.common.utils.PojoUtils ;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
@Slf4j
@Service
-//public class UserSv extends MPJBaseServiceImpl<BaUserMapper, BaUser> {
public class UserSv {
private BaUserMapper dao;
+ private BaUserRoleMapper urDao;
+ private BaRolePermissionsMapper baRolePermissionsMapper;
@Autowired
- private void setDao(BaUserMapper dao){
+ private void setDao(BaUserMapper dao) {
this.dao = dao;
}
- /**
- * 寰楀埌涓�涓墖鍖�
- * @param id 鐗囧尯ID
- * @return 鐗囧尯瀹炰綋
- */
- public BaUser selectById(Long id){
- return this.dao.selectById(id) ;
+ @Autowired
+ private void setDao(BaUserRoleMapper dao) {
+ this.urDao = dao;
+ }
+
+ @Autowired
+ private void setDao(BaRolePermissionsMapper dao) {
+ this.baRolePermissionsMapper = dao;
}
/**
- * 寰楀埌涓�涓墖鍖�
- * @param vo 鏌ヨ鏉′欢鍊煎璞�
- * @return 鐗囧尯瀹炰綋
+ * 寰楀埌涓�涓敤鎴�
+ *
+ * @param id 鐢ㄦ埛ID
+ * @return 鐢ㄦ埛瀹炰綋
*/
- @SuppressWarnings("unchecked")
- public QueryResultVo<List<BaUser>> selectSome(QueryVo vo){
- Map<String, Object> params = (Map<String, Object>)PojoUtils.generalize(vo) ;
- Long itemTotal = this.dao.selectTotal(params) ;
+ public BaUser selectById(Long id) {
+ return this.dao.selectById(id);
+ }
- QueryResultVo<List<BaUser>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = vo.pageSize ;
- rsVo.pageCurr = vo.pageCurr ;
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ */
+ public QueryResultVo<List<VoUserInfo>> selectSome(QueryVo queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = this.dao.getRecordCount(params);
+
+ QueryResultVo<List<VoUserInfo>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = this.dao.selectSome(params) ;
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃锛屽彇鐢ㄦ埛ID
+ * 鏍规嵁鐢ㄦ埛ID鑾峰彇roleId鍒楄〃锛屽苟娣诲姞鍒拌繑鍥炲璞′腑
+ * 鏍规嵁鐢ㄦ埛ID鑾峰彇roleName鍒楄〃锛屽苟娣诲姞鍒拌繑鍥炲璞′腑
+ */
+ List<VoUserInfo> list_users = Optional.ofNullable(this.dao.getUsers(params)).orElse(new ArrayList<>());
+ if(list_users.size() > 0) {
+ for(int i = 0; i < list_users.size(); i++) {
+ VoUserInfo voUserInfo = list_users.get(i);
+ String userId = voUserInfo.getUserId();
+
+ JSONArray array_roleIds = new JSONArray();
+ List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
+ for (int j = 0; j < list_roleIds.size(); j++) {
+ Map map_roleId = list_roleIds.get(j);
+ if(map_roleId != null) {
+ array_roleIds.add(map_roleId.get("roleId").toString());
+ }
+
+ }
+ List<Map<String, Object>> list_roleId = (List<Map<String, Object>>) JSON.parse(array_roleIds.toJSONString());
+
+ JSONArray array_roleNames = new JSONArray();
+ List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
+ for (int j = 0; j < list_roleNames.size(); j++) {
+ Map map_roleName = list_roleNames.get(j);
+ if(map_roleName != null) {
+ array_roleNames.add(map_roleName.get("roleName").toString());
+ }
+ }
+ List<Map<String, Object>> list_roleName = (List<Map<String, Object>>) JSON.parse(array_roleNames.toJSONString());
+
+ voUserInfo.setRoleIds(list_roleId);
+ voUserInfo.setRoleNames(list_roleName);
+ }
+ }
+ rsVo.obj = list_users;
return rsVo ;
}
/**
* 淇濆瓨瀹炰綋
* @param po 瀹炰綋
- * @return 鏁伴噺
+ * @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int save(BaUser po){
- return this.dao.insert(po) ;
+ public Long save(BaUser po){
+ //return this.dao.putin(po) ;
+ this.dao.putin(po) ;
+ return po.getUserId();
}
/**
* 淇濆瓨淇敼瀹炰綋
* @param po 瀹炰綋
- * @return 鏁伴噺
+ * @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int update(BaUser po){
- return this.dao.updateByPrimaryKeySelective(po) ;
+ public int update(BaUser po) {
+ return this.dao.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 淇敼瀵嗙爜
+ *
+ * @param id 鐢ㄦ埛ID
+ * @param password 鏂板瘑鐮�
+ * @return 褰卞搷璁板綍鏁伴噺
+ */
+ public int changePassword(Long id, String password) {
+ return this.dao.changePassword(id, password);
+ }
+
+ /**
+ * 璁剧疆鐢ㄦ埛瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛id
+ * @param roleIds 閫夋嫨鐨勮鑹瞚d闆嗗悎
+ * @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
+ */
+ public int setRoles(Long userId, Long[] roleIds) {
+ this.urDao.deleteByUserId(userId);
+ int count = 0;
+ if (roleIds != null && roleIds.length > 0) {
+ for (Long roleId : roleIds) {
+ count += this.urDao.insertSelective(new BaUserRole(userId, roleId));
+ }
+ }
+ return count ;
+ }
+
+ /**
+ * 璁剧疆鐢ㄦ埛瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛id
+ * @param roleIds 閫夋嫨鐨勮鑹瞚d闆嗗悎
+ * @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
+ */
+ public int setRoles(Long userId, String[] roleIds) {
+ this.urDao.deleteByUserId(userId);
+ int count = 0;
+ if (roleIds != null && roleIds.length > 0) {
+ for (String roleId : roleIds) {
+ count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
+ }
+ }
+ return count;
}
/**
* 淇濆瓨淇敼瀹炰綋
* @param id 瀹炰綋ID
- * @return 鏁伴噺
+ * @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int delete(Long id){
- return this.dao.deleteLogicById(id) ;
+ public int delete(Long id) {
+ return this.dao.deleteLogicById(id);
}
+
+ /**
+ * 鐢熸垚鎸囧畾浣嶆暟闅忔満鏁板瓧瀵嗙爜
+ *
+ * @param length 澶氶暱闅忔満鏁�
+ * @return 闅忔満鏁�
+ */
+ public String getStringRandom(int length) {
+ String val = "";
+ Random random = new Random();
+ for (int i = 0; i < length; i++) {
+ String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num";
+ if ("char".equalsIgnoreCase(charOrNum)) {
+ int temp = random.nextInt(2) % 2 == 0 ? 65 : 97;
+ val += (char) (random.nextInt(26) + temp);
+ } else if ("num".equalsIgnoreCase(charOrNum)) {
+ val += String.valueOf(random.nextInt(10));
+ }
+ }
+ return val;
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鐢ㄦ埛淇℃伅鍒楄〃
+ */
+ public VoUserInfo getUserInfos(Long userId) {
+ VoUserInfo voUserInfo = new VoUserInfo();
+ JSONArray array_permission = new JSONArray();
+ Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
+ if(map.size() == 0) {
+ return null;
+ }
+ voUserInfo.setUserId(String.valueOf(userId));
+ voUserInfo.setUserName(map.get("userName").toString());
+ voUserInfo.setPhone(map.get("phone").toString());
+ voUserInfo.setBlockId(map.get("blockId").toString());
+ voUserInfo.setBlockName(map.get("blockName").toString());
+
+ /**
+ * 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
+ * 濡傛灉褰撳墠鐢ㄦ埛鏄秴绾х鐞嗗憳锛屽垯涓婅堪涓夐」鍧囦负admin
+ */
+ List list_roleIds = new ArrayList();
+ List list_roleNames = new ArrayList();
+ if(voUserInfo.getUserName().equals("瓒呯骇绠＄悊鍛�")) {
+ array_permission.add("admin");
+ list_roleIds.add("admin");
+ list_roleNames.add("admin");
+ } else {
+ List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
+ if(list.size() > 0) {
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject job = array.getJSONObject(i);
+ list_roleIds.add(job.getLong("roleId").toString());
+ list_roleNames.add(job.getString("roleName"));
+
+ Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
+ BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
+ if(baRolePermissions != null) {
+ array_permission.addAll(baRolePermissions.getPermissions());
+ }
+ }
+ }
+ }
+ voUserInfo.setRoleIds(list_roleIds);
+ voUserInfo.setRoleNames(list_roleNames);
+ voUserInfo.setPermissions(array_permission);
+
+
+ return voUserInfo;
+ }
}
--
Gitblit v1.8.0