Commit aebac0a614fbe9dd7a2fdb993ec15fded3c65199
1 parent
12e4485a
tijiao
Showing
3 changed files
with
40 additions
and
57 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
| @@ -511,7 +511,7 @@ public class BerthsStatisticController extends BizController { | @@ -511,7 +511,7 @@ public class BerthsStatisticController extends BizController { | ||
| 511 | request.setBaseRequest(new BaseInfo(1, 0)); | 511 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 512 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); | 512 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); |
| 513 | 513 | ||
| 514 | - //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 514 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 515 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 515 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 516 | 516 | ||
| 517 | List<String> xAxisData = Lists.newArrayList(); | 517 | List<String> xAxisData = Lists.newArrayList(); |
| @@ -530,14 +530,18 @@ public class BerthsStatisticController extends BizController { | @@ -530,14 +530,18 @@ public class BerthsStatisticController extends BizController { | ||
| 530 | int berthFreeRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; | 530 | int berthFreeRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; |
| 531 | LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthFreeRatio); | 531 | LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthFreeRatio); |
| 532 | 532 | ||
| 533 | - | ||
| 534 | - | 533 | + String[] billTitle = new String[4]; |
| 534 | + billTitle[0] = "日报表车位使用统计"+format.format(new Date()); | ||
| 535 | + billTitle[1] = "汇总"; | ||
| 536 | + billTitle[2] = "停车场: " + parkName; | ||
| 537 | + billTitle[3] = "统计时间: " + format2.format(request.getBeginTime()); | ||
| 535 | String sheetName = "日报表车位使用统计"; | 538 | String sheetName = "日报表车位使用统计"; |
| 536 | String fileName = "日报表车位使用统计" + format2.format(new Date()); | 539 | String fileName = "日报表车位使用统计" + format2.format(new Date()); |
| 537 | // 1.创建excel信息 | 540 | // 1.创建excel信息 |
| 538 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); | 541 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); |
| 539 | // 2.设置excel表头和表体 | 542 | // 2.设置excel表头和表体 |
| 540 | - Layouter.buildReport(workSheet, title, 0, 0); | 543 | + //Layouter.buildReport(workSheet, title, 0, 0); |
| 544 | + Layouter.buildReportYearMonth(workSheet, title, 0, 0, billTitle); | ||
| 541 | // 3.填充数据 | 545 | // 3.填充数据 |
| 542 | List<Object[]> contentList = new ArrayList<Object[]>(); | 546 | List<Object[]> contentList = new ArrayList<Object[]>(); |
| 543 | 547 | ||
| @@ -567,7 +571,7 @@ public class BerthsStatisticController extends BizController { | @@ -567,7 +571,7 @@ public class BerthsStatisticController extends BizController { | ||
| 567 | } | 571 | } |
| 568 | 572 | ||
| 569 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); | 573 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); |
| 570 | - fillUserManager.fillSalesOrga(workSheet, title, contentList, 2); | 574 | + fillUserManager.fillSalesOrga(workSheet, title, contentList, billTitle.length+2); |
| 571 | // 4.excel输出配置 | 575 | // 4.excel输出配置 |
| 572 | ExcelUtil.write(response, workSheet, fileName); | 576 | ExcelUtil.write(response, workSheet, fileName); |
| 573 | } | 577 | } |
| @@ -649,8 +653,9 @@ public class BerthsStatisticController extends BizController { | @@ -649,8 +653,9 @@ public class BerthsStatisticController extends BizController { | ||
| 649 | request.setBaseRequest(new BaseInfo(1, 0)); | 653 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 650 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); | 654 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); |
| 651 | 655 | ||
| 652 | - //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 656 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 653 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 657 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 658 | + SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM"); | ||
| 654 | 659 | ||
| 655 | 660 | ||
| 656 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), | 661 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), |
| @@ -678,13 +683,19 @@ public class BerthsStatisticController extends BizController { | @@ -678,13 +683,19 @@ public class BerthsStatisticController extends BizController { | ||
| 678 | int berthFreeRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; | 683 | int berthFreeRatio = ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE; |
| 679 | LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthFreeRatio); | 684 | LineChartVO freeBerthRatios = getFreeBerthRatios(request, xAxisData, dateType, berthFreeRatio); |
| 680 | 685 | ||
| 686 | + String[] billTitle = new String[4]; | ||
| 687 | + billTitle[0] = "月报表车位使用统计"+format.format(new Date()); | ||
| 688 | + billTitle[1] = "汇总"; | ||
| 689 | + billTitle[2] = "停车场: " + parkName; | ||
| 690 | + billTitle[3] = "统计时间: " + format3.format(request.getBeginTime()); | ||
| 681 | 691 | ||
| 682 | String sheetName = "月报表车位使用统计"; | 692 | String sheetName = "月报表车位使用统计"; |
| 683 | String fileName = "月报表车位使用统计" + format2.format(new Date()); | 693 | String fileName = "月报表车位使用统计" + format2.format(new Date()); |
| 684 | // 1.创建excel信息 | 694 | // 1.创建excel信息 |
| 685 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); | 695 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); |
| 686 | // 2.设置excel表头和表体 | 696 | // 2.设置excel表头和表体 |
| 687 | - Layouter.buildReport(workSheet, title, 0, 0); | 697 | + //Layouter.buildReport(workSheet, title, 0, 0); |
| 698 | + Layouter.buildReportYearMonth(workSheet, title, 0, 0, billTitle); | ||
| 688 | // 3.填充数据 | 699 | // 3.填充数据 |
| 689 | List<Object[]> contentList = new ArrayList<Object[]>(); | 700 | List<Object[]> contentList = new ArrayList<Object[]>(); |
| 690 | 701 | ||
| @@ -714,7 +725,7 @@ public class BerthsStatisticController extends BizController { | @@ -714,7 +725,7 @@ public class BerthsStatisticController extends BizController { | ||
| 714 | } | 725 | } |
| 715 | 726 | ||
| 716 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); | 727 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); |
| 717 | - fillUserManager.fillSalesOrga(workSheet, title, contentList, 2); | 728 | + fillUserManager.fillSalesOrga(workSheet, title, contentList, billTitle.length+2); |
| 718 | // 4.excel输出配置 | 729 | // 4.excel输出配置 |
| 719 | ExcelUtil.write(response, workSheet, fileName); | 730 | ExcelUtil.write(response, workSheet, fileName); |
| 720 | } | 731 | } |
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
| @@ -256,21 +256,6 @@ public class MonthBillManagementController extends BizController { | @@ -256,21 +256,6 @@ public class MonthBillManagementController extends BizController { | ||
| 256 | // 2.调用接口查询当前登录人管辖的停车场名称 | 256 | // 2.调用接口查询当前登录人管辖的停车场名称 |
| 257 | UserInfo userInfo = sessionCommUtil.getUserInfo(); | 257 | UserInfo userInfo = sessionCommUtil.getUserInfo(); |
| 258 | List<String> plNos = userInfo.getPlNos(); | 258 | List<String> plNos = userInfo.getPlNos(); |
| 259 | - // UserInfo userInfo = sessionCommUtil.getUserInfo(); | ||
| 260 | - // List<String> plNos = new ArrayList<>(); | ||
| 261 | - // if (userInfo != null) { | ||
| 262 | - // TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | ||
| 263 | - // tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | ||
| 264 | - // tdCompanyParkQueryRequest.setSessionId(session.getId()); | ||
| 265 | - // tdCompanyParkQueryRequest.setSysCode(sysCode); | ||
| 266 | - // BizResult<List<String>> bizResult = tdCustCompanyService.queryParkNoByCustIds | ||
| 267 | - // (tdCompanyParkQueryRequest); | ||
| 268 | - // // 拥有的停车场编号 | ||
| 269 | - // plNos = ResultUtils.getBizResultData(bizResult); | ||
| 270 | - // } | ||
| 271 | - // if (CollectionUtils.isEmpty(plNos)) { | ||
| 272 | - // throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); | ||
| 273 | - // } | ||
| 274 | billQueryRequest.setParkIdList(plNos); | 259 | billQueryRequest.setParkIdList(plNos); |
| 275 | logger.info("月账单管理统计列表 req={}", JSONObject.toJSONString(billQueryRequest)); | 260 | logger.info("月账单管理统计列表 req={}", JSONObject.toJSONString(billQueryRequest)); |
| 276 | BizResult<List<BillManageForMonthDTO>> respondResult = monthBillManagementService | 261 | BizResult<List<BillManageForMonthDTO>> respondResult = monthBillManagementService |
| @@ -292,20 +277,6 @@ public class MonthBillManagementController extends BizController { | @@ -292,20 +277,6 @@ public class MonthBillManagementController extends BizController { | ||
| 292 | // 2.调用接口查询当前登录人管辖的停车场名称 | 277 | // 2.调用接口查询当前登录人管辖的停车场名称 |
| 293 | UserInfo userInfo = sessionCommUtil.getUserInfo(); | 278 | UserInfo userInfo = sessionCommUtil.getUserInfo(); |
| 294 | List<String> plNos = userInfo.getPlNos(); | 279 | List<String> plNos = userInfo.getPlNos(); |
| 295 | - // List<String> plNos = new ArrayList<>(); | ||
| 296 | - // if (userInfo != null) { | ||
| 297 | - // TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | ||
| 298 | - // tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | ||
| 299 | - // tdCompanyParkQueryRequest.setSessionId(session.getId()); | ||
| 300 | - // tdCompanyParkQueryRequest.setSysCode(sysCode); | ||
| 301 | - // BizResult<List<String>> bizResult = tdCustCompanyService.queryParkNoByCustIds | ||
| 302 | - // (tdCompanyParkQueryRequest); | ||
| 303 | - // // 拥有的停车场编号 | ||
| 304 | - // plNos = ResultUtils.getBizResultData(bizResult); | ||
| 305 | - // } | ||
| 306 | - // if (CollectionUtils.isEmpty(plNos)) { | ||
| 307 | - // throw new BizException(ErrorType.PARK_LOT_NOT_EXISTS, "停车场plnos不存在"); | ||
| 308 | - // } | ||
| 309 | billQueryRequest.setParkIdList(plNos); | 280 | billQueryRequest.setParkIdList(plNos); |
| 310 | logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest)); | 281 | logger.info("月账单管理对账单统计明细 req={}", JSONObject.toJSONString(billQueryRequest)); |
| 311 | BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService | 282 | BizResult<PageBean<BillManageForMonthDetailDTO>> respondResult = monthBillManagementService |
| @@ -442,19 +413,6 @@ public class MonthBillManagementController extends BizController { | @@ -442,19 +413,6 @@ public class MonthBillManagementController extends BizController { | ||
| 442 | // 2.调用接口查询当前登录人管辖的停车场名称 | 413 | // 2.调用接口查询当前登录人管辖的停车场名称 |
| 443 | UserInfo userInfo = sessionCommUtil.getUserInfo(); | 414 | UserInfo userInfo = sessionCommUtil.getUserInfo(); |
| 444 | List<String> plNos = userInfo.getPlNos(); | 415 | List<String> plNos = userInfo.getPlNos(); |
| 445 | - // // 2.调用接口查询当前登录人管辖的停车场名称 | ||
| 446 | - // UserInfo userInfo = sessionCommUtil.getUserInfo(); | ||
| 447 | - // List<String> plNos = new ArrayList<>(); | ||
| 448 | - // if (userInfo != null) { | ||
| 449 | - // TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | ||
| 450 | - // tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | ||
| 451 | - // tdCompanyParkQueryRequest.setSessionId(session.getId()); | ||
| 452 | - // tdCompanyParkQueryRequest.setSysCode(sysCode); | ||
| 453 | - // BizResult<List<String>> bizResult = tdCustCompanyService.queryParkNoByCustIds( | ||
| 454 | - // tdCompanyParkQueryRequest); | ||
| 455 | - // // 拥有的停车场编号 | ||
| 456 | - // plNos = ResultUtils.getBizResultData(bizResult); | ||
| 457 | - // } | ||
| 458 | billQueryRequest.setParkIdList(plNos); | 416 | billQueryRequest.setParkIdList(plNos); |
| 459 | logger.info("月账单导出所有 req={}", JSONObject.toJSONString(billQueryRequest)); | 417 | logger.info("月账单导出所有 req={}", JSONObject.toJSONString(billQueryRequest)); |
| 460 | respondResult = monthBillManagementService | 418 | respondResult = monthBillManagementService |
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java
| @@ -406,7 +406,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -406,7 +406,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 406 | request.setBaseRequest(new BaseInfo(1, 0)); | 406 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 407 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); | 407 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); |
| 408 | 408 | ||
| 409 | - //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 409 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 410 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 410 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 411 | 411 | ||
| 412 | List<String> xAxisData = Lists.newArrayList(); | 412 | List<String> xAxisData = Lists.newArrayList(); |
| @@ -418,6 +418,11 @@ public class VehicleFlowStatisticController extends BizController { | @@ -418,6 +418,11 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 418 | xAxisData.add(hour + ":00"); | 418 | xAxisData.add(hour + ":00"); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | + String[] billTitle = new String[4]; | ||
| 422 | + billTitle[0] = "日报表车流量使用统计"+format.format(new Date()); | ||
| 423 | + billTitle[1] = "汇总"; | ||
| 424 | + billTitle[2] = "停车场: " + parkName; | ||
| 425 | + billTitle[3] = "统计时间: " + format2.format(request.getBeginTime()); | ||
| 421 | String dateType = "HH:mm"; | 426 | String dateType = "HH:mm"; |
| 422 | LineChartVO VehicleFlows = getVehicleFlows(request, xAxisData, dateType); | 427 | LineChartVO VehicleFlows = getVehicleFlows(request, xAxisData, dateType); |
| 423 | 428 | ||
| @@ -426,7 +431,8 @@ public class VehicleFlowStatisticController extends BizController { | @@ -426,7 +431,8 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 426 | // 1.创建excel信息 | 431 | // 1.创建excel信息 |
| 427 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); | 432 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); |
| 428 | // 2.设置excel表头和表体 | 433 | // 2.设置excel表头和表体 |
| 429 | - Layouter.buildReport(workSheet, title, 0, 0); | 434 | + //Layouter.buildReport(workSheet, title, 0, 0); |
| 435 | + Layouter.buildReportYearMonth(workSheet, title, 0, 0, billTitle); | ||
| 430 | // 3.填充数据 | 436 | // 3.填充数据 |
| 431 | List<Object[]> contentList = new ArrayList<Object[]>(); | 437 | List<Object[]> contentList = new ArrayList<Object[]>(); |
| 432 | 438 | ||
| @@ -441,7 +447,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -441,7 +447,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 441 | } | 447 | } |
| 442 | 448 | ||
| 443 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); | 449 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); |
| 444 | - fillUserManager.fillSalesOrga(workSheet, title, contentList, 2); | 450 | + fillUserManager.fillSalesOrga(workSheet, title, contentList, billTitle.length+2); |
| 445 | // 4.excel输出配置 | 451 | // 4.excel输出配置 |
| 446 | ExcelUtil.write(response, workSheet, fileName); | 452 | ExcelUtil.write(response, workSheet, fileName); |
| 447 | } | 453 | } |
| @@ -468,9 +474,9 @@ public class VehicleFlowStatisticController extends BizController { | @@ -468,9 +474,9 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 468 | request.setBaseRequest(new BaseInfo(1, 0)); | 474 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 469 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); | 475 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); |
| 470 | 476 | ||
| 471 | - //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 477 | + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 472 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 478 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 473 | - | 479 | + SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM"); |
| 474 | 480 | ||
| 475 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), | 481 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), |
| 476 | new Timestamp(request.getBeginTime().getTime())); | 482 | new Timestamp(request.getBeginTime().getTime())); |
| @@ -494,12 +500,20 @@ public class VehicleFlowStatisticController extends BizController { | @@ -494,12 +500,20 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 494 | String dateType = "MM-dd"; | 500 | String dateType = "MM-dd"; |
| 495 | LineChartVO VehicleFlows = getVehicleFlows(request, xAxisData, dateType); | 501 | LineChartVO VehicleFlows = getVehicleFlows(request, xAxisData, dateType); |
| 496 | 502 | ||
| 503 | + String[] billTitle = new String[4]; | ||
| 504 | + billTitle[0] = "月报表车流量使用统计"+format.format(new Date()); | ||
| 505 | + billTitle[1] = "汇总"; | ||
| 506 | + billTitle[2] = "停车场: " + parkName; | ||
| 507 | + billTitle[3] = "统计时间: " + format3.format(request.getBeginTime()); | ||
| 508 | + | ||
| 509 | + | ||
| 497 | String sheetName = "月报表车流量使用统计"; | 510 | String sheetName = "月报表车流量使用统计"; |
| 498 | String fileName = "月报表车流量使用统计" + format2.format(new Date()); | 511 | String fileName = "月报表车流量使用统计" + format2.format(new Date()); |
| 499 | // 1.创建excel信息 | 512 | // 1.创建excel信息 |
| 500 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); | 513 | XSSFSheet workSheet = ExcelUtil.createExcel(sheetName); |
| 501 | // 2.设置excel表头和表体 | 514 | // 2.设置excel表头和表体 |
| 502 | - Layouter.buildReport(workSheet, title, 0, 0); | 515 | + //Layouter.buildReport(workSheet, title, 0, 0); |
| 516 | + Layouter.buildReportYearMonth(workSheet, title, 0, 0, billTitle); | ||
| 503 | // 3.填充数据 | 517 | // 3.填充数据 |
| 504 | List<Object[]> contentList = new ArrayList<Object[]>(); | 518 | List<Object[]> contentList = new ArrayList<Object[]>(); |
| 505 | 519 | ||
| @@ -514,7 +528,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -514,7 +528,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 514 | } | 528 | } |
| 515 | 529 | ||
| 516 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); | 530 | ExcleFillDateManager fillUserManager = new ExcleFillDateManager(); |
| 517 | - fillUserManager.fillSalesOrga(workSheet, title, contentList, 2); | 531 | + fillUserManager.fillSalesOrga(workSheet, title, contentList, billTitle.length+2); |
| 518 | // 4.excel输出配置 | 532 | // 4.excel输出配置 |
| 519 | ExcelUtil.write(response, workSheet, fileName); | 533 | ExcelUtil.write(response, workSheet, fileName); |
| 520 | } | 534 | } |