Merge remote-tracking branch 'origin/master'

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;

src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java

@@ -51,7 +51,6 @@ public class SysRoleResourcePermissionServiceImpl  implements SysRoleResourcePer
     public List<ZtreeComposite> findZtree(Long roleId) {
         List<ZtreeComposite> ztreeList=new ArrayList<>();
         List<SysResource> resourceList=sysResourceDao.findByParentId(0L);
-
         for (SysResource sysResource:resourceList){
             ZtreeItem ztreeItem=new ZtreeItem();
             ztreeItem.setId(sysResource.getId());

src/main/java/com/lq/code/service/BaseService.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface BaseService<T> {
 
-    BaseDao<T> getBaseDao();
+    BaseDao<T>      getBaseDao();
 
     default T findOne(Long id){
        return getBaseDao().findOne(id);

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 {
     /**

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
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.SysPermission" parameterType="long">
+    <select id="findOne" resultType="SysPermission" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  sys_permission
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.SysPermission">
+    <select id="findAll" resultType="SysPermission">
         SELECT <include refid="column_list"/>
           FROM  sys_permission
         WHERE status = 1
@@ -40,7 +40,7 @@
         WHERE status = 1
     </select>
 
-    <select id="findBySysResourceId" resultType="com.lq.entity.SysPermission" parameterType="long">
+    <select id="findBySysResourceId" resultType="SysPermission" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM sys_permission
         WHERE status = 1
@@ -48,7 +48,7 @@
         ORDER BY create_time DESC,update_time DESC
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.SysPermission" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="SysPermission" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -62,7 +62,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.SysPermission" >
+    <update id="update" parameterType="SysPermission" >
 
         UPDATE
             sys_permission

src/main/resources/mybatis/mapping/WechatInfoDao.xml

@@ -9,15 +9,15 @@
     <sql id="column_list">
         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
     </sql>
-    <select id="findOne" resultType="com.lq.entity.WechatInfo" parameterType="long">
+    <select id="findOne" resultType="WechatInfo" parameterType="long">
         SELECT <include refid="column_list"/> FROM  wechat_info  WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatInfo">
+    <select id="findAll" resultType="WechatInfo">
         SELECT <include refid="column_list"/> FROM  wechat_info WHERE status = 1
     </select>
 
-    <insert id="save" parameterType="com.lq.entity.WechatInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="WechatInfo" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -31,7 +31,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatInfo">
+    <update id="update" parameterType="WechatInfo">
         UPDATE
             wechat_info
         <trim prefix="set" suffixOverrides=",">
@@ -65,18 +65,18 @@
 
     </delete>
 
-    <select id="count" resultType="int" parameterType="com.lq.cms.vo.WechatInfoVo">
+    <select id="count" resultType="int" parameterType="WechatInfoVo">
         SELECT count(id) FROM wechat_info
     </select>
 
-    <select id="findListPage" parameterType="com.lq.cms.vo.WechatInfoVo" resultType="com.lq.cms.vo.WechatInfoVo">
+    <select id="findListPage" parameterType="WechatInfoVo" resultType="WechatInfoVo">
         SELECT <include refid="column_list"/>
         FROM wechat_info t1
         WHERE status = 1
         ORDER BY t1.create_time DESC
     </select>
 
-    <select id="getByWechatOpenId" resultType="com.lq.entity.WechatInfo" parameterType="string">
+    <select id="getByWechatOpenId" resultType="WechatInfo" parameterType="string">
       SELECT <include refid="column_list"/>
         FROM wechat_info wi
       WHERE

src/main/resources/mybatis/mapping/WechatKeywordDao.xml

@@ -9,13 +9,13 @@
         matchin_type,create_time,update_time,wechat_rule_id,id,keyword,status
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.WechatKeyword" parameterType="long">
+    <select id="findOne" resultType="WechatKeyword" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  wechat_keyword
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatKeyword">
+    <select id="findAll" resultType="WechatKeyword">
         SELECT <include refid="column_list"/>
           FROM  wechat_keyword
         WHERE status = 1
@@ -27,7 +27,7 @@
         WHERE status = 1
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.WechatKeyword" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="WechatKeyword" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -41,7 +41,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatKeyword">
+    <update id="update" parameterType="WechatKeyword">
         UPDATE
             wechat_keyword
         <trim prefix="set" suffixOverrides=",">
@@ -66,7 +66,7 @@
             id=#{id}
     </update>
     
-    <select id="findByWechatRuleIdAndStatus" resultType="com.lq.entity.WechatKeyword">
+    <select id="findByWechatRuleIdAndStatus" resultType="WechatKeyword">
         SELECT <include refid="column_list"/>
           FROM wechat_keyword
         WHERE

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
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.WechatMessage" parameterType="long">
+    <select id="findOne" resultType="WechatMessage" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  wechat_message
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatMessage">
+    <select id="findAll" resultType="WechatMessage">
         SELECT <include refid="column_list"/>
           FROM  wechat_message
         WHERE status = 1
@@ -27,7 +27,7 @@
         WHERE status = 1
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.WechatMessage" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="WechatMessage" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -41,7 +41,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatMessage">
+    <update id="update" parameterType="WechatMessage">
         UPDATE
             wechat_message
         <trim prefix="set" suffixOverrides=",">
@@ -78,7 +78,7 @@
           status = 1
     </select>
 
-    <select id="findAllByWechatMessageVo" resultType="com.lq.entity.WechatMessage" parameterType="WechatMessageVo">
+    <select id="findAllByWechatMessageVo" resultType="WechatMessage" parameterType="WechatMessageVo">
         SELECT <include refid="column_list"/>
           FROM wechat_message
         WHERE

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
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.WechatRule" parameterType="long">
+    <select id="findOne" resultType="WechatRule" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  wechat_rule
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatRule">
+    <select id="findAll" resultType="WechatRule">
         SELECT <include refid="column_list"/>
           FROM  wechat_rule
         WHERE status = 1
@@ -28,7 +28,7 @@
         WHERE status = 1
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.WechatRule" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="WechatRule" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -42,7 +42,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatRule">
+    <update id="update" parameterType="WechatRule">
         UPDATE
             wechat_rule
         <trim prefix="set" suffixOverrides=",">
@@ -70,7 +70,7 @@
             id=#{id}
     </update>
 
-    <select id="findByWechatInfoIdAndStatus" resultType="com.lq.entity.WechatRule" >
+    <select id="findByWechatInfoIdAndStatus" resultType="WechatRule" >
       SELECT  <include refid="column_list"/>
         FROM wechat_rule
       WHERE

src/main/resources/mybatis/mapping/WechatRuleMessageDao.xml

@@ -9,13 +9,13 @@
         wechat_rule_id,id,wechat_message_id,status,create_time
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.WechatRuleMessage" parameterType="long">
+    <select id="findOne" resultType="WechatRuleMessage" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  wechat_rule_message
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatRuleMessage">
+    <select id="findAll" resultType="WechatRuleMessage">
         SELECT <include refid="column_list"/>
           FROM  wechat_rule_message
         WHERE status = 1
@@ -27,7 +27,7 @@
         WHERE status = 1
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.WechatRuleMessage" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="WechatRuleMessage" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -41,7 +41,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatRuleMessage">
+    <update id="update" parameterType="WechatRuleMessage">
         UPDATE
             wechat_rule_message
         <trim prefix="set" suffixOverrides=",">
@@ -64,7 +64,7 @@
             id=#{id}
     </update>
     
-    <select id="getByRuleIdAndMessageId" resultType="com.lq.entity.WechatRuleMessage" parameterType="Long">
+    <select id="getByRuleIdAndMessageId" resultType="WechatRuleMessage" parameterType="Long">
         SELECT <include refid="column_list"/>
           FROM wechat_rule_message
         WHERE status = 1
@@ -72,7 +72,7 @@
           AND wechat_rule_id = #{ruleId}
     </select>
 
-    <select id="findByWechatRuleId" resultType="com.lq.entity.WechatRuleMessage" parameterType="Long">
+    <select id="findByWechatRuleId" resultType="WechatRuleMessage" parameterType="Long">
         SELECT <include refid="column_list"/>
           FROM wechat_rule_message
         WHERE status = 1

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
     </sql>
 
-    <select id="findOne" resultType="com.lq.entity.WechatUser" parameterType="long">
+    <select id="findOne" resultType="WechatUser" parameterType="long">
         SELECT <include refid="column_list"/>
           FROM  wechat_user
         WHERE id=#{id} AND status = 1
     </select>
 
-    <select id="findAll" resultType="com.lq.entity.WechatUser">
+    <select id="findAll" resultType="WechatUser">
         SELECT <include refid="column_list"/>
           FROM  wechat_user
         WHERE status = 1
@@ -27,7 +27,7 @@
         WHERE status = 1
     </select>
 
-    <insert id="save"  parameterType="com.lq.entity.WechatUser" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save"  parameterType="WechatUser" useGeneratedKeys="true" keyProperty="id">
 
         <selectKey keyProperty="id" order="AFTER" resultType="Long">
             SELECT LAST_INSERT_ID()
@@ -41,7 +41,7 @@
     </insert>
 
 
-    <update id="update" parameterType="com.lq.entity.WechatUser">
+    <update id="update" parameterType="WechatUser">
         UPDATE
             wechat_user
         <trim prefix="set" suffixOverrides=",">

src/main/webapp/WEB-INF/views/jsp/cms/sys/log/index.jsp

@@ -27,6 +27,9 @@
     </script>
 </head>
 <body>
+<div id="searchFrom">
+    时间: <input class="easyui-datebox"> - <input class="easyui-datebox">
+</div>
 <table id="dataList"></table>
 </body>
 </html>