From f37f7973e17601b33574218056de3df5b2226287 Mon Sep 17 00:00:00 2001
From: qi_liang <qi_liang_gz@163.com>
Date: Thu, 30 May 2019 15:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lq/cms/service/WechatRuleService.java |  4 ++++
 .../lq/cms/service/impl/WechatRuleServiceImpl.java | 14 ++++++++++++++
 .../lq/cms/web/wechat/WechatRuleController.java    |  8 ++++++++
 .../WEB-INF/views/jsp/cms/wechat/rule/index.jsp    | 10 ++++++----
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lq/cms/service/WechatRuleService.java b/src/main/java/com/lq/cms/service/WechatRuleService.java
index 99b0987..b335fdf 100644
--- a/src/main/java/com/lq/cms/service/WechatRuleService.java
+++ b/src/main/java/com/lq/cms/service/WechatRuleService.java
@@ -42,4 +42,8 @@ public interface WechatRuleService extends BaseService<WechatRule> {
      * 通过规则ID查找规则详情
      */
     WechatRuleVo getWechatRuleVoById(Long wechatRuleId);
+    /**
+     * 通过规则ID删除规则
+     */
+    void deleteWechatRuleById(Long id);
 }
diff --git a/src/main/java/com/lq/cms/service/impl/WechatRuleServiceImpl.java b/src/main/java/com/lq/cms/service/impl/WechatRuleServiceImpl.java
index b6f7604..ee5a299 100644
--- a/src/main/java/com/lq/cms/service/impl/WechatRuleServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/WechatRuleServiceImpl.java
@@ -110,6 +110,20 @@ public class WechatRuleServiceImpl extends BaseServiceImpl<WechatRule> implement
         return wechatRuleVo;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteWechatRuleById(Long id) {
+        WechatRule wechatRule = wechatRuleDao.findOne(id);
+        if (wechatRule!=null){
+            List<WechatKeyword> wechatKeywordList = wechatKeywordDao.findByWechatRuleIdAndStatus(id,StatusTypeEnum.STATUS_ACTIVITY_YES.getValue());
+            wechatKeywordList.forEach(wechatKeyword -> {
+                wechatKeywordDao.delete(wechatKeyword.getId());
+            });
+            wechatRuleDao.delete(id);
+        }
+
+    }
+
     @Override
     public BaseDao<WechatRule> getBaseDao() {
         return wechatRuleDao;
diff --git a/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java b/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
index 3edf6d2..236f8f9 100755
--- a/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
+++ b/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
@@ -69,6 +69,14 @@ public class WechatRuleController {
         return ajaxResult;
     }
 
+    @ResponseBody
+    @RequestMapping("/delete")
+    public AjaxResult delete(Long id){
+        AjaxResult ajaxResult = new AjaxResult();
+        wechatRuleService.deleteWechatRuleById(id);
+        return ajaxResult;
+    }
+
     @ResponseBody
     @RequestMapping("/getWechatRuleById")
     public Object getWechatRuleById(Long wechatRuleId){
diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
index d531c1b..58427aa 100755
--- a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
+++ b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
@@ -609,10 +609,9 @@
     function delRule(ruleId){
         var data = new Object();
         data.id = ruleId;
-
         $.ajax({
             type:"post",
-            url:"${ctx}/admin/wechat/delWechatRule.htm",
+            url:"${ctx}/cms/wechat/rule/delete.htm",
             traditional:true,
             data:data,
             dataType:"json",
@@ -647,13 +646,16 @@
             }else{
                 isShow = 'classhide';
             }
-
+            var updateStr = '';
+            if (wechatMessage.updateTime!=null||wechatMessage.updateTime!=""||wechatMessage.updateTime!=undefined){
+                updateStr = wechatMessage.updateTime.substring(0,10);
+            }
             html += ' <div class="message-row" onclick="onMessaegRow(this)">';
             html += '<input type="hidden" value="'+wechatMessage.id+'" />';
             html +='<div class="message-title">'+wechatMessage.title+'</div>';
             html +='<img class="message-image" src="${ctx}/loadFile/'+wechatMessage.imageUrl+'" width="50" height="60">';
             html +='<div class="message-content">'+content +'</div>';
-            html +='<div class="message-createTime">更新于 '+wechatMessage.updateTime+' </div>';
+            html +='<div class="message-createTime">更新于 '+updateStr+' </div>';
             html +='<div class="chekc-Div '+isShow+'" > <img class ="check-image" src="${ctx}/resources/cms/wechat/rule/image/u710.png"></div>';
             html += '</div>';
         }