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 b3cfbe77 80fa8c59
Showing 3 changed files with 118 additions and 11 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java
@@ -9,8 +9,12 @@ import com.clouds.common.web.vo.BizResultVO;
 import com.clouds.common.web.vo.EasyUIDataGridVO;
 import com.zteits.clouds.api.apibase.bean.BaseRequest;
 import com.zteits.clouds.api.apibase.bean.BizResult;
+import com.zteits.clouds.api.dto.park.param.ParkInfoByAreaBlockIdsRequest;
 import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
+import com.zteits.clouds.api.dto.sys.TbAreaDTO;
 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
+import com.zteits.clouds.api.dto.sys.param.AreaBlockQueryByParentIdRequest;
+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;
@@ -45,6 +49,9 @@ public class AreaManageController {
     @Autowired
     private TbAreaService tbAreaService;
+    @Autowired
+    private ParkingLotService parkingLotService;
+
     @ApiOperation("根据归属组织ID查询区域与区块树")
     @PostMapping("/queryAreaAndBlockTree")
     public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
@@ -68,4 +75,26 @@ public class AreaManageController {
         return resultVO;
     }
+    @ApiOperation("根据区块ID查询区块下停车场数量")
+    @PostMapping("/queryParkInfoNumByAreaBlockIds")
+    public BizResultVO<Integer> queryParkInfoNumByAreaBlockIds(@RequestBody ParkInfoByAreaBlockIdsRequest request){
+        BizResult<List<AreaTreeDTO>> bizResult =  parkingLotService.queryParkInfoByAreaBlockIds(request);
+        BizResultVO<Integer> bizResultVO = new BizResultVO<>();
+        Integer num;
+        if(ResultUtils.isSuccess(bizResult)){
+            List<AreaTreeDTO> list = bizResult.getData();
+            if(list != null){
+                num = list.size();
+            }else {
+                num = 0;
+            }
+            bizResultVO.setData(num);
+        }else{
+            bizResultVO.setCode(bizResult.getErrCode().getCode());
+            bizResultVO.setMsg(bizResult.getErrMsg());
+        }
+
+        return bizResultVO;
+    }
+
 }
 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
-import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.dubbo.common.utils.StringUtils;
+import com.clouds.common.utils.DateUtil;
 import com.clouds.common.utils.excle.ExcelUtil;
 import com.clouds.common.utils.excle.ExcleFillDateManager;
 import com.clouds.common.utils.excle.Layouter;
@@ -25,10 +30,8 @@ import com.clouds.common.web.BizController;
 import com.clouds.common.web.vo.BizResultVO;
 import com.zteits.clouds.api.apibase.bean.BizResult;
 import com.zteits.clouds.api.apibase.bean.PageBean;
-import com.zteits.clouds.api.dto.clouds.dto.BillManageDTO;
 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationDTO;
 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationForHourDTO;
-import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest;
 import com.zteits.clouds.api.dto.clouds.param.ParkDurationRequest;
 import com.zteits.clouds.api.service.clouds.CloudsParDurationService;
@@ -44,12 +47,40 @@ public class CloudsParDurationController extends BizController{
 	/**
 	 * 企业云平台->停车时长折线图－>按日.<br/>
 	 * @return
+	 * @throws Exception 
 	 */
 	@ApiOperation("企业云平台->停车时长折线图－>按日")
 	@PostMapping("/queryEchartsForParkDurationForDay")
-	public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest){
-		BizResult<List<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
-		return new BizResultVO<List<ParkDurationDTO>>(result);
+	public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest,HttpServletResponse response) throws Exception{
+		BizResult<Map<String,Object>> result  = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
+       
+		return new BizResultVO<Map<String,Object>>(result);
+	}
+	
+	/**
+	 * 获取2个时间的时间所有天数.<br/>
+	 * @param parkDurationRequest
+	 * @return
+	 */
+	public List<String> getTwoDaysDay(ParkDurationRequest parkDurationRequest){
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String beginTime = DateUtil.getDateString(parkDurationRequest.getParkOutBeginTime(),"yyyy-MM-dd");
+		String endTime = DateUtil.getDateString(parkDurationRequest.getParkOutEndTime(),"yyyy-MM-dd");
+		List<String> dateList =new ArrayList<String>(); 
+		//获取开始结束之间的所有日期
+	    try {
+			List<Date> datas = DateUtil.getBetweenDates(format.parse(beginTime),format.parse(endTime));
+			if(!CollectionUtils.isEmpty(datas)){
+				for(Date e:datas){
+					if(e != null){
+						dateList.add(format.format(e));
+					}
+				}
+			}
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	    return dateList;
 	}
 	/**
@@ -228,12 +259,13 @@ public class CloudsParDurationController extends BizController{
 	/**
 	 * 企业云平台->停车时长折线图－>按日.<br/>
 	 * @return
+	 * @throws Exception 
 	 */
 	@ApiOperation("企业云平台->停车时长折线图－>按月")
 	@PostMapping("/queryEchartsForParkDurationForMonth")
-	public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest){
-		BizResult<List<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
-		return new BizResultVO<List<ParkDurationDTO>>(result);
+	public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest) throws Exception{
+		BizResult<Map<String,Object>> result  = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
+		return new BizResultVO<Map<String,Object>>(result);
 	}
 	/**
@@ -298,4 +330,5 @@ public class CloudsParDurationController extends BizController{
+	
 }
@@ -28,8 +28,10 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
 import com.zteits.clouds.api.apibase.constants.ErrorType;
 import com.zteits.clouds.api.apibase.exception.BizException;
 import com.zteits.clouds.api.dto.clouds.param.RealTimeMonitoringRequest;
+import com.zteits.clouds.api.dto.park.dto.BerthsDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkOccupancyRateDTO;
 import com.zteits.clouds.api.dto.park.dto.TpPEqpLogDTO;
+import com.zteits.clouds.api.dto.park.param.QueryBerthForPageRequest;
 import com.zteits.clouds.api.dto.sys.SysOpDTO;
 import com.zteits.clouds.api.dto.sys.SysOrgDTO;
 import com.zteits.clouds.api.dto.sys.SysRoleDTO;
@@ -38,6 +40,7 @@ import com.zteits.clouds.api.dto.sys.param.SysOpForPageRequest;
 import com.zteits.clouds.api.dto.sys.param.SysOpSaveOrModfiyRequest;
 import com.zteits.clouds.api.dto.sys.param.SysOrgPageQueryRequest;
 import com.zteits.clouds.api.dto.sys.param.SysRolePageQueryRequest;
+import com.zteits.clouds.api.service.park.BerthManageService;
 import com.zteits.clouds.api.service.park.EqpBerthsService;
 import io.swagger.annotations.Api;
@@ -67,6 +70,8 @@ public class RealTimeMonitorController extends BizController {
 	@Autowired
 	private EqpBerthsService eqpBerthsService;
+	@Autowired
+	private BerthManageService berthManageService;
     /**
@@ -78,8 +83,8 @@ public class RealTimeMonitorController extends BizController {
      * langlw 2017-08-30
      */
     @ApiOperation("分页查询停车场设备日志数据")
-    @PostMapping("/queryOpsBySysCode")
-    public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryUsersPageList(
+    @PostMapping("/queryParkEqpForPageByPlNo")
+    public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryParkEqpForPageByPlNo(
         @RequestBody RealTimeMonitoringRequest request)
         throws Exception {
     	logger.info("调用分页查询停车场设备日志数据dubbo服务入参：request={}"+JSONObject.toJSONString(request));
@@ -109,4 +114,44 @@ public class RealTimeMonitorController extends BizController {
 		logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
         return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
     }
+    
+    
+    
+    /**
+     * 通过车位对象分页查询车位信息
+     * query berths by berth for page
+     * langlw 2017-8-31
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("通过车位对象分页查询车位信息")
+    @PostMapping("/queryBerthByBerthForPage")
+    public BizResultVO<EasyUIDataGridVO<BerthsDTO>> queryBerthByBerthForPage(
+        @RequestBody QueryBerthForPageRequest request)
+        throws Exception {
+    	logger.info("通过车位对象分页查询车位信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
+		BizResult<PageBean<BerthsDTO>> result = berthManageService.queryBerthByBerth(request);
+		logger.info("通过车位对象分页查询车位信息dubbo服务返回信息：response={}"+JSONObject.toJSONString(result));
+        return returnJqGridData(result, BerthsDTO.class);
+    }
+    
+    /**
+     * 分组查询停车场占用率
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     * langlw 2017-08-31
+     */
+    @ApiOperation("分组查询停车场占用率")
+    @PostMapping("/queryParkBerthOccupancyRate")
+    public BizResultVO<List<ParkOccupancyRateDTO>> queryParkBerthOccupancyRate(
+        @RequestBody QueryBerthForPageRequest request)
+        throws Exception {
+    	logger.info("调用分组查询停车场占用率dubbo服务入参：request={}"+JSONObject.toJSONString(request));
+		BizResult<List<ParkOccupancyRateDTO>> result = berthManageService.queryParkOccupancyRate(request);
+		logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
+        return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
+    }
 }