From 04a3aa29899d113b8ed8dabf674b054e2b0e8c31 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 04 七月 2024 15:19:15 +0800
Subject: [PATCH] user模块 查全部接口返回userID变id
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 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 77591e9..064851b 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
@@ -54,23 +54,57 @@
}
/**
- * 寰楀埌涓�涓敤鎴�
- *
- * @param vo 鏌ヨ鏉′欢鍊煎璞�
- * @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 QueryResultVo<List<VoUserInfo>> selectSome(QueryVo queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- QueryResultVo<List<BaUser>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = vo.pageSize;
- rsVo.pageCurr = vo.pageCurr;
+ 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);
- return rsVo;
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃锛屽彇鐢ㄦ埛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.getId();
+
+ 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 ;
}
/**
@@ -79,8 +113,10 @@
* @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int save(BaUser po){
- return this.dao.putin(po) ;
+ public Long save(BaUser po){
+ //return this.dao.putin(po) ;
+ this.dao.putin(po) ;
+ return po.getId();
}
/**
@@ -130,14 +166,15 @@
* @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
*/
public int setRoles(Long userId, String[] roleIds) {
- this.urDao.deleteByUserId(userId);
+
int count = 0;
if (roleIds != null && roleIds.length > 0) {
+ this.urDao.deleteByUserId(userId);
for (String roleId : roleIds) {
count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
}
}
- return count;
+ return 1;
}
/**
@@ -181,10 +218,14 @@
VoUserInfo voUserInfo = new VoUserInfo();
JSONArray array_permission = new JSONArray();
Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
- if(map.size() > 0) {
- voUserInfo.setUserId(String.valueOf(userId));
- voUserInfo.setUserName(map.get("userName").toString());
+ if(map.size() == 0) {
+ return null;
}
+ voUserInfo.setId(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());
/**
* 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
--
Gitblit v1.8.0