From 5fe2a582e57d9ce35dbfb32c6e1c2227f35268f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 七月 2025 14:23:05 +0800
Subject: [PATCH] 修改资源相关的操作

---
 se-system/src/main/resources/mapper/sys/ResMapper.xml |  111 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/se-system/src/main/resources/mapper/sys/ResMapper.xml b/se-system/src/main/resources/mapper/sys/ResMapper.xml
index ba4b6e8..8b69026 100644
--- a/se-system/src/main/resources/mapper/sys/ResMapper.xml
+++ b/se-system/src/main/resources/mapper/sys/ResMapper.xml
@@ -4,21 +4,63 @@
     <select id="selectCount" resultType="java.lang.Integer">
         select count(*) from lf.sys_res
         <where>
+            1 = 1
             <if test="name != null">
-                upper(name) like #{name}
+                and (upper(cn_name) like #{name} or upper(en_name) like #{name})
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="category != null">
+                and category = #{category}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="data != null">
+                and data = #{data}
             </if>
         </where>
     </select>
 
     <select id="selectByPage" resultType="com.terra.system.entity.sys.ResEntity">
-        select a.*,fn_rec_query(a.depid, 'dep') depName,fn_rec_query(a.dirid, 'dir') dirName,fn_uname(a.create_user) createName,fn_uname(a.update_user) updateName from lf.sys_res a
+        select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName from lf.sys_res a
         <where>
+            1 = 1
             <if test="name != null">
-                upper(a.name) like #{name}
+                and (upper(cn_name) like #{name} or upper(en_name) like #{name})
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="category != null">
+                and category = #{category}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="data != null">
+                and data = #{data}
             </if>
         </where>
         order by a.id desc
-        limit #{limit} offset #{offset}
+        limit #{limit} offset #{offset};
+    </select>
+
+    <select id="selectAll" resultType="com.terra.system.entity.sys.ResEntity">
+        select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName
+        from lf.sys_res a
+        order by id desc;
+    </select>
+
+    <select id="selectById" resultType="com.terra.system.entity.sys.ResEntity">
+        select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName
+        from lf.sys_res a
+        where id = #{id};
+    </select>
+
+    <select id="selectByPubid" resultType="com.terra.system.entity.sys.ResEntity">
+        select * from lf.sys_res where pubid = #{pubid} limit 1;
     </select>
 
     <select id="selectCountForRole" resultType="java.lang.Integer">
@@ -45,48 +87,47 @@
         limit #{limit} offset #{offset}
     </select>
 
-    <select id="selectResAll" resultType="com.terra.system.entity.sys.ResEntity">
-        select * from lf.sys_res order by id desc
-    </select>
+    <insert id="insert" parameterType="com.terra.system.entity.sys.ResEntity">
+        <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
+            select currval('lf.sys_res_id_seq'::regclass) as id
+        </selectKey>
 
-    <select id="selectRes" resultType="com.terra.system.entity.sys.ResEntity">
-        select * from lf.sys_res where id = #{id}
-    </select>
-
-    <insert id="insertRes" parameterType="com.terra.system.entity.data.DictEntity">
-       insert into lf.sys_res
-       (name,server,source,depid,dirid,code,descr,img,create_user,create_time,bak)
-       values
-       (#{name},#{server},#{source},#{depid},#{dirid},#{code},#{descr},#{img},#{createUser},now(),#{bak});
+        insert into lf.sys_res
+        (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args,pubid)
+        values
+        (#{cnName},#{enName},#{status},#{type},#{data},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args},#{pubid})
     </insert>
 
-    <insert id="insertRess">
-       insert into lf.sys_res
-        (name,server,source,depid,dirid,code,descr,img,create_user,create_time,bak)
-       values
+    <insert id="inserts">
+        insert into lf.sys_res
+        (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args,pubid)
+        values
         <foreach collection="list" item="item" index="index" separator=",">
-            #{item.name},#{item.server},#{item.source},#{item.depid},#{item.dirid},#{item.code},#{item.descr},#{item.img},#{item.createUser},now(),#{item.bak})
+            (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.data},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args},#{item.pubid})
         </foreach>
     </insert>
 
-    <delete id="deleteRes">
-        delete from lf.sys_role_res where resid = #{id};
+    <delete id="delete">
+        delete from lf.sys_layer where resid = #{id};
         delete from lf.sys_res where id = #{id};
     </delete>
 
-    <delete id="deleteRess">
-        delete from lf.sys_role_res where resid in
-        <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>;
-        delete from lf.sys_res where id in
-        <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>;
+    <delete id="deletes">
+        delete from lf.sys_layer where resid in (${ids});
+        delete from lf.sys_res where id in (${ids});
     </delete>
 
-    <update id="updateRes">
-    update lf.sys_res set name=#{name},server=#{server},source=#{source},depid=#{depid},dirid=#{dirid},code=#{code},descr=#{descr},img=#{img},
-    update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
+    <update id="update">
+        update lf.sys_res
+        set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},data=#{data},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args},pubid=#{pubid}
+        where id=#{id}
+    </update>
+
+    <update id="updates">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update lf.sys_res
+            set cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},data=#{item.data},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args},pubid=#{item.pubid}
+            where id = #{item.id}
+        </foreach>
     </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3