From 7f5d914898c9d05942705ce7d80c0d14a8174df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:14 +0800
Subject: [PATCH] 1、common模块优化代码； 2、通信中间件优化代码，队列遍历由递归调用改为while循环，原因是队列数据量大时递归调易产生栈溢出，HashTable多线程应用时仍有线程安全问题，改为HashMap+同步锁； 3、RTU模拟器和模拟器控制服务增加report命令
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
index c52b2eb..6af6bd3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
<!--@mbg.generated-->
- <!--@Table ba_priviledge-->
+ <!--@Table ba_privilege-->
<result column="id" jdbcType="BIGINT" property="id" />
<result column="num" jdbcType="INTEGER" property="num" />
<result column="name" jdbcType="VARCHAR" property="name" />
@@ -19,12 +19,12 @@
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from ba_priviledge
+ from ba_privilege
</select>
<select id="selectPrivilegeByUserId" resultType="Integer">
select p.num
- from ba_priviledge p
+ from ba_privilege p
inner join ba_role_privilege rp on p.id = rp.privilegeId
inner join ba_user_role ur on rp.roleId = ur.roleId
inner join ba_role r on ur.roleId = r.id
@@ -36,17 +36,16 @@
<select id="selectPrivilegeByRoleId" resultType="Integer">
select p.num
- from ba_priviledge p
+ from ba_privilege p
inner join ba_role_privilege rp on p.id = rp.privilegeId
<if test="roleId != null">
where rp.roleId = #{roleId, jdbcType=BIGINT}
</if>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
<!--@mbg.generated-->
- insert into ba_priviledge (id, num, name, type
- )
+ insert into ba_privilege (<include refid="Base_Column_List" />)
values (#{id,jdbcType=BIGINT},
#{num,jdbcType=INTEGER},
#{name,jdbcType=VARCHAR},
@@ -56,7 +55,7 @@
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
<!--@mbg.generated-->
- insert into ba_priviledge
+ insert into ba_privilege
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
--
Gitblit v1.8.0