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 | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 31 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 ed562ae..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 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
@@ -24,41 +26,43 @@
private BaUserRoleMapper urDao;
@Autowired
- private void setDao(BaUserMapper dao){
+ private void setDao(BaUserMapper dao) {
this.dao = dao;
}
@Autowired
- private void setDao(BaUserRoleMapper dao){
+ private void setDao(BaUserRoleMapper dao) {
this.urDao = dao;
}
/**
* 寰楀埌涓�涓敤鎴�
+ *
* @param id 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀹炰綋
*/
- public BaUser selectById(Long id){
- return this.dao.selectById(id) ;
+ public BaUser selectById(Long id) {
+ return this.dao.selectById(id);
}
/**
* 寰楀埌涓�涓敤鎴�
+ *
* @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<BaUser>> selectSome(QueryVo vo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
+ Long itemTotal = this.dao.selectTotal(params);
- QueryResultVo<List<BaUser>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = vo.pageSize ;
- rsVo.pageCurr = vo.pageCurr ;
+ QueryResultVo<List<BaUser>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = vo.pageSize;
+ rsVo.pageCurr = vo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = this.dao.selectSome(params) ;
+ rsVo.obj = this.dao.selectSome(params);
- return rsVo ;
+ return rsVo;
}
/**
@@ -77,35 +81,55 @@
* @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 id 鐢ㄦ埛ID
* @param password 鏂板瘑鐮�
* @return 褰卞搷璁板綍鏁伴噺
*/
- public int changePassword(Long id, String password){
- return this.dao.changePassword(id, password) ;
+ public int changePassword(Long id, String password) {
+ return this.dao.changePassword(id, password);
}
/**
* 璁剧疆鐢ㄦ埛瑙掕壊
- * @param userId 鐢ㄦ埛id
+ *
+ * @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)) ;
+ 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;
}
/**
@@ -114,8 +138,71 @@
* @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();
+ 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