Skip to content

Commit

Permalink
Merge pull request #22 from x841122987/master
Browse files Browse the repository at this point in the history 
修改分页BUG&规则uid问题
  • Loading branch information
@RedisOptimal
RedisOptimal committed Jul 9, 2014
2 parents 1e474a1 + dc0769a commit 66aa3f5
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 1 deletion.
50 changes: 50 additions & 0 deletions Mario/src/main/resources/mybatis/Mario_node_stateMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,56 @@
<select id="findTotalNum" parameterType="Mario_node_state"
resultType="int">
select count(zk_id) from mario_node_state
<where>
<if test="zk_id != null and zk_id != ''">
and zk_id = #{zk_id}
</if>
<if test="path != null and path != ''">
and path like '${path}%'
</if>
<if test="data != null and data != ''">
and data = #{data}
</if>
<if test="data_length != null and data_length != ''">
and data_length = #{data_length}
</if>
<if test="num_children != null and num_children != ''">
and num_children = #{num_children}
</if>
<if test="version != null and version != ''">
and version = #{version}
</if>
<if test="aversion != null and aversion != ''">
and aversion = #{aversion}
</if>
<if test="cversion != null and cversion != ''">
and cversion = #{cversion}
</if>
<if test="ctime != null and ctime != ''">
and ctime = #{ctime}
</if>
<if test="mtime != null and mtime != ''">
and mtime = #{mtime}
</if>
<if test="czxid != null and czxid != ''">
and czxid = #{czxid}
</if>
<if test="mzxid != null and mzxid != ''">
and mzxid = #{mzxid}
</if>
<if test="pzxid != null and pzxid != ''">
and pzxid = #{pzxid}
</if>
<if test="ephemeral_owner != null and ephemeral_owner != ''">
and ephemeral_owner = #{ephemeral_owner}
</if>
<if test="state_version != null and state_version != ''">
and state_version = #{state_version}
</if>
<if test="state_time != null and state_time != ''">
and state_time = #{state_time}
</if>
</where>
</select>

<delete id="deleteByZkid" parameterType="Mario_node_state">
Expand Down
29 changes: 29 additions & 0 deletions Mario/src/main/resources/mybatis/Mario_plugin_infoMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,35 @@

<select id="findTotalNum" parameterType="Mario_plugin_info" resultType="int">
select count(1) from mario_plugin_info
<where>
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="plugin_name != null and plugin_name != ''">
and plugin_name = #{plugin_name}
</if>
<if test="zk_id != null and zk_id != ''">
and zk_id = #{zk_id}
</if>
<if test="msg_sender != null and msg_sender != ''">
and msg_sender = #{msg_sender}
</if>
<if test="mail_sender != null and mail_sender != ''">
and mail_sender = #{mail_sender}
</if>
<if test="phone_number != null and phone_number != ''">
and phone_number = #{phone_number}
</if>
<if test="email_address != null and email_address != ''">
and email_address = #{email_address}
</if>
<if test="args != null and args != ''">
and args = #{args}
</if>
<if test="commit != null and commit != ''">
and commit = #{commit}
</if>
</where>
</select>

<insert id="insert" parameterType="Mario_plugin_info">
Expand Down
2 changes: 1 addition & 1 deletion Mario/src/main/resources/mybatis/Mario_rule_infoMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</insert>

<update id="update" parameterType="Mario_rule_info">
update mario_rule_info set zk_id = #{zk_id} , path = #{path} , type = #{type} , min_children_number = #{min_children_number} , max_children_number = #{max_children_number} , phone_number = #{phone_number} , email_address = #{email_address} , user_id = #{user_id} , enable = #{enable} where id = #{id}
update mario_rule_info set zk_id = #{zk_id} , path = #{path} , type = #{type} , min_children_number = #{min_children_number} , max_children_number = #{max_children_number} , phone_number = #{phone_number} , email_address = #{email_address} , enable = #{enable} where id = #{id}
</update>

<delete id="delete" parameterType="Mario_rule_info">
Expand Down
14 changes: 14 additions & 0 deletions Mario/src/main/resources/mybatis/Mario_server_infoMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@

<select id="findTotalNum" parameterType="Mario_server_info" resultType="int">
select count(1) from mario_server_info
<where>
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="zk_id != null and zk_id != ''">
and zk_id = #{zk_id}
</if>
<if test="host != null and host != ''">
and host = #{host}
</if>
<if test="port != null and port != ''">
and port = #{port}
</if>
</where>
</select>

<insert id="insert" parameterType="Mario_server_info">
Expand Down
44 changes: 44 additions & 0 deletions Mario/src/main/resources/mybatis/Mario_server_stateMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,50 @@
<select id="findTotalNum" parameterType="Mario_server_state"
resultType="int">
select count(id) from mario_server_state
<where>
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="server_id != null and server_id != ''">
and server_id = #{server_id}
</if>
<if test="min_latency != null and min_latency != ''">
and min_latency = #{min_latency}
</if>
<if test="ave_latency != null and ave_latency != ''">
and ave_latency = #{ave_latency}
</if>
<if test="max_latency != null and max_latency != ''">
and max_latency = #{max_latency}
</if>
<if test="received != null and received != ''">
and received = #{received}
</if>
<if test="sent != null and sent != ''">
and sent = #{sent}
</if>
<if test="outstanding != null and outstanding != ''">
and outstanding = #{outstanding}
</if>
<if test="zxid != null and zxid != ''">
and zxid = #{zxid}
</if>
<if test="mode != null and mode != ''">
and mode = #{mode}
</if>
<if test="node_count != null and node_count != ''">
and node_count = #{node_count}
</if>
<if test="total_watches != null and total_watches != ''">
and total_watches = #{total_watches}
</if>
<if test="client_number != null and client_number != ''">
and client_number = #{client_number}
</if>
<if test="time_stamp != null and time_stamp != ''">
and time_stamp = #{time_stamp}
</if>
</where>
</select>

<select id="findBetweenTimeStamp" resultType="Mario_server_state">
Expand Down
17 changes: 17 additions & 0 deletions Mario/src/main/resources/mybatis/Mario_zk_infoMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@

<select id="findTotalNum" parameterType="Mario_zk_info" resultType="int">
select count(1) from mario_zk_info
<where>
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="zk_name != null and zk_name != ''">
and zk_name = #{zk_name}
</if>
<if test="session_timeout != null and session_timeout != ''">
and session_timeout = #{session_timeout}
</if>
<if test="observer != null and observer != ''">
and observer = #{observer}
</if>
<if test="observer_auth != null and observer_auth != ''">
and observer_auth = #{observer_auth}
</if>
</where>
</select>

<insert id="insert" parameterType="Mario_zk_info">
Expand Down

0 comments on commit 66aa3f5

Please sign in to comment.