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
llw
2 parents 1e627229 1c05ff6d
Showing 3 changed files with 89 additions and 5 deletions
src/main/java/com/zteits/irain/portal/vo/parkinglotcloudplatform/datastatistic/ParkLotEqpTypeCountVO.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.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;
+	}
+    
+}
@@ -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/>
@@ -438,12 +446,14 @@ public class IndexPageStatisticController extends BizController {
         }
         Double totalfreeRatio = 0.00;
         for (ParkingLotUseStatisticDTO statisticDTO : pageBean.getDataList()) {
-            totalfreeRatio += this.weightForFreeRation(statisticDTO.getStatisticBeginTime(),
-                statisticDTO.getFreeRatio(), statisticDTO.getPlNo());
+            totalfreeRatio += statisticDTO.getFreeRatio();
+                //暂时不加权
+                //this.weightForFreeRation(statisticDTO.getStatisticBeginTime(),
+                //statisticDTO.getFreeRatio(), statisticDTO.getPlNo());
         }
         logger.info("加权后的空置率之和：" + totalfreeRatio + " 时间戳个数：" + pageBean.getDataList().size());
         Double avgFreeRation = totalfreeRatio / pageBean.getDataList().size();
-        String result = String.format("%.2f", avgFreeRation);
+        String result = String.format("%.2f", avgFreeRation*100);
         return new BizResultVO<String>().setData(result);
     }
@@ -481,4 +491,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);
+	}
 }
 package com.zteits.irain.portal.web.parkinglotcloudplatform.parklotmanage;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -104,8 +105,10 @@ public class ParkLotManageController{
 	private List<String> GetParkLotNosByCurrUser(String sysCode) throws Exception {
 		logger.info("根据登录人权限获取停车场列表");
 		UserInfo userInfo = sessionCommUtil.getUserInfo();
-		List<String> plNos = userInfo.getOrgIds();
-
+        List<String> plNos  =new ArrayList<>();
+		if(null !=userInfo){
+            plNos = userInfo.getOrgIds();
+        }
 		return plNos;
 	}
 }