From 8a9d1db21fd7aa32c277414f92c9cbbba320c9c3 Mon Sep 17 00:00:00 2001
From: atao <zzt_work@163.com>
Date: Thu, 7 Sep 2017 19:55:39 +0800
Subject: [PATCH] 提交代码

---
 src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
 src/main/resources/dubbo/dubbo-park-consumer.xml                                                                  | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
 2 files changed, 142 insertions(+), 106 deletions(-)

diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
index 6c00315..4a42cae 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
@@ -1,7 +1,6 @@
 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -32,12 +31,14 @@ 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.dto.ParkingCountDTO;
 import com.zteits.clouds.api.dto.clouds.param.CustIncomeTotalQueryRequset;
+import com.zteits.clouds.api.dto.park.dto.IndexSignRecordDTO;
 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.dto.TodayVehicleFlowOccupyRateAndTurnOverDTO;
 import com.zteits.clouds.api.dto.park.param.CommonPlnosQueryRequest;
 import com.zteits.clouds.api.dto.park.param.EqpTypeQueryByPlNosRequest;
+import com.zteits.clouds.api.dto.park.param.IndexSignRecordQueryRequest;
 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;
@@ -46,9 +47,9 @@ import com.zteits.clouds.api.service.park.ParkingLotBerthsService;
 import com.zteits.clouds.api.service.park.ParkingLotEqpService;
 import com.zteits.clouds.api.service.park.ParkingLotQueryService;
 import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService;
+import com.zteits.clouds.api.service.park.SignRecordService;
 import com.zteits.irain.portal.constant.ParkConstant;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.BerthsAndFlowLineChartVO;
-import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeForPayTypeResVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalParkVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO;
@@ -102,6 +103,9 @@ public class IndexPageStatisticController extends BizController {
     @Autowired
     private ParkingLotBerthsService parkingLotBerthsService;
 
+    @Autowired
+    private SignRecordService signRecordService;
+
     /**
      * 云平台首页－>企业客户负责所有的停车场汇总.<br/>
      *
@@ -113,7 +117,7 @@ public class IndexPageStatisticController extends BizController {
     public BizResultVO<CustIncomeTotalVO> queryCustIncomeTotal(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
         throws Exception {
-        logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
+        logger.info("---begin企业云平台首页-实际收入查询,入参={}", JSONObject.toJSON(custIncomeTotalQueryRequset));
         BizResultVO<CustIncomeTotalVO> bizResultVO = new BizResultVO<>();
 
         BizResult<CustIncomeTotalDTO> result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
@@ -136,7 +140,7 @@ public class IndexPageStatisticController extends BizController {
 
     /**
      * 云平台首页－>企业客户负责某个停车收入情况.<br/>
-     * 
+     *
      * @return
      * @throws Exception
      */
@@ -192,16 +196,18 @@ public class IndexPageStatisticController extends BizController {
     /**
      * 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.<br/>
      * 说明:
-     *  1.2017-08-22将支付方式更改为饼图.<br/>
+     * 1.2017-08-22将支付方式更改为饼图.<br/>
+     *
      * @return
      * @throws Exception
      */
-    
+
     @ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
     @PostMapping("/queryCustIncomeForPayType")
     public BizResultVO<List<CustIncomeForPayTypeDTO>> queryCustIncomeForPayType(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
-        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}",
+            JSONObject.toJSONString(custIncomeTotalQueryRequset));
         BizResult<List<CustIncomeForPayTypeDTO>> result = cusIncomeService.queryCustIncomeForPayType(
             custIncomeTotalQueryRequset);
         logger.info("...end企业客户负责某个停车不同的支付方式收入情况,响应为: result={}", JSONObject.toJSONString(result));
@@ -425,34 +431,34 @@ public class IndexPageStatisticController extends BizController {
      */
     @ApiOperation("实时查询当前周转率")
     @PostMapping("/realtimeTurnoverRate")
-    public BizResultVO<Map<String,Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
-        BizResultVO<Map<String,Object>> res = new BizResultVO<>();
-        Map<String,Object> resMap = new HashMap<>();
+    public BizResultVO<Map<String, Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
+        BizResultVO<Map<String, Object>> res = new BizResultVO<>();
+        Map<String, Object> resMap = new HashMap<>();
         //1、查询截止当前进场停车次数
         BizResult<Long> bizResult = iInOutParkingService.queryRealTimeInParkNumOfPlNos(request);
-        if(ResultUtils.isError(bizResult)){
+        if (ResultUtils.isError(bizResult)) {
             res.setCode(bizResult.getErrCode().getCode());
             res.setMsg(bizResult.getErrMsg());
             return res;
         }
         //2、根据停车场编号查询停车场总车位数
         BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
-        if(ResultUtils.isError(berthResult)){
+        if (ResultUtils.isError(berthResult)) {
             res.setCode(berthResult.getErrCode().getCode());
             res.setMsg(berthResult.getErrMsg());
             return res;
         }
 
         //停车次数
-        resMap.put("parkNum",bizResult.getData());
+        resMap.put("parkNum", bizResult.getData());
         //总车位数
-        resMap.put("allBerthNum",berthResult.getData());
+        resMap.put("allBerthNum", berthResult.getData());
         double rate = bizResult.getData() * 1.0 / berthResult.getData() * 100;
         String rateStr = new DecimalFormat("#.00").format(rate);
-        if(rate == 0){
+        if (rate == 0) {
             rateStr = "0.00";
         }
-        resMap.put("rate",rateStr);
+        resMap.put("rate", rateStr);
         res.setData(resMap);
         return res;
     }
@@ -466,35 +472,35 @@ public class IndexPageStatisticController extends BizController {
      */
     @ApiOperation("实时查询当前占用率")
     @PostMapping("/realtimeoccupationRate")
-    public BizResultVO<Map<String,Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
-        BizResultVO<Map<String,Object>> res = new BizResultVO<>();
-        Map<String,Object> resMap = new HashMap<>();
+    public BizResultVO<Map<String, Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
+        BizResultVO<Map<String, Object>> res = new BizResultVO<>();
+        Map<String, Object> resMap = new HashMap<>();
 
         //1、查询截止当前空余车位数
         BizResult<Long> bizResult = parkingLotBerthsService.queryAllFreeBerthNum(request);
-        if(ResultUtils.isError(bizResult)){
+        if (ResultUtils.isError(bizResult)) {
             res.setCode(bizResult.getErrCode().getCode());
             res.setMsg(bizResult.getErrMsg());
             return res;
         }
         //2、根据停车场编号查询停车场总车位数
         BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
-        if(ResultUtils.isError(berthResult)){
+        if (ResultUtils.isError(berthResult)) {
             res.setCode(berthResult.getErrCode().getCode());
             res.setMsg(berthResult.getErrMsg());
             return res;
         }
         //空余车位数
-        resMap.put("freeBerthNum",bizResult.getData());
+        resMap.put("freeBerthNum", bizResult.getData());
         //总车位数
-        resMap.put("allBerthNum",berthResult.getData());
+        resMap.put("allBerthNum", berthResult.getData());
 
-        double rate = (1-bizResult.getData() * 1.0 / berthResult.getData()) * 100;
+        double rate = (1 - bizResult.getData() * 1.0 / berthResult.getData()) * 100;
         String rateStr = new DecimalFormat("#.00").format(rate);
-        if(rate == 0){
+        if (rate == 0) {
             rateStr = "0.00";
         }
-        resMap.put("rate",rateStr);
+        resMap.put("rate", rateStr);
         res.setData(resMap);
         return res;
 
@@ -570,19 +576,22 @@ public class IndexPageStatisticController extends BizController {
     }
 
     /**
-	 * 企业云平台首页-->停车次数统计(饼图).<br/>
-	 * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
-	 * @param custIncomeTotalQueryRequset
-	 * @return
-	 * @throws Exception
-	 */
+     * 企业云平台首页-->停车次数统计(饼图).<br/>
+     * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
+     *
+     * @param custIncomeTotalQueryRequset
+     * @return
+     * @throws Exception
+     */
     @ApiOperation("企业云平台首页-->停车次数统计(饼图)")
     @PostMapping("/queryParingCount")
-    public BizResultVO<List<ParkingCountDTO>> queryParingCount(@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception{
-    	logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
-    	BizResult<List<ParkingCountDTO>> result =cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
-    	logger.info("...end停车次数统计->调用后场dubbo服务...");
-    	return new BizResultVO<List<ParkingCountDTO>>(result);
+    public BizResultVO<List<ParkingCountDTO>> queryParingCount(
+        @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
+        logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}",
+            JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        BizResult<List<ParkingCountDTO>> result = cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
+        logger.info("...end停车次数统计->调用后场dubbo服务...");
+        return new BizResultVO<List<ParkingCountDTO>>(result);
     }
 
     /**
@@ -607,4 +616,20 @@ public class IndexPageStatisticController extends BizController {
         }
         return new BizResult<>(resultList);
     }
+
+    /**
+     * 查询首页签到记录
+     *
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "首页签到记录")
+    @PostMapping("/queryIndexSignRecord")
+    @ResponseBody
+    public BizResultVO<List<IndexSignRecordDTO>> queryIndexSignRecord(
+        @RequestBody IndexSignRecordQueryRequest request) {
+        BizResult<List<IndexSignRecordDTO>> dtos = signRecordService.queryIndexSignRecord(request);
+        return new BizResultVO<>(dtos);
+    }
+
 }
diff --git a/src/main/resources/dubbo/dubbo-park-consumer.xml b/src/main/resources/dubbo/dubbo-park-consumer.xml
index 72de840..23a74d3 100644
--- a/src/main/resources/dubbo/dubbo-park-consumer.xml
+++ b/src/main/resources/dubbo/dubbo-park-consumer.xml
@@ -81,7 +81,7 @@
     <dubbo:reference interface="com.zteits.clouds.api.service.park.RefreshParkCacheService"
                      version="${spring.dubbo.provider.version}"
                      id="refreshSysCacheService" timeout="30000"/>
-	<!-- 刷新Sys缓存 -->
+    <!-- 刷新Sys缓存 -->
     <dubbo:reference interface="com.zteits.clouds.api.service.sys.RefreshSysCacheService"
                      version="${spring.dubbo.provider.version}"
                      id="refreshParkCacheService" timeout="30000"/>
@@ -89,17 +89,18 @@
     <!-- 通过企业客户Ids查询停车场编码 -->
     <dubbo:reference id="tdCustCompanyService" interface="com.zteits.clouds.api.service.pay.TdCustCompanyService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
-                  
-      <!--#########################政府云平台#################################################-->
+
+    <!--#########################政府云平台#################################################-->
 
     <!-- 诱导屏dubbo接口-->
     <dubbo:reference id="guideScreenService" interface="com.zteits.clouds.api.service.park.GuideScreenService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
 
-    
+
     <!-- 政府云平台->停车线上线下排行service -->
-     <dubbo:reference id="parkTransactionService" interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
-           version="${spring.dubbo.provider.version}" timeout="30000"/>
+    <dubbo:reference id="parkTransactionService"
+                     interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
+                     version="${spring.dubbo.provider.version}" timeout="30000"/>
     <dubbo:reference id="guideParkRelService" interface="com.zteits.clouds.api.service.park.GuideParkRelService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
     <!-- 停车场LBS-查询停车场经纬度 -->
@@ -109,69 +110,79 @@
     <dubbo:reference id="tdCFileService" interface="com.zteits.clouds.api.service.pay.TdCFileService"
                      version="${spring.dubbo.provider.version}"
                      timeout="30000"/>
-     <!-- 停车轨迹 -->
-    <dubbo:reference id="parkPreferenceService" interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
+    <!-- 停车轨迹 -->
+    <dubbo:reference id="parkPreferenceService"
+                     interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 热点区域 -->
+    <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- sys区域查询 -->
+    <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 企业云平台->数据统计->进出场上报 -->
+    <dubbo:reference id="inOutParkStatisticService"
+                     interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+
+    <!-- 企业云平台->数据统计->年卡月卡统计 -->
+    <dubbo:reference id="yearMonthCardStatisticService"
+                     interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->
+    <dubbo:reference id="monthBillManagementService"
+                     interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- 泊位状态同步 -->
+    <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－停车时长统计 -->
+    <dubbo:reference id="cloudsParDurationService"
+                     interface="com.zteits.clouds.api.service.clouds.CloudsParDurationService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－>基础信息->泊位区间管理 -->
+    <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－基础信息-泊位管理 -->
+    <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－设备管理 -pda管理-->
+    <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 地磁管理 -->
+    <dubbo:reference id="geomagneticManagementService"
+                     interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
+                     version="${spring.dubbo.provider.version}" timeout="30000"/>
+
+    <!-- sys 字典获取 -->
+    <dubbo:reference id="sysCommonService" interface="com.zteits.clouds.api.service.sys.SysCommonService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!--签到记录服务-->
+    <dubbo:reference id="signRecordService" interface="com.zteits.clouds.api.service.park.SignRecordService"
                      version="${spring.dubbo.provider.version}"
                      timeout="30000"/>
-     <!-- 热点区域 --> 
-     <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      <!-- sys区域查询 --> 
-     <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-    <!-- 企业云平台->数据统计->进出场上报 --> 
-     <dubbo:reference id="inOutParkStatisticService" interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      
-     <!-- 企业云平台->数据统计->年卡月卡统计 --> 
-     <dubbo:reference id="yearMonthCardStatisticService" interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->      
-      <dubbo:reference id="monthBillManagementService" interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-      <!-- 泊位状态同步 -->
-      <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-      <!--企业云平台－停车时长统计 -->
-      <dubbo:reference id="cloudsParDurationService" interface="com.zteits.clouds.api.service.clouds.CloudsParDurationService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-      <!--企业云平台－>基础信息->泊位区间管理 -->
-      <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-    
-      <!--企业云平台－基础信息-泊位管理 -->
-      <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-       <!--企业云平台－设备管理 -pda管理-->
-      <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-       <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      <!-- 地磁管理 --> 
-      <dubbo:reference id="geomagneticManagementService" interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
-	      version="${spring.dubbo.provider.version}" timeout="30000"/>
-	      
-	  <!-- sys 字典获取 --> 
-      <dubbo:reference id="sysCommonService" interface="com.zteits.clouds.api.service.sys.SysCommonService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
 </beans>
\ No newline at end of file
--
libgit2 0.21.4