From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 一月 2024 17:24:02 +0800
Subject: [PATCH] 1、增加流浪控制器实体（和数据库表）； 2、修改部分通信协议实现； 3、增加部分通信协议实现； 4、增加通信中间件RTU上行数据处理任务树部分节点。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 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 b226a95..1a41c18 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,20 +1,22 @@
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.BaUserMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserRoleMapper;
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 org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
@Slf4j
@Service
@@ -65,18 +67,16 @@
/**
* 淇濆瓨瀹炰綋
- *
* @param po 瀹炰綋
* @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int save(BaUser po) {
- return this.dao.insert(po);
+ public int save(BaUser po){
+ return this.dao.putin(po) ;
}
/**
* 淇濆瓨淇敼瀹炰綋
- *
* @param po 瀹炰綋
* @return 褰卞搷璁板綍鏁伴噺
*/
@@ -111,7 +111,7 @@
count += this.urDao.insertSelective(new BaUserRole(userId, roleId));
}
}
- return count;
+ return count ;
}
/**
@@ -121,12 +121,12 @@
* @param roleIds 閫夋嫨鐨勮鑹瞚d闆嗗悎
* @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
*/
- public int setRoles(String userId, String[] roleIds) {
- this.urDao.deleteByUserId(Long.parseLong(userId));
+ 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(Long.parseLong(userId), Long.parseLong(roleId)));
+ count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
}
}
return count;
@@ -134,7 +134,6 @@
/**
* 淇濆瓨淇敼瀹炰綋
- *
* @param id 瀹炰綋ID
* @return 褰卞搷璁板綍鏁伴噺
*/
@@ -165,5 +164,45 @@
return val;
}
+ /**
+ * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鐢ㄦ埛淇℃伅鍒楄〃
+ */
+ public VoUserInfo getUserInfos(Long userId) {
+ VoUserInfo voUserInfo = new VoUserInfo();
+ String permission = "";
+ Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
+ if(map.size() > 0) {
+ voUserInfo.setUserId(userId);
+ voUserInfo.setUserName(map.get("userName").toString());
+ }
+ List list_roleIds = new ArrayList();
+ List list_roleNames = new ArrayList();
+ List list_permissions = new ArrayList();
+
+ 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"));
+ list_roleNames.add(job.getString("roleName"));
+
+ String permissions = Optional.ofNullable(job.getString("permissions")).orElse("");
+ if(permissions.length() > 0) {
+ permissions = permissions.substring(1, permissions.length() - 1);
+ permissions= permissions.replace(String.valueOf(" "), "");
+ permission = permission + permissions + ",";
+ }
+ }
+ voUserInfo.setRoleIds(list_roleIds);
+ voUserInfo.setRoleNames(list_roleNames);
+ permission = permission.substring(0, permission.length()-1);
+ list_permissions.add(permission);
+ voUserInfo.setPermissions(list_permissions);
+ }
+ return voUserInfo;
+ }
}
--
Gitblit v1.8.0