From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 19 五月 2025 11:48:35 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 163 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 141 insertions(+), 22 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java index edcd033..e34da66 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java @@ -98,6 +98,11 @@ Partner partner = partnerService.getPartner(id); return R.ok(partner); } + @ResponseBody + @GetMapping("/getAllPartner") + public R<List<Partner>> getAllPartner(){ + return R.ok(partnerService.list()); + } @@ -214,13 +219,29 @@ } // 充电算帐单按钮权限 @PostMapping("/getChargingBillMenu/{partnerId}/{siteId}") - R<Boolean> getChargingBillMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ + R<List<Boolean>> getChargingBillMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charge_bill_order/download").eq(TSiteMenu::getStatus, 0)); TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); - return partnerSite!=null?R.ok(true):R.ok(false); + TSiteMenu two = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charge_bill_order").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite1 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + List<Boolean> booleans = new ArrayList<>(); + if (partnerSite!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite1!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + return R.ok(booleans); } // 充电时段统计按钮权限 @PostMapping("/getChargingListMenu/{partnerId}/{siteId}") @@ -236,6 +257,42 @@ .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu three = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charging_period_statistics").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite2 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, three.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + if (partnerSite!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite1!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite2!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + return R.ok(booleans); + } + // 账户结算帐单按钮权限 + @PostMapping("/getAccountMenu/{partnerId}/{siteId}") + R<List<Boolean>> getAccountMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ + TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/account_settlement/download").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu two = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/account_settlement").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite1 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + List<Boolean> booleans = new ArrayList<>(); if (partnerSite!=null){ booleans.add(true); }else{ @@ -247,16 +304,6 @@ booleans.add(false); } return R.ok(booleans); - } - // 账户结算帐单按钮权限 - @PostMapping("/getAccountMenu/{partnerId}/{siteId}") - R<Boolean> getAccountMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ - TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/account_settlement/download").eq(TSiteMenu::getStatus, 0)); - TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() - .eq(TPartnerSite::getPartnerId, partnerId) - .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) - .eq(TPartnerSite::getSiteId, siteId)); - return partnerSite!=null?R.ok(true):R.ok(false); } // 结算表记录按钮权限 @PostMapping("/getSettlementListMenu/{partnerId}/{siteId}") @@ -272,6 +319,42 @@ .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu three = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/balance_sheet_record").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite2 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, three.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + if (partnerSite!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite1!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite2!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + return R.ok(booleans); + } + // 充电桩订单按钮权限 + @PostMapping("/getChargingOrderMenu/{partnerId}/{siteId}") + R<List<Boolean>> getChargingOrderMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ + TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charging_pile_order/record").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu two = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charging_pile_order").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite1 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + List<Boolean> booleans = new ArrayList<>(); if (partnerSite!=null){ booleans.add(true); }else{ @@ -283,16 +366,6 @@ booleans.add(false); } return R.ok(booleans); - } - // 充电桩订单按钮权限 - @PostMapping("/getChargingOrderMenu/{partnerId}/{siteId}") - R<Boolean> getChargingOrderMenu(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ - TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charging_pile_order/record").eq(TSiteMenu::getStatus, 0)); - TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() - .eq(TPartnerSite::getPartnerId, partnerId) - .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) - .eq(TPartnerSite::getSiteId, siteId)); - return partnerSite!=null?R.ok(true):R.ok(false); } // 订单申诉按钮权限 @PostMapping("/managePageListMenu/{partnerId}/{siteId}") @@ -308,12 +381,22 @@ .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu three = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/order_appeal").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite2 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, three.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); if (partnerSite!=null){ booleans.add(true); }else{ booleans.add(false); } if (partnerSite1!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite2!=null){ booleans.add(true); }else{ booleans.add(false); @@ -334,12 +417,22 @@ .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu three = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/parking_record").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite2 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, three.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); if (partnerSite!=null){ booleans.add(true); }else{ booleans.add(false); } if (partnerSite1!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + if (partnerSite2!=null){ booleans.add(true); }else{ booleans.add(false); @@ -360,6 +453,11 @@ .eq(TPartnerSite::getPartnerId, partnerId) .eq(TPartnerSite::getSiteMenuId, two.getMenuId()) .eq(TPartnerSite::getSiteId, siteId)); + TSiteMenu three = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charging_pile_order/monitoring_record").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite2 = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, three.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); if (partnerSite!=null){ booleans.add(true); }else{ @@ -370,6 +468,27 @@ }else{ booleans.add(false); } + if (partnerSite2!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } + return R.ok(booleans); + } + // 充电评价数据权限 + @PostMapping("/chargeEvaluation/{partnerId}/{siteId}") + R<List<Boolean>> chargeEvaluation(@PathVariable("partnerId")Integer partnerId,@PathVariable("siteId") Integer siteId){ + List<Boolean> booleans = new ArrayList<>(); + TSiteMenu one = siteMenuService.getOne(new LambdaQueryWrapper<TSiteMenu>().eq(TSiteMenu::getPath, "/data/charge_evaluation").eq(TSiteMenu::getStatus, 0)); + TPartnerSite partnerSite = partnerSiteService.getOne(new LambdaQueryWrapper<TPartnerSite>() + .eq(TPartnerSite::getPartnerId, partnerId) + .eq(TPartnerSite::getSiteMenuId, one.getMenuId()) + .eq(TPartnerSite::getSiteId, siteId)); + if (partnerSite!=null){ + booleans.add(true); + }else{ + booleans.add(false); + } return R.ok(booleans); } } -- Gitblit v1.7.1