zhiyuxing
/
estateagents
Tarkkaile 0
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 15 Wiki Activity
Selaa lähdekoodia

楼盘，项目类型，orgId

魏熙美 5 vuotta sitten
vanhempi
35880fbcea
commit
28625a1610
6 muutettua tiedostoa jossa 42 lisäystä ja 31 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 16
    16
      src/main/java/com/huiju/estateagents/controller/TaBuildingController.java
  2. 10
    3
      src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java
  3. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java
  4. 5
    5
      src/main/java/com/huiju/estateagents/service/ITaBuildingService.java
  5. 9
    6
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java
  6. 1
    0
      src/main/resources/mapper/TaBuildingMapper.xml

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

@@ -75,8 +75,8 @@ public class TaBuildingController extends BaseController {
75 75 
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
76 76 
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
77 77 
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
78 
-                                     @RequestParam(value = "orgId",required = false)Integer orgId){
79 
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
78 
+                                     HttpServletRequest request){
79 
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
80 80 
     }
81 81
82 82 
     /**
 
@@ -96,9 +96,9 @@ public class TaBuildingController extends BaseController {
96 96 
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
97 97 
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
98 98 
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
99 
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
100 
-        Map map = JWTUtils.getUserIdAndOrgId(request);
101 
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,Integer.valueOf(map.get("orgId").toString()));
99 
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
100 
+                                           HttpServletRequest request){
101 
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
102 102 
     }
103 103
104 104 
     /**
 
@@ -107,8 +107,8 @@ public class TaBuildingController extends BaseController {
107 107 
      * @return
108 108 
      */
109 109 
     @PutMapping("/admin/building/update")
110 
-    public ResponseBean buildingUpdate(@RequestBody String parameter){
111 
-        return taBuildingService.buildingUpdate(parameter);
110 
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
111 
+        return taBuildingService.buildingUpdate(parameter, getOrgId(request));
112 112 
     }
113 113
114 114 
     /**
 
@@ -117,8 +117,8 @@ public class TaBuildingController extends BaseController {
117 117 
      * @return
118 118 
      */
119 119 
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
120 
-    public ResponseBean buildingAdd(@RequestBody String parameter){
121 
-        return taBuildingService.buildingAdd(parameter);
120 
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request){
121 
+        return taBuildingService.buildingAdd(parameter, getOrgId(request));
122 122 
     }
123 123
124 124 
     /**
 
@@ -127,19 +127,19 @@ public class TaBuildingController extends BaseController {
127 127 
      * @return
128 128 
      */
129 129 
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
130 
-    public ResponseBean buildingUpdateStatus(@RequestBody String parameter){
131 
-        return taBuildingService.buildingUpdateStatus(parameter);
130 
+    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request){
131 
+        return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
132 132 
     }
133 133
134 134 
     /**
135 135 
      * 楼盘删除
136 136 
      * @param id
137 
-     * @param session
137 
+     * @param request
138 138 
      * @return
139 139 
      */
140 140 
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
141 
-    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpSession session){
142 
-        return taBuildingService.buildingdelete(id);
141 
+    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request){
142 
+        return taBuildingService.buildingdelete(id, getOrgId(request));
143 143 
     }
144 144
145 145 
     /**
 
@@ -284,8 +284,8 @@ public class TaBuildingController extends BaseController {
284 284 
      * 查询当前所有项目
285 285 
      */
286 286 
     @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
287 
-    public  ResponseBean buildingAll(){
288 
-        ResponseBean taBuilding= taBuildingService.buildingAll();
287 
+    public  ResponseBean buildingAll(HttpServletRequest request){
288 
+        ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
289 289 
         return taBuilding;
290 290 
     }
291 291 
 }

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

@@ -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 TdBuildingTypeController extends BaseController {
44 46 
      */
45 47 
     @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.GET)
46 48 
     public ResponseBean tdBuildingTypeList(@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 
             //使用分页插件
 
@@ -52,6 +55,7 @@ public class TdBuildingTypeController extends BaseController {
52 55 
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
53 56 
             queryWrapper.eq("status", 1);
54 57 
             queryWrapper.orderByDesc("create_date");
58 
+            queryWrapper.eq("org_id", getOrgId(request));
55 59
56 60 
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
57 61 
             responseBean.addSuccess(result);
 
@@ -95,9 +99,10 @@ public class TdBuildingTypeController extends BaseController {
95 99 
      * @return
96 100 
      */
97 101 
     @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.POST)
98 
-    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType){
102 
+    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
99 103 
         ResponseBean responseBean = new ResponseBean();
100 104 
         try {
105 
+            tdBuildingType.setOrgId(getOrgId(request));
101 106 
             if (iTdBuildingTypeService.save(tdBuildingType)){
102 107 
                 responseBean.addSuccess(tdBuildingType);
103 108 
             }else {
 
@@ -139,9 +144,11 @@ public class TdBuildingTypeController extends BaseController {
139 144 
      */
140 145 
     @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.PUT)
141 146 
     public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
142 
-                                        @RequestBody TdBuildingType tdBuildingType){
147 
+                                        @RequestBody TdBuildingType tdBuildingType,
148 
+                                             HttpServletRequest request){
143 149 
         ResponseBean responseBean = new ResponseBean();
144 150 
         try {
151 
+            tdBuildingType.setOrgId(getOrgId(request));
145 152 
             if (iTdBuildingTypeService.updateById(tdBuildingType)){
146 153 
                 responseBean.addSuccess(tdBuildingType);
147 154 
             }else {

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Näytä tiedosto 

@@ -41,7 +41,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
41 41 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
42 42 
     void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);
43 43
44 
-    List<TaBuilding> buildingAll();
44 
+    List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
45 45
46 46 
     /**
47 47 
      * 查询当前楼盘

+ 5
- 5
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Näytä tiedosto 

@@ -54,7 +54,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
54 54 
      * @param parameter
55 55 
      * @return
56 56 
      */
57 
-    ResponseBean buildingUpdate(String parameter);
57 
+    ResponseBean buildingUpdate(String parameter, Integer orgId);
58 58
59 59 
     /**
60 60 
      *

@@ -68,19 +68,19 @@ public interface ITaBuildingService extends IService<TaBuilding> {
68 68 
      * @param parameter
69 69 
      * @return
70 70 
      */
71 
-    ResponseBean buildingAdd(String parameter);
71 
+    ResponseBean buildingAdd(String parameter, Integer orgId);
72 72
73 73 
     /**
74 74 
      * 修改成已发布
75 75 
      * @return
76 76 
      */
77 
-    ResponseBean buildingUpdateStatus(String parameter);
77 
+    ResponseBean buildingUpdateStatus(String parameter, Integer orgId);
78 78
79 79 
     /**
80 80 
      * 楼盘删除
81 81 
      * @return
82 82 
      */
83 
-    ResponseBean buildingdelete(String id);
83 
+    ResponseBean buildingdelete(String id, Integer orgId);
84 84
85 85
86 86 
     /**

@@ -155,7 +155,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
155 155 
      * 查询所有项目
156 156 
      * @return
157 157 
      */
158 
-    ResponseBean buildingAll();
158 
+    ResponseBean buildingAll(Integer orgId);
159 159
160 160 
     Integer getCityById(String buildingId);
161 161 
 }

+ 9
- 6
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Näytä tiedosto 

@@ -192,7 +192,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
192 192 
     }
193 193
194 194 
     @Override
195 
-    public ResponseBean buildingUpdate(String parameter) {
195 
+    public ResponseBean buildingUpdate(String parameter, Integer orgId) {
196 196 
         JSONObject object= JSONObject.parseObject(parameter);
197 197
198 198 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);

@@ -244,7 +244,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
244 244 
     }
245 245
246 246 
     @Override
247 
-    public ResponseBean buildingAdd(String parameter) {
247 
+    public ResponseBean buildingAdd(String parameter, Integer orgId) {
248 248 
         JSONObject object= JSONObject.parseObject(parameter);
249 249
250 250 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);

@@ -253,6 +253,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
253 253 
         }
254 254 
         building.setCreateDate(LocalDateTime.now());
255 255 
         building.setStatus(0);
256 
+        building.setOrgId(orgId);
256 257 
         if (taBuildingMapper.insert(building) < 1) {
257 258 
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
258 259 
         }

@@ -288,13 +289,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
288 289 
     }
289 290
290 291 
     @Override
291 
-    public ResponseBean buildingUpdateStatus(String parameter) {
292 
+    public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
292 293 
         TaBuilding  building = new TaBuilding();
293 294 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
294 295 
         Integer  status= jsonobject.getInteger("status");
295 296 
         String id = jsonobject.getString("id");
296 297 
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
297 298 
         buildingIdQueryWrapper.eq("building_id", id);
299 
+        buildingIdQueryWrapper.eq("org_id", orgId);
298 300 
         building.setBuildingId(id);
299 301 
         building.setStatus(status);
300 302 
         taBuildingMapper.update(building,buildingIdQueryWrapper);

@@ -302,7 +304,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
302 304 
     }
303 305
304 306 
     @Override
305 
-    public ResponseBean buildingdelete(String id) {
307 
+    public ResponseBean buildingdelete(String id, Integer orgId) {
306 308 
         TaBuilding  building = new TaBuilding();
307 309 
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
308 310 
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);

@@ -313,6 +315,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
313 315 
         }
314 316 
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
315 317 
         buildingIdQueryWrapper.eq("building_id", id);
318 
+        buildingIdQueryWrapper.eq("org_id", orgId);
316 319 
         building.setBuildingId(String.valueOf(id));
317 320 
         building.setStatus(-1);
318 321 
         taBuildingMapper.update(building,buildingIdQueryWrapper);

@@ -571,8 +574,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
571 574 
     }
572 575
573 576 
     @Override
574 
-    public ResponseBean buildingAll() {
575 
-        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll();
577 
+    public ResponseBean buildingAll(Integer orgId) {
578 
+        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll(orgId);
576 579 
         return ResponseBean.success(taBuilding);
577 580 
     }
578 581

+ 1
- 0
src/main/resources/mapper/TaBuildingMapper.xml Näytä tiedosto 

@@ -65,6 +65,7 @@
65 65 
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
66 66 
          SELECT * FROM ta_building
67 67 
          where status > -1
68 
+         and org_id = #{orgId}
68 69 
     </select>
69 70
70 71 
     <select id="selectBuilding" resultType="com.huiju.estateagents.entity.TaBuilding">