* 新需求提交

src/main/java/com/huiju/estateagents/job/NoticeTimeJob.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.sample.service.ITaNoticeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 开屏通知定时任务
+ */
+@Slf4j
+@Component
+@Configuration
+@EnableScheduling
+public class NoticeTimeJob {
+
+    @Autowired
+    private ITaNoticeService taNoticeService;
+
+    /**
+     * 自动下架已过期的开屏通知
+     */
+    @Scheduled(cron = "* * */6 * * ?")
+    public void updateStatusByInvalidTime() {
+        log.info("updateStatusByInvalidTime 定时任务 开始");
+
+        Integer result = taNoticeService.updateStatusByInvalidTime();
+
+        log.info("updateStatusByInvalidTime 定时任务 结束,共更新{}条数据", result);
+    }
+
+}

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

@@ -5,10 +5,9 @@ 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.entity.SysAdvancedConfigRelation;
 import com.huiju.estateagents.sample.entity.TaContact;
-import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.entity.TaSampleContact;
@@ -19,13 +18,7 @@ import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -34,8 +27,8 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
-    * 样例表  前端控制器
-    * </p>
+ * 样例表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-18
@@ -60,28 +53,21 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/channel/ListH5SampleByCondition",method= RequestMethod.GET)
-    public ResponseBean ListH5SampleByCondition(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       String sampleName){
+    @RequestMapping(value = "/channel/listH5SampleByCondition", 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.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);
-        }catch (Exception e){
+            responseBean = iTaH5SampleService.listH5SampleByCondition(pageNum, pageSize, sampleName);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleList -=- {}",e.toString());
+            logger.error("ListH5SampleByCondition -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -89,30 +75,31 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taH5Sample",method= RequestMethod.GET)
-    public ResponseBean taH5SampleList(@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){
+    @RequestMapping(value = "/admin/taH5Sample", method = RequestMethod.GET)
+    public ResponseBean taH5SampleList(@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) {
         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.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
-            queryWrapper.orderByDesc("order_no","create_date");
+            queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleList -=- {}",e.toString());
+            logger.error("taH5SampleList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -120,22 +107,23 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taH5Sample 实体对象
      * @return
      */
-    @RequestMapping(value="/taH5Sample",method= RequestMethod.POST)
-    public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample){
+    @RequestMapping(value = "/taH5Sample", method = RequestMethod.POST)
+    public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaH5SampleService.save(taH5Sample)){
+            if (iTaH5SampleService.save(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleAdd -=- {}",e.toString());
+            logger.error("taH5SampleAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -143,21 +131,22 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taH5Sample/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taH5SampleDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taH5Sample/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taH5SampleDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaH5SampleService.removeById(id)){
+            if (iTaH5SampleService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleDelete -=- {}",e.toString());
+            logger.error("taH5SampleDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -165,23 +154,24 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taH5Sample 实体对象
      * @return
      */
-    @RequestMapping(value="/taH5Sample/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taH5Sample/{id}", method = RequestMethod.PUT)
     public ResponseBean taH5SampleUpdate(@PathVariable Integer id,
-                                        @RequestBody TaH5Sample taH5Sample){
+                                         @RequestBody TaH5Sample taH5Sample) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaH5SampleService.updateById(taH5Sample)){
+            if (iTaH5SampleService.updateById(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleUpdate -=- {}",e.toString());
+            logger.error("taH5SampleUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -189,16 +179,17 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taH5Sample/{id}",method= RequestMethod.GET)
-    public ResponseBean taH5SampleGet(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taH5Sample/{id}", method = RequestMethod.GET)
+    public ResponseBean taH5SampleGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaH5SampleService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleDelete -=- {}",e.toString());
+            logger.error("taH5SampleDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -207,41 +198,42 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @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,
-                                        @RequestParam(value ="sampleName",required = false) String sampleName,
-                                        @RequestParam(value ="tag",required = false) String tag,
-                                        @RequestParam(value ="status",required = false) Integer status,
-                                        @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
-                                        @RequestParam(value ="endCreateDate",required = false) String endCreateDate){
+    @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,
+                                        @RequestParam(value = "sampleName", required = false) String sampleName,
+                                        @RequestParam(value = "tag", required = false) String tag,
+                                        @RequestParam(value = "status", required = false) Integer status,
+                                        @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                        @RequestParam(value = "endCreateDate", required = false) String endCreateDate) {
         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.eq(null != status,"demand_status",status);
-            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.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
+            queryWrapper.eq(null != status, "demand_status", status);
+            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("status", CommConstant.STATUS_DELETE);
-            queryWrapper.orderByDesc("order_no","create_date");
+            queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
             result.getRecords().forEach(e -> {
-                if (!StringUtils.isEmpty(e.getTag())){
+                if (!StringUtils.isEmpty(e.getTag())) {
                     e.setTags(Arrays.asList(e.getTag().split(",")));
                 }
             });
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleList -=- {}",e.toString());
+            logger.error("taH5SampleList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -249,17 +241,18 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taH5Sample 实体对象
      * @return
      */
-    @RequestMapping(value="/channel/h5Sample/add",method= RequestMethod.POST)
-    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample){
+    @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.setTag(String.join(",", tags));
             taH5Sample.setCreateDate(LocalDateTime.now());
-            if (iTaH5SampleService.save(taH5Sample)){
+            if (iTaH5SampleService.save(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
                 taContactList.forEach(e -> {
                     TaSampleContact taSampleContact = new TaSampleContact();
@@ -268,12 +261,12 @@ public class TaH5SampleController extends BaseController {
                     iTaSampleContactService.save(taSampleContact);
                 });
                 responseBean.addSuccess(taH5Sample);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleAdd -=- {}",e.toString());
+            logger.error("taH5SampleAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -282,55 +275,56 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 获取详情
+     *
      * @param
      * @return
      */
-    @RequestMapping(value="/channel/get/h5Sample/{id}",method= RequestMethod.GET)
-    public ResponseBean getTaH5Sample(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/get/h5Sample/{id}", method = RequestMethod.GET)
+    public ResponseBean getTaH5Sample(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
             QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper();
-            queryWrapper.eq("sample_id",taH5Sample.getSampleId());
+            queryWrapper.eq("sample_id", taH5Sample.getSampleId());
             List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
-            if (sampleContactList.size() > 0){
-                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id",sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
+            if (sampleContactList.size() > 0) {
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
                 taH5Sample.setTaContactList(taContactList);
             }
-            if (!StringUtils.isEmpty(taH5Sample.getTag())){
+            if (!StringUtils.isEmpty(taH5Sample.getTag())) {
                 taH5Sample.setTags(Arrays.asList(taH5Sample.getTag().split(",")));
             }
             responseBean.addSuccess(taH5Sample);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleAdd -=- {}",e.toString());
+            logger.error("taH5SampleAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
 
-
     /**
      * 更新对象
+     *
      * @param taH5Sample 实体对象
      * @return
      */
-    @RequestMapping(value="/channel/update/h5Sample/{id}",method= RequestMethod.PUT)
-    public ResponseBean updateTaH5Sample(@PathVariable Integer id,@RequestBody TaH5Sample taH5Sample){
+    @RequestMapping(value = "/channel/update/h5Sample/{id}", method = RequestMethod.PUT)
+    public ResponseBean updateTaH5Sample(@PathVariable Integer id, @RequestBody TaH5Sample taH5Sample) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taH5Sample.setSampleId(id);
             List<String> tags = taH5Sample.getTags();
-            if (tags.size() > 0){
-                taH5Sample.setTag(String.join(",",tags));
-            }else{
+            if (tags.size() > 0) {
+                taH5Sample.setTag(String.join(",", tags));
+            } else {
                 taH5Sample.setTag("");
             }
             QueryWrapper<TaSampleContact> taSampleContactQueryWrapper = new QueryWrapper<>();
-            taSampleContactQueryWrapper.eq("sample_id",id);
+            taSampleContactQueryWrapper.eq("sample_id", id);
             iTaSampleContactService.remove(taSampleContactQueryWrapper);
-            if (iTaH5SampleService.updateById(taH5Sample)){
+            if (iTaH5SampleService.updateById(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
                 taContactList.forEach(e -> {
                     TaSampleContact taSampleContact = new TaSampleContact();
@@ -339,12 +333,12 @@ public class TaH5SampleController extends BaseController {
                     iTaSampleContactService.save(taSampleContact);
                 });
                 responseBean.addSuccess(taH5Sample);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleAdd -=- {}",e.toString());
+            logger.error("taH5SampleAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -353,30 +347,31 @@ public class TaH5SampleController extends BaseController {
 
     /**
      * 删除sample
+     *
      * @return
      */
-    @RequestMapping(value="/channel/put/h5Sample/{id}",method= RequestMethod.PUT)
-    public ResponseBean putTaH5Sample(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/put/h5Sample/{id}", method = RequestMethod.PUT)
+    public ResponseBean putTaH5Sample(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //查看是否有关联的需求单
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("sample_id",id);
-            queryWrapper.gt("demand_status",CommConstant.STATUS_DELETE);
+            queryWrapper.eq("sample_id", id);
+            queryWrapper.gt("demand_status", CommConstant.STATUS_DELETE);
             List<TaH5Demand> list = iTaH5DemandService.list(queryWrapper);
-            if (list.size() > 0){
-                return ResponseBean.error("存在关联的需求单，删除失败！",ResponseBean.ERROR_UNAVAILABLE);
+            if (list.size() > 0) {
+                return ResponseBean.error("存在关联的需求单，删除失败！", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
             taH5Sample.setStatus(CommConstant.STATUS_DELETE);
-            if (iTaH5SampleService.updateById(taH5Sample)){
+            if (iTaH5SampleService.updateById(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taH5SampleAdd -=- {}",e.toString());
+            logger.error("taH5SampleAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -149,7 +149,7 @@ public class TaNoticeController extends BaseController {
             }
             if (taNotice.getTargetId() != null) {
                 TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
-                if(taH5Sample != null){
+                if (taH5Sample != null) {
                     taNotice.setTargetName(taH5Sample.getSampleName());
                 }
             }

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

@@ -3,6 +3,7 @@ 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;
@@ -14,7 +15,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 样例表 
+ * 样例表
  * </p>
  *
  * @author fxf
@@ -99,4 +100,31 @@ public class TaH5Sample implements Serializable {
      */
     @TableField(exist = false)
     private List<TaContact> taContactList = new ArrayList<>();
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 新增人
+     */
+    private Integer addUser;
+
+    /**
+     * 添加人姓名
+     */
+    @TableField(exist = false)
+    private String addUserName;
+
+    /**
+     * 修改人姓名
+     */
+    @TableField(exist = false)
+    private String updateUserName;
 }

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

@@ -77,6 +77,4 @@ public class TaNotice implements Serializable {
      * 权重
      */
     private Integer orderNo;
-
-
 }

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

@@ -1,8 +1,10 @@
 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.TaH5Sample;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-03-18
  */
 @Mapper
+@Component
 public interface TaH5SampleMapper extends BaseMapper<TaH5Sample> {
 
+    IPage<TaH5Sample> listH5SampleByCondition(IPage<TaH5Sample> pg, String sampleName);
 }

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

@@ -38,5 +38,12 @@ public interface TaNoticeMapper extends BaseMapper<TaNotice> {
                                           @Param("type") String type);
 
     IPage<TaNotice> listNoticeByConditionForAdmin(IPage<TaNotice> pg,
-                                          @Param("type") String type);
+                                                  @Param("type") String type);
+
+    /**
+     * 自动下架已过期的开屏通知
+     *
+     * @return
+     */
+    Integer updateStatusByInvalidTime();
 }

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

@@ -1,6 +1,7 @@
 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.TaH5Sample;
 
 /**
@@ -13,4 +14,14 @@ import com.huiju.estateagents.sample.entity.TaH5Sample;
  */
 public interface ITaH5SampleService extends IService<TaH5Sample> {
 
+    /**
+     * 条件查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param sampleName
+     * @return
+     */
+    ResponseBean listH5SampleByCondition(Integer pageNum, Integer pageSize, String sampleName);
+
 }

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

@@ -41,4 +41,11 @@ public interface ITaNoticeService extends IService<TaNotice> {
      * @return
      */
     ResponseBean batchDelete(List<TaNotice> taNoticeList);
+
+    /**
+     * 自动下架已过期的开屏通知
+     *
+     * @return
+     */
+    Integer updateStatusByInvalidTime();
 }

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

@@ -1,9 +1,16 @@
 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.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.mapper.TaH5SampleMapper;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +24,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaH5SampleServiceImpl extends ServiceImpl<TaH5SampleMapper, TaH5Sample> implements ITaH5SampleService {
 
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
+
+    @Override
+    public ResponseBean listH5SampleByCondition(Integer pageNum, Integer pageSize, String sampleName) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
+        pg = taH5SampleMapper.listH5SampleByCondition(pg, sampleName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
 }

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

@@ -75,4 +75,9 @@ public class TaNoticeServiceImpl extends ServiceImpl<TaNoticeMapper, TaNotice> i
         responseBean.addSuccess(updateBatchById(updateList));
         return responseBean;
     }
+
+    @Override
+    public Integer updateStatusByInvalidTime() {
+        return taNoticeMapper.updateStatusByInvalidTime();
+    }
 }

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

@@ -2,4 +2,23 @@
 <!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.TaH5SampleMapper">
 
+    <select id="listH5SampleByCondition" resultType="com.huiju.estateagents.sample.entity.TaH5Sample">
+        SELECT
+            t.*,
+            t2.user_name addUserName,
+            t3.user_name updateUserName
+        FROM
+            ta_h5_sample t
+            LEFT JOIN ta_user t2 ON t.add_user = t2.user_id
+            LEFT JOIN ta_user t3 ON t.update_user = t3.user_id
+        WHERE
+            t.`status` != - 1
+            <if test = "sampleName != null and sampleName != ''">
+                AND t.sample_name LIKE concat('%',#{sampleName},'%')
+            </if>
+        ORDER BY
+            t.order_no,
+            t.create_date
+    </select>
+
 </mapper>

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

@@ -41,4 +41,11 @@
             t.order_no DESC,
             t.create_date DESC
     </select>
+
+    <update id="updateStatusByInvalidTime">
+        UPDATE ta_notice t
+            SET t.`status` = 0
+        WHERE
+            t.invalid_time &lt; NOW( )
+    </update>
 </mapper>