傅行帆 5 лет назад
Родитель
Сommit
558e26cbd3

+ 15
- 7
src/main/java/com/huiju/estateagents/controller/TaOfficeNewsController.java Просмотреть файл

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

+ 11
- 2
src/main/java/com/huiju/estateagents/entity/TaOfficeNews.java Просмотреть файл

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