diff --git a/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java index c5a807a..651f487 100755 --- a/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java @@ -13,9 +13,10 @@ import java.util.List; /** * Created by qi_liang on 2018/6/21. + * @author qi */ @Service -public class SysLogServiceImpl implements SysLogService { +public class SysLogServiceImpl implements SysLogService { @Autowired private SysLogDao sysLogDao; diff --git a/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java index 49aa6d0..2d678d6 100755 --- a/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java +++ b/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java @@ -51,7 +51,6 @@ public class SysRoleResourcePermissionServiceImpl implements SysRoleResourcePer public List findZtree(Long roleId) { List ztreeList=new ArrayList<>(); List resourceList=sysResourceDao.findByParentId(0L); - for (SysResource sysResource:resourceList){ ZtreeItem ztreeItem=new ZtreeItem(); ztreeItem.setId(sysResource.getId()); diff --git a/src/main/java/com/lq/code/service/BaseService.java b/src/main/java/com/lq/code/service/BaseService.java index 863c3ac..e5ac2f5 100755 --- a/src/main/java/com/lq/code/service/BaseService.java +++ b/src/main/java/com/lq/code/service/BaseService.java @@ -10,7 +10,7 @@ import java.util.List; */ public interface BaseService { - BaseDao getBaseDao(); + BaseDao getBaseDao(); default T findOne(Long id){ return getBaseDao().findOne(id); diff --git a/src/main/java/com/lq/entity/SysLog.java b/src/main/java/com/lq/entity/SysLog.java index c3fcdda..336dd30 100755 --- a/src/main/java/com/lq/entity/SysLog.java +++ b/src/main/java/com/lq/entity/SysLog.java @@ -6,6 +6,7 @@ import java.util.Date; /** 系统日志表 * Created by qi on 2017/7/27. + * @author qi */ public class SysLog extends IdEntity { /** diff --git a/src/main/resources/mybatis/mapping/SysPermissionDao.xml b/src/main/resources/mybatis/mapping/SysPermissionDao.xml index 052e65b..9f19b89 100644 --- a/src/main/resources/mybatis/mapping/SysPermissionDao.xml +++ b/src/main/resources/mybatis/mapping/SysPermissionDao.xml @@ -12,13 +12,13 @@ permission_type,permission_key,name,sys_resource_id,sp.id,sp.status,sp.create_time,sp.create_user_id,sp.update_time,sp.update_user_id - SELECT FROM sys_permission WHERE id=#{id} AND status = 1 - SELECT FROM sys_permission WHERE status = 1 @@ -40,7 +40,7 @@ WHERE status = 1 - SELECT FROM sys_permission WHERE status = 1 @@ -48,7 +48,7 @@ ORDER BY create_time DESC,update_time DESC - + SELECT LAST_INSERT_ID() @@ -62,7 +62,7 @@ - + UPDATE sys_permission diff --git a/src/main/resources/mybatis/mapping/WechatInfoDao.xml b/src/main/resources/mybatis/mapping/WechatInfoDao.xml index 463cddd..d186501 100644 --- a/src/main/resources/mybatis/mapping/WechatInfoDao.xml +++ b/src/main/resources/mybatis/mapping/WechatInfoDao.xml @@ -9,15 +9,15 @@ id,wechat_open_id,app_secpet,create_time,app_id,encoding_type,wechat_name,url,token,encoding_aes_key,last_update_time,status,wechat_info_type,certification,open_reply - SELECT FROM wechat_info WHERE id=#{id} AND status = 1 - SELECT FROM wechat_info WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -31,7 +31,7 @@ - + UPDATE wechat_info @@ -65,18 +65,18 @@ - SELECT count(id) FROM wechat_info - SELECT FROM wechat_info t1 WHERE status = 1 ORDER BY t1.create_time DESC - SELECT FROM wechat_info wi WHERE diff --git a/src/main/resources/mybatis/mapping/WechatKeywordDao.xml b/src/main/resources/mybatis/mapping/WechatKeywordDao.xml index fd19901..54c5581 100644 --- a/src/main/resources/mybatis/mapping/WechatKeywordDao.xml +++ b/src/main/resources/mybatis/mapping/WechatKeywordDao.xml @@ -9,13 +9,13 @@ matchin_type,create_time,update_time,wechat_rule_id,id,keyword,status - SELECT FROM wechat_keyword WHERE id=#{id} AND status = 1 - SELECT FROM wechat_keyword WHERE status = 1 @@ -27,7 +27,7 @@ WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -41,7 +41,7 @@ - + UPDATE wechat_keyword @@ -66,7 +66,7 @@ id=#{id} - SELECT FROM wechat_keyword WHERE diff --git a/src/main/resources/mybatis/mapping/WechatMessageDao.xml b/src/main/resources/mybatis/mapping/WechatMessageDao.xml index 7f9b65c..93840da 100644 --- a/src/main/resources/mybatis/mapping/WechatMessageDao.xml +++ b/src/main/resources/mybatis/mapping/WechatMessageDao.xml @@ -9,13 +9,13 @@ to_url,message_type,create_time,image_url,update_time,id,title,media_id,user_id,content,status - SELECT FROM wechat_message WHERE id=#{id} AND status = 1 - SELECT FROM wechat_message WHERE status = 1 @@ -27,7 +27,7 @@ WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -41,7 +41,7 @@ - + UPDATE wechat_message @@ -78,7 +78,7 @@ status = 1 - SELECT FROM wechat_message WHERE diff --git a/src/main/resources/mybatis/mapping/WechatRuleDao.xml b/src/main/resources/mybatis/mapping/WechatRuleDao.xml index 89769cb..74ca6dc 100644 --- a/src/main/resources/mybatis/mapping/WechatRuleDao.xml +++ b/src/main/resources/mybatis/mapping/WechatRuleDao.xml @@ -9,13 +9,13 @@ create_user_id,reply_type,create_time,update_user_id,rule_name,wechat_info_id,update_time,id,status - SELECT FROM wechat_rule WHERE id=#{id} AND status = 1 - SELECT FROM wechat_rule WHERE status = 1 @@ -28,7 +28,7 @@ WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -42,7 +42,7 @@ - + UPDATE wechat_rule @@ -70,7 +70,7 @@ id=#{id} - SELECT FROM wechat_rule WHERE diff --git a/src/main/resources/mybatis/mapping/WechatRuleMessageDao.xml b/src/main/resources/mybatis/mapping/WechatRuleMessageDao.xml index 5da2f9f..bbe590c 100644 --- a/src/main/resources/mybatis/mapping/WechatRuleMessageDao.xml +++ b/src/main/resources/mybatis/mapping/WechatRuleMessageDao.xml @@ -9,13 +9,13 @@ wechat_rule_id,id,wechat_message_id,status,create_time - SELECT FROM wechat_rule_message WHERE id=#{id} AND status = 1 - SELECT FROM wechat_rule_message WHERE status = 1 @@ -27,7 +27,7 @@ WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -41,7 +41,7 @@ - + UPDATE wechat_rule_message @@ -64,7 +64,7 @@ id=#{id} - SELECT FROM wechat_rule_message WHERE status = 1 @@ -72,7 +72,7 @@ AND wechat_rule_id = #{ruleId} - SELECT FROM wechat_rule_message WHERE status = 1 diff --git a/src/main/resources/mybatis/mapping/WechatUserDao.xml b/src/main/resources/mybatis/mapping/WechatUserDao.xml index 726d0b7..b2a7ba9 100644 --- a/src/main/resources/mybatis/mapping/WechatUserDao.xml +++ b/src/main/resources/mybatis/mapping/WechatUserDao.xml @@ -9,13 +9,13 @@ country,unionid,sybscribe_scene,qr_scene,qr_scene_str,subscribe_time,city,tagid_id,open_id,nick_name,sex,groupid,language,remark,province,head_img_url,wechat_info_id,id,status - SELECT FROM wechat_user WHERE id=#{id} AND status = 1 - SELECT FROM wechat_user WHERE status = 1 @@ -27,7 +27,7 @@ WHERE status = 1 - + SELECT LAST_INSERT_ID() @@ -41,7 +41,7 @@ - + UPDATE wechat_user diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/sys/log/index.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/sys/log/index.jsp index 8595d6c..0ae9e8f 100755 --- a/src/main/webapp/WEB-INF/views/jsp/cms/sys/log/index.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/cms/sys/log/index.jsp @@ -27,6 +27,9 @@ +
+ 时间: - +