* 新需求

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-03-18
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaH5SampleController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaH5SampleController.class);
@@ -42,15 +42,17 @@ public class TaH5SampleController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taH5Sample",method= RequestMethod.GET)
-    public ResponseBean taH5SampleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taH5Sample",method= RequestMethod.GET)
+    public ResponseBean ListH5SampleByCondition(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       String sampleName){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like("sample_name",sampleName);
+            queryWrapper.orderByDesc("order_no","create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
             responseBean.addSuccess(result);

src/main/java/com/huiju/estateagents/sample/controller/TaNoticeController.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.sample.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,16 +19,19 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
-    * 开屏通知  前端控制器
-    * </p>
+ * 开屏通知  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-18
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaNoticeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaNoticeController.class);
@@ -37,26 +41,29 @@ public class TaNoticeController extends BaseController {
 
 
     /**
-     * 分页查询列表
+     * 条件查询通知列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @param type       类型
      * @return
      */
-    @RequestMapping(value="/taNotice",method= RequestMethod.GET)
-    public ResponseBean taNoticeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
+    public ResponseBean listNoticeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String title, String targetType, String targetName, Integer status,
+                                              String type) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaNotice> result = iTaNoticeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
+            responseBean = iTaNoticeService.listNoticeByCondition(pageNum, pageSize, title, targetType, targetName, status, type);
+            logger.info("TaNoticeController.listNoticeByCondition 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeList -=- {}",e.toString());
+            logger.error("taNoticeList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -64,43 +71,42 @@ public class TaNoticeController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value="/taNotice",method= RequestMethod.POST)
-    public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice){
+    @RequestMapping(value = "/admin/taNotice", method = RequestMethod.POST)
+    public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaNoticeService.save(taNotice)){
+            if (iTaNoticeService.save(taNotice)) {
                 responseBean.addSuccess(taNotice);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeAdd -=- {}",e.toString());
+            logger.error("taNoticeAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 批量删除开屏通知
+     *
+     * @param taNoticeList
      */
     @ResponseBody
-    @RequestMapping(value="/taNotice/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taNoticeDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taNotice/batchDelete/{id}", method = RequestMethod.DELETE)
+    public ResponseBean batchDelete(List<TaNotice> taNoticeList) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaNoticeService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            responseBean = iTaNoticeService.batchDelete(taNoticeList);
+            logger.info("TaNoticeController.taNoticeDelete 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeDelete -=- {}",e.toString());
+            logger.error("taNoticeDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -108,23 +114,24 @@ public class TaNoticeController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id       实体ID
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value="/taNotice/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taNotice/{id}", method = RequestMethod.PUT)
     public ResponseBean taNoticeUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNotice taNotice){
+                                       @RequestBody TaNotice taNotice) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaNoticeService.updateById(taNotice)){
+            if (iTaNoticeService.updateById(taNotice)) {
                 responseBean.addSuccess(taNotice);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeUpdate -=- {}",e.toString());
+            logger.error("taNoticeUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -132,16 +139,17 @@ public class TaNoticeController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taNotice/{id}",method= RequestMethod.GET)
-    public ResponseBean taNoticeGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taNotice/{id}", method = RequestMethod.GET)
+    public ResponseBean taNoticeGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaNoticeService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeDelete -=- {}",e.toString());
+            logger.error("taNoticeDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/sample/entity/TaNotice.java

@@ -1,16 +1,19 @@
 package com.huiju.estateagents.sample.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 开屏通知 
+ * 开屏通知
  * </p>
  *
  * @author fxf
@@ -49,6 +52,12 @@ public class TaNotice implements Serializable {
      */
     private Integer targetId;
 
+    /**
+     * 关联业务名
+     */
+    @TableField(exist = false)
+    private String targetName;
+
     /**
      * 状态 -1删除0是未发布1是已发布
      */

src/main/java/com/huiju/estateagents/sample/mapper/TaNoticeMapper.java

@@ -1,8 +1,13 @@
 package com.huiju.estateagents.sample.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.sample.entity.TaNotice;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +18,22 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-03-18
  */
 @Mapper
+@Component
 public interface TaNoticeMapper extends BaseMapper<TaNotice> {
 
+    /**
+     * 条件查询开屏通知
+     *
+     * @param pg
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @return
+     */
+    IPage<TaNotice> listNoticeByCondition(IPage<TaNotice> pg, @Param("title") String title,
+                                          @Param("targetType") String targetType,
+                                          @Param("targetName") String targetName,
+                                          @Param("status") Integer status,
+                                          @Param("type") String type);
 }

src/main/java/com/huiju/estateagents/sample/service/ITaNoticeService.java

@@ -1,7 +1,11 @@
 package com.huiju.estateagents.sample.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.sample.entity.TaNotice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,26 @@ import com.huiju.estateagents.sample.entity.TaNotice;
  */
 public interface ITaNoticeService extends IService<TaNotice> {
 
+    /**
+     * 条件查询开屏通知列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @param type
+     * @return
+     */
+    ResponseBean listNoticeByCondition(Integer pageNum, Integer pageSize, String title, String targetType, String targetName,
+                                       Integer status, String type);
+
+    /**
+     * 批量删除
+     *
+     * @param taNoticeList
+     * @return
+     */
+    ResponseBean batchDelete(List<TaNotice> taNoticeList);
 }

src/main/java/com/huiju/estateagents/sample/service/impl/TaNoticeServiceImpl.java

@@ -1,11 +1,21 @@
 package com.huiju.estateagents.sample.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.sample.entity.TaNotice;
 import com.huiju.estateagents.sample.mapper.TaNoticeMapper;
 import com.huiju.estateagents.sample.service.ITaNoticeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 开屏通知  服务实现类
@@ -14,7 +24,41 @@ import org.springframework.stereotype.Service;
  * @author fxf
  * @since 2020-03-18
  */
+@Slf4j
 @Service
 public class TaNoticeServiceImpl extends ServiceImpl<TaNoticeMapper, TaNotice> implements ITaNoticeService {
 
+    @Autowired
+    private TaNoticeMapper taNoticeMapper;
+
+    @Override
+    public ResponseBean listNoticeByCondition(Integer pageNum, Integer pageSize, String title, String targetType, String targetName, Integer status, String type) {
+        log.info("TaNoticeServiceImpl.listNoticeByCondition 接收参数：pageNum:{},pageSize:{},title:{},targetType:{},targetName:{},status:{},type:{}",
+                pageNum, pageSize, title, targetType, targetName, status, type);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //使用分页插件
+        IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
+        pg = taNoticeMapper.listNoticeByCondition(pg, title, targetType, targetName, status, type);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean batchDelete(List<TaNotice> taNoticeList) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaNotice> updateList = new ArrayList<>();
+        TaNotice newNotice;
+        for (TaNotice taNotice : taNoticeList) {
+            newNotice = new TaNotice();
+            newNotice.setNoticeId(taNotice.getNoticeId());
+            newNotice.setStatus(CommConstant.STATUS_DELETE);
+            updateList.add(newNotice);
+        }
+
+        responseBean.addSuccess(updateBatchById(updateList));
+        return responseBean;
+    }
 }

src/main/resources/mapper/sample/TaNoticeMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.sample.mapper.TaNoticeMapper">
 
+    <select id="listNoticeByCondition" resultType="com.huiju.estateagents.sample.entity.TaNotice">
+        SELECT
+            t.*,
+            t2.sample_name targetName
+        FROM
+            ta_notice t
+            LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
+        <where>
+            <if test="title != null and title != ''">
+                t.title like CONCAT('%',#{title}, '%')
+            </if>
+            <if test="targetName != null and targetName != ''">
+                AND t2.sample_name like CONCAT('%',#{targetName}, '%')
+            </if>
+            <if test="targetType != null and targetType != ''">
+                AND t.target_type = #{targetType}
+            </if>
+            <if test="status != null">
+                AND t.`status` = #{status}
+            </if>
+        </where>
+        ORDER BY
+            t.order_no DESC,t.create_date DESC
+    </select>
 </mapper>