From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml index 3b273b9..a07541e 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml @@ -269,7 +269,7 @@ SELECT COUNT(*) AS recordCount FROM ba_user user - INNER JOIN ba_user_role usro ON usro.userId = user.id +<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id--> <where> AND user.supperAdmin != 1 AND user.deleted = 0 @@ -291,7 +291,7 @@ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃--> <select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo"> SELECT - CAST(id AS char) AS userId, + CAST(id AS char) AS id, phone, name AS userName, disabled AS stateId, @@ -302,7 +302,7 @@ CAST(blockId AS char) AS blockId, (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName FROM ba_user user - INNER JOIN ba_user_role usro ON usro.userId = user.id +<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id--> <where> AND user.supperAdmin != 1 AND user.deleted = 0 @@ -343,4 +343,12 @@ WHERE userId = ${userId} </select> + + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> + <!--@mbg.generated--> + select + <include refid="Base_Column_List" /> + from ba_user + where id = #{id,jdbcType=BIGINT} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0