From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
index d67b381..073fe7d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
@@ -3,8 +3,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrBase.user.QueryVo;
import com.dy.pipIrrGlobal.daoBa.BaRoleMapper;
+import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
import com.dy.pipIrrGlobal.daoBa.BaRolePrivilegeMapper;
import com.dy.pipIrrGlobal.pojoBa.BaRole;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -32,6 +34,8 @@
this.rolePrivDao = dao;
}
+ @Autowired
+ private BaRolePermissionsMapper baRolePermissionsMapper;
/**
* 寰楀埌鎵�鏈夎鑹�
@@ -78,9 +82,15 @@
* @param po 瀹炰綋
* @return 褰卞搷璁板綍鏁伴噺
*/
+
+ /**
+ * 12鏈�20鏃� 鏈卞疂姘戜慨鏀硅繑鍥炲�硷紝娣诲姞瑙掕壊鍚庤繑鍥炰富閿�
+ */
@Transactional
- public int save(BaRole po){
- return this.dao.putin(po) ;
+ public Long save(BaRole po){
+ //return this.dao.putin(po) ;
+ this.dao.putin(po) ;
+ return po.getId();
}
/**
@@ -126,5 +136,22 @@
return this.dao.deleteLogicById(id) ;
}
+ /**
+ * 娣诲姞鎺堟潈璁板綍
+ * @param po
+ * @return
+ */
+ public Integer addPermissions(BaRolePermissions po) {
+ return baRolePermissionsMapper.insert(po);
+ }
+
+ /**
+ * 渚濇嵁瑙掕壊缂栧彿鍒犻櫎鎺堟潈璁板綍
+ * @param roleid
+ * @return
+ */
+ public Integer delPermissionsByRoleId(Long roleid) {
+ return baRolePermissionsMapper.delPermissionsByRoleId(roleid);
+ }
}
--
Gitblit v1.8.0