dingxin 5 年 前
コミット
2a63d4bf3c
共有35 個のファイルを変更した464 個の追加47 個の削除を含む
  1. 149
    0
      src/main/java/com/huiju/estateagents/center/taUser/controller/TaButtonUriMapController.java
  2. 40
    0
      src/main/java/com/huiju/estateagents/center/taUser/entity/TaButtonUriMap.java
  3. 20
    0
      src/main/java/com/huiju/estateagents/center/taUser/mapper/TaButtonUriMapMapper.java
  4. 17
    0
      src/main/java/com/huiju/estateagents/center/taUser/service/ITaButtonUriMapService.java
  5. 28
    0
      src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaButtonUriMapServiceImpl.java
  6. 7
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  7. 3
    2
      src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.java
  8. 10
    3
      src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java
  9. 8
    4
      src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java
  10. 8
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsController.java
  11. 8
    5
      src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java
  12. 5
    1
      src/main/java/com/huiju/estateagents/controller/TaPolicyController.java
  13. 3
    2
      src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
  14. 8
    4
      src/main/java/com/huiju/estateagents/controller/TdBizEventController.java
  15. 4
    0
      src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java
  16. 80
    1
      src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java
  17. 6
    1
      src/main/java/com/huiju/estateagents/mapper/SysButtonInMenuMapper.java
  18. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java
  19. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TdBizEventMapper.java
  20. 5
    1
      src/main/java/com/huiju/estateagents/service/ISysButtonInMenuService.java
  21. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  22. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingIntentionService.java
  23. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java
  24. 1
    1
      src/main/java/com/huiju/estateagents/service/ITdBizEventService.java
  25. 12
    1
      src/main/java/com/huiju/estateagents/service/impl/SysButtonInMenuServiceImpl.java
  26. 2
    2
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  27. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java
  28. 1
    0
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java
  29. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java
  30. 1
    0
      src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java
  31. 2
    2
      src/main/java/com/huiju/estateagents/service/impl/TdBizEventServiceImpl.java
  32. 10
    0
      src/main/resources/mapper/SysButtonInMenuMapper.xml
  33. 1
    1
      src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml
  34. 13
    0
      src/main/resources/mapper/TaButtonUriMapMapper.xml
  35. 3
    0
      src/main/resources/mapper/TdBizEventMapper.xml

+ 149
- 0
src/main/java/com/huiju/estateagents/center/taUser/controller/TaButtonUriMapController.java ファイルの表示

