Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits…

…-bcp-portal into branch_0808

Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits…
…-bcp-portal into branch_0808
atao
2 parents cd8983e0 9fd1a85d
Showing 3 changed files with 105 additions and 154 deletions
.gitignore
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BillManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
 # Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
 ### macOS template
 *.DS_Store
 .AppleDouble
@@ -26,75 +83,5 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
-### Maven template
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
-### Eclipse template
-
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# Eclipse Core
-.project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-.idea
 *.iml
@@ -83,21 +83,17 @@ public class BillManageController extends BizController {
 			HttpServletResponse response) throws Exception {
 		TdCustCompanyService sert = map.get("tdCustCompanyService");
 		logger.info("---begin--日账汇总单查询调用后场dubbo服务,入参＝{}", JSONObject.toJSON(billQueryRequest));
-//		System.out.println("seesionId="+request.getSession().getId());
-//		UserInfo userInfo = sessionCommUtil.getUserInfo();
-//		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-//		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-//		if (userInfo != null) {
-//			
-//			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-//			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-//			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-//			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
-//		}
-		 // 2.调用接口查询当前登录人管辖的停车场名称
-        UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
-        billQueryRequest.setParkIdList(plNos);
+		System.out.println("seesionId="+request.getSession().getId());
+		UserInfo userInfo = sessionCommUtil.getUserInfo();
+		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
+		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
+		if (userInfo != null) {
+			
+			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
+			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
+			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
+			billQueryRequest.setParkIdList(userInfo.getOrgIds());
+		}
 		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest);
 		result.setErrMsg(billQueryRequest.getParkIdList().toString());
@@ -119,25 +115,18 @@ public class BillManageController extends BizController {
 			HttpServletResponse response) throws Exception {
 		BizResult<PageBean<BillManageDTO>> result = new BizResult<PageBean<BillManageDTO>>();
 		logger.info("---begin---日账单查看调用后场dubbo服务,入参={}", JSONObject.toJSONString(billQueryRequest));
-//		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-//		UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-//		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-//		if (userInfo != null) {
-//			
-//			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-//			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-//			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-//			billQueryRequest.setUserName(userInfo.getName());
-//			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
-//			
-//		}
-		
-		// 2.调用接口查询当前登录人管辖的停车场名称
-        UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
-        billQueryRequest.setParkIdList(plNos);
-        billQueryRequest.setUserName(userInfo.getName());
-		
+		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
+		UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key());
+		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
+		if (userInfo != null) {
+			
+			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
+			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
+			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
+			billQueryRequest.setUserName(userInfo.getName());
+			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
+			
+		}
 		result = billManageForDayService.queryBillforDayDeatilPage(billQueryRequest);
 		logger.info("---end---日账单查看调用后场dubbo服务,结果＝{}", JSONObject.toJSON(result));
@@ -30,6 +30,7 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeForPayTypeDTO;
 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.ParkLotEqpTypeCountStatisticByCountryDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
@@ -112,7 +113,7 @@ public class IndexPageStatisticController extends BizController {
     public BizResultVO<CustIncomeTotalVO> queryCustIncomeTotal(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
         throws Exception {
-
+        logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
         BizResultVO<CustIncomeTotalVO> bizResultVO = new BizResultVO<>();
         BizResult<CustIncomeTotalDTO> result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
@@ -129,13 +130,13 @@ public class IndexPageStatisticController extends BizController {
         vo.setPayedTotalAmount(result.getData().getPayedTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         bizResultVO.setData(vo);
-
+        logger.info("---end企业云平台首页-实际收入查询");
         return bizResultVO;
     }
     /**
      * 云平台首页－>企业客户负责某个停车收入情况.<br/>
-     *
+     * 
      * @return
      * @throws Exception
      */
@@ -190,57 +191,21 @@ public class IndexPageStatisticController extends BizController {
     /**
      * 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.<br/>
-     *
+     * 说明:
+     *  1.2017-08-22将支付方式更改为饼图.<br/>
      * @return
      * @throws Exception
      */
+    
     @ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
     @PostMapping("/queryCustIncomeForPayType")
-    public BizResultVO<CustIncomeForPayTypeResVO> queryCustIncomeForPayType(
+    public BizResultVO<List<CustIncomeForPayTypeDTO>> queryCustIncomeForPayType(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
-        logger.info("调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
         BizResult<List<CustIncomeForPayTypeDTO>> result = cusIncomeService.queryCustIncomeForPayType(
             custIncomeTotalQueryRequset);
-
-        logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(result));
-        //如果不成功
-        if (!ResultUtils.isSuccess(result)) {
-            return new BizResultVO<>(result.getErrCode(), result.getErrMsg());
-        }
-        List<CustIncomeForPayTypeDTO> data = result.getData();
-
-        CustIncomeForPayTypeResVO res = new CustIncomeForPayTypeResVO();
-        res.addLegendData("费用", "占比");
-
-        BigDecimal total = BigDecimal.ZERO;
-        List<String> amount = new ArrayList<>();
-        for (CustIncomeForPayTypeDTO dto : data) {
-            //添加X轴数据
-            res.addXAxisData(dto.getPayTypeName());
-            total = total.add(dto.getPayedTotalAmount());
-            logger.info("返回的类型 和 数据为: payTypeName={},payedTotalAmount={},total={}", dto.getPayTypeName(),
-                dto.getPayedTotalAmount().toString(), total.toString());
-            amount.add(dto.getPayedTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP)
-                .doubleValue() + "");
-        }
-        //计算占比
-        List<String> zb = new ArrayList<>();
-        for (CustIncomeForPayTypeDTO dto : data) {
-            logger.info("计算占比 total={}", total.toString());
-            if (BigDecimal.ZERO.equals(total) || total.doubleValue() == 0.00) {
-                zb.add("0.00");
-            } else {
-                zb.add(dto.getPayedTotalAmount().divide(total, 4, RoundingMode.HALF_UP)
-                    .multiply(new BigDecimal("100.00")).doubleValue() + "");
-            }
-
-        }
-        res.addChildData("费用", amount);
-        res.addChildData("占比", zb);
-        BizResultVO<CustIncomeForPayTypeResVO> resResult = new BizResultVO<>();
-        resResult.setData(res);
-        logger.info("返回到前台的数据为: res={}", JSONObject.toJSONString(res));
-        return resResult;
+        logger.info("...end企业客户负责某个停车不同的支付方式收入情况,响应为: result={}", JSONObject.toJSONString(result));
+        return new BizResultVO<List<CustIncomeForPayTypeDTO>>(result);
     }
     @ApiOperation("查询今日车流量占用率周转率")
@@ -604,10 +569,20 @@ public class IndexPageStatisticController extends BizController {
         }
     }
-    public static void main(String[] args) {
-        BigDecimal m = BigDecimal.ZERO;
-        BigDecimal n = m.add(BigDecimal.TEN);
-        System.out.println(new BigDecimal("00.0").doubleValue() == 0);
+    /**
+	 * 企业云平台首页-->停车次数统计(饼图).<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);
     }
     /**