Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java
#	src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java
#	src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -715,4 +715,9 @@ public class CommConstant {
      * 线下缴费
      */
     public static final String PAY_TYPE_ONLINE = "onLine";
+
+    /**
+     * 作废状态
+     */
+    public static final Integer DEMAND_STATUS_INVALID = 4;
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.service.ITaContactService;
 import org.slf4j.Logger;
@@ -18,11 +20,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * <p>
-    * 联系人表  前端控制器
-    * </p>
+ * 联系人表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-18
@@ -38,26 +44,37 @@ public class TaContactController extends BaseController {
 
 
     /**
-     * 分页查询列表
+     * 条件查询联系人列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param contactName
+     * @param telephone
+     * @param phone
+     * @param job
      * @return
      */
-    @RequestMapping(value="/admin/taContact",method= RequestMethod.GET)
-    public ResponseBean taContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
+    public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               String contactName, String telephone, String phone, String job) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job", job);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactList -=- {}",e.toString());
+            logger.error("taContactList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -65,43 +82,51 @@ public class TaContactController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taContact 实体对象
      * @return
      */
-    @RequestMapping(value="/taContact",method= RequestMethod.POST)
-    public ResponseBean taContactAdd(@RequestBody TaContact taContact){
+    @RequestMapping(value = "/channel/taContact", method = RequestMethod.POST)
+    public ResponseBean taContactAdd(@RequestBody TaContact taContact) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContactService.save(taContact)){
+            taContact.setCreateDate(LocalDateTime.now());
+            taContact.setStatus(CommConstant.STATUS_NORMAL);
+            if (iTaContactService.save(taContact)) {
                 responseBean.addSuccess(taContact);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactAdd -=- {}",e.toString());
+            logger.error("taContactAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 批量删除
+     *
      */
     @ResponseBody
-    @RequestMapping(value="/taContact/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taContactDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContact/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaContactService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
+            List<TaContact> updateList = new ArrayList<>();
+            TaContact newContact;
+            for (TaContact taContact : taContactList) {
+                newContact = new TaContact();
+                newContact.setContactId(taContact.getContactId());
+                newContact.setStatus(CommConstant.STATUS_DELETE);
+                updateList.add(newContact);
             }
-        }catch (Exception e){
+
+            responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactDelete -=- {}",e.toString());
+            logger.error("taContactDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -109,23 +134,24 @@ public class TaContactController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id        实体ID
      * @param taContact 实体对象
      * @return
      */
-    @RequestMapping(value="/taContact/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.PUT)
     public ResponseBean taContactUpdate(@PathVariable Integer id,
-                                        @RequestBody TaContact taContact){
+                                        @RequestBody TaContact taContact) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContactService.updateById(taContact)){
+            if (iTaContactService.updateById(taContact)) {
                 responseBean.addSuccess(taContact);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactUpdate -=- {}",e.toString());
+            logger.error("taContactUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -133,16 +159,52 @@ public class TaContactController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taContact/{id}",method= RequestMethod.GET)
-    public ResponseBean taContactGet(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.GET)
+    public ResponseBean taContactGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaContactService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 联系人列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taContact",method= RequestMethod.GET)
+    public ResponseBean getContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="contactName",required = false) String contactName,
+                                       @RequestParam(value ="telephone",required = false) String telephone,
+                                       @RequestParam(value ="phone",required = false) String phone,
+                                       @RequestParam(value ="job",required = false) String job){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name",contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone",telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job",job);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("order_no","create_date");
+
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taContactDelete -=- {}",e.toString());
+            logger.error("taContactList -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.sample.controller;
 
+import com.alibaba.fastjson.JSONArray;
+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;
@@ -12,6 +14,7 @@ import com.huiju.estateagents.sample.service.ITaH5DemandService;
 import com.huiju.estateagents.service.ITaOrgService;
 import org.apache.poi.ss.formula.functions.T;
 import org.omg.CORBA.INTERNAL;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -211,4 +217,118 @@ public class TaH5DemandController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 获取h5需求清单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand",method= RequestMethod.GET)
+    public ResponseBean getH5DemandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="sampleName",required = false) String sampleName,
+                                        @RequestParam(value ="orgName",required = false) String orgName,
+                                        @RequestParam(value ="orderer",required = false) String orderer,
+                                        @RequestParam(value ="phone",required = false) String phone,
+                                        @RequestParam(value ="demandStatus",required = false) Integer demandStatus,
+                                        @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                        @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Demand> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(orgName),"org_name",orgName);
+            queryWrapper.like(!StringUtils.isEmpty(orderer),"orderer",orderer);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.eq(null != demandStatus,"demand_status",demandStatus);
+            queryWrapper.ge(!StringUtils.isEmpty(startCreateDate),"date_format(create_date,'%Y-%m-%d')",startCreateDate);
+            queryWrapper.le(!StringUtils.isEmpty(endCreateDate),"date_format(create_date,'%Y-%m-%d')",endCreateDate);
+            queryWrapper.gt("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaH5Demand> result = iTaH5DemandService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 批量删除需求单
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/batch",method= RequestMethod.PUT)
+    public ResponseBean batchUpdateH5DemandList(@RequestBody String ids,
+                                        HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            int successNum = 0;
+            int failNum = 0;
+            JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
+            for (Object id : jsonArray) {
+                TaH5Demand h5Demand = iTaH5DemandService.getById((Integer) id);
+                if (CommConstant.DEMAND_STATUS_INVALID.equals(h5Demand.getDemandStatus())){
+                    h5Demand.setDemandStatus(CommConstant.STATUS_DELETE);
+                    iTaH5DemandService.updateById(h5Demand);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/{id}",method= RequestMethod.GET)
+    public ResponseBean getH5Demand(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5DemandService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 更新需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/update/{id}",method= RequestMethod.PUT)
+    public ResponseBean updateH5Demand(@PathVariable Integer id,@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Demand.setDemandId(id);
+            taH5Demand.setUpdateDate(LocalDateTime.now());
+            responseBean.addSuccess(iTaH5DemandService.updateById(taH5Demand));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +23,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 样例表  前端控制器
@@ -36,6 +43,8 @@ public class TaH5SampleController extends BaseController {
     @Autowired
     public ITaH5SampleService iTaH5SampleService;
 
+    @Autowired
+    public ITaSampleContactService iTaSampleContactService;
 
     /**
      * 分页查询列表
@@ -43,20 +52,18 @@ public class TaH5SampleController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taH5Sample",method= RequestMethod.GET)
-    public ResponseBean taH5SampleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/channel/ListH5SampleByCondition",method= RequestMethod.GET)
+    public ResponseBean ListH5SampleByCondition(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="sampleName", required = false) String sampleName,
-                                       @RequestParam(value ="tag", required = false) String tag){
+                                       String sampleName){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
-            queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
-            queryWrapper.orderByDesc("order_no");
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no","create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -152,4 +159,65 @@ public class TaH5SampleController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/h5Sample/list",method= RequestMethod.GET)
+    public ResponseBean geth5SampleList(@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.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.orderByDesc("order_no","create_date");
+
+            IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/h5Sample/add",method= RequestMethod.POST)
+    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<String> tags = taH5Sample.getTags();
+            taH5Sample.setTag(String.join(",",tags));
+            taH5Sample.setCreateDate(LocalDateTime.now());
+            if (iTaH5SampleService.save(taH5Sample)){
+                List<TaContact> taContactList = taH5Sample.getTaContactList();
+                taContactList.forEach(e -> {
+                    TaSampleContact taSampleContact = new TaSampleContact();
+                    taSampleContact.setContactId(e.getContactId());
+                    taSampleContact.setSampleId(taH5Sample.getSampleId());
+                    iTaSampleContactService.save(taSampleContact);
+                });
+                responseBean.addSuccess(taH5Sample);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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,20 @@ 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.time.LocalDateTime;
+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);
@@ -35,28 +40,30 @@ public class TaNoticeController extends BaseController {
     @Autowired
     public ITaNoticeService iTaNoticeService;
 
-
     /**
-     * 分页查询列表
+     * 条件查询通知列表
+     *
      * @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 = "/channel/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,43 @@ public class TaNoticeController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value="/taNotice",method= RequestMethod.POST)
-    public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice){
+    @RequestMapping(value = "/channel/taNotice", method = RequestMethod.POST)
+    public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaNoticeService.save(taNotice)){
+            taNotice.setCreateDate(LocalDateTime.now());
+            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 = "/channel/taNotice/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody 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 +115,24 @@ public class TaNoticeController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id       实体ID
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value="/taNotice/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/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 +140,41 @@ 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 = "/channel/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());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询通知列表-admin
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param type       类型 目前默认 sample
+     * @return
+     */
+    @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
+    public ResponseBean listNoticeByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String type) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);
+            logger.info("TaNoticeController.listNoticeByConditionForAdmin 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taNoticeDelete -=- {}",e.toString());
+            logger.error("listNoticeByConditionForAdmin -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,9 +1,13 @@
 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 java.util.ArrayList;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -79,5 +83,20 @@ public class TaH5Sample implements Serializable {
      */
     private String sampleContent;
 
+    /**
+     * 样例链接
+     */
+    private String sampleContentLink;
+
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<String> tags = new ArrayList<>();
 
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<TaContact> taContactList = new ArrayList<>();
 }

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,25 @@ 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);
+
+    IPage<TaNotice> listNoticeByConditionForAdmin(IPage<TaNotice> pg,
+                                          @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,28 @@ 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);
+
+    ResponseBean listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, 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,55 @@ 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 listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, String type) {
+        log.info("TaNoticeServiceImpl.listNoticeByConditionForAdmin 接收参数：pageNum:{},pageSize:{},type:{}",
+                pageNum, pageSize, type);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //使用分页插件
+        IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
+        pg = taNoticeMapper.listNoticeByConditionForAdmin(pg, 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,42 @@
 <!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
+            t.`status` != -1
+            <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>
+        ORDER BY
+            t.order_no DESC,t.create_date DESC
+    </select>
+
+    <select id="listNoticeByConditionForAdmin" 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
+            t.`status` == 1
+            AND t.invalid_time &gt;= NOW( )
+        ORDER BY
+            t.order_no DESC,t.create_date DESC
+    </select>
 </mapper>