BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 8a9d1db21fd7aa32c277414f92c9cbbba320c9c3

Authored by atao
1 parent bc299cf5

提交代码

Inline Side-by-side
Showing 2 changed files with 142 additions and 106 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
  View file @8a9d1db
1 1 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
2 2  
3 3 import java.math.BigDecimal;
4   -import java.math.RoundingMode;
5 4 import java.text.DecimalFormat;
6 5 import java.util.ArrayList;
7 6 import java.util.Calendar;
... ... @@ -32,12 +31,14 @@ import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalDTO;
32 31 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalParkDTO;
33 32 import com.zteits.clouds.api.dto.clouds.dto.ParkingCountDTO;
34 33 import com.zteits.clouds.api.dto.clouds.param.CustIncomeTotalQueryRequset;
  34 +import com.zteits.clouds.api.dto.park.dto.IndexSignRecordDTO;
35 35 import com.zteits.clouds.api.dto.park.dto.ParkLotEqpTypeCountStatisticByCountryDTO;
36 36 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
37 37 import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO;
38 38 import com.zteits.clouds.api.dto.park.dto.TodayVehicleFlowOccupyRateAndTurnOverDTO;
39 39 import com.zteits.clouds.api.dto.park.param.CommonPlnosQueryRequest;
40 40 import com.zteits.clouds.api.dto.park.param.EqpTypeQueryByPlNosRequest;
  41 +import com.zteits.clouds.api.dto.park.param.IndexSignRecordQueryRequest;
41 42 import com.zteits.clouds.api.dto.park.param.ParkingLotUseStatisticForPageRequest;
42 43 import com.zteits.clouds.api.dto.park.param.RealTimeVehicleFlowQueryRequest;
43 44 import com.zteits.clouds.api.service.clouds.CustIncomeService;
... ... @@ -46,9 +47,9 @@ import com.zteits.clouds.api.service.park.ParkingLotBerthsService;
46 47 import com.zteits.clouds.api.service.park.ParkingLotEqpService;
47 48 import com.zteits.clouds.api.service.park.ParkingLotQueryService;
48 49 import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService;
  50 +import com.zteits.clouds.api.service.park.SignRecordService;
49 51 import com.zteits.irain.portal.constant.ParkConstant;
50 52 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.BerthsAndFlowLineChartVO;
51   -import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeForPayTypeResVO;
52 53 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalParkVO;
53 54 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalVO;
54 55 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO;
... ... @@ -102,6 +103,9 @@ public class IndexPageStatisticController extends BizController {
102 103 @Autowired
103 104 private ParkingLotBerthsService parkingLotBerthsService;
104 105  
  106 + @Autowired
  107 + private SignRecordService signRecordService;
  108 +
105 109 /**
106 110 * 云平台首页－>企业客户负责所有的停车场汇总.<br/>
107 111 *
... ... @@ -113,7 +117,7 @@ public class IndexPageStatisticController extends BizController {
113 117 public BizResultVO<CustIncomeTotalVO> queryCustIncomeTotal(
114 118 @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
115 119 throws Exception {
116   - logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
  120 + logger.info("---begin企业云平台首页-实际收入查询,入参={}", JSONObject.toJSON(custIncomeTotalQueryRequset));
117 121 BizResultVO<CustIncomeTotalVO> bizResultVO = new BizResultVO<>();
118 122  
119 123 BizResult<CustIncomeTotalDTO> result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
... ... @@ -136,7 +140,7 @@ public class IndexPageStatisticController extends BizController {
136 140  
137 141 /**
138 142 * 云平台首页－>企业客户负责某个停车收入情况.<br/>
139   - *
  143 + *
140 144 * @return
141 145 * @throws Exception
142 146 */
... ... @@ -192,16 +196,18 @@ public class IndexPageStatisticController extends BizController {
192 196 /**
193 197 * 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.<br/>
194 198 * 说明:
195   - * 1.2017-08-22将支付方式更改为饼图.<br/>
  199 + * 1.2017-08-22将支付方式更改为饼图.<br/>
  200 + *
196 201 * @return
197 202 * @throws Exception
198 203 */
199   -
  204 +
200 205 @ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
201 206 @PostMapping("/queryCustIncomeForPayType")
202 207 public BizResultVO<List<CustIncomeForPayTypeDTO>> queryCustIncomeForPayType(
203 208 @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
204   - logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
  209 + logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}",
  210 + JSONObject.toJSONString(custIncomeTotalQueryRequset));
205 211 BizResult<List<CustIncomeForPayTypeDTO>> result = cusIncomeService.queryCustIncomeForPayType(
206 212 custIncomeTotalQueryRequset);
207 213 logger.info("...end企业客户负责某个停车不同的支付方式收入情况,响应为: result={}", JSONObject.toJSONString(result));
... ... @@ -425,34 +431,34 @@ public class IndexPageStatisticController extends BizController {
425 431 */
426 432 @ApiOperation("实时查询当前周转率")
427 433 @PostMapping("/realtimeTurnoverRate")
428   - public BizResultVO<Map<String,Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
429   - BizResultVO<Map<String,Object>> res = new BizResultVO<>();
430   - Map<String,Object> resMap = new HashMap<>();
  434 + public BizResultVO<Map<String, Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
  435 + BizResultVO<Map<String, Object>> res = new BizResultVO<>();
  436 + Map<String, Object> resMap = new HashMap<>();
431 437 //1、查询截止当前进场停车次数
432 438 BizResult<Long> bizResult = iInOutParkingService.queryRealTimeInParkNumOfPlNos(request);
433   - if(ResultUtils.isError(bizResult)){
  439 + if (ResultUtils.isError(bizResult)) {
434 440 res.setCode(bizResult.getErrCode().getCode());
435 441 res.setMsg(bizResult.getErrMsg());
436 442 return res;
437 443 }
438 444 //2、根据停车场编号查询停车场总车位数
439 445 BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
440   - if(ResultUtils.isError(berthResult)){
  446 + if (ResultUtils.isError(berthResult)) {
441 447 res.setCode(berthResult.getErrCode().getCode());
442 448 res.setMsg(berthResult.getErrMsg());
443 449 return res;
444 450 }
445 451  
446 452 //停车次数
447   - resMap.put("parkNum",bizResult.getData());
  453 + resMap.put("parkNum", bizResult.getData());
448 454 //总车位数
449   - resMap.put("allBerthNum",berthResult.getData());
  455 + resMap.put("allBerthNum", berthResult.getData());
450 456 double rate = bizResult.getData() * 1.0 / berthResult.getData() * 100;
451 457 String rateStr = new DecimalFormat("#.00").format(rate);
452   - if(rate == 0){
  458 + if (rate == 0) {
453 459 rateStr = "0.00";
454 460 }
455   - resMap.put("rate",rateStr);
  461 + resMap.put("rate", rateStr);
456 462 res.setData(resMap);
457 463 return res;
458 464 }
... ... @@ -466,35 +472,35 @@ public class IndexPageStatisticController extends BizController {
466 472 */
467 473 @ApiOperation("实时查询当前占用率")
468 474 @PostMapping("/realtimeoccupationRate")
469   - public BizResultVO<Map<String,Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
470   - BizResultVO<Map<String,Object>> res = new BizResultVO<>();
471   - Map<String,Object> resMap = new HashMap<>();
  475 + public BizResultVO<Map<String, Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
  476 + BizResultVO<Map<String, Object>> res = new BizResultVO<>();
  477 + Map<String, Object> resMap = new HashMap<>();
472 478  
473 479 //1、查询截止当前空余车位数
474 480 BizResult<Long> bizResult = parkingLotBerthsService.queryAllFreeBerthNum(request);
475   - if(ResultUtils.isError(bizResult)){
  481 + if (ResultUtils.isError(bizResult)) {
476 482 res.setCode(bizResult.getErrCode().getCode());
477 483 res.setMsg(bizResult.getErrMsg());
478 484 return res;
479 485 }
480 486 //2、根据停车场编号查询停车场总车位数
481 487 BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
482   - if(ResultUtils.isError(berthResult)){
  488 + if (ResultUtils.isError(berthResult)) {
483 489 res.setCode(berthResult.getErrCode().getCode());
484 490 res.setMsg(berthResult.getErrMsg());
485 491 return res;
486 492 }
487 493 //空余车位数
488   - resMap.put("freeBerthNum",bizResult.getData());
  494 + resMap.put("freeBerthNum", bizResult.getData());
489 495 //总车位数
490   - resMap.put("allBerthNum",berthResult.getData());
  496 + resMap.put("allBerthNum", berthResult.getData());
491 497  
492   - double rate = (1-bizResult.getData() * 1.0 / berthResult.getData()) * 100;
  498 + double rate = (1 - bizResult.getData() * 1.0 / berthResult.getData()) * 100;
493 499 String rateStr = new DecimalFormat("#.00").format(rate);
494   - if(rate == 0){
  500 + if (rate == 0) {
495 501 rateStr = "0.00";
496 502 }
497   - resMap.put("rate",rateStr);
  503 + resMap.put("rate", rateStr);
498 504 res.setData(resMap);
499 505 return res;
500 506  
... ... @@ -570,19 +576,22 @@ public class IndexPageStatisticController extends BizController {
570 576 }
571 577  
572 578 /**
573   - * 企业云平台首页-->停车次数统计(饼图).<br/>
574   - * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
575   - * @param custIncomeTotalQueryRequset
576   - * @return
577   - * @throws Exception
578   - */
  579 + * 企业云平台首页-->停车次数统计(饼图).<br/>
  580 + * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
  581 + *
  582 + * @param custIncomeTotalQueryRequset
  583 + * @return
  584 + * @throws Exception
  585 + */
579 586 @ApiOperation("企业云平台首页-->停车次数统计(饼图)")
580 587 @PostMapping("/queryParingCount")
581   - public BizResultVO<List<ParkingCountDTO>> queryParingCount(@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception{
582   - logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
583   - BizResult<List<ParkingCountDTO>> result =cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
584   - logger.info("...end停车次数统计->调用后场dubbo服务...");
585   - return new BizResultVO<List<ParkingCountDTO>>(result);
  588 + public BizResultVO<List<ParkingCountDTO>> queryParingCount(
  589 + @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
  590 + logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}",
  591 + JSONObject.toJSONString(custIncomeTotalQueryRequset));
  592 + BizResult<List<ParkingCountDTO>> result = cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
  593 + logger.info("...end停车次数统计->调用后场dubbo服务...");
  594 + return new BizResultVO<List<ParkingCountDTO>>(result);
586 595 }
587 596  
588 597 /**
... ... @@ -607,4 +616,20 @@ public class IndexPageStatisticController extends BizController {
607 616 }
608 617 return new BizResult<>(resultList);
609 618 }
  619 +
  620 + /**
  621 + * 查询首页签到记录
  622 + *
  623 + * @param request
  624 + * @return
  625 + */
  626 + @ApiOperation(value = "首页签到记录")
  627 + @PostMapping("/queryIndexSignRecord")
  628 + @ResponseBody
  629 + public BizResultVO<List<IndexSignRecordDTO>> queryIndexSignRecord(
  630 + @RequestBody IndexSignRecordQueryRequest request) {
  631 + BizResult<List<IndexSignRecordDTO>> dtos = signRecordService.queryIndexSignRecord(request);
  632 + return new BizResultVO<>(dtos);
  633 + }
  634 +
610 635 }
... ...
src/main/resources/dubbo/dubbo-park-consumer.xml
  View file @8a9d1db
... ... @@ -81,7 +81,7 @@
81 81 <dubbo:reference interface="com.zteits.clouds.api.service.park.RefreshParkCacheService"
82 82 version="${spring.dubbo.provider.version}"
83 83 id="refreshSysCacheService" timeout="30000"/>
84   - <!-- 刷新Sys缓存 -->
  84 + <!-- 刷新Sys缓存 -->
85 85 <dubbo:reference interface="com.zteits.clouds.api.service.sys.RefreshSysCacheService"
86 86 version="${spring.dubbo.provider.version}"
87 87 id="refreshParkCacheService" timeout="30000"/>
... ... @@ -89,17 +89,18 @@
89 89 <!-- 通过企业客户Ids查询停车场编码 -->
90 90 <dubbo:reference id="tdCustCompanyService" interface="com.zteits.clouds.api.service.pay.TdCustCompanyService"
91 91 version="${spring.dubbo.provider.version}" timeout="30000"/>
92   -
93   - <!--#########################政府云平台#################################################-->
  92 +
  93 + <!--#########################政府云平台#################################################-->
94 94  
95 95 <!-- 诱导屏dubbo接口-->
96 96 <dubbo:reference id="guideScreenService" interface="com.zteits.clouds.api.service.park.GuideScreenService"
97 97 version="${spring.dubbo.provider.version}" timeout="30000"/>
98 98  
99   -
  99 +
100 100 <!-- 政府云平台->停车线上线下排行service -->
101   - <dubbo:reference id="parkTransactionService" interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
102   - version="${spring.dubbo.provider.version}" timeout="30000"/>
  101 + <dubbo:reference id="parkTransactionService"
  102 + interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
  103 + version="${spring.dubbo.provider.version}" timeout="30000"/>
103 104 <dubbo:reference id="guideParkRelService" interface="com.zteits.clouds.api.service.park.GuideParkRelService"
104 105 version="${spring.dubbo.provider.version}" timeout="30000"/>
105 106 <!-- 停车场LBS-查询停车场经纬度 -->
... ... @@ -109,69 +110,79 @@
109 110 <dubbo:reference id="tdCFileService" interface="com.zteits.clouds.api.service.pay.TdCFileService"
110 111 version="${spring.dubbo.provider.version}"
111 112 timeout="30000"/>
112   - <!-- 停车轨迹 -->
113   - <dubbo:reference id="parkPreferenceService" interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
  113 + <!-- 停车轨迹 -->
  114 + <dubbo:reference id="parkPreferenceService"
  115 + interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
  116 + version="${spring.dubbo.provider.version}"
  117 + timeout="30000"/>
  118 + <!-- 热点区域 -->
  119 + <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
  120 + version="${spring.dubbo.provider.version}"
  121 + timeout="30000"/>
  122 +
  123 + <!-- sys区域查询 -->
  124 + <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
  125 + version="${spring.dubbo.provider.version}"
  126 + timeout="30000"/>
  127 + <!-- 企业云平台->数据统计->进出场上报 -->
  128 + <dubbo:reference id="inOutParkStatisticService"
  129 + interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
  130 + version="${spring.dubbo.provider.version}"
  131 + timeout="30000"/>
  132 +
  133 +
  134 + <!-- 企业云平台->数据统计->年卡月卡统计 -->
  135 + <dubbo:reference id="yearMonthCardStatisticService"
  136 + interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
  137 + version="${spring.dubbo.provider.version}"
  138 + timeout="30000"/>
  139 +
  140 + <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->
  141 + <dubbo:reference id="monthBillManagementService"
  142 + interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
  143 + version="${spring.dubbo.provider.version}"
  144 + timeout="30000"/>
  145 +
  146 + <!-- 泊位状态同步 -->
  147 + <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
  148 + version="${spring.dubbo.provider.version}"
  149 + timeout="30000"/>
  150 +
  151 + <!--企业云平台－停车时长统计 -->
  152 + <dubbo:reference id="cloudsParDurationService"
  153 + interface="com.zteits.clouds.api.service.clouds.CloudsParDurationService"
  154 + version="${spring.dubbo.provider.version}"
  155 + timeout="30000"/>
  156 +
  157 + <!--企业云平台－>基础信息->泊位区间管理 -->
  158 + <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
  159 + version="${spring.dubbo.provider.version}"
  160 + timeout="30000"/>
  161 +
  162 + <!--企业云平台－基础信息-泊位管理 -->
  163 + <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
  164 + version="${spring.dubbo.provider.version}"
  165 + timeout="30000"/>
  166 +
  167 + <!--企业云平台－设备管理 -pda管理-->
  168 + <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
  169 + version="${spring.dubbo.provider.version}"
  170 + timeout="30000"/>
  171 +
  172 + <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
  173 + version="${spring.dubbo.provider.version}"
  174 + timeout="30000"/>
  175 + <!-- 地磁管理 -->
  176 + <dubbo:reference id="geomagneticManagementService"
  177 + interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
  178 + version="${spring.dubbo.provider.version}" timeout="30000"/>
  179 +
  180 + <!-- sys 字典获取 -->
  181 + <dubbo:reference id="sysCommonService" interface="com.zteits.clouds.api.service.sys.SysCommonService"
  182 + version="${spring.dubbo.provider.version}"
  183 + timeout="30000"/>
  184 + <!--签到记录服务-->
  185 + <dubbo:reference id="signRecordService" interface="com.zteits.clouds.api.service.park.SignRecordService"
114 186 version="${spring.dubbo.provider.version}"
115 187 timeout="30000"/>
116   - <!-- 热点区域 -->
117   - <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
118   - version="${spring.dubbo.provider.version}"
119   - timeout="30000"/>
120   -
121   - <!-- sys区域查询 -->
122   - <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
123   - version="${spring.dubbo.provider.version}"
124   - timeout="30000"/>
125   - <!-- 企业云平台->数据统计->进出场上报 -->
126   - <dubbo:reference id="inOutParkStatisticService" interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
127   - version="${spring.dubbo.provider.version}"
128   - timeout="30000"/>
129   -
130   -
131   - <!-- 企业云平台->数据统计->年卡月卡统计 -->
132   - <dubbo:reference id="yearMonthCardStatisticService" interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
133   - version="${spring.dubbo.provider.version}"
134   - timeout="30000"/>
135   -
136   - <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->
137   - <dubbo:reference id="monthBillManagementService" interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
138   - version="${spring.dubbo.provider.version}"
139   - timeout="30000"/>
140   -
141   - <!-- 泊位状态同步 -->
142   - <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
143   - version="${spring.dubbo.provider.version}"
144   - timeout="30000"/>
145   -
146   - <!--企业云平台－停车时长统计 -->
147   - <dubbo:reference id="cloudsParDurationService" interface="com.zteits.clouds.api.service.clouds.CloudsParDurationService"
148   - version="${spring.dubbo.provider.version}"
149   - timeout="30000"/>
150   -
151   - <!--企业云平台－>基础信息->泊位区间管理 -->
152   - <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
153   - version="${spring.dubbo.provider.version}"
154   - timeout="30000"/>
155   -
156   - <!--企业云平台－基础信息-泊位管理 -->
157   - <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
158   - version="${spring.dubbo.provider.version}"
159   - timeout="30000"/>
160   -
161   - <!--企业云平台－设备管理 -pda管理-->
162   - <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
163   - version="${spring.dubbo.provider.version}"
164   - timeout="30000"/>
165   -
166   - <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
167   - version="${spring.dubbo.provider.version}"
168   - timeout="30000"/>
169   - <!-- 地磁管理 -->
170   - <dubbo:reference id="geomagneticManagementService" interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
171   - version="${spring.dubbo.provider.version}" timeout="30000"/>
172   -
173   - <!-- sys 字典获取 -->
174   - <dubbo:reference id="sysCommonService" interface="com.zteits.clouds.api.service.sys.SysCommonService"
175   - version="${spring.dubbo.provider.version}"
176   - timeout="30000"/>
177 188 </beans>
178 189 \ No newline at end of file
... ...