BJ_ZTEITS-Developers / zteits-gcp-portal

Commit 757a705b042f294a3a8bae443a89891890755b00

Authored by 王彪总
1 parent adf5157c

修改端口

Inline Side-by-side
Showing 2 changed files with 27 additions and 26 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
  View file @757a705
... ... @@ -79,7 +79,7 @@ import io.swagger.annotations.ApiOperation;
79 79 @Api(value = "结算管理 账单管理 月账单管理", description = "停车场云平台 月账单管理")
80 80 @Controller
81 81 @RequestMapping("/monthbill")
82   -public class MonthBillManagementController extends BizController {
  82 +public class MonthBillManagementController extends BizController {/*
83 83 private static final Logger logger = LoggerFactory.getLogger(MonthBillManagementController.class);
84 84  
85 85 @Autowired
... ... @@ -108,11 +108,11 @@ public class MonthBillManagementController extends BizController {
108 108 return new BizResultVO<>(respondResult);
109 109 }
110 110  
111   - /**
  111 + *//**
112 112 * 临停收费, 按支付方式汇总统计，tp表示临停
113 113 *
114 114 * @param request
115   - */
  115 + *//*
116 116 @ApiOperation("临停收费, 按支付方式汇总统计，tp表示临停")
117 117 @PostMapping("/tpStatistic")
118 118 @ResponseBody
... ... @@ -124,12 +124,12 @@ public class MonthBillManagementController extends BizController {
124 124 return new BizResultVO<>(respondResult);
125 125 }
126 126  
127   - /**
  127 + *//**
128 128 * <!-- 临停收费，按照停车场分组后，按支付方式分类统计 TP ByParkinglot-->
129 129 *
130 130 * @param request
131 131 * @return
132   - */
  132 + *//*
133 133 @ApiOperation("临停收费, 按照停车场分组后，按支付方式分类统计，tp表示临停，Pklt表示停车场")
134 134 @PostMapping("/tpPkltStatistic")
135 135 @ResponseBody
... ... @@ -142,12 +142,12 @@ public class MonthBillManagementController extends BizController {
142 142 return new BizResultVO<>(respondResult);
143 143 }
144 144  
145   - /**
  145 + *//**
146 146 * <!-- 月卡、年卡, 按支付方式汇总统计 CardMY-->
147 147 *
148 148 * @param request
149 149 * @return
150   - */
  150 + *//*
151 151 @ApiOperation("月卡、年卡, 按支付方式汇总统计")
152 152 @PostMapping("/cardStatistic")
153 153 @ResponseBody
... ... @@ -159,12 +159,12 @@ public class MonthBillManagementController extends BizController {
159 159 return new BizResultVO<>(respondResult);
160 160 }
161 161  
162   - /**
  162 + *//**
163 163 * <!-- 月卡、年卡，按照停车场分组后，按支付方式分类统计CardMY ByParkinglot-->
164 164 *
165 165 * @param request
166 166 * @return
167   - */
  167 + *//*
168 168 @ApiOperation("月卡、年卡, 按支付方式汇总统计，Pklt表示停车场")
169 169 @PostMapping("/cardPkltStatistic")
170 170 @ResponseBody
... ... @@ -179,12 +179,12 @@ public class MonthBillManagementController extends BizController {
179 179  
180 180 // ----------------------------------------------------2017-8-1新添加-----------------------------------------------
181 181  
182   - /**
  182 + *//**
183 183 *
184 184 * @param request
185 185 * @return
186 186 * @throws Exception
187   - */
  187 + *//*
188 188 @ApiOperation("月账单管理统计列表")
189 189 @PostMapping("/queryBillforMonthList")
190 190 @ResponseBody
... ... @@ -214,11 +214,11 @@ public class MonthBillManagementController extends BizController {
214 214 return returnJqGridDataByList(respondResult, BillManageForMonthDTO.class);
215 215 }
216 216  
217   - /**
  217 + *//**
218 218 *
219 219 * @param request
220 220 * @return
221   - */
  221 + *//*
222 222 @ApiOperation("月账单管理对账单统计明细")
223 223 @PostMapping("/queryBillforMonthDetail")
224 224 @ResponseBody
... ... @@ -242,18 +242,19 @@ public class MonthBillManagementController extends BizController {
242 242 // }
243 243 billQueryRequest.setParkIdList(plNos);
244 244 logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest));
  245 +
245 246 BizResult<List<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService
246 247 .queryBillforMonthDetail(billQueryRequest);
247 248 logger.info("月账单管理对账单统计明细 respondResult={}", JSONObject.toJSONString(respondResult));
248 249 return returnJqGridDataByList(respondResult, BillManageForMonthDetailDTO.class);
249 250 }
250 251  
251   - /**
  252 + *//**
252 253 * 月账单临停导出.<br/>
253 254 *
254 255 * @param request
255 256 * @param response
256   - */
  257 + *//*
257 258 @ApiOperation("月账单临停导出")
258 259 @GetMapping("/exportToExcleForBillForMonthTmp")
259 260 public void exportToExcleForBillForMonthTmp(@RequestParam List<String> parkIdList,
... ... @@ -273,7 +274,7 @@ public class MonthBillManagementController extends BizController {
273 274 billQueryRequest.setParkIdList(parkIdList);
274 275 billQueryRequest.setOrderTypeList(orderTypeList);
275 276 billQueryRequest.setBaseRequest(new BaseInfo(1, 0));
276   - /** 查询月账单. */
  277 + *//** 查询月账单. *//*
277 278 result = monthBillManagementService.queryBillforMonthDetailForList(billQueryRequest);
278 279 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
279 280 SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -349,12 +350,12 @@ public class MonthBillManagementController extends BizController {
349 350  
350 351 }
351 352  
352   - /**
  353 + *//**
353 354 * 月账单年卡月卡导出.<br/>
354 355 *
355 356 * @param request
356 357 * @param response
357   - */
  358 + *//*
358 359 @ApiOperation("月账单年卡月卡导出")
359 360 @GetMapping("/exportToExcleForBillForYearOrMonth")
360 361 public void exportToExcleForBillForYearOrMonth(@RequestParam List<String> parkIdList,
... ... @@ -373,7 +374,7 @@ public class MonthBillManagementController extends BizController {
373 374 yearMonthCardStatisticRequest.setEndTime(DateUtil.to_date(endTime, DateUtil.DATETIME_FORMAT));
374 375 yearMonthCardStatisticRequest.setParkIdList(parkIdList);
375 376 yearMonthCardStatisticRequest.setBaseRequest(new BaseInfo(1, 0));
376   - /** 查询月账单年卡月卡. */
  377 + *//** 查询月账单年卡月卡. *//*
377 378 result = yearMonthCardStatisticService.queryYearMonthCardStatistic(yearMonthCardStatisticRequest);
378 379  
379 380 SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -445,12 +446,12 @@ public class MonthBillManagementController extends BizController {
445 446  
446 447  
447 448  
448   - /**
  449 + *//**
449 450 * 月账单所有导出.<br/>
450 451 *
451 452 * @param request
452 453 * @param response
453   - */
  454 + *//*
454 455 @ApiOperation("月账单所有导出")
455 456 @GetMapping("/exportToExcleForBillForAll")
456 457 public void exportToExcleForBillForAll(
... ... @@ -556,16 +557,16 @@ public class MonthBillManagementController extends BizController {
556 557  
557 558  
558 559  
559   - /**
  560 + *//**
560 561 * 通过session信息获取停车场编码.<br/>
561 562 *
562 563 * @param billQueryRequest
563 564 * @param userInfo
564 565 * @return
565 566 * @throws Exception
566   - */
  567 + *//*
567 568 private List<String> queryParkNoByCustIds(TdCompanyParkQueryRequest tdCompanyParkQueryRequest) throws Exception {
568   - /** 查询停车场编码. */
  569 + *//** 查询停车场编码. *//*
569 570 BizResult<List<String>> parkNoResult = tdCustCompanyService.queryParkNoByCustIds(tdCompanyParkQueryRequest);
570 571 if (parkNoResult.isSuccess() && parkNoResult != null && parkNoResult.getData() != null) {
571 572 logger.info("根据登录获取到对应的停车场编码=" + JSONArray.toJSONString(parkNoResult.getData()));
... ... @@ -579,4 +580,4 @@ public class MonthBillManagementController extends BizController {
579 580  
580 581  
581 582  
582   -}
  583 +*/}
... ...
src/main/resources/application-prod.properties
  View file @757a705
1 1 #irain
2 2 irain.url=http://api.parkingwang.com:8280
3   -server.port=8192
  3 +server.port=8094
4 4 #irain艾润
5 5 irain.appid=avakrky0gk1m7n00
6 6 #irain
... ...