增加了悬赏,标签查看,评论页面,标签上传后端有问题,评论还没跟后端连,优化了一些小界面
Change-Id: I44f5ef2eb0a8ebd91a4b3b3b446f897bea41435f
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c86c6b3..cb1a87c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
profile: D:/ruoyi/uploadPath
# 获取ip地址开关
- addressEnabled: true
+ addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
diff --git a/ruoyi-admin/src/main/resources/mapper/system/BtTorrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BtTorrentMapper.xml
index afb29d7..e19128a 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/BtTorrentMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/BtTorrentMapper.xml
@@ -24,7 +24,9 @@
<select id="selectBtTorrentList" parameterType="BtTorrent" resultMap="BtTorrentResult">
<include refid="selectBtTorrentVo"/>
- <where>
+ <where>
+ <if test="torrentId != null and torrentId != ''"> and torrent_id = #{torrentId}</if>
+
<if test="infoHash != null and infoHash != ''"> and info_hash = #{infoHash}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="length != null "> and length = #{length}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml
new file mode 100644
index 0000000..bae8185
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/system/RewardTasksMapper.xml
@@ -0,0 +1,93 @@
+<?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.ruoyi.reward.mapper.RewardTasksMapper">
+
+ <resultMap type="RewardTasks" id="RewardTasksResult">
+ <result property="rewardId" column="reward_id" />
+ <result property="title" column="title" />
+ <result property="description" column="description" />
+ <result property="amount" column="amount" />
+ <result property="status" column="status" />
+ <result property="publisherId" column="publisher_id" />
+ <result property="accepterId" column="accepter_id" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ </resultMap>
+
+ <sql id="selectRewardTasksVo">
+ select reward_id, title, description, amount, status, publisher_id, accepter_id, create_time, update_time, remark from reward_tasks
+ </sql>
+
+ <select id="selectRewardTasksList" parameterType="RewardTasks" resultMap="RewardTasksResult">
+ <include refid="selectRewardTasksVo"/>
+ <where>
+ <if test="title != null and title != ''"> and title = #{title}</if>
+ <if test="description != null and description != ''"> and description = #{description}</if>
+ <if test="amount != null "> and amount = #{amount}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="publisherId != null "> and publisher_id = #{publisherId}</if>
+ <if test="accepterId != null "> and accepter_id = #{accepterId}</if>
+ </where>
+ </select>
+
+ <select id="selectRewardTasksByRewardId" parameterType="Long" resultMap="RewardTasksResult">
+ <include refid="selectRewardTasksVo"/>
+ where reward_id = #{rewardId}
+ </select>
+
+ <insert id="insertRewardTasks" parameterType="RewardTasks" useGeneratedKeys="true" keyProperty="rewardId">
+ insert into reward_tasks
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="title != null and title != ''">title,</if>
+ <if test="description != null and description != ''">description,</if>
+ <if test="amount != null">amount,</if>
+ <if test="status != null">status,</if>
+ <if test="publisherId != null">publisher_id,</if>
+ <if test="accepterId != null">accepter_id,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="remark != null">remark,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="title != null and title != ''">#{title},</if>
+ <if test="description != null and description != ''">#{description},</if>
+ <if test="amount != null">#{amount},</if>
+ <if test="status != null">#{status},</if>
+ <if test="publisherId != null">#{publisherId},</if>
+ <if test="accepterId != null">#{accepterId},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="remark != null">#{remark},</if>
+ </trim>
+ </insert>
+
+ <update id="updateRewardTasks" parameterType="RewardTasks">
+ update reward_tasks
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="title != null and title != ''">title = #{title},</if>
+ <if test="description != null and description != ''">description = #{description},</if>
+ <if test="amount != null">amount = #{amount},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="publisherId != null">publisher_id = #{publisherId},</if>
+ <if test="accepterId != null">accepter_id = #{accepterId},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="remark != null">remark = #{remark},</if>
+ </trim>
+ where reward_id = #{rewardId}
+ </update>
+
+ <delete id="deleteRewardTasksByRewardId" parameterType="Long">
+ delete from reward_tasks where reward_id = #{rewardId}
+ </delete>
+
+ <delete id="deleteRewardTasksByRewardIds" parameterType="String">
+ delete from reward_tasks where reward_id in
+ <foreach item="rewardId" collection="array" open="(" separator="," close=")">
+ #{rewardId}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file