BJ_ZTEITS-Developers / zteits-bcp-portal

Commit d5c19bde97e0b67fbb722b366359d1af3dbf5f00

Authored by 王彪总
2 parents e89afc67 d227f4ab

Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits… 

…-bcp-portal.git into branch_0808
Inline Side-by-side
Showing 5 changed files with 13 additions and 7 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
  View file @d5c19bd
... ... @@ -5,6 +5,7 @@ import java.util.List;
5 5 import javax.servlet.http.HttpSession;
6 6  
7 7 import com.clouds.common.utils.ResultUtils;
  8 +import com.clouds.common.web.SessionCommUtil;
8 9 import com.clouds.common.web.vo.BizResultVO;
9 10 import com.clouds.common.web.vo.EasyUIDataGridVO;
10 11 import com.zteits.clouds.api.apibase.bean.BaseRequest;
... ... @@ -18,6 +19,7 @@ import com.zteits.clouds.api.service.park.ParkingLotService;
18 19 import com.zteits.clouds.api.service.sys.TbAreaService;
19 20 import io.swagger.annotations.Api;
20 21 import io.swagger.annotations.ApiOperation;
  22 +import jdk.nashorn.internal.objects.annotations.Property;
21 23 import org.slf4j.Logger;
22 24 import org.slf4j.LoggerFactory;
23 25 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -52,6 +54,9 @@ public class AreaManageController {
52 54 @Autowired
53 55 private ParkingLotService parkingLotService;
54 56  
  57 + @Autowired
  58 + private SessionCommUtil sessionCommUtil;
  59 +
55 60 @ApiOperation("根据归属组织ID查询区域与区块树")
56 61 @PostMapping("/queryAreaAndBlockTree")
57 62 public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
... ... @@ -60,8 +65,7 @@ public class AreaManageController {
60 65 EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
61 66 AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
62 67 request.setSysCode(baseRequest.getSysCode());
63   - // TODO 此处orgId 从当前登录操作人中取，现在先不限制
64   - request.setOrgId(1L);
  68 + request.setOrgId(sessionCommUtil.getUserInfo().getOrgId());
65 69 BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
66 70 if (ResultUtils.isSuccess(result)) {
67 71 easyUIDataGridVO.setRows(result.getData());
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthManageController.java
  View file @d5c19bd
... ... @@ -135,6 +135,8 @@ public class BerthManageController extends BizController {
135 135 BerthManageRequest request = new BerthManageRequest();
136 136 request.setSysCode(sysCode);
137 137 request.setPlNos(plNos);
  138 + request.setParkTypes(parkTypes);
  139 + request.setParkAreaCodes(parkAreaCodes);
138 140 request.setBaseRequest(new BaseInfo(1, 1000));
139 141  
140 142  
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
  View file @d5c19bd
... ... @@ -255,7 +255,7 @@ public class MonthBillManagementController extends BizController {
255 255 throws Exception {
256 256 // 2.调用接口查询当前登录人管辖的停车场名称
257 257 UserInfo userInfo = sessionCommUtil.getUserInfo();
258   - List<String> plNos = userInfo.getOrgIds();
  258 + List<String> plNos = userInfo.getPlNos();
259 259 // UserInfo userInfo = sessionCommUtil.getUserInfo();
260 260 // List<String> plNos = new ArrayList<>();
261 261 // if (userInfo != null) {
... ... @@ -291,7 +291,7 @@ public class MonthBillManagementController extends BizController {
291 291 throws Exception {
292 292 // 2.调用接口查询当前登录人管辖的停车场名称
293 293 UserInfo userInfo = sessionCommUtil.getUserInfo();
294   - List<String> plNos = userInfo.getOrgIds();
  294 + List<String> plNos = userInfo.getPlNos();
295 295 // List<String> plNos = new ArrayList<>();
296 296 // if (userInfo != null) {
297 297 // TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
... ... @@ -441,7 +441,7 @@ public class MonthBillManagementController extends BizController {
441 441 billQueryRequest.setBaseRequest(new BaseInfo(1, 0));
442 442 // 2.调用接口查询当前登录人管辖的停车场名称
443 443 UserInfo userInfo = sessionCommUtil.getUserInfo();
444   - List<String> plNos = userInfo.getOrgIds();
  444 + List<String> plNos = userInfo.getPlNos();
445 445 // // 2.调用接口查询当前登录人管辖的停车场名称
446 446 // UserInfo userInfo = sessionCommUtil.getUserInfo();
447 447 // List<String> plNos = new ArrayList<>();
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java
  View file @d5c19bd
... ... @@ -118,7 +118,7 @@ public class ParkLotStatisticController {
118 118 UserInfo userInfo = sessionCommUtil.getUserInfo();
119 119 List<String> plNos=Lists.newArrayList();
120 120 if(null != userInfo){
121   - plNos= userInfo.getOrgIds();
  121 + plNos= userInfo.getPlNos();
122 122 }
123 123 // if(userInfo!=null){
124 124 // TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
  View file @d5c19bd
... ... @@ -126,7 +126,7 @@ public class ParkLotManageController extends BizController{
126 126 UserInfo userInfo = sessionCommUtil.getUserInfo();
127 127 List<String> plNos =new ArrayList<>();
128 128 if(null !=userInfo){
129   - plNos = userInfo.getOrgIds();
  129 + plNos = userInfo.getPlNos();
130 130 }
131 131 return plNos;
132 132 }
... ...