傅行帆 5 anos atrás
pai
commit
d8617b8ced

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Ver arquivo

@@ -210,6 +210,7 @@ public class TaBuildingDynamicController extends BaseController {
210 210
         dynamic.setPublishDate(LocalDateTime.now());
211 211
         dynamic.setCreateDate(LocalDateTime.now());
212 212
         iBuildingDynamicService.save(dynamic);
213
+        responseBean.addSuccess(dynamic);
213 214
         return responseBean;
214 215
     }
215 216
 

+ 16
- 10
src/main/java/com/huiju/estateagents/controller/TaPosterController.java Ver arquivo

@@ -5,6 +5,7 @@ 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;
8 9
 import com.huiju.estateagents.entity.TaPoster;
9 10
 import com.huiju.estateagents.service.TaPosterService;
10 11
 import org.slf4j.Logger;
@@ -18,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
18 19
 import org.springframework.web.bind.annotation.ResponseBody;
19 20
 import org.springframework.web.bind.annotation.RestController;
20 21
 
22
+import javax.servlet.http.HttpServletRequest;
23
+import java.time.LocalDateTime;
24
+
21 25
 /**
22 26
  * <p>
23 27
  * 分享海报表  前端控制器
@@ -27,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
27 31
  * @since 2019-09-21
28 32
  */
29 33
 @RestController
30
-@RequestMapping("/")
34
+@RequestMapping("/api")
31 35
 public class TaPosterController extends BaseController {
32 36
 
33 37
     private final Logger logger = LoggerFactory.getLogger(TaPosterController.class);
@@ -69,10 +73,13 @@ public class TaPosterController extends BaseController {
69 73
      * @param poster 实体对象
70 74
      * @return
71 75
      */
72
-    @RequestMapping(value = "/poster", method = RequestMethod.POST)
73
-    public ResponseBean posterAdd(@RequestBody TaPoster poster) {
76
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.POST)
77
+    public ResponseBean posterAdd(@RequestBody TaPoster poster, HttpServletRequest request) {
74 78
         ResponseBean responseBean = new ResponseBean();
75 79
         try {
80
+            poster.setStatus(CommConstant.STATUS_NORMAL);
81
+            poster.setOrgId(getOrgId(request));
82
+            poster.setCreateDate(LocalDateTime.now());
76 83
             if (iPosterService.save(poster)) {
77 84
                 responseBean.addSuccess(poster);
78 85
             } else {
@@ -116,10 +123,11 @@ public class TaPosterController extends BaseController {
116 123
      * @param poster 实体对象
117 124
      * @return
118 125
      */
119
-    @RequestMapping(value = "/poster/{id}", method = RequestMethod.PUT)
126
+    @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
120 127
     public ResponseBean posterUpdate(@PathVariable Integer id,
121 128
                                      @RequestBody TaPoster poster) {
122 129
         ResponseBean responseBean = new ResponseBean();
130
+        poster.setPosterId(id);
123 131
         try {
124 132
             if (iPosterService.updateById(poster)) {
125 133
                 responseBean.addSuccess(poster);
@@ -135,15 +143,13 @@ public class TaPosterController extends BaseController {
135 143
     }
136 144
 
137 145
     /**
138
-     * 根据id查询对象
139
-     *
140
-     * @param id 实体ID
146
+     * 查询对象
141 147
      */
142
-    @RequestMapping(value = "/poster/{id}", method = RequestMethod.GET)
143
-    public ResponseBean posterGet(@PathVariable Integer id) {
148
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.GET)
149
+    public ResponseBean posterGet(@RequestParam String targetId,@RequestParam String targetType ) {
144 150
         ResponseBean responseBean = new ResponseBean();
145 151
         try {
146
-            responseBean.addSuccess(iPosterService.getById(id));
152
+            responseBean.addSuccess(iPosterService.getPostersForTarget(targetId,targetType));
147 153
         } catch (Exception e) {
148 154
             e.printStackTrace();
149 155
             logger.error("posterDelete -=- {}", e.toString());

+ 16
- 9
src/main/java/com/huiju/estateagents/controller/TaShareContentController.java Ver arquivo

@@ -5,6 +5,7 @@ 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;
8 9
 import com.huiju.estateagents.entity.TaShareContent;
9 10
 import com.huiju.estateagents.service.TaShareContentService;
10 11
 import org.slf4j.Logger;
@@ -18,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
18 19
 import org.springframework.web.bind.annotation.ResponseBody;
19 20
 import org.springframework.web.bind.annotation.RestController;
20 21
 
22
+import javax.servlet.http.HttpServletRequest;
23
+import java.time.LocalDateTime;
24
+
21 25
 /**
22 26
  * <p>
23 27
     *   前端控制器
@@ -27,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
27 31
  * @since 2019-09-21
28 32
  */
29 33
 @RestController
30
-@RequestMapping("/")
34
+@RequestMapping("/api")
31 35
 public class TaShareContentController extends BaseController {
32 36
 
33 37
     private final Logger logger = LoggerFactory.getLogger(TaShareContentController.class);
@@ -67,10 +71,13 @@ public class TaShareContentController extends BaseController {
67 71
      * @param shareContent 实体对象
68 72
      * @return
69 73
      */
70
-    @RequestMapping(value="/shareContent",method= RequestMethod.POST)
71
-    public ResponseBean shareContentAdd(@RequestBody TaShareContent shareContent){
74
+    @RequestMapping(value="/admin/shareContent",method= RequestMethod.POST)
75
+    public ResponseBean shareContentAdd(@RequestBody TaShareContent shareContent, HttpServletRequest request){
72 76
         ResponseBean responseBean = new ResponseBean();
73 77
         try {
78
+            shareContent.setStatus(CommConstant.STATUS_NORMAL);
79
+            shareContent.setOrgId(getOrgId(request));
80
+            shareContent.setCreateDate(LocalDateTime.now());
74 81
             if (iShareContentService.save(shareContent)){
75 82
                 responseBean.addSuccess(shareContent);
76 83
             }else {
@@ -112,10 +119,11 @@ public class TaShareContentController extends BaseController {
112 119
      * @param shareContent 实体对象
113 120
      * @return
114 121
      */
115
-    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.PUT)
122
+    @RequestMapping(value="/admin/shareContent/{id}",method= RequestMethod.PUT)
116 123
     public ResponseBean shareContentUpdate(@PathVariable Integer id,
117 124
                                         @RequestBody TaShareContent shareContent){
118 125
         ResponseBean responseBean = new ResponseBean();
126
+        shareContent.setShareContentId(id);
119 127
         try {
120 128
             if (iShareContentService.updateById(shareContent)){
121 129
                 responseBean.addSuccess(shareContent);
@@ -131,14 +139,13 @@ public class TaShareContentController extends BaseController {
131 139
     }
132 140
 
133 141
     /**
134
-     * 根据id查询对象
135
-     * @param id  实体ID
142
+     * 查询对象
136 143
      */
137
-    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.GET)
138
-    public ResponseBean shareContentGet(@PathVariable Integer id){
144
+    @RequestMapping(value="/admin/shareContent",method= RequestMethod.GET)
145
+    public ResponseBean shareContentGet(@RequestParam String targetId,@RequestParam String targetType ){
139 146
         ResponseBean responseBean = new ResponseBean();
140 147
         try {
141
-            responseBean.addSuccess(iShareContentService.getById(id));
148
+            responseBean.addSuccess(iShareContentService.getPostersForTarget(targetId,targetType));
142 149
         }catch (Exception e){
143 150
             e.printStackTrace();
144 151
             logger.error("shareContentDelete -=- {}",e.toString());