zhiyuxing
/
estateagents
Bevaka 0
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 15 Wiki Activity
Bläddra i källkod

提交

魏熙美 5 år sedan
förälder
0638fc3149
incheckning
394a442a96
3 ändrade filer med 12 tillägg och 11 borttagningar
Delad Vy Visa Diff Statistik
  1. 5
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsController.java
  2. 5
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java
  3. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Visa fil 

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

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java Visa fil 

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

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java Visa fil 

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