魏熙美 5 年前
父节点
当前提交
394a442a96

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsController.java 查看文件

42
      * @param pageSize
42
      * @param pageSize
43
      * @return
43
      * @return
44
      */
44
      */
45
-    @RequestMapping(value="/taNews",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
46
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
48
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
71
      * @param taNews 实体对象
71
      * @param taNews 实体对象
72
      * @return
72
      * @return
73
      */
73
      */
74
-    @RequestMapping(value="/taNews",method= RequestMethod.POST)
74
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
75
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
75
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
76
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
76
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
77
         return responseBean;
77
         return responseBean;
82
      * @param id  实体ID
82
      * @param id  实体ID
83
      */
83
      */
84
     @ResponseBody
84
     @ResponseBody
85
-    @RequestMapping(value="/taNews/{id}", method= RequestMethod.DELETE)
85
+    @RequestMapping(value="/admin/taNews/{id}", method= RequestMethod.DELETE)
86
     public ResponseBean taNewsDelete(@PathVariable Integer id){
86
     public ResponseBean taNewsDelete(@PathVariable Integer id){
87
         ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
87
         ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
88
         return responseBean;
88
         return responseBean;
94
      * @param taNews 实体对象
94
      * @param taNews 实体对象
95
      * @return
95
      * @return
96
      */
96
      */
97
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.PUT)
97
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
98
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
98
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
99
                                         @RequestBody TaNews taNews){
99
                                         @RequestBody TaNews taNews){
100
         taNews.setNewsId(id);
100
         taNews.setNewsId(id);
106
      * 根据id查询对象
106
      * 根据id查询对象
107
      * @param id  实体ID
107
      * @param id  实体ID
108
      */
108
      */
109
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.GET)
109
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.GET)
110
     public ResponseBean taNewsGet(@PathVariable Integer id){
110
     public ResponseBean taNewsGet(@PathVariable Integer id){
111
         ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
111
         ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
112
         return responseBean;
112
         return responseBean;

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java 查看文件

42
      * @param pageSize
42
      * @param pageSize
43
      * @return
43
      * @return
44
      */
44
      */
45
-    @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/taNewsType",method= RequestMethod.GET)
46
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
48
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
56
      * @param taNewsType 实体对象
56
      * @param taNewsType 实体对象
57
      * @return
57
      * @return
58
      */
58
      */
59
-    @RequestMapping(value="/taNewsType",method= RequestMethod.POST)
59
+    @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
60
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
60
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
61
         ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
61
         ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
62
         return responseBean;
62
         return responseBean;
67
      * @param id  实体ID
67
      * @param id  实体ID
68
      */
68
      */
69
     @ResponseBody
69
     @ResponseBody
70
-    @RequestMapping(value="/taNewsType/{id}", method= RequestMethod.DELETE)
70
+    @RequestMapping(value="/admin/taNewsType/{id}", method= RequestMethod.DELETE)
71
     public ResponseBean taNewsTypeDelete(@PathVariable Integer id){
71
     public ResponseBean taNewsTypeDelete(@PathVariable Integer id){
72
         ResponseBean responseBean = iTaNewsTypeService.deleteTaNewsType(id);
72
         ResponseBean responseBean = iTaNewsTypeService.deleteTaNewsType(id);
73
         return responseBean;
73
         return responseBean;
79
      * @param taNewsType 实体对象
79
      * @param taNewsType 实体对象
80
      * @return
80
      * @return
81
      */
81
      */
82
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.PUT)
82
+    @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
83
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
83
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
84
                                         @RequestBody TaNewsType taNewsType){
84
                                         @RequestBody TaNewsType taNewsType){
85
         taNewsType.setNewsTypeId(id);
85
         taNewsType.setNewsTypeId(id);
91
      * 根据id查询对象
91
      * 根据id查询对象
92
      * @param id  实体ID
92
      * @param id  实体ID
93
      */
93
      */
94
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.GET)
94
+    @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.GET)
95
     public ResponseBean taNewsTypeGet(@PathVariable Integer id){
95
     public ResponseBean taNewsTypeGet(@PathVariable Integer id){
96
         ResponseBean responseBean = iTaNewsTypeService.getTaNewsTypeById(id);
96
         ResponseBean responseBean = iTaNewsTypeService.getTaNewsTypeById(id);
97
         return responseBean;
97
         return responseBean;

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java 查看文件

12
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
12
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
13
 import com.huiju.estateagents.service.ITaBuildingService;
13
 import com.huiju.estateagents.service.ITaBuildingService;
14
 import com.huiju.estateagents.service.ITaNewsTypeService;
14
 import com.huiju.estateagents.service.ITaNewsTypeService;
15
+import org.apache.commons.lang3.StringUtils;
15
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.stereotype.Service;
17
 import org.springframework.stereotype.Service;
17
 
18
 
40
         page.setSize(pageSize);
41
         page.setSize(pageSize);
41
 
42
 
42
         QueryWrapper<TaNewsType> taNewsQueryWrapper = new QueryWrapper<>();
43
         QueryWrapper<TaNewsType> taNewsQueryWrapper = new QueryWrapper<>();
43
-        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
44
+        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
44
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
45
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
45
         taNewsQueryWrapper.eq("status", 1);
46
         taNewsQueryWrapper.eq("status", 1);
46
         taNewsQueryWrapper.orderByDesc("create_date");
47
         taNewsQueryWrapper.orderByDesc("create_date");