From 757a705b042f294a3a8bae443a89891890755b00 Mon Sep 17 00:00:00 2001 From: wangbiao Date: Fri, 18 Aug 2017 10:00:21 +0800 Subject: [PATCH] 修改端口 --- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java | 51 ++++++++++++++++++++++++++------------------------- src/main/resources/application-prod.properties | 2 +- 2 files changed, 27 insertions(+), 26 deletions(-) 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 3af4587..b1897ed 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 @@ -79,7 +79,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "结算管理 账单管理 月账单管理", description = "停车场云平台 月账单管理") @Controller @RequestMapping("/monthbill") -public class MonthBillManagementController extends BizController { +public class MonthBillManagementController extends BizController {/* private static final Logger logger = LoggerFactory.getLogger(MonthBillManagementController.class); @Autowired @@ -108,11 +108,11 @@ public class MonthBillManagementController extends BizController { return new BizResultVO<>(respondResult); } - /** + *//** * 临停收费, 按支付方式汇总统计，tp表示临停 * * @param request - */ + *//* @ApiOperation("临停收费, 按支付方式汇总统计，tp表示临停") @PostMapping("/tpStatistic") @ResponseBody @@ -124,12 +124,12 @@ public class MonthBillManagementController extends BizController { return new BizResultVO<>(respondResult); } - /** + *//** * * * @param request * @return - */ + *//* @ApiOperation("临停收费, 按照停车场分组后，按支付方式分类统计，tp表示临停，Pklt表示停车场") @PostMapping("/tpPkltStatistic") @ResponseBody @@ -142,12 +142,12 @@ public class MonthBillManagementController extends BizController { return new BizResultVO<>(respondResult); } - /** + *//** * * * @param request * @return - */ + *//* @ApiOperation("月卡、年卡, 按支付方式汇总统计") @PostMapping("/cardStatistic") @ResponseBody @@ -159,12 +159,12 @@ public class MonthBillManagementController extends BizController { return new BizResultVO<>(respondResult); } - /** + *//** * * * @param request * @return - */ + *//* @ApiOperation("月卡、年卡, 按支付方式汇总统计，Pklt表示停车场") @PostMapping("/cardPkltStatistic") @ResponseBody @@ -179,12 +179,12 @@ public class MonthBillManagementController extends BizController { // ----------------------------------------------------2017-8-1新添加----------------------------------------------- - /** + *//** * * @param request * @return * @throws Exception - */ + *//* @ApiOperation("月账单管理统计列表") @PostMapping("/queryBillforMonthList") @ResponseBody @@ -214,11 +214,11 @@ public class MonthBillManagementController extends BizController { return returnJqGridDataByList(respondResult, BillManageForMonthDTO.class); } - /** + *//** * * @param request * @return - */ + *//* @ApiOperation("月账单管理对账单统计明细") @PostMapping("/queryBillforMonthDetail") @ResponseBody @@ -242,18 +242,19 @@ public class MonthBillManagementController extends BizController { // } billQueryRequest.setParkIdList(plNos); logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest)); + BizResult> respondResult = monthBillManagementService .queryBillforMonthDetail(billQueryRequest); logger.info("月账单管理对账单统计明细 respondResult={}", JSONObject.toJSONString(respondResult)); return returnJqGridDataByList(respondResult, BillManageForMonthDetailDTO.class); } - /** + *//** * 月账单临停导出.
* * @param request * @param response - */ + *//* @ApiOperation("月账单临停导出") @GetMapping("/exportToExcleForBillForMonthTmp") public void exportToExcleForBillForMonthTmp(@RequestParam List parkIdList, @@ -273,7 +274,7 @@ public class MonthBillManagementController extends BizController { billQueryRequest.setParkIdList(parkIdList); billQueryRequest.setOrderTypeList(orderTypeList); billQueryRequest.setBaseRequest(new BaseInfo(1, 0)); - /** 查询月账单. */ + *//** 查询月账单. *//* result = monthBillManagementService.queryBillforMonthDetailForList(billQueryRequest); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); @@ -349,12 +350,12 @@ public class MonthBillManagementController extends BizController { } - /** + *//** * 月账单年卡月卡导出.
* * @param request * @param response - */ + *//* @ApiOperation("月账单年卡月卡导出") @GetMapping("/exportToExcleForBillForYearOrMonth") public void exportToExcleForBillForYearOrMonth(@RequestParam List parkIdList, @@ -373,7 +374,7 @@ public class MonthBillManagementController extends BizController { yearMonthCardStatisticRequest.setEndTime(DateUtil.to_date(endTime, DateUtil.DATETIME_FORMAT)); yearMonthCardStatisticRequest.setParkIdList(parkIdList); yearMonthCardStatisticRequest.setBaseRequest(new BaseInfo(1, 0)); - /** 查询月账单年卡月卡. */ + *//** 查询月账单年卡月卡. *//* result = yearMonthCardStatisticService.queryYearMonthCardStatistic(yearMonthCardStatisticRequest); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); @@ -445,12 +446,12 @@ public class MonthBillManagementController extends BizController { - /** + *//** * 月账单所有导出.
* * @param request * @param response - */ + *//* @ApiOperation("月账单所有导出") @GetMapping("/exportToExcleForBillForAll") public void exportToExcleForBillForAll( @@ -556,16 +557,16 @@ public class MonthBillManagementController extends BizController { - /** + *//** * 通过session信息获取停车场编码.
* * @param billQueryRequest * @param userInfo * @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())); @@ -579,4 +580,4 @@ public class MonthBillManagementController extends BizController { -} +*/} diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 89f2cee..79cd7fe 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,6 +1,6 @@ #irain irain.url=http://api.parkingwang.com:8280 -server.port=8192 +server.port=8094 #irain艾润 irain.appid=avakrky0gk1m7n00 #irain -- libgit2 0.21.4