@@ -0,0 +1,149 @@
1
+package com.huiju.estateagents.center.taUser.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
9
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.PathVariable;
14
+import org.springframework.web.bind.annotation.RequestBody;
15
+import org.springframework.web.bind.annotation.RequestMapping;
16
+import org.springframework.web.bind.annotation.RequestMethod;
17
+import org.springframework.web.bind.annotation.RequestParam;
18
+import org.springframework.web.bind.annotation.ResponseBody;
19
+import org.springframework.web.bind.annotation.RestController;
20
+
21
+/**
22
+ * <p>
23
+    * 按钮路由映射表  前端控制器
24
+    * </p>
25
+ *
26
+ * @author jobob
27
+ * @since 2019-09-26
28
+ */
29
+@RestController
30
+@RequestMapping("/")
31
+public class TaButtonUriMapController extends BaseController {
32
+
33
+    private final Logger logger = LoggerFactory.getLogger(TaButtonUriMapController.class);
34
+
35
+    @Autowired
36
+    public ITaButtonUriMapService iTaButtonUriMapService;
37
+
38
+
39
+    /**
40
+     * 分页查询列表
41
+     * @param pageNum
42
+     * @param pageSize
43
+     * @return
44
+     */
45
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.GET)
46
+    public ResponseBean taButtonUriMapList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
+        ResponseBean responseBean = new ResponseBean();
49
+        try {
50
+            //使用分页插件
51
+		    IPage<TaButtonUriMap> pg = new Page<>(pageNum, pageSize);
52
+            QueryWrapper<TaButtonUriMap> queryWrapper = new QueryWrapper<>();
53
+            queryWrapper.orderByDesc("create_date");
54
+
55
+            IPage<TaButtonUriMap> result = iTaButtonUriMapService.page(pg, queryWrapper);
56
+            responseBean.addSuccess(result);
57
+        }catch (Exception e){
58
+            e.printStackTrace();
59
+            logger.error("taButtonUriMapList -=- {}",e.toString());
60
+            responseBean.addError(e.getMessage());
61
+        }
62
+        return responseBean;
63
+    }
64
+
65
+    /**
66
+     * 保存对象
67
+     * @param taButtonUriMap 实体对象
68
+     * @return
69
+     */
70
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.POST)
71
+    public ResponseBean taButtonUriMapAdd(@RequestBody TaButtonUriMap taButtonUriMap){
72
+        ResponseBean responseBean = new ResponseBean();
73
+        try {
74
+            if (iTaButtonUriMapService.save(taButtonUriMap)){
75
+                responseBean.addSuccess(taButtonUriMap);
76
+            }else {
77
+                responseBean.addError("fail");
78
+            }
79
+        }catch (Exception e){
80
+            e.printStackTrace();
81
+            logger.error("taButtonUriMapAdd -=- {}",e.toString());
82
+            responseBean.addError(e.getMessage());
83
+        }
84
+        return responseBean;
85
+    }
86
+
87
+    /**
88
+     * 根据id删除对象
89
+     * @param id  实体ID
90
+     */
91
+    @ResponseBody
92
+    @RequestMapping(value="/taButtonUriMap/{id}", method= RequestMethod.DELETE)
93
+    public ResponseBean taButtonUriMapDelete(@PathVariable Integer id){
94
+        ResponseBean responseBean = new ResponseBean();
95
+        try {
96
+            if(iTaButtonUriMapService.removeById(id)){
97
+                responseBean.addSuccess("success");
98
+            }else {
99
+                responseBean.addError("fail");
100
+            }
101
+        }catch (Exception e){
102
+            e.printStackTrace();
103
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
104
+            responseBean.addError(e.getMessage());
105
+        }
106
+        return responseBean;
107
+    }
108
+
109
+    /**
110
+     * 修改对象
111
+     * @param id  实体ID
112
+     * @param taButtonUriMap 实体对象
113
+     * @return
114
+     */
115
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.PUT)
116
+    public ResponseBean taButtonUriMapUpdate(@PathVariable Integer id,
117
+                                        @RequestBody TaButtonUriMap taButtonUriMap){
118
+        ResponseBean responseBean = new ResponseBean();
119
+        try {
120
+            if (iTaButtonUriMapService.updateById(taButtonUriMap)){
121
+                responseBean.addSuccess(taButtonUriMap);
122
+            }else {
123
+                responseBean.addError("fail");
124
+            }
125
+        }catch (Exception e){
126
+            e.printStackTrace();
127
+            logger.error("taButtonUriMapUpdate -=- {}",e.toString());
128
+            responseBean.addError(e.getMessage());
129
+        }
130
+        return responseBean;
131
+    }
132
+
133
+    /**
134
+     * 根据id查询对象
135
+     * @param id  实体ID
136
+     */
137
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.GET)
138
+    public ResponseBean taButtonUriMapGet(@PathVariable Integer id){
139
+        ResponseBean responseBean = new ResponseBean();
140
+        try {
141
+            responseBean.addSuccess(iTaButtonUriMapService.getById(id));
142
+        }catch (Exception e){
143
+            e.printStackTrace();
144
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
145
+            responseBean.addError(e.getMessage());
146
+        }
147
+        return responseBean;
148
+    }
149
+}

+ 40
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaButtonUriMap.java ファイルの表示

@@ -0,0 +1,40 @@
1
+package com.huiju.estateagents.center.taUser.entity;
2
+
3
+import lombok.Data;
4
+import lombok.EqualsAndHashCode;
5
+import lombok.experimental.Accessors;
6
+
7
+import java.io.Serializable;
8
+
9
+/**
10
+ * <p>
11
+ * 按钮路由映射表 
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2019-09-26
16
+ */
17
+@Data
18
+@EqualsAndHashCode(callSuper = false)
19
+@Accessors(chain = true)
20
+public class TaButtonUriMap implements Serializable {
21
+
22
+    private static final long serialVersionUID = 1L;
23
+
24
+    /**
25
+     * 按钮
26
+     */
27
+    private String buttonCode;
28
+
29
+    /**
30
+     * uri
31
+     */
32
+    private String uri;
33
+
34
+    /**
35
+     * 说明
36
+     */
37
+    private String remark;
38
+
39
+
40
+}

+ 20
- 0
src/main/java/com/huiju/estateagents/center/taUser/mapper/TaButtonUriMapMapper.java ファイルの表示

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.center.taUser.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
5
+import org.apache.ibatis.annotations.Mapper;
6
+import org.apache.ibatis.annotations.Param;
7
+
8
+/**
9
+ * <p>
10
+ * 按钮路由映射表  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-09-26
15
+ */
16
+@Mapper
17
+public interface TaButtonUriMapMapper extends BaseMapper<TaButtonUriMap> {
18
+	
19
+	TaButtonUriMap getByURI(@Param("uri") String uri);
20
+}

+ 17
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/ITaButtonUriMapService.java ファイルの表示

@@ -0,0 +1,17 @@
1
+package com.huiju.estateagents.center.taUser.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
5
+
6
+/**
7
+ * <p>
8
+ * 按钮路由映射表  服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-09-26
13
+ */
14
+public interface ITaButtonUriMapService extends IService<TaButtonUriMap> {
15
+	
16
+	TaButtonUriMap getByURI(String uri);
17
+}

+ 28
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaButtonUriMapServiceImpl.java ファイルの表示

@@ -0,0 +1,28 @@
1
+package com.huiju.estateagents.center.taUser.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
5
+import com.huiju.estateagents.center.taUser.mapper.TaButtonUriMapMapper;
6
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
7
+import org.springframework.beans.factory.annotation.Autowired;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ * 按钮路由映射表  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-09-26
17
+ */
18
+@Service
19
+public class TaButtonUriMapServiceImpl extends ServiceImpl<TaButtonUriMapMapper, TaButtonUriMap> implements ITaButtonUriMapService {
20
+	
21
+	@Autowired
22
+	private TaButtonUriMapMapper taButtonUriMapMapper;
23
+	
24
+	@Override
25
+	public TaButtonUriMap getByURI(String uri) {
26
+		return taButtonUriMapMapper.getByURI(uri);
27
+	}
28
+}

+ 7
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java ファイルの表示

@@ -251,24 +251,26 @@ public class TaBuildingDynamicController extends BaseController {
251 251
 
252 252
 
253 253
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
254
-    public ResponseBean send(@PathVariable String dynamicId) {
254
+    public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
255 255
         ResponseBean responseBean = new ResponseBean();
256 256
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
257 257
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
258 258
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
259 259
         dynamic.setStatus(1);
260 260
         dynamic.setPublishDate(LocalDateTime.now());
261
+        dynamic.setOrgId(getOrgId(request));
261 262
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
262 263
         return responseBean;
263 264
     }
264 265
 
265 266
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
266
-    public ResponseBean cancel(@PathVariable String dynamicId) {
267
+    public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
267 268
         ResponseBean responseBean = new ResponseBean();
268 269
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
269 270
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
270 271
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
271 272
         dynamic.setStatus(0);
273
+        dynamic.setOrgId(getOrgId(request));
272 274
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
273 275
         return responseBean;
274 276
     }
@@ -292,11 +294,12 @@ public class TaBuildingDynamicController extends BaseController {
292 294
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
293 295
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
294 296
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
295
-                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
297
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId,
298
+                                    HttpServletRequest request) {
296 299
         Page<TaActivityDynamicEnlist> page = new Page<>();
297 300
         page.setSize(pageSize);
298 301
         page.setCurrent(pageNum);
299
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
302
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request));
300 303
 
301 304
         HashMap<String, Object> map = new HashMap<>();
302 305
         map.put("list", signList);

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.java ファイルの表示

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
19 19
 import org.springframework.web.bind.annotation.RestController;
20 20
 import com.huiju.estateagents.base.BaseController;
21 21
 
22
+import javax.servlet.http.HttpServletRequest;
22 23
 import java.util.List;
23 24
 
24 25
 /**
@@ -92,9 +93,9 @@ public class TaBuildingIntentionController extends BaseController {
92 93
      * @return
93 94
      */
94 95
     @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
95
-    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId){
96
+    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId, HttpServletRequest request){
96 97
         ResponseBean responseBean = new ResponseBean();
97
-        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId);
98
+        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId, getOrgId(request));
98 99
         return responseBean;
99 100
     }
100 101
 

+ 10
- 3
src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java ファイルの表示

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
21 21
 import org.springframework.web.bind.annotation.RestController;
22 22
 import com.huiju.estateagents.base.BaseController;
23 23
 
24
+import javax.servlet.http.HttpServletRequest;
24 25
 import java.time.LocalDateTime;
25 26
 import java.util.ArrayList;
26 27
 import java.util.List;
@@ -51,13 +52,15 @@ public class TaBuildingReportController extends BaseController {
51 52
      */
52 53
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
53 54
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
54
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
55
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
56
+                                             HttpServletRequest request){
55 57
         ResponseBean responseBean = new ResponseBean();
56 58
         try {
57 59
             //使用分页插件
58 60
 		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
59 61
             QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
60 62
             queryWrapper.orderByDesc("create_date");
63
+            queryWrapper.eq("org_id", getOrgId(request));
61 64
 
62 65
             IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
63 66
             responseBean.addSuccess(result);
@@ -74,13 +77,15 @@ public class TaBuildingReportController extends BaseController {
74 77
      * @return
75 78
      */
76 79
     @RequestMapping(value="/admin/taBuildingReport/add",method= RequestMethod.POST)
77
-    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString){
80
+    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString, HttpServletRequest request){
78 81
         ResponseBean responseBean = new ResponseBean();
82
+        Integer orgId = getOrgId(request);
79 83
         try {
80 84
             JSONArray jsonArray = JSONObject.parseObject(jsonString).getJSONArray("list");
81 85
             List<TaBuildingReport> list = new ArrayList<>();
82 86
             jsonArray.stream().forEach(e -> {
83 87
                 TaBuildingReport taBuildingReport = new TaBuildingReport();
88
+                taBuildingReport.setOrgId(orgId);
84 89
                 taBuildingReport.setReportCode(e.toString());
85 90
                 taBuildingReport.setCreateDate(LocalDateTime.now());
86 91
                 list.add(taBuildingReport);
@@ -128,9 +133,11 @@ public class TaBuildingReportController extends BaseController {
128 133
      */
129 134
     @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
130 135
     public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
131
-                                        @RequestBody TaBuildingReport taBuildingReport){
136
+                                        @RequestBody TaBuildingReport taBuildingReport,
137
+                                               HttpServletRequest request){
132 138
         ResponseBean responseBean = new ResponseBean();
133 139
         try {
140
+            taBuildingReport.setOrgId(getOrgId(request));
134 141
             if (iTaBuildingReportService.updateById(taBuildingReport)){
135 142
                 responseBean.addSuccess(taBuildingReport);
136 143
             }else {

+ 8
- 4
src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java ファイルの表示

@@ -54,14 +54,15 @@ public class TaCustomerMessageController extends BaseController {
54 54
      */
55 55
     @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
56 56
     public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
57
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
+                                              HttpServletRequest request){
58 59
         ResponseBean responseBean = new ResponseBean();
59 60
         try {
60 61
             //使用分页插件
61 62
 		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
62 63
             QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
63 64
             queryWrapper.orderByDesc("create_date");
64
-
65
+            queryWrapper.eq("org_id", getOrgId(request));
65 66
             IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
66 67
             responseBean.addSuccess(result);
67 68
         }catch (Exception e){
@@ -78,9 +79,10 @@ public class TaCustomerMessageController extends BaseController {
78 79
      * @return
79 80
      */
80 81
     @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
81
-    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
82
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
82 83
         ResponseBean responseBean = new ResponseBean();
83 84
         try {
85
+            taCustomerMessage.setOrgId(getOrgId(request));
84 86
             if (iTaCustomerMessageService.save(taCustomerMessage)){
85 87
                 responseBean.addSuccess(taCustomerMessage);
86 88
             }else {
@@ -124,9 +126,11 @@ public class TaCustomerMessageController extends BaseController {
124 126
      */
125 127
     @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
126 128
     public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
127
-                                        @RequestBody TaCustomerMessage taCustomerMessage){
129
+                                                @RequestBody TaCustomerMessage taCustomerMessage,
130
+                                                HttpServletRequest request){
128 131
         ResponseBean responseBean = new ResponseBean();
129 132
         try {
133
+            taCustomerMessage.setOrgId(getOrgId(request));
130 134
             if (iTaCustomerMessageService.updateById(taCustomerMessage)){
131 135
                 responseBean.addSuccess(taCustomerMessage);
132 136
             }else {

+ 8
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsController.java ファイルの表示

@@ -63,13 +63,13 @@ public class TaNewsController extends BaseController {
63 63
      * @return
64 64
      */
65 65
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
66
-    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
66
+    public ResponseBean taNewsList(HttpServletRequest request,
67
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
67 68
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
68 69
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
69
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
70 70
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
71 71
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
72
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
72
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
73 73
         return responseBean;
74 74
     }
75 75
 
@@ -109,9 +109,10 @@ public class TaNewsController extends BaseController {
109 109
      * @return
110 110
      */
111 111
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
112
-    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
112
+    public ResponseBean taNewsAdd(@RequestBody TaNews taNews, HttpServletRequest request){
113 113
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
114 114
         taNews.setCityId(cityId);
115
+        taNews.setOrgId(getOrgId(request));
115 116
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
116 117
         return responseBean;
117 118
     }
@@ -135,10 +136,12 @@ public class TaNewsController extends BaseController {
135 136
      */
136 137
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
137 138
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
138
-                                        @RequestBody TaNews taNews){
139
+                                        @RequestBody TaNews taNews,
140
+                                     HttpServletRequest request){
139 141
         taNews.setNewsId(id);
140 142
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
141 143
         taNews.setCityId(cityId);
144
+        taNews.setOrgId(getOrgId(request));
142 145
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
143 146
         return responseBean;
144 147
     }

+ 8
- 5
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java ファイルの表示

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestParam;
18 18
 import org.springframework.web.bind.annotation.ResponseBody;
19 19
 import org.springframework.web.bind.annotation.RestController;
20 20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
21 23
 /**
22 24
  * <p>
23 25
     * 资讯类型表  前端控制器
@@ -46,8 +48,8 @@ public class TaNewsTypeController extends BaseController {
46 48
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47 49
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48 50
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
49
-                                       @RequestParam(value = "orgId", required = false) Integer orgId){
50
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
51
+                                       HttpServletRequest request){
52
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
51 53
         return responseBean;
52 54
     }
53 55
 
@@ -57,8 +59,8 @@ public class TaNewsTypeController extends BaseController {
57 59
      * @return
58 60
      */
59 61
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
60
-    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
61
-        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
62
+    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
63
+        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
62 64
         return responseBean;
63 65
     }
64 66
 
@@ -81,8 +83,9 @@ public class TaNewsTypeController extends BaseController {
81 83
      */
82 84
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
83 85
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
84
-                                        @RequestBody TaNewsType taNewsType){
86
+                                        @RequestBody TaNewsType taNewsType, HttpServletRequest request){
85 87
         taNewsType.setNewsTypeId(id);
88
+        taNewsType.setOrgId(getOrgId(request));
86 89
         ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
87 90
         return responseBean;
88 91
     }

+ 5
- 1
src/main/java/com/huiju/estateagents/controller/TaPolicyController.java ファイルの表示

@@ -55,7 +55,8 @@ public class TaPolicyController extends BaseController {
55 55
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.GET)
56 56
     public ResponseBean taPolicyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57 57
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
-                                     @RequestParam(value ="cityId") Integer cityId){
58
+                                     @RequestParam(value ="cityId", required = false) Integer cityId,
59
+                                     HttpServletRequest request){
59 60
         ResponseBean responseBean = new ResponseBean();
60 61
         try {
61 62
             //使用分页插件
@@ -64,6 +65,7 @@ public class TaPolicyController extends BaseController {
64 65
             queryWrapper.eq(null != cityId,"city_id",cityId);
65 66
             queryWrapper.orderByDesc("weight", "create_date");
66 67
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
68
+            queryWrapper.eq("org_id", getOrgId(request));
67 69
 
68 70
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
69 71
             responseBean.addSuccess(result);
@@ -124,6 +126,7 @@ public class TaPolicyController extends BaseController {
124 126
 
125 127
             taPolicy.setStatus(1);
126 128
             taPolicy.setCreateDate(LocalDateTime.now());
129
+            taPolicy.setOrgId(getOrgId(request));
127 130
 
128 131
             if (iTaPolicyService.save(taPolicy)){
129 132
                 responseBean.addSuccess(taPolicy);
@@ -182,6 +185,7 @@ public class TaPolicyController extends BaseController {
182 185
 
183 186
             TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
184 187
             taPolicy.setCityName(tdCity.getName());
188
+            taPolicy.setOrgId(getOrgId(request));
185 189
 
186 190
             if (iTaPolicyService.updateById(taPolicy)){
187 191
                 responseBean.addSuccess(taPolicy);

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java ファイルの表示

@@ -215,7 +215,8 @@ public class TaRecommendCustomerController extends BaseController {
215 215
 
216 216
     // 客户列表 公客/私客
217 217
     @GetMapping("/admin/customer/recommend")
218
-    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
218
+    public ResponseBean getCustomerList (HttpServletRequest request,
219
+                                         @RequestParam(value ="name",required = false) String name,
219 220
                                          @RequestParam(value ="tel",required = false) String tel,
220 221
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
221 222
                                          @RequestParam(value ="consultName",required = false) String consultName,
@@ -227,7 +228,7 @@ public class TaRecommendCustomerController extends BaseController {
227 228
                                          @RequestParam(value = "sex",required = false)Integer sex,
228 229
                                          @RequestParam(value = "customerType") String customerType){ // public 公  private 私
229 230
         try{
230
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, null)); //getOrgId(request)
231
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
231 232
         }catch (Exception e){
232 233
             e.printStackTrace();
233 234
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

+ 8
- 4
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java ファイルの表示

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
18 18
 import org.springframework.web.bind.annotation.RestController;
19 19
 import com.huiju.estateagents.base.BaseController;
20 20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
21 23
 /**
22 24
  * <p>
23 25
     * 事件字典  前端控制器
@@ -44,7 +46,8 @@ public class TdBizEventController extends BaseController {
44 46
      */
45 47
     @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
46 48
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
49
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
50
+                                       HttpServletRequest request){
48 51
         ResponseBean responseBean = new ResponseBean();
49 52
         try {
50 53
             //使用分页插件
@@ -70,13 +73,14 @@ public class TdBizEventController extends BaseController {
70 73
      */
71 74
     @RequestMapping(value="/admin/tdBizEventIntention",method= RequestMethod.GET)
72 75
     public ResponseBean tdBizEventAndIntention(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
73
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
74
-                                            @RequestParam(value = "buildingId", required = false) String buildingId){
76
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
77
+                                               @RequestParam(value = "buildingId", required = false) String buildingId,
78
+                                               HttpServletRequest request){
75 79
         ResponseBean responseBean = new ResponseBean();
76 80
         try {
77 81
             //使用分页插件
78 82
             IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
79
-            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId);
83
+            responseBean = iTdBizEventService.getBizEventAndIntention(pg, buildingId, getOrgId(request));
80 84
         }catch (Exception e){
81 85
             logger.error("tdBizEventList -=- {}",e.toString());
82 86
             responseBean.addError(e.getMessage());

+ 4
- 0
src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java ファイルの表示

@@ -47,6 +47,10 @@ public class SysButtonInMenu implements Serializable {
47 47
     private Integer status;
48 48
 
49 49
     private String code;
50
+    
51
+    private String remark;
52
+
53
+    private String remark;
50 54
 
51 55
     @TableField(exist = false)
52 56
     private List<Integer> roles;

+ 80
- 1
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java ファイルの表示

@@ -1,10 +1,20 @@
1 1
 package com.huiju.estateagents.interceptor;
2 2
 
3 3
 import com.alibaba.fastjson.JSONObject;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 5
 import com.huiju.estateagents.base.ResponseBean;
5 6
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
6 7
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
8
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
9
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
10
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
11
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
7 12
 import com.huiju.estateagents.common.JWTUtils;
13
+import com.huiju.estateagents.common.StringUtils;
14
+import com.huiju.estateagents.entity.SysButtonInMenu;
15
+import com.huiju.estateagents.entity.TaRoleButton;
16
+import com.huiju.estateagents.service.ISysButtonInMenuService;
17
+import com.huiju.estateagents.service.ITaRoleButtonService;
8 18
 import io.jsonwebtoken.*;
9 19
 import org.springframework.beans.factory.annotation.Autowired;
10 20
 import org.springframework.stereotype.Component;
@@ -13,6 +23,8 @@ import org.springframework.web.servlet.ModelAndView;
13 23
 
14 24
 import javax.servlet.http.HttpServletRequest;
15 25
 import javax.servlet.http.HttpServletResponse;
26
+import java.util.List;
27
+import java.util.Map;
16 28
 
17 29
 @Component
18 30
 public class AccessInterceptor implements HandlerInterceptor {
@@ -20,6 +32,18 @@ public class AccessInterceptor implements HandlerInterceptor {
20 32
     @Autowired
21 33
     private ISysTokenService sysTokenService;
22 34
     
35
+    @Autowired
36
+    private ITaUserRoleService taUserRoleService;
37
+    
38
+    @Autowired
39
+    private ITaRoleButtonService taRoleButtonService;
40
+    
41
+    @Autowired
42
+    private ISysButtonInMenuService sysButtonInMenuService;
43
+    
44
+    @Autowired
45
+    private ITaButtonUriMapService taButtonUriMapService;
46
+    
23 47
     private String[] whiteList = {
24 48
             "/wx/chat", // 聊天暂时不鉴权
25 49
             "/api/wx/login",
@@ -112,9 +136,64 @@ public class AccessInterceptor implements HandlerInterceptor {
112 136
             return false;
113 137
         }
114 138
         
139
+        //按钮权限校验
140
+        boolean state = checkButtonRole(request);
141
+        if (!state){
142
+            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
143
+        
144
+            response.addHeader("Content-type", "application/json");
145
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
146
+            return false;
147
+        }
148
+        
115 149
         return true;
116 150
     }
117
-
151
+    
152
+    //检验按钮权限
153
+    private boolean checkButtonRole(HttpServletRequest request) {
154
+        if(StringUtils.isEmpty(request.getHeader("x-action"))){
155
+            return false;
156
+        }
157
+        //根据路径匹配code 一致继续 否则无权限
158
+        String requestURI = request.getRequestURI();
159
+        String method = request.getMethod();
160
+        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(method+":"+requestURI);
161
+        if (null == taButtonUriMap){
162
+            return true;
163
+        }
164
+        
165
+        if (!taButtonUriMap.getButtonCode().equals(request.getHeader("x-action"))){
166
+            return false;
167
+        }
168
+        
169
+        //根据code查询按钮权限
170
+        Map map = JWTUtils.getUserIdAndOrgId(request);
171
+        QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
172
+        sysButtonInMenuQueryWrapper.eq("code",request.getHeader("x-action"));
173
+        SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
174
+        if (null == sysButtonInMenu){
175
+            return false;
176
+        }
177
+        //查询角色
178
+        QueryWrapper<TaRoleButton> taRoleButtonQueryWrapper = new QueryWrapper<>();
179
+        taRoleButtonQueryWrapper.eq("btn_id",sysButtonInMenu.getBtnId());
180
+        List<TaRoleButton> taRoleButtonList = taRoleButtonService.list(taRoleButtonQueryWrapper);
181
+        if (taRoleButtonList.size() < 1){
182
+            return true;
183
+        }
184
+        //查询用户
185
+        QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
186
+        taUserRoleQueryWrapper.eq("user_id",map.get("userId"));
187
+        TaUserRole taUserRole = taUserRoleService.getOne(taUserRoleQueryWrapper);
188
+        for (TaRoleButton taRoleButton : taRoleButtonList){
189
+            if (taRoleButton.getRoleId().equals(taUserRole.getRoleId())){
190
+                return true;
191
+            }
192
+        }
193
+        
194
+        return false;
195
+    }
196
+    
118 197
     private boolean checkMiniApp(HttpServletRequest request) {
119 198
         String requestURI = request.getRequestURI();
120 199
 

+ 6
- 1
src/main/java/com/huiju/estateagents/mapper/SysButtonInMenuMapper.java ファイルの表示

@@ -2,7 +2,11 @@ package com.huiju.estateagents.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.huiju.estateagents.entity.SysButtonInMenu;
5
+import com.huiju.estateagents.entity.TaRoleButton;
5 6
 import org.apache.ibatis.annotations.Mapper;
7
+import org.apache.ibatis.annotations.Param;
8
+
9
+import java.util.List;
6 10
 
7 11
 /**
8 12
  * <p>
@@ -14,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
14 18
  */
15 19
 @Mapper
16 20
 public interface SysButtonInMenuMapper extends BaseMapper<SysButtonInMenu> {
17
-
21
+	
22
+	List<SysButtonInMenu> getButtonList(@Param("roleId") Integer roleId);
18 23
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java ファイルの表示

@@ -25,5 +25,5 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
25 25
      * @param dynamicId
26 26
      * @return
27 27
      */
28
-    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId);
28
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
29 29
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TdBizEventMapper.java ファイルの表示

@@ -26,5 +26,5 @@ public interface TdBizEventMapper extends BaseMapper<TdBizEvent> {
26 26
      * @param buildingId
27 27
      * @return
28 28
      */
29
-    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId);
29
+    IPage<TdBizEvent> selectBizEventAndIntention(IPage<TdBizEvent> pg, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
30 30
 }

+ 5
- 1
src/main/java/com/huiju/estateagents/service/ISysButtonInMenuService.java ファイルの表示

@@ -2,6 +2,9 @@ package com.huiju.estateagents.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.entity.SysButtonInMenu;
5
+import com.huiju.estateagents.entity.TaRoleButton;
6
+
7
+import java.util.List;
5 8
 
6 9
 /**
7 10
  * <p>
@@ -12,5 +15,6 @@ import com.huiju.estateagents.entity.SysButtonInMenu;
12 15
  * @since 2019-09-11
13 16
  */
14 17
 public interface ISysButtonInMenuService extends IService<SysButtonInMenu> {
15
-
18
+	
19
+	List<SysButtonInMenu> getButtonList(Integer roleId);
16 20
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java ファイルの表示

@@ -79,7 +79,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
79 79
      * @param page
80 80
      * @return
81 81
      */
82
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
82
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId);
83 83
 
84 84
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
85 85
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingIntentionService.java ファイルの表示

@@ -23,5 +23,5 @@ public interface ITaBuildingIntentionService extends IService<TaBuildingIntentio
23 23
      * @param tdBizEventsList
24 24
      * @return
25 25
      */
26
-    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId);
26
+    ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId, Integer orgId);
27 27
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java ファイルの表示

@@ -43,7 +43,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
43 43
      * @param taNewsType
44 44
      * @return
45 45
      */
46
-    ResponseBean addTaNewsType(TaNewsType taNewsType);
46
+    ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId);
47 47
 
48 48
     /**
49 49
      * 删除资讯类型

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITdBizEventService.java ファイルの表示

@@ -22,6 +22,6 @@ public interface ITdBizEventService extends IService<TdBizEvent> {
22 22
      * @param buildingId
23 23
      * @return
24 24
      */
25
-    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId);
25
+    ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId);
26 26
 
27 27
 }

+ 12
- 1
src/main/java/com/huiju/estateagents/service/impl/SysButtonInMenuServiceImpl.java ファイルの表示

@@ -2,10 +2,14 @@ package com.huiju.estateagents.service.impl;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 4
 import com.huiju.estateagents.entity.SysButtonInMenu;
5
+import com.huiju.estateagents.entity.TaRoleButton;
5 6
 import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
6 7
 import com.huiju.estateagents.service.ISysButtonInMenuService;
8
+import org.springframework.beans.factory.annotation.Autowired;
7 9
 import org.springframework.stereotype.Service;
8 10
 
11
+import java.util.List;
12
+
9 13
 /**
10 14
  * <p>
11 15
  * 菜单按钮表  服务实现类
@@ -16,5 +20,12 @@ import org.springframework.stereotype.Service;
16 20
  */
17 21
 @Service
18 22
 public class SysButtonInMenuServiceImpl extends ServiceImpl<SysButtonInMenuMapper, SysButtonInMenu> implements ISysButtonInMenuService {
19
-
23
+	
24
+	@Autowired
25
+	private SysButtonInMenuMapper sysButtonInMenuMapper;
26
+	
27
+	@Override
28
+	public List<SysButtonInMenu> getButtonList(Integer roleId) {
29
+		return sysButtonInMenuMapper.getButtonList(roleId);
30
+	}
20 31
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java ファイルの表示

@@ -245,8 +245,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
245 245
     }
246 246
 
247 247
     @Override
248
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
249
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
248
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId) {
249
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId);
250 250
         return ResponseBean.success(signList);
251 251
     }
252 252
 

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingIntentionServiceImpl.java ファイルの表示

@@ -27,7 +27,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
27 27
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
28 28
 
29 29
     @Override
30
-    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId) {
30
+    public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId, Integer orgId) {
31 31
         ResponseBean responseBean = new ResponseBean();
32 32
 
33 33
         // 先删除库中存在的
@@ -45,6 +45,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
45 45
                 taBuildingIntention.setCreateDate(e.getCreateDate());
46 46
                 taBuildingIntention.setBuildingId(buildingId);
47 47
                 taBuildingIntention.setStatus(1);
48
+                taBuildingIntention.setOrgId(orgId);
48 49
                 return taBuildingIntention;
49 50
         }).collect(Collectors.toList());
50 51
 

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java ファイルの表示

@@ -203,6 +203,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
203 203
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
204 204
             QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
205 205
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
206
+            buildingIdQueryWrapper.eq("org_id", orgId);
206 207
             taBuildingMapper.update(building,buildingIdQueryWrapper);
207 208
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
208 209
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java ファイルの表示

@@ -81,7 +81,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
81 81
     }
82 82
 
83 83
     @Override
84
-    public ResponseBean addTaNewsType(TaNewsType taNewsType) {
84
+    public ResponseBean addTaNewsType(TaNewsType taNewsType, Integer orgId) {
85 85
         ResponseBean responseBean = new ResponseBean();
86 86
 
87 87
         //-- 校验 公司,楼盘
@@ -89,6 +89,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
89 89
 
90 90
         taNewsType.setCreateDate(LocalDateTime.now());
91 91
         taNewsType.setStatus(1);
92
+        taNewsType.setOrgId(orgId);
92 93
         this.save(taNewsType);
93 94
         responseBean.addSuccess(taNewsType);
94 95
         return responseBean;

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java ファイルの表示

@@ -395,6 +395,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
395 395
         queryWrapper.eq("recommend_person",customerId);
396 396
 //        queryWrapper.eq("building_id",building);
397 397
         queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
398
+        queryWrapper.eq("org_id", orgId);
398 399
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
399 400
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);
400 401
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TdBizEventServiceImpl.java ファイルの表示

@@ -26,9 +26,9 @@ public class TdBizEventServiceImpl extends ServiceImpl<TdBizEventMapper, TdBizEv
26 26
     private TdBizEventMapper tdBizEventMapper;
27 27
 
28 28
     @Override
29
-    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId) {
29
+    public ResponseBean getBizEventAndIntention(IPage<TdBizEvent> pg, String buildingId, Integer orgId) {
30 30
         ResponseBean responseBean = new ResponseBean();
31
-        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId);
31
+        IPage<TdBizEvent> page = tdBizEventMapper.selectBizEventAndIntention(pg, buildingId, orgId);
32 32
         responseBean.addSuccess(page);
33 33
         return responseBean;
34 34
     }

+ 10
- 0
src/main/resources/mapper/SysButtonInMenuMapper.xml ファイルの表示

@@ -2,4 +2,14 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 <mapper namespace="com.huiju.estateagents.mapper.SysButtonInMenuMapper">
4 4
 
5
+    <select id="getButtonList" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
6
+        SELECT
7
+            t.serial_no,
8
+            s.*
9
+        FROM
10
+            ta_role_button t
11
+            LEFT JOIN sys_button_in_menu s ON t.btn_id = s.btn_id
12
+        WHERE
13
+            t.role_id = #{roleId}
14
+    </select>
5 15
 </mapper>

+ 1
- 1
src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml ファイルの表示

@@ -2,6 +2,6 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
4 4
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
5
-            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId}
5
+            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
6 6
         </select>
7 7
 </mapper>

+ 13
- 0
src/main/resources/mapper/TaButtonUriMapMapper.xml ファイルの表示

@@ -0,0 +1,13 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaButtonUriMapMapper">
4
+
5
+    <select id="getByURI" resultType="com.huiju.estateagents.center.taUser.entity.TaButtonUriMap">
6
+        SELECT
7
+            *
8
+        FROM
9
+            ta_button_uri_map
10
+        WHERE
11
+            #{uri} REGEXP uri
12
+    </select>
13
+</mapper>

+ 3
- 0
src/main/resources/mapper/TdBizEventMapper.xml ファイルの表示

@@ -25,6 +25,9 @@
25 25
                 <if test="buildingId != null and buildingId != ''">
26 26
                     tbi.building_id = #{buildingId}
27 27
                 </if>
28
+                <if test="orgId != null">
29
+                    and tbi.org_id = #{orgId}
30
+                </if>
28 31
             </trim>
29 32
         ) as building_intention
30 33