From 3ab2f7e5b2aaad81eef2638dd3b7bc1f47c51b6b Mon Sep 17 00:00:00 2001 From: llw <18235445130@163.com> Date: Fri, 18 Aug 2017 09:32:44 +0800 Subject: [PATCH] tijiao --- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java | 29 ++++++++++++++++------------- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java | 16 +++++----------- 5 files changed, 251 insertions(+), 220 deletions(-) diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java index 6daaf0a..8dee59f 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java @@ -113,10 +113,10 @@ public class BerthsStatisticController extends BizController { public BizResultVO> GetParkingPlaceStatistic( @RequestBody ParkingLotUseStatisticForPageRequest requestObject) throws InstantiationException, IllegalAccessException { - if (null == requestObject.getBeginTime() || null==requestObject.getEndTime()) { - throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); - } - + if (null == requestObject.getBeginTime() || null == requestObject.getEndTime()) { + throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); + } + Calendar beginc = Calendar.getInstance(); beginc.setTime(requestObject.getBeginTime()); int beginYear = beginc.get(Calendar.YEAR); @@ -153,7 +153,7 @@ public class BerthsStatisticController extends BizController { plNoslist.add(plNos); request.setPlNos(plNoslist); request.setBaseRequest(new BaseInfo(1, 0)); - + Calendar beginc = Calendar.getInstance(); beginc.setTime(request.getBeginTime()); int beginYear = beginc.get(Calendar.YEAR); @@ -194,7 +194,7 @@ public class BerthsStatisticController extends BizController { Object[] obj = new Object[title.length]; int index = 0; obj[index++] = format.format(e.getStatisticBeginTime()); - obj[index++] = e.getFreeRatio() *100 +"%"; + obj[index++] = e.getFreeRatio() * 100 + "%"; obj[index++] = e.getTurnoverRatio(); contentList.add(obj); } @@ -215,13 +215,14 @@ public class BerthsStatisticController extends BizController { @ResponseBody public BizResultVO getFreeRatioBerthForLineChart( @RequestBody ParkingLotUseStatisticForPageRequest request) { - //根据权限获取停车场列表 - if (null == request.getBeginTime() || null==request.getEndTime()) { - throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); - } + // 根据权限获取停车场列表 + if (null == request.getBeginTime() || null == request.getEndTime()) { + throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); + } logger.info("根据停车场编号获取该停车场车位空置率折线图"); Calendar beginTime = Calendar.getInstance(); beginTime.setTime(request.getBeginTime()); + int year = beginTime.get(Calendar.YEAR); Calendar endTime = Calendar.getInstance(); endTime.setTime(request.getEndTime()); @@ -229,28 +230,27 @@ public class BerthsStatisticController extends BizController { Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), new Timestamp(request.getBeginTime().getTime())); List xAxisData = Lists.newArrayList(); - String dateType=""; - int berthRatio=ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; + String dateType = ""; + int berthRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; + request.setBaseRequest(new BaseInfo(1, 0)); if (dayDifference == 0L) { // 1个小时为一个时间戳 request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); String day = ""; String month = ""; - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); - month = String.format("%02d", (beginMonth)); - day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { - String hour = String.format("%02d", (j)); - xAxisData.add(month + "-" + day + " " + hour); - } + + int beginMonth = beginTime.get(Calendar.MONTH) + 1; + int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + month = String.format("%02d", (beginMonth)); + day = String.format("%02d", (beginDay)); + for (int j = 0; j <= totaltimestampCount; j++) { + String hour = String.format("%02d", (j)); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); } - request.setBaseRequest(new BaseInfo(1, 0)); - dateType="MM-dd HH"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); + + dateType = "yyyy-MM-dd HH"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); return new BizResultVO().setData(freeBerthRatios); } else if (dayDifference <= 3L) { // 1小时为一个时间戳 @@ -258,38 +258,41 @@ public class BerthsStatisticController extends BizController { int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); String day = ""; String month = ""; - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + for (int i = 0; i <= dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate.setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); month = String.format("%02d", (beginMonth)); day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { + for (int j = 0; j <= totaltimestampCount; j++) { String hour = String.format("%02d", (j)); - xAxisData.add(month + "-" + day + " " + hour); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); } } - request.setBaseRequest(new BaseInfo(1, 0)); - dateType="MM-dd HH"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); + dateType = "yyyy-MM-dd HH"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); return new BizResultVO().setData(freeBerthRatios); } else { // 1天为一个时间戳 request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + for (int i = 0; i <= dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate.setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); String month = String.format("%02d", (beginMonth)); String day = String.format("%02d", (beginDay)); - xAxisData.add(month + "-" + day); + xAxisData.add(year + "-" + month + "-" + day); + } - } - request.setBaseRequest(new BaseInfo(1, 0)); - dateType="MM-dd"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); - return new BizResultVO().setData(freeBerthRatios); + dateType = "yyyy-MM-dd"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); + return new BizResultVO().setData(freeBerthRatios); + } } /** @@ -305,11 +308,11 @@ public class BerthsStatisticController extends BizController { @RequestBody ParkingLotUseStatisticForPageRequest request) { logger.info("根据停车场编号获取该停车场车位周转率折线图"); - if (null == request.getBeginTime() || null==request.getEndTime()) { - throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); - } + if (null == request.getBeginTime() || null == request.getEndTime()) { + throw new BizException(ErrorType.PARAMM_NULL, "开始时间和结束时间"); + } Calendar beginTime = Calendar.getInstance(); - int year=beginTime.get(Calendar.YEAR); + int year = beginTime.get(Calendar.YEAR); beginTime.setTime(request.getBeginTime()); Calendar endTime = Calendar.getInstance(); @@ -318,28 +321,27 @@ public class BerthsStatisticController extends BizController { Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), new Timestamp(request.getBeginTime().getTime())); List xAxisData = Lists.newArrayList(); - String dateType=""; + String dateType = ""; request.setBaseRequest(new BaseInfo(1, 0)); - int berthRatio=ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER; + int berthRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER; if (dayDifference == 0L) { - //1个小时为一个时间戳 + // 1个小时为一个时间戳 request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); String day = ""; String month = ""; - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); - month = String.format("%02d", (beginMonth)); - day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { - String hour = String.format("%02d", (j)); - xAxisData.add(year+"-"+month + "-" + day + " " + hour); - } + + int beginMonth = beginTime.get(Calendar.MONTH) + 1; + int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + month = String.format("%02d", (beginMonth)); + day = String.format("%02d", (beginDay)); + for (int j = 0; j <= totaltimestampCount; j++) { + String hour = String.format("%02d", (j)); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); } - dateType="yyyy-MM-dd HH"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); + + dateType = "yyyy-MM-dd HH"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); return new BizResultVO().setData(freeBerthRatios); } else if (dayDifference <= 3L) { // 1小时为一个时间戳 @@ -347,41 +349,45 @@ public class BerthsStatisticController extends BizController { int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); String day = ""; String month = ""; - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + for (int i = 0; i <= dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate.setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); month = String.format("%02d", (beginMonth)); day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { + for (int j = 0; j <= totaltimestampCount; j++) { String hour = String.format("%02d", (j)); - xAxisData.add(year+"-"+month + "-" + day + " " + hour); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); } } - dateType="yyyy-MM-dd HH"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); + dateType = "yyyy-MM-dd HH"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); return new BizResultVO().setData(freeBerthRatios); } else { // 1天为一个时间戳 request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); - for (int i = 0; i < dayDifference.intValue(); i++) { - beginTime.add(Calendar.DAY_OF_MONTH, 1); - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + for (int i = 0; i <= dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate.setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); String month = String.format("%02d", (beginMonth)); String day = String.format("%02d", (beginDay)); - xAxisData.add(year+"-"+month + "-" + day); + xAxisData.add(year + "-" + month + "-" + day); + } - dateType="yyyy-MM-dd"; - LineChartVO freeBerthRatios=getFreeBerthRatios(request, xAxisData, dateType,berthRatio); + dateType = "yyyy-MM-dd"; + LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthRatio); return new BizResultVO().setData(freeBerthRatios); } } - - - private LineChartVO getFreeBerthRatios(ParkingLotUseStatisticForPageRequest request, - List xAxisData,String dateType ,int berthRatio){ + + private LineChartVO getFreeBerthRatios(ParkingLotUseStatisticForPageRequest request, List xAxisData, + String dateType, int berthRatio) { logger.info("调用DUBBO服务入参：" + JSON.toJSONString(request)); BizResult> bizResult = parkingLotStatisticService .queryParkingLotUseStatisticForPage(request); @@ -403,33 +409,33 @@ public class BerthsStatisticController extends BizController { // 保存空置率 if (!parkLotMap.containsKey(key)) { Map timeAndVal = Maps.newHashMap(); - if(ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio){ + if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) { timeAndVal.put(statisBeginTime, statisticDTO.getFreeRatio() * 100); parkLotMap.put(key, timeAndVal); - }else if(ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio){ + } else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) { timeAndVal.put(statisBeginTime, statisticDTO.getTurnoverRatio() * 100); parkLotMap.put(key, timeAndVal); } } else { - if(ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio){ + if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) { parkLotMap.get(key).put(statisBeginTime, statisticDTO.getFreeRatio() * 100); - }else if(ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio){ + } else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) { parkLotMap.get(key).put(statisBeginTime, statisticDTO.getTurnoverRatio() * 100); } } } } - //判断是否包含所有待查询的停车场信息 - if(request.getPlNos().size()>parkLotMap.size()){ - for (String plNo:request.getPlNos()) { - if(!parkLotMap.containsKey(plNo)){ - ParkingLotDTO parkingLotDTO=ParkingLotCacheUtil.getParkLotByPlNo(plNo); - parkNameMap.put(plNo, parkingLotDTO.getPlName()); - parkLotMap.put(plNo, Maps.newHashMap()); - } - } - } + // 判断是否包含所有待查询的停车场信息 + if (request.getPlNos().size() > parkLotMap.size()) { + for (String plNo : request.getPlNos()) { + if (!parkLotMap.containsKey(plNo)) { + ParkingLotDTO parkingLotDTO = ParkingLotCacheUtil.getParkLotByPlNo(plNo); + parkNameMap.put(plNo, parkingLotDTO.getPlName()); + parkLotMap.put(plNo, Maps.newHashMap()); + } + } + } // 封装车位统计信息 LineChartVO freeBerthRatios = new LineChartVO(); @@ -453,7 +459,7 @@ public class BerthsStatisticController extends BizController { for (String timestamp : xAxisData) { if (freeRatioMaps.containsKey(timestamp)) { lastFreeRatio = freeRatioMaps.get(timestamp).intValue(); - }else{ + } else { lastFreeRatio = 0; } freeRations.add(lastFreeRatio); diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java index 9fcf01c..4b3e8c6 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/InOutParkStatisticController.java @@ -10,14 +10,12 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.config.authentication.UserServiceBeanDefinitionParser; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -25,20 +23,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.fastjson.JSON; -import com.clouds.common.entity.UserInfo; -import com.clouds.common.utils.AmountUtils; import com.clouds.common.utils.DateUtil; import com.clouds.common.utils.ResultUtils; import com.clouds.common.utils.excle.ExcelUtil; import com.clouds.common.utils.excle.ExcleFillDateManager; import com.clouds.common.utils.excle.Layouter; import com.clouds.common.web.BizController; -import com.clouds.common.web.SessionCommUtil; import com.clouds.common.web.vo.BizResultVO; import com.clouds.common.web.vo.EasyUIDataGridVO; import com.google.common.collect.Lists; @@ -48,16 +41,13 @@ import com.zteits.clouds.api.apibase.bean.BizResult; 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.dto.BillManageDTO; import com.zteits.clouds.api.dto.park.dto.InOutParkDTO; import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO; import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticSumDTO; import com.zteits.clouds.api.dto.park.param.InOutParkRequest; import com.zteits.clouds.api.dto.park.param.ParkingLotUseStatisticForPageRequest; -import com.zteits.clouds.api.dto.pay.param.TdCompanyParkQueryRequest; import com.zteits.clouds.api.service.clouds.InOutParkStatisticService; import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService; -import com.zteits.clouds.api.service.pay.TdCustCompanyService; import com.zteits.irain.portal.constant.ParkConstant; import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO; import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO.SerieVO; @@ -125,6 +115,7 @@ public class InOutParkStatisticController extends BizController { Calendar beginTime = Calendar.getInstance(); beginTime.setTime(request.getBeginTime()); + int year = beginTime.get(Calendar.YEAR); Calendar endTime = Calendar.getInstance(); endTime.setTime(request.getEndTime()); @@ -137,56 +128,95 @@ public class InOutParkStatisticController extends BizController { if (dayDifference == 0L) { //同一天 // 20分钟为一个时间戳 - UseStatisticRequest.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER20MINUTE); - int totaltimestampCount = (endTime.get(Calendar.HOUR_OF_DAY)-beginTime.get(Calendar.HOUR_OF_DAY))*3; - for (int i = 0; i < totaltimestampCount; i++) { - int hour1 = beginTime.get(Calendar.HOUR_OF_DAY)+i/3; - String hour = String.format("%02d", hour1); - String minute = String.format("%02d", (i % 3) * 20); - xAxisData.add(hour + ":" + minute); - } - dateType="HH:mm"; + UseStatisticRequest.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); + int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); + String day = ""; + String month = ""; + + int beginMonth = beginTime.get(Calendar.MONTH) + 1; + int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); + month = String.format("%02d", (beginMonth)); + day = String.format("%02d", (beginDay)); + for (int j = 0; j <= totaltimestampCount; j++) { + String hour = String.format("%02d", (j)); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); + } + + dateType = "yyyy-MM-dd HH"; LineChartVO vehicleFlows=getVehicleFlows(UseStatisticRequest, xAxisData, dateType); return new BizResultVO().setData(vehicleFlows); } else if (dayDifference <= 3L) { // 1小时为一个时间戳 UseStatisticRequest.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); - int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); - String day = ""; - String month = ""; - for (int i = 0; i < dayDifference.intValue(); i++) { - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); - month = String.format("%02d", (beginMonth)); - day = String.format("%02d", (beginDay)); - int endDay = endTime.get(Calendar.DAY_OF_MONTH); - if(beginDay != endDay){ - totaltimestampCount = 24; - } - for (int j = 0; j < totaltimestampCount; j++) { - String hour = String.format("%02d", (j)); - xAxisData.add(month + "-" + day + " " + hour); - } - beginTime.add(Calendar.DAY_OF_MONTH, 1); - } - dateType="MM-dd HH"; + int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); + String day = ""; + String month = ""; + for (int i = 0; i <=dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate .setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); + month = String.format("%02d", (beginMonth)); + day = String.format("%02d", (beginDay)); + for (int j = 0; j < 24; j++) { + String hour = String.format("%02d", (j)); + xAxisData.add(year + "-" + month + "-" + day + " " + hour); + } + } + dateType = "yyyy-MM-dd HH"; + + +// +// int totaltimestampCount = endTime.get(Calendar.HOUR_OF_DAY); +// String day = ""; +// String month = ""; +// for (int i = 0; i < dayDifference.intValue(); i++) { +// int beginMonth = beginTime.get(Calendar.MONTH) + 1; +// int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); +// month = String.format("%02d", (beginMonth)); +// day = String.format("%02d", (beginDay)); +// int endDay = endTime.get(Calendar.DAY_OF_MONTH); +// if(beginDay != endDay){ +// totaltimestampCount = 24; +// } +// for (int j = 0; j < totaltimestampCount; j++) { +// String hour = String.format("%02d", (j)); +// xAxisData.add(month + "-" + day + " " + hour); +// } +// beginTime.add(Calendar.DAY_OF_MONTH, 1); +// } +// dateType="MM-dd HH"; LineChartVO vehicleFlows=getVehicleFlows(UseStatisticRequest, xAxisData, dateType); return new BizResultVO().setData(vehicleFlows); } else { // 1天为一个时间戳 UseStatisticRequest.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); - for (int i = 0; i < dayDifference.intValue()+1; i++) { - int beginMonth = beginTime.get(Calendar.MONTH) + 1; - int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); - String month = String.format("%02d", (beginMonth)); - String day = String.format("%02d", (beginDay)); - xAxisData.add(month + "-" + day); - beginTime.add(Calendar.DAY_OF_MONTH, 1); + for (int i = 0; i <=dayDifference.intValue(); i++) { + Calendar tempDate = Calendar.getInstance(); + tempDate .setTime(request.getBeginTime()); + tempDate.add(Calendar.DAY_OF_MONTH, i); + int beginMonth = tempDate.get(Calendar.MONTH) + 1; + int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); + String month = String.format("%02d", (beginMonth)); + String day = String.format("%02d", (beginDay)); + xAxisData.add(year + "-" + month + "-" + day); - } - dateType="MM-dd"; + } + dateType = "yyyy-MM-dd"; + +// for (int i = 0; i < dayDifference.intValue()+1; i++) { +// int beginMonth = beginTime.get(Calendar.MONTH) + 1; +// int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); +// String month = String.format("%02d", (beginMonth)); +// String day = String.format("%02d", (beginDay)); +// xAxisData.add(month + "-" + day); +// beginTime.add(Calendar.DAY_OF_MONTH, 1); +// +// } +// dateType="MM-dd"; LineChartVO vehicleFlows=getVehicleFlows(UseStatisticRequest, xAxisData, dateType); return new BizResultVO().setData(vehicleFlows); diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java index c6c9835..9cb8c58 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java @@ -14,13 +14,11 @@ import javax.servlet.http.HttpSession; import com.alibaba.dubbo.common.utils.CollectionUtils; import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.clouds.common.entity.UserInfo; import com.clouds.common.utils.AmountUtils; import com.clouds.common.utils.DateUtil; -import com.clouds.common.utils.ResultUtils; import com.clouds.common.utils.excle.ExcelUtil; import com.clouds.common.utils.excle.ExcleFillDateManager; import com.clouds.common.utils.excle.Layouter; @@ -42,7 +40,6 @@ import com.zteits.clouds.api.dto.clouds.dto.MonthBillSummaryStatisticDTO; import com.zteits.clouds.api.dto.clouds.dto.YearMonthCardStatisticDTO; import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest; import com.zteits.clouds.api.dto.clouds.param.MonthBillRequest; -import com.zteits.clouds.api.dto.pay.param.TdCompanyParkQueryRequest; import com.zteits.clouds.api.dto.pay.param.YearMonthCardStatisticRequest; import com.zteits.clouds.api.service.clouds.MonthBillManagementService; import com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService; @@ -76,11 +73,6 @@ public class MonthBillManagementController extends BizController { private MonthBillManagementService monthBillManagementService; @Autowired private YearMonthCardStatisticService yearMonthCardStatisticService; - - @Autowired - private TdCustCompanyService tdCustCompanyService; - @Autowired - private HttpSession session; @Autowired private SessionCommUtil sessionCommUtil; @Value("${project.syscode}") @@ -180,18 +172,20 @@ public class MonthBillManagementController extends BizController { public BizResultVO> queryBillforMonthList( @RequestBody BillQueryRequest billQueryRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - // 2.调用接口查询当前登录人管辖的停车场名称 + // 2.调用接口查询当前登录人管辖的停车场名称 UserInfo userInfo = sessionCommUtil.getUserInfo(); - List plNos = new ArrayList<>(); - if (userInfo != null) { - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); - tdCompanyParkQueryRequest.setSessionId(session.getId()); - tdCompanyParkQueryRequest.setSysCode(sysCode); - BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); - // 拥有的停车场编号 - plNos = ResultUtils.getBizResultData(bizResult); - } + List plNos = userInfo.getOrgIds(); +// UserInfo userInfo = sessionCommUtil.getUserInfo(); +// List plNos = new ArrayList<>(); +// if (userInfo != null) { +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); +// tdCompanyParkQueryRequest.setSessionId(session.getId()); +// tdCompanyParkQueryRequest.setSysCode(sysCode); +// BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); +// // 拥有的停车场编号 +// plNos = ResultUtils.getBizResultData(bizResult); +// } // if (CollectionUtils.isEmpty(plNos)) { // throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); // } @@ -215,16 +209,17 @@ public class MonthBillManagementController extends BizController { throws Exception { // 2.调用接口查询当前登录人管辖的停车场名称 UserInfo userInfo = sessionCommUtil.getUserInfo(); - List plNos = new ArrayList<>(); - if (userInfo != null) { - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); - tdCompanyParkQueryRequest.setSessionId(session.getId()); - tdCompanyParkQueryRequest.setSysCode(sysCode); - BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); - // 拥有的停车场编号 - plNos = ResultUtils.getBizResultData(bizResult); - } + List plNos = userInfo.getOrgIds(); +// List plNos = new ArrayList<>(); +// if (userInfo != null) { +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); +// tdCompanyParkQueryRequest.setSessionId(session.getId()); +// tdCompanyParkQueryRequest.setSysCode(sysCode); +// BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); +// // 拥有的停车场编号 +// plNos = ResultUtils.getBizResultData(bizResult); +// } // if (CollectionUtils.isEmpty(plNos)) { // throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); // } @@ -456,17 +451,20 @@ public class MonthBillManagementController extends BizController { billQueryRequest.setBaseRequest(new BaseInfo(1, 0)); // 2.调用接口查询当前登录人管辖的停车场名称 UserInfo userInfo = sessionCommUtil.getUserInfo(); - List plNos = new ArrayList<>(); - if (userInfo != null) { - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); - tdCompanyParkQueryRequest.setSessionId(session.getId()); - tdCompanyParkQueryRequest.setSysCode(sysCode); - BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds( - tdCompanyParkQueryRequest); - // 拥有的停车场编号 - plNos = ResultUtils.getBizResultData(bizResult); - } + List plNos = userInfo.getOrgIds(); +// // 2.调用接口查询当前登录人管辖的停车场名称 +// UserInfo userInfo = sessionCommUtil.getUserInfo(); +// List plNos = new ArrayList<>(); +// if (userInfo != null) { +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); +// tdCompanyParkQueryRequest.setSessionId(session.getId()); +// tdCompanyParkQueryRequest.setSysCode(sysCode); +// BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds( +// tdCompanyParkQueryRequest); +// // 拥有的停车场编号 +// plNos = ResultUtils.getBizResultData(bizResult); +// } billQueryRequest.setParkIdList(plNos); logger.info("月账单导出所有 req={}", JSONObject.toJSONString(billQueryRequest)); respondResult = monthBillManagementService @@ -549,17 +547,17 @@ public class MonthBillManagementController extends BizController { * @return * @throws Exception */ - private List queryParkNoByCustIds(TdCompanyParkQueryRequest tdCompanyParkQueryRequest) throws Exception { - /** 查询停车场编码. */ - BizResult> parkNoResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); - if (parkNoResult.isSuccess() && parkNoResult != null && parkNoResult.getData() != null) { - logger.info("根据登录获取到对应的停车场编码=" + JSONArray.toJSONString(parkNoResult.getData())); - return parkNoResult.getData(); - } else { - logger.info("根据登录用户没有获取到对应的停车场编码"); - return null; - } - - } +// private List queryParkNoByCustIds(TdCompanyParkQueryRequest tdCompanyParkQueryRequest) throws Exception { +// /** 查询停车场编码. */ +// BizResult> parkNoResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest); +// if (parkNoResult.isSuccess() && parkNoResult != null && parkNoResult.getData() != null) { +// logger.info("根据登录获取到对应的停车场编码=" + JSONArray.toJSONString(parkNoResult.getData())); +// return parkNoResult.getData(); +// } else { +// logger.info("根据登录用户没有获取到对应的停车场编码"); +// return null; +// } +// +// } } \ No newline at end of file diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java index ec75291..15e98c4 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/ParkLotStatisticController.java @@ -112,21 +112,24 @@ public class ParkLotStatisticController { private List GetParkLotNosByCurrUser(String sysCode) throws Exception { logger.info("根据登录人权限获取停车场列表"); - List plNos = Lists.newArrayList(); - //2.调用接口查询当前登录人管辖的停车场名称 /*plNos.add("A320211000"); plNos.add("B1504020C7");*/ - UserInfo userInfo = sessionCommUtil.getUserInfo(); - if(userInfo!=null){ - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); - tdCompanyParkQueryRequest.setSysCode(sysCode); - tdCompanyParkQueryRequest.setSessionId(session.getId()); - BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest ); - plNos = ResultUtils.getBizResultData(bizResult); - }else{ - throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS); - } + // 2.调用接口查询当前登录人管辖的停车场名称 + UserInfo userInfo = sessionCommUtil.getUserInfo(); + List plNos = userInfo.getOrgIds(); +// if(userInfo!=null){ +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); +// tdCompanyParkQueryRequest.setSysCode(sysCode); +// tdCompanyParkQueryRequest.setSessionId(session.getId()); +// BizResult> bizResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest ); +// plNos = ResultUtils.getBizResultData(bizResult); +// }else{ +// throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS); +// } + if(CollectionUtils.isEmpty(plNos)){ + throw new BizException(ErrorType.AUTH_TOKEN_NOT_EXISTS); + } return plNos; } } diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java index 1c3f9e2..2908491 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java @@ -10,7 +10,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import com.alibaba.dubbo.common.utils.CollectionUtils; import com.alibaba.fastjson.JSON; @@ -37,7 +36,6 @@ import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO; import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticMaxAndMinDTO; import com.zteits.clouds.api.dto.park.param.ParkingLotUseStatisticForPageRequest; import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService; -import com.zteits.clouds.api.service.pay.TdCustCompanyService; import com.zteits.irain.portal.constant.ParkConstant; import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO; import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO.SerieVO; @@ -79,11 +77,7 @@ public class VehicleFlowStatisticController extends BizController { @Autowired private ParkingLotUseStatisticService parkingLotStatisticService; @Autowired - private HttpSession session; - @Autowired private SessionCommUtil sessionCommUtil; - @Autowired - private TdCustCompanyService tdCustCompanyService; @ApiOperation("分页查询车流量数据统计车位总流量") @PostMapping("getVehicleFlowStatisticForPage") @@ -229,9 +223,9 @@ public class VehicleFlowStatisticController extends BizController { // 2.调用接口查询当前登录人管辖的停车场名称 UserInfo userInfo = sessionCommUtil.getUserInfo(); List plNos = userInfo.getOrgIds(); - if (CollectionUtils.isEmpty(plNos)) { - throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); - } +// if (CollectionUtils.isEmpty(plNos)) { +// throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); +// } request.setPlNos(plNos); logger.info("根据停车场编号获取该停车场今日车流量和车位折线图"); @@ -258,7 +252,7 @@ public class VehicleFlowStatisticController extends BizController { int beginDay = beginTime.get(Calendar.DAY_OF_MONTH); month = String.format("%02d", (beginMonth)); day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { + for (int j = 0; j <= totaltimestampCount; j++) { String hour = String.format("%02d", (j)); xAxisData.add(year + "-" + month + "-" + day + " " + hour); } @@ -281,7 +275,7 @@ public class VehicleFlowStatisticController extends BizController { int beginDay = tempDate.get(Calendar.DAY_OF_MONTH); month = String.format("%02d", (beginMonth)); day = String.format("%02d", (beginDay)); - for (int j = 0; j < totaltimestampCount; j++) { + for (int j = 0; j <= totaltimestampCount; j++) { String hour = String.format("%02d", (j)); xAxisData.add(year + "-" + month + "-" + day + " " + hour); } -- libgit2 0.21.4