From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 161 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 146 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index d8c0283..12c8b3a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,31 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRoleMapper">
+<!-- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <!–@mbg.generated–>-->
+<!-- <!–@Table ba_role–>-->
+<!-- <id column="id" jdbcType="BIGINT" property="id" />-->
+<!-- <result column="name" jdbcType="VARCHAR" property="name" />-->
+<!-- <result column="operator" jdbcType="BIGINT" property="operator" />-->
+<!-- <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />-->
+<!-- <result column="deleted" jdbcType="TINYINT" property="deleted" />-->
+<!-- </resultMap>-->
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
<result column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
<result column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
</resultMap>
- <sql id="Base_Column_List">
- id, name, deleted
- </sql>
+<!-- <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <collection property="priviList" fetchType="eager" column="{roleId=id}" select="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />-->
+<!-- </resultMap>-->
<sql id="part_Column_List">
- id, name, deleted
+ id, name, operator, operate_dt, deleted
</sql>
-
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from ba_role
- </select>
<select id="selectByUserId" resultMap="partResultMap">
select <include refid="part_Column_List" />
@@ -37,15 +44,34 @@
</if>
</select>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, `name`, `operator`, operate_dt, deleted
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ba_role
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from ba_role
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
- insert into ba_role (id, `name`, deleted)
- values (#{id,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR},
- #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- )
+ <!--@mbg.generated-->
+ insert into ba_role (id, `name`, `operator`,
+ operate_dt, deleted)
+ values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operateDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
insert into ba_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -53,6 +79,12 @@
</if>
<if test="name != null">
`name`,
+ </if>
+ <if test="operator != null">
+ `operator`,
+ </if>
+ <if test="operateDt != null">
+ operate_dt,
</if>
<if test="deleted != null">
deleted,
@@ -65,9 +97,108 @@
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
+ <if test="operator != null">
+ #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
+ </if>
<if test="deleted != null">
#{deleted,jdbcType=TINYINT},
</if>
</trim>
</insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
+ update ba_role
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="operator != null">
+ `operator` = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
+ update ba_role
+ set `name` = #{name,jdbcType=VARCHAR},
+ `operator` = #{operator,jdbcType=BIGINT},
+ operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+ deleted = #{deleted,jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!--鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺锛屾坊鍔犺鑹叉椂鍒ゆ柇鏄惁閲嶅悕-->
+ <select id="getRecordCountByName" resultType="java.lang.Integer">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ba_role
+ WHERE name = #{roleName}
+ </select>
+
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�–>-->
+<!-- <select id="getRecordCount" resultType="java.lang.Long">-->
+<!-- SELECT-->
+<!-- COUNT(*) AS recordCount-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
+
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
+
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- </select>-->
+
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍–>-->
+<!-- <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">-->
+<!-- SELECT-->
+<!-- (@i:=@i+1) AS id,-->
+<!-- t.* FROM-->
+<!-- (-->
+<!-- SELECT-->
+<!-- role.id AS roleId,-->
+<!-- role.name AS roleName,-->
+<!-- per.permissions,-->
+<!-- (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,-->
+<!-- role.operate_dt AS operateDt-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
+
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
+
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY role.operate_dt DESC-->
+<!-- <if test="pageCurr != null and pageSize != null">-->
+<!-- LIMIT ${pageCurr}, ${pageSize}-->
+<!-- </if>-->
+<!-- ) t-->
+<!-- , (SELECT @i:=0) AS itable-->
+<!-- </select>-->
+
+ <!--鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄-->
+ <update id="deleteRoleById">
+ UPDATE ba_role SET deleted = 1 WHERE id = ${roleId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0