优化活动管理模块

王言钊
1 parent 5a1b07d8
Showing 6 changed files with 131 additions and 27 deletions
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
src/main/resources/templates/common/frame.html
src/main/resources/templates/page/activity.html
src/main/resources/templates/page/video.html
@@ -3,6 +3,7 @@ package com.cnlive.shenhe.controller;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -61,8 +62,8 @@ public class ShyActivityController {
     }
     @GetMapping("/page")
-    public String getShyActivity(Integer id, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model) {
-        PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(id, pageNum, pageSize);
+    public String getShyActivity( @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Model model,String activity,String exempt_from_trial) {
+        PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(pageNum, pageSize,activity,exempt_from_trial);
         model.addAttribute("ShyActivitylist", shyActivityPageInfo);
         return "page/activity.html";
     }
+package com.cnlive.shenhe.dto;
+
+
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * @author yanzhaowang
+ * @create 2022-03-14 13:16
+ */
+@Component
+public class ShyActivityDTO implements Serializable {
+
+
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+
+    private String activity;
+
+    private Byte exempt_from_trial;
+
+    public ShyActivityDTO(Integer pageNum, Integer pageSize, String activity, Byte exempt_from_trial) {
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.activity = activity;
+        this.exempt_from_trial = exempt_from_trial;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getActivity() {
+        return activity;
+    }
+
+    public void setActivity(String activity) {
+        this.activity = activity;
+    }
+
+    public Byte getExempt_from_trial() {
+        return exempt_from_trial;
+    }
+
+    public void setExempt_from_trial(Byte exempt_from_trial) {
+        this.exempt_from_trial = exempt_from_trial;
+    }
+
+    public ShyActivityDTO(String activity, Byte exempt_from_trial) {
+        this.activity = activity;
+        this.exempt_from_trial = exempt_from_trial;
+    }
+
+    public ShyActivityDTO() {
+    }
+}
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.mapper.ShyActivityMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -71,15 +72,26 @@ public class ShyActivityImpl {
     /**
      * 查询活动
-     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    public PageInfo<ShyActivity> selectByExample(Integer id, Integer pageNum, Integer pageSize) {
+    public PageInfo<ShyActivity> selectByExample(Integer pageNum, Integer pageSize,String activity,String exempt_from_trial) {
         Example example = new Example(ShyActivity.class);
+        //如果为空 按照倒序排序  分页查询所有
+        //以创建时间为条件进行倒序
+        example.setOrderByClause("`create_time` desc");
+
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo(id);
+
+        // 如果查询条件不为空  按照条件走模糊查询
+        if (CommonUtils.isNotEmpty(String.valueOf(exempt_from_trial))) {
+            criteria.andLike("exempt_from_trial", "%" + exempt_from_trial + "%");
+        }
+        // 如果查询条件不为空  按照条件走模糊查询
+        if (CommonUtils.isNotEmpty(activity)) {
+            criteria.andLike("activity", "%" + activity + "%");
+        }
         PageHelper.startPage(pageNum, pageSize, true);
         List<ShyActivity> shyActivities = ShyActivityMapper.selectByExample(example);
         PageInfo<ShyActivity> shyActivityPageInfo = new PageInfo<>(shyActivities);
@@ -99,7 +99,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
                     <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
                     <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
                     <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
-                    <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>
+<!--                    <li><a href="/activity/page" id="/activity/page"> 活动管理</a></li>-->
                 </ul>
             </li>
         </ul>
@@ -101,7 +101,7 @@
                                 </div>
                                 <div class="col-md-6 pull-right" style="padding: 0; width: 5%;">
                                     <button class="btn btn-default" type="button" name="refresh"
-                                            title="搜索" id="emailQuery">搜索
+                                            title="搜索" id="QueryAll">搜索
                                     </button>
                                 </div>
                                 <div class="col-md-6 pull-right" style="padding: 0; width: 20%;">
@@ -109,15 +109,18 @@
                                            style="font-size: 15px; top: 8px; font-weight: 100;">活动名称:</label>
                                     <div class="col-sm-7" style="padding: 0;">
                                         <input class="form-control" type="text" th:value="${param.activity}"
-                                               id="email_query">
+                                               id="activity_query">
                                     </div>
                                 </div>
                                 <div class="col-md-5 pull-right" style="padding: 0; width: 15%;">
                                     <label for="sp_id" class="control-label cb-toolbar"
                                            style="font-size: 15px; top: 8px; font-weight: 100;">是否审核:</label>
                                     <div class="col-sm-7" style="padding: 0;">
-                                        <input class="form-control" type="text" th:value="${param.exempt_from_trial}"
-                                               id="remark_query">
+                                        <select class="form-control" id="exempt_from_trial_query" name="exempt_from_trial">
+                                            <option value="" name="-选择审核类型-">-选择审核类型-</option>
+                                            <option value="0" name="未审核">未审免</option>
+                                            <option value="1" name="已经审核">已经审免</option>
+                                        </select>
                                     </div>
                                 </div>
                             </div>
@@ -213,10 +216,11 @@
                                                                                   th:text="'共 '+${ShyActivitylist.total}+' 条记录，每页显示'">共 0 条记录</span>
                                         <select class="" id="pageSize" name="pageSize"
                                                 onchange="selectPageSize()">
-                                            <option value="10" th:selected="${pageSize==10}">10</option>
-                                            <option value="20" th:selected="${pageSize==20}">20</option>
-                                            <option value="50" th:selected="${pageSize==50}">50</option>
-                                            <option value="100" th:selected="${pageSize==100}">100</option>
+                                            <option value="10" th:selected="${ShyActivitylist.pageSize==10}">10</option>
+                                            <option value="20" th:selected="${ShyActivitylist.pageSize==20}">20</option>
+                                            <option value="50" th:selected="${ShyActivitylist.pageSize==50}">50</option>
+                                            <option value="100" th:selected="${ShyActivitylist.pageSize==100}">100
+                                            </option>
                                         </select> <span class="pagination-info">条记录</span>
                                     </div>
                                     <div class="pull-right pagination">
@@ -297,11 +301,19 @@
                         </div>
                         <div class="form-group">
-                            <label class="control-label col-sm-3" style="font-size: 15px;">审核类型（0|1）:</label>
+                            <label class="control-label col-sm-3" style="font-size: 15px;">审核类型:</label>
                             <div class="col-sm-9" style="margin-top: -5px;margin-bottom: 20px;">
-                                <input class="form-control" style="width:40%;" type="text" value=""
-                                       id="exempt_from_trial"
-                                       name="exempt_from_trial">
+
+                                <select class="" id="exempt_from_trial" name="exempt_from_trial">
+                                    <option value="" name="-选择审核类型-">-选择审核类型-</option>
+                                    <option value="0" name="未审核">未审免</option>
+                                    <option value="1" name="已经审核">已经审免</option>
+                                </select>
+
+
+                                <!--                                <input class="form-control" style="width:40%;" type="text" value=""-->
+                                <!--                                       id="exempt_from_trial"-->
+                                <!--                                       name="exempt_from_trial">-->
                             </div>
                         </div>
@@ -344,8 +356,14 @@
                         </div>
                         <div class="form-group">
-                            <label class="control-label col-sm-3" style="font-size: 15px;">审核类型（0|1）:</label>
+                            <label class="control-label col-sm-3" style="font-size: 15px;">审核类型:</label>
                             <div class="col-sm-9" style="margin-top: -5px;margin-bottom: 20px;">
+                                <!--                                <select class="" id="exempt_from_trial1" name="exempt_from_trial">-->
+                                <!--                                    <option value="" name="选择审核类型">审核类型</option>-->
+                                <!--                                    <option value="0" name="未审核">未审核</option>-->
+                                <!--                                    <option value="1" name="已经审核">已经审核</option>-->
+                                <!--                                </select>-->
+
                                 <input class="form-control" style="width:40%;" type="text" value="0"
                                        id="exempt_from_trial1"
                                        name="exempt_from_trial">
@@ -365,11 +383,11 @@
     </div>
     <script>
-
+        // 添加事件
         function submitAdd() {
             var activity1 = $("#activity1").val();
             var exempt_from_trial1 = $("#exempt_from_trial1").val();
-            $.post("/activity/add?activity=" + activity1+"&exempt_from_trial="+exempt_from_trial1, function (data) {
+            $.post("/activity/add?activity=" + activity1 + "&exempt_from_trial=" + exempt_from_trial1, function (data) {
                 if (data.errorCode == 0) {
                     alert(data.errorMessage);
                     location.href = location.href;
@@ -378,11 +396,13 @@
                 }
             })
         }
+
+        // 修改事件
         function submitUpate() {
             var id = $("#id").val();
             var activity = $("#activity").val();
             var exempt_from_trial = $("#exempt_from_trial").val();
-            $.post("/activity/update?exempt_from_trial="+ exempt_from_trial+"&activity="+activity+"&id="+id, function (data) {
+            $.post("/activity/update?exempt_from_trial=" + exempt_from_trial + "&activity=" + activity + "&id=" + id, function (data) {
                 if (data.errorCode == 0) {
                     alert(data.errorMessage);
                     location.href = location.href;
@@ -482,10 +502,10 @@
             }
         }
-        //搜索
-        $('#emailQuery').click(function () {
-            var activity = $("#email_query").val();
-            var exempt_from_trial = $("#remark_query").val();
+        //搜索事件
+        $('#QueryAll').click(function () {
+            var activity = $("#activity_query").val();
+            var exempt_from_trial = $("#exempt_from_trial_query").val();
             var pageSize = $("#pageSize").val();
             window.location.href = "/activity/page?activity=" + activity + "&exempt_from_trial=" + exempt_from_trial + "&pageSize=" + pageSize;
         });
@@ -140,7 +140,6 @@
                                             <label for="state" class="control-label cb-toolbar">分类:</label>
                                             <div class="col-sm-10" style="padding: 0;">
                                                 <select class="form-control" id="source" name="source">
-
                                                     <option value="" >全部</option>
                                                     <option th:each="activitys : ${activityList}"
                                                             th:selected="${source}==${activitys.id}"