From 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 09:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 87353bc..34a893d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -2,22 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
-import com.ruoyi.chargingPile.api.model.Site;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
+import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
-import com.ruoyi.chargingPile.api.vo.ChargingGunCountVO;
-import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
-import com.ruoyi.chargingPile.api.vo.SiteVO;
-import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
+import com.ruoyi.chargingPile.api.vo.*;
import com.ruoyi.chargingPile.domain.SiteMenu;
-import com.ruoyi.chargingPile.service.IPartnerService;
-import com.ruoyi.chargingPile.service.ISiteService;
-import com.ruoyi.chargingPile.service.TChargingGunService;
-import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GeodesyUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -36,10 +30,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.*;
/**
* @author zhibing.pu
@@ -64,33 +57,80 @@
@Resource
private RoleSiteClient roleSiteClient;
@Resource
+ private ParkingLotClient parkingLotClient;
+ @Resource
private TChargingPileService chargingPileService;
@Resource
private TChargingGunService chargingGunService;
+ @Autowired
+ private TParkingLotService parkingLotService;
+ @Autowired
+ private TAccountingStrategyService accountingStrategyService;
+ @Autowired
+ private TAccountingStrategyDetailService accountingStrategyDetailService;
+
+
+ /**
+ * 小程序扫一扫
+ * @param number
+ * @return
+ */
+ @PostMapping("/getSiteInfoByNumber")
+ @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
+ public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
+ SiteInfoVO siteInfoVO = new SiteInfoVO();
+ TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getNumber, number).one();
+ Site byId = siteService.getById(one.getSiteId());
+ TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
+ for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
+ // 当前时间属于那个阶段 取哪个阶段的电价
+ if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }
+ }
+ siteInfoVO.setName(byId.getName());
+ siteInfoVO.setNumber(one.getNumber().toString());
+ siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ return R.ok(siteInfoVO);
+ }
-
-
-
- @ResponseBody
@GetMapping("/getSiteList")
@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(GetSiteList siteList){
PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
return AjaxResult.success(list);
}
- @ResponseBody
@GetMapping("/getSiteList1")
@ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-活动费用统计"})
public AjaxResult<List<Site>> getSiteList1(){
return AjaxResult.success(siteService.list(new QueryWrapper<>()));
}
- @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
+
+ @GetMapping("/getSiteListGun")
+ @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-接口信息使用"})
+ public AjaxResult<List<Site>> getSiteListGun(){
+ return AjaxResult.success(siteService.getSiteListGun());
+ }
+
+ @PostMapping("/getSiteListParkLot")
+ @ApiOperation(value = "获取站点列表不分页", tags = {"管理后台-停车场绑定"})
+ public AjaxResult<List<Site>> getSiteListParkLot(){
+ return AjaxResult.success(siteService.getSiteListParkLot());
+ }
+ @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理-首页"})
@PostMapping("/pageList")
public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
return AjaxResult.success(siteService.pageList(query));
}
+ @ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
+ @PostMapping("/getMapSiteList")
+ public AjaxResult<List<SiteVO>> getMapSiteList(@Validated @RequestBody SiteQuery query){
+ return AjaxResult.success(siteService.getMapSiteList(query));
+ }
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
@@ -98,7 +138,12 @@
// 计算距离
Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
siteDetailVO.setDistance(distance.get("WGS84"));
- // TODO 查询绑定车牌提示文案
+ // 查询绑定车牌提示文案
+ TParkingLot parkingLot = parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
+ .eq(TParkingLot::getSiteId, query.getSiteId()));
+ if(Objects.nonNull(parkingLot)){
+ siteDetailVO.setRemark(parkingLot.getRemark());
+ }
return AjaxResult.success(siteDetailVO);
}
@@ -117,11 +162,23 @@
@ResponseBody
- @PostMapping("/getSiteList")
+ @PostMapping("/addSite")
@ApiOperation(value = "添加站点", tags = {"管理后台-站点管理"})
public AjaxResult addSite(@RequestBody Site site){
return siteService.addSite(site);
}
+
+
+
+ @ResponseBody
+ @PostMapping("/getSiteInfo/{id}")
+ @ApiOperation(value = "获取站点详情", tags = {"管理后台-站点管理"})
+ public AjaxResult<Site> getSiteInfo(@PathVariable Integer id){
+ Site site = siteService.getById(id);
+ return AjaxResult.success(site);
+ }
+
+
@ResponseBody
@PostMapping("/editSite")
@@ -131,12 +188,12 @@
}
@ResponseBody
- @DeleteMapping("/delSite/{id}")
+ @DeleteMapping("/delSite")
@ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delSite(@PathVariable Integer[] id){
+ public AjaxResult delSite(@RequestParam("id") Integer[] id){
return siteService.delSite(id);
}
@@ -192,4 +249,16 @@
List<Site> sites = siteService.listByIds(ids);
return R.ok(sites);
}
+
+
+ /**
+ * 获取所有站点数据
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getSiteAll")
+ public R<List<Site>> getSiteAll(){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1