瀏覽代碼

新需求

傅行帆 4 年之前
父節點
當前提交
558e26cbd3

+ 15
- 7
src/main/java/com/huiju/estateagents/controller/TaOfficeNewsController.java 查看文件

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.common.StringUtils;
8 10
 import org.slf4j.Logger;
9 11
 import org.slf4j.LoggerFactory;
10 12
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
27 29
  * @since 2020-06-11
28 30
  */
29 31
 @RestController
30
-@RequestMapping("/")
32
+@RequestMapping("/api")
31 33
 public class TaOfficeNewsController extends BaseController {
32 34
 
33 35
     private final Logger logger = LoggerFactory.getLogger(TaOfficeNewsController.class);
@@ -42,15 +44,20 @@ public class TaOfficeNewsController extends BaseController {
42 44
      * @param pageSize
43 45
      * @return
44 46
      */
45
-    @RequestMapping(value="/taOfficeNews",method= RequestMethod.GET)
47
+    @RequestMapping(value="/channel/taOfficeNews",method= RequestMethod.GET)
46 48
     public ResponseBean taOfficeNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
49
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
50
+                                         @RequestParam(value ="title",required = false) String title,
51
+                                         @RequestParam(value ="status",required = false) Integer status){
48 52
         ResponseBean responseBean = new ResponseBean();
49 53
         try {
50 54
             //使用分页插件
51 55
 		    IPage<TaOfficeNews> pg = new Page<>(pageNum, pageSize);
52 56
             QueryWrapper<TaOfficeNews> queryWrapper = new QueryWrapper<>();
53
-            queryWrapper.orderByDesc("create_date");
57
+            queryWrapper.like(!StringUtils.isEmpty(title),"title",title);
58
+            queryWrapper.eq(null != status,"status",status);
59
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
60
+            queryWrapper.orderByDesc("weight","create_date");
54 61
 
55 62
             IPage<TaOfficeNews> result = iTaOfficeNewsService.page(pg, queryWrapper);
56 63
             responseBean.addSuccess(result);
@@ -67,7 +74,7 @@ public class TaOfficeNewsController extends BaseController {
67 74
      * @param taOfficeNews 实体对象
68 75
      * @return
69 76
      */
70
-    @RequestMapping(value="/taOfficeNews",method= RequestMethod.POST)
77
+    @RequestMapping(value="/channel/taOfficeNews",method= RequestMethod.POST)
71 78
     public ResponseBean taOfficeNewsAdd(@RequestBody TaOfficeNews taOfficeNews){
72 79
         ResponseBean responseBean = new ResponseBean();
73 80
         try {
@@ -112,11 +119,12 @@ public class TaOfficeNewsController extends BaseController {
112 119
      * @param taOfficeNews 实体对象
113 120
      * @return
114 121
      */
115
-    @RequestMapping(value="/taOfficeNews/{id}",method= RequestMethod.PUT)
122
+    @RequestMapping(value="/channel/taOfficeNews/{id}",method= RequestMethod.PUT)
116 123
     public ResponseBean taOfficeNewsUpdate(@PathVariable Integer id,
117 124
                                         @RequestBody TaOfficeNews taOfficeNews){
118 125
         ResponseBean responseBean = new ResponseBean();
119 126
         try {
127
+            taOfficeNews.setNewsId(id);
120 128
             if (iTaOfficeNewsService.updateById(taOfficeNews)){
121 129
                 responseBean.addSuccess(taOfficeNews);
122 130
             }else {
@@ -134,7 +142,7 @@ public class TaOfficeNewsController extends BaseController {
134 142
      * 根据id查询对象
135 143
      * @param id  实体ID
136 144
      */
137
-    @RequestMapping(value="/taOfficeNews/{id}",method= RequestMethod.GET)
145
+    @RequestMapping(value="/channel/taOfficeNews/{id}",method= RequestMethod.GET)
138 146
     public ResponseBean taOfficeNewsGet(@PathVariable Integer id){
139 147
         ResponseBean responseBean = new ResponseBean();
140 148
         try {

+ 11
- 2
src/main/java/com/huiju/estateagents/entity/TaOfficeNews.java 查看文件

@@ -2,12 +2,13 @@ package com.huiju.estateagents.entity;
2 2
 
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5
-import java.time.LocalDateTime;
6
-import java.io.Serializable;
7 5
 import lombok.Data;
8 6
 import lombok.EqualsAndHashCode;
9 7
 import lombok.experimental.Accessors;
10 8
 
9
+import java.io.Serializable;
10
+import java.time.LocalDateTime;
11
+
11 12
 /**
12 13
  * <p>
13 14
  * 资讯 
@@ -64,5 +65,13 @@ public class TaOfficeNews implements Serializable {
64 65
      */
65 66
     private Integer status;
66 67
 
68
+    /**
69
+     * 置顶
70
+     */
71
+    private Integer weight;
67 72
 
73
+    /**
74
+     * 主图
75
+     */
76
+    private String thumb;
68 77
 }