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

…-bcp-portal.git into branch_0808

Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits…
…-bcp-portal.git into branch_0808
王彪总
2 parents e89afc67 d227f4ab
Showing 5 changed files with 13 additions and 7 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpSession;
 import com.clouds.common.utils.ResultUtils;
+import com.clouds.common.web.SessionCommUtil;
 import com.clouds.common.web.vo.BizResultVO;
 import com.clouds.common.web.vo.EasyUIDataGridVO;
 import com.zteits.clouds.api.apibase.bean.BaseRequest;
@@ -18,6 +19,7 @@ import com.zteits.clouds.api.service.park.ParkingLotService;
 import com.zteits.clouds.api.service.sys.TbAreaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.objects.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,9 @@ public class AreaManageController {
     @Autowired
     private ParkingLotService parkingLotService;
+    @Autowired
+    private SessionCommUtil sessionCommUtil;
+
     @ApiOperation("根据归属组织ID查询区域与区块树")
     @PostMapping("/queryAreaAndBlockTree")
     public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
@@ -60,8 +65,7 @@ public class AreaManageController {
         EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
         AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
         request.setSysCode(baseRequest.getSysCode());
-        // TODO 此处orgId 从当前登录操作人中取，现在先不限制
-        request.setOrgId(1L);
+        request.setOrgId(sessionCommUtil.getUserInfo().getOrgId());
         BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
         if (ResultUtils.isSuccess(result)) {
             easyUIDataGridVO.setRows(result.getData());
@@ -135,6 +135,8 @@ public class BerthManageController extends BizController {
 		BerthManageRequest request = new BerthManageRequest();
 		request.setSysCode(sysCode);
 		request.setPlNos(plNos);
+		request.setParkTypes(parkTypes);
+		request.setParkAreaCodes(parkAreaCodes);
 		request.setBaseRequest(new BaseInfo(1, 1000));
@@ -255,7 +255,7 @@ public class MonthBillManagementController extends BizController {
         throws Exception {
         // 2.调用接口查询当前登录人管辖的停车场名称
         UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
+        List<String> plNos = userInfo.getPlNos();
         //        UserInfo userInfo = sessionCommUtil.getUserInfo();
         //        List<String> plNos = new ArrayList<>();
         //        if (userInfo != null) {
@@ -291,7 +291,7 @@ public class MonthBillManagementController extends BizController {
         throws Exception {
         // 2.调用接口查询当前登录人管辖的停车场名称
         UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
+        List<String> plNos = userInfo.getPlNos();
         //        List<String> plNos = new ArrayList<>();
         //        if (userInfo != null) {
         //            TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
@@ -441,7 +441,7 @@ public class MonthBillManagementController extends BizController {
             billQueryRequest.setBaseRequest(new BaseInfo(1, 0));
             // 2.调用接口查询当前登录人管辖的停车场名称
             UserInfo userInfo = sessionCommUtil.getUserInfo();
-            List<String> plNos = userInfo.getOrgIds();
+            List<String> plNos = userInfo.getPlNos();
             //            // 2.调用接口查询当前登录人管辖的停车场名称
             //            UserInfo userInfo = sessionCommUtil.getUserInfo();
             //            List<String> plNos = new ArrayList<>();
@@ -118,7 +118,7 @@ public class ParkLotStatisticController {
         UserInfo userInfo = sessionCommUtil.getUserInfo();
         List<String> plNos=Lists.newArrayList();
         if(null != userInfo){
-        	plNos= userInfo.getOrgIds();
+        	plNos= userInfo.getPlNos();
         }
 //		if(userInfo!=null){
 //			TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
@@ -126,7 +126,7 @@ public class ParkLotManageController extends BizController{
 		UserInfo userInfo = sessionCommUtil.getUserInfo();
         List<String> plNos  =new ArrayList<>();
 		if(null !=userInfo){
-            plNos = userInfo.getOrgIds();
+            plNos = userInfo.getPlNos();
         }
 		return plNos;
 	}