Merge remote-tracking branch 'origin/branch_0808' into branch_0808

atao
2 parents 0561d2a0 378c1c5c
Showing 6 changed files with 117 additions and 27 deletions
src/main/java/com/zteits/irain/portal/vo/parkinglotcloudplatform/datastatistic/ParkLotEqpTypeCountVO.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BillManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java
+package com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic;
+
+/**
+ * 通过停车场编号统计设备类型数量
+ * 
+ * Copyright: Copyright (c) 2017  zteits
+ * 
+ * @ClassName: ParkLotEqpTypeCountVO.java
+ * @Description: 
+ * @version: v1.0.0
+ * @author: wangfei
+ * @date: 2017年8月18日   下午2:31:24 
+ * Modification History: 
+ * Date             Author          Version            Description
+ *---------------------------------------------------------*
+ * 2017年6月29日      wangfei              v1.0.0               创建
+ */
+public class ParkLotEqpTypeCountVO {
+
+	
+	/**设备类型:1-地磁*/
+    private Integer eqpType;
+    /**设备状态:1-未安装，2-使用中，3-损坏*/
+    private Integer eqpState;
+    /**个数*/
+    private Integer eqpNum;
+    
+	public Integer getEqpState() {
+		return eqpState;
+	}
+	public void setEqpState(Integer eqpState) {
+		this.eqpState = eqpState;
+	}
+	
+	public Integer getEqpType() {
+		return eqpType;
+	}
+	public void setEqpType(Integer eqpType) {
+		this.eqpType = eqpType;
+	}
+	public Integer getEqpNum() {
+		return eqpNum;
+	}
+	public void setEqpNum(Integer eqpNum) {
+		this.eqpNum = eqpNum;
+	}
+    
+}
@@ -237,7 +237,7 @@ public class BerthsStatisticController extends BizController {
 			// 1个小时为一个时间戳
 			request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR);
 			int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY);
-			for (int j = 0; j <= totaltimestampCount; j++) {
+			for (int j = 0; j <= totaltimestampCount+1; j++) {
 				String hour = String.format("%02d", (j));
 				xAxisData.add(hour+":00");
 			}
@@ -321,7 +321,7 @@ public class BerthsStatisticController extends BizController {
 			// 1个小时为一个时间戳
 			request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR);
 			int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY);
-			for (int j = 0; j <= totaltimestampCount; j++) {
+			for (int j = 0; j <= totaltimestampCount+1; j++) {
 				String hour = String.format("%02d", (j));
 				xAxisData.add(hour+":00");
 			}
@@ -83,17 +83,21 @@ public class BillManageController extends BizController {
 			HttpServletResponse response) throws Exception {
 		TdCustCompanyService sert = map.get("tdCustCompanyService");
 		logger.info("---begin--日账汇总单查询调用后场dubbo服务,入参＝{}", JSONObject.toJSON(billQueryRequest));
-		System.out.println("seesionId="+request.getSession().getId());
-		UserInfo userInfo = sessionCommUtil.getUserInfo();
-		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-		if (userInfo != null) {
-			
-			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
-		}
+//		System.out.println("seesionId="+request.getSession().getId());
+//		UserInfo userInfo = sessionCommUtil.getUserInfo();
+//		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
+//		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
+//		if (userInfo != null) {
+//			
+//			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
+//			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
+//			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
+//			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
+//		}
+		 // 2.调用接口查询当前登录人管辖的停车场名称
+        UserInfo userInfo = sessionCommUtil.getUserInfo();
+        List<String> plNos = userInfo.getOrgIds();
+        billQueryRequest.setParkIdList(plNos);
 		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest);
 		result.setErrMsg(billQueryRequest.getParkIdList().toString());
@@ -115,18 +119,25 @@ public class BillManageController extends BizController {
 			HttpServletResponse response) throws Exception {
 		BizResult<PageBean<BillManageDTO>> result = new BizResult<PageBean<BillManageDTO>>();
 		logger.info("---begin---日账单查看调用后场dubbo服务,入参={}", JSONObject.toJSONString(billQueryRequest));
-		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-		UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-		if (userInfo != null) {
-			
-			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-			billQueryRequest.setUserName(userInfo.getName());
-			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
-			
-		}
+//		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
+//		UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key());
+//		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
+//		if (userInfo != null) {
+//			
+//			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
+//			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
+//			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
+//			billQueryRequest.setUserName(userInfo.getName());
+//			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
+//			
+//		}
+		
+		// 2.调用接口查询当前登录人管辖的停车场名称
+        UserInfo userInfo = sessionCommUtil.getUserInfo();
+        List<String> plNos = userInfo.getOrgIds();
+        billQueryRequest.setParkIdList(plNos);
+        billQueryRequest.setUserName(userInfo.getName());
+		
 		result = billManageForDayService.queryBillforDayDeatilPage(billQueryRequest);
 		logger.info("---end---日账单查看调用后场dubbo服务,结果＝{}", JSONObject.toJSON(result));
@@ -126,7 +126,7 @@ public class InOutParkStatisticController extends BizController {
 			// 1个小时为一个时间戳
 			UseStatisticRequest.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR);
 			int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY);
-			for (int j = 0; j <= totaltimestampCount; j++) {
+			for (int j = 0; j <= totaltimestampCount+1; j++) {
 				String hour = String.format("%02d", (j));
 				xAxisData.add(hour + ":00");
 			}
@@ -13,10 +13,12 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
@@ -36,12 +38,15 @@ import com.zteits.clouds.api.dto.clouds.dto.CustIncomeForPayTypeDTO;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalDTO;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalParkDTO;
 import com.zteits.clouds.api.dto.clouds.param.CustIncomeTotalQueryRequset;
+import com.zteits.clouds.api.dto.park.dto.ParkLotEqpTypeCountStatisticByCountryDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO;
+import com.zteits.clouds.api.dto.park.param.EqpTypeQueryByPlNosRequest;
 import com.zteits.clouds.api.dto.park.param.ParkingLotUseStatisticForPageRequest;
 import com.zteits.clouds.api.dto.park.param.RealTimeVehicleFlowQueryRequest;
 import com.zteits.clouds.api.service.clouds.CustIncomeService;
 import com.zteits.clouds.api.service.park.IInOutParkingService;
+import com.zteits.clouds.api.service.park.ParkingLotEqpService;
 import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService;
 import com.zteits.irain.portal.constant.ParkConstant;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.BerthsAndFlowLineChartVO;
@@ -50,6 +55,7 @@ import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustInco
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO.SerieVO;
+import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.ParkLotEqpTypeCountVO;
 import io.swagger.annotations.ApiOperation;
@@ -81,6 +87,8 @@ public class IndexPageStatisticController extends BizController {
     private IInOutParkingService iInOutParkingService;
     @Autowired
     private ParkingLotUseStatisticService parkingLotStatisticService;
+    @Autowired
+    private ParkingLotEqpService parkingLotEqpService;
     /**
      * 云平台首页－>企业客户负责所有的停车场汇总.<br/>
@@ -481,4 +489,27 @@ public class IndexPageStatisticController extends BizController {
         System.out.println(new BigDecimal("00.0").doubleValue() == 0);
     }
+    /**
+	 * @param request
+	 * @return
+	 * 2017年8月18日 wangfei
+	 */
+	@ApiOperation(value="根据停车场编号统计设备数量")
+	@PostMapping("statisticParkLotEqpCountByPlNos")
+	@ResponseBody
+	public BizResult<List<ParkLotEqpTypeCountVO>> statisticParkLotEqpCountByPlNos(@RequestBody 
+			EqpTypeQueryByPlNosRequest request){
+		logger.info("停车场编号："+request.getPlNos()+" 统计设备数量等信息");
+		List<ParkLotEqpTypeCountVO> resultList = new ArrayList<>();
+        BizResult<List<ParkLotEqpTypeCountStatisticByCountryDTO>> result = parkingLotEqpService
+        		.StatisticParkLotEqpCountByPlNos(request);
+        if (!CollectionUtils.isEmpty(result.getData())) {
+            for (ParkLotEqpTypeCountStatisticByCountryDTO i :result.getData()) {
+            	ParkLotEqpTypeCountVO vo = new ParkLotEqpTypeCountVO();
+                BeanUtils.copyProperties(i, vo);
+                resultList.add(vo);
+            }
+        }
+        return new BizResult<>(resultList);
+	}
 }
@@ -246,7 +246,7 @@ public class VehicleFlowStatisticController extends BizController {
             request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR);
             int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY);
-            for (int j = 0; j <= totaltimestampCount; j++) {
+            for (int j = 0; j <= totaltimestampCount+1; j++) {
                 String hour = String.format("%02d", (j));
                 xAxisData.add(hour+":00");
             }