From a11d427687249a455b68fc2b3ea94ddc7fb80b29 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 24 一月 2024 18:50:44 +0800
Subject: [PATCH] 1.查询开卡记录 2.修改取水口参数传入方式 3.完善取水口是否绑定控制器查询
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 28 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 8e5fbc6..afe4e62 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,68 @@
}
/**
- * 寰楀埌涓�涓敤鎴�
- *
- * @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<>() ;
+
+ 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 = 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.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 ;
}
/**
@@ -186,27 +231,37 @@
voUserInfo.setUserName(map.get("userName").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"));
- 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());
+ 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);
}
+ voUserInfo.setRoleIds(list_roleIds);
+ voUserInfo.setRoleNames(list_roleNames);
+ voUserInfo.setPermissions(array_permission);
+
return voUserInfo;
}
}
--
Gitblit v1.8.0