作者 若依

!199 规范命名、用户角色单个逻辑删除、去除多余代码

Merge pull request !199 from fuzui/some_problems
@@ -78,9 +78,9 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor @@ -78,9 +78,9 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
78 } 78 }
79 79
80 // 唯一标识(指定key + 消息头) 80 // 唯一标识(指定key + 消息头)
81 - String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + submitKey; 81 + String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
82 82
83 - Object sessionObj = redisCache.getCacheObject(cache_repeat_key); 83 + Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
84 if (sessionObj != null) 84 if (sessionObj != null)
85 { 85 {
86 Map<String, Object> sessionMap = (Map<String, Object>) sessionObj; 86 Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
@@ -95,7 +95,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor @@ -95,7 +95,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
95 } 95 }
96 Map<String, Object> cacheMap = new HashMap<String, Object>(); 96 Map<String, Object> cacheMap = new HashMap<String, Object>();
97 cacheMap.put(url, nowDataMap); 97 cacheMap.put(url, nowDataMap);
98 - redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS); 98 + redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
99 return false; 99 return false;
100 } 100 }
101 101
@@ -135,12 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -135,12 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
135 where role_id = #{roleId} 135 where role_id = #{roleId}
136 </update> 136 </update>
137 137
138 - <update id="updateRoleStatus" parameterType="SysRole">  
139 - update sys_user set status = #{status} where user_id = #{userId}  
140 - </update>  
141 -  
142 <delete id="deleteRoleById" parameterType="Long"> 138 <delete id="deleteRoleById" parameterType="Long">
143 - delete from sys_role where role_id = #{roleId} 139 + update sys_role set del_flag = '2' where role_id = #{roleId}
144 </delete> 140 </delete>
145 141
146 <delete id="deleteRoleByIds" parameterType="Long"> 142 <delete id="deleteRoleByIds" parameterType="Long">
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
169 </update> 169 </update>
170 170
171 <delete id="deleteUserById" parameterType="Long"> 171 <delete id="deleteUserById" parameterType="Long">
172 - delete from sys_user where user_id = #{userId} 172 + update sys_user set del_flag = '2' where user_id = #{userId}
173 </delete> 173 </delete>
174 174
175 <delete id="deleteUserByIds" parameterType="Long"> 175 <delete id="deleteUserByIds" parameterType="Long">