傅行帆 5 vuotta sitten
vanhempi
commit
d8617b8ced

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Näytä tiedosto

210
         dynamic.setPublishDate(LocalDateTime.now());
210
         dynamic.setPublishDate(LocalDateTime.now());
211
         dynamic.setCreateDate(LocalDateTime.now());
211
         dynamic.setCreateDate(LocalDateTime.now());
212
         iBuildingDynamicService.save(dynamic);
212
         iBuildingDynamicService.save(dynamic);
213
+        responseBean.addSuccess(dynamic);
213
         return responseBean;
214
         return responseBean;
214
     }
215
     }
215
 
216
 

+ 16
- 10
src/main/java/com/huiju/estateagents/controller/TaPosterController.java Näytä tiedosto

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

+ 16
- 9
src/main/java/com/huiju/estateagents/controller/TaShareContentController.java Näytä tiedosto

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