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;
+
/**
* 云平台首页－>企业客户负责所有的停车场汇总.
*
@@ -113,7 +117,7 @@ public class IndexPageStatisticController extends BizController {
public BizResultVO queryCustIncomeTotal(
@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
throws Exception {
- logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
+ logger.info("---begin企业云平台首页-实际收入查询,入参={}", JSONObject.toJSON(custIncomeTotalQueryRequset));
BizResultVO bizResultVO = new BizResultVO<>();
BizResult result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
@@ -136,7 +140,7 @@ public class IndexPageStatisticController extends BizController {
/**
* 云平台首页－>企业客户负责某个停车收入情况.
- *
+ *
* @return
* @throws Exception
*/
@@ -192,16 +196,18 @@ public class IndexPageStatisticController extends BizController {
/**
* 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.
* 说明:
- * 1.2017-08-22将支付方式更改为饼图.
+ * 1.2017-08-22将支付方式更改为饼图.
+ *
* @return
* @throws Exception
*/
-
+
@ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
@PostMapping("/queryCustIncomeForPayType")
public BizResultVO> queryCustIncomeForPayType(
@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
- logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+ logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}",
+ JSONObject.toJSONString(custIncomeTotalQueryRequset));
BizResult> 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> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
- BizResultVO> res = new BizResultVO<>();
- Map resMap = new HashMap<>();
+ public BizResultVO> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
+ BizResultVO> res = new BizResultVO<>();
+ Map resMap = new HashMap<>();
//1、查询截止当前进场停车次数
BizResult 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 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> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
- BizResultVO> res = new BizResultVO<>();
- Map resMap = new HashMap<>();
+ public BizResultVO> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
+ BizResultVO> res = new BizResultVO<>();
+ Map resMap = new HashMap<>();
//1、查询截止当前空余车位数
BizResult 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 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 {
}
/**
- * 企业云平台首页-->停车次数统计(饼图).
- * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.
- * @param custIncomeTotalQueryRequset
- * @return
- * @throws Exception
- */
+ * 企业云平台首页-->停车次数统计(饼图).
+ * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.
+ *
+ * @param custIncomeTotalQueryRequset
+ * @return
+ * @throws Exception
+ */
@ApiOperation("企业云平台首页-->停车次数统计(饼图)")
@PostMapping("/queryParingCount")
- public BizResultVO> queryParingCount(@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception{
- logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
- BizResult> result =cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
- logger.info("...end停车次数统计->调用后场dubbo服务...");
- return new BizResultVO>(result);
+ public BizResultVO> queryParingCount(
+ @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
+ logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}",
+ JSONObject.toJSONString(custIncomeTotalQueryRequset));
+ BizResult> result = cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
+ logger.info("...end停车次数统计->调用后场dubbo服务...");
+ return new BizResultVO>(result);
}
/**
@@ -607,4 +616,20 @@ public class IndexPageStatisticController extends BizController {
}
return new BizResult<>(resultList);
}
+
+ /**
+ * 查询首页签到记录
+ *
+ * @param request
+ * @return
+ */
+ @ApiOperation(value = "首页签到记录")
+ @PostMapping("/queryIndexSignRecord")
+ @ResponseBody
+ public BizResultVO> queryIndexSignRecord(
+ @RequestBody IndexSignRecordQueryRequest request) {
+ BizResult> 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 @@
-
+
@@ -89,17 +89,18 @@
-
-
+
+
-
+
-
+
@@ -109,69 +110,79 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file