ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderAccountingStrategyFallbackFactory.java
@@ -32,6 +32,11 @@ public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days) { return R.fail("获取给定天数每天的充电量统计数据失败：" + throwable.getMessage()); } @Override public R<List<Double>> getDailyChargingDegree(Integer days) { return R.fail("获取给定天数每天的充电度数失败：" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
@@ -6,9 +6,11 @@ import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; import java.util.Set; /** * @author zhibing.pu @@ -24,5 +26,14 @@ * @return */ @GetMapping("/t-charging-order-accounting-strategy/getTotalElectricQuantity") R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days); R<List<List<Map<String, Object>>>> getTotalElectricQuantity(Integer days, @RequestParam("siteIds") Set<Integer> siteIds); /** * 获取给定天数每天的充电度数 * @param days * @return */ @GetMapping("/t-charging-order-getDailyChargingDegree-strategy/getUtilizationTrend") R<List<Double>> getDailyChargingDegree(Integer days, @RequestParam("siteIds") Set<Integer> siteIds); } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -6,6 +6,7 @@ import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.query.TChargingCountQuery; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -29,4 +30,13 @@ */ @PostMapping(value = "/t-charging-order/getChargingCount") public R<Integer> getChargingCount(@RequestBody TChargingCountQuery req); /** * 根据充电枪获取正在充电的订单 * @param chargingGunId 充电枪id * @return */ @GetMapping(value = "/t-charging-order/getOrderDetailByGunId") R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId); } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -67,6 +67,14 @@ @ApiModelProperty(value = "充电枪id") @TableField("charging_gun_id") private Integer chargingGunId; @ApiModelProperty(value = "充电总度数") @TableField("charging_capacity") private BigDecimal chargingCapacity; @ApiModelProperty(value = "充电功率") @TableField("charging_power") private BigDecimal chargingPower; @ApiModelProperty(value = "充电开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,4 @@ com.ruoyi.order.api.factory.ChargingOrderFallbackFactory com.ruoyi.order.api.factory.OrderFallbackFactory com.ruoyi.order.api.factory.ExchangeOrderFallbackFactory com.ruoyi.order.api.factory.ChargingOrderAccountingStrategyFallbackFactory ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -6,6 +6,9 @@ import com.ruoyi.chargingPile.api.query.TChargingGunQuery; import com.ruoyi.chargingPile.api.vo.TChargingGunVO; import com.ruoyi.chargingPile.dto.ChargeMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.chargingPile.service.TChargingGunService; import com.ruoyi.chargingPile.service.TChargingPileService; import com.ruoyi.common.core.domain.R; @@ -136,11 +139,29 @@ } @ResponseBody @GetMapping("/chargeMonitoring/{siteId}") @ApiOperation(value = "修改备注", tags = {"管理后台-充电设备监控"}) @ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"}) public AjaxResult<ChargeMonitoring> chargeMonitoring(@PathVariable Integer siteId){ ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId); return AjaxResult.success(chargeMonitoring); } @ResponseBody @GetMapping("/getChargingGunCountMonitoring/{siteId}") @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"}) public AjaxResult<ChargingGunCountMonitoring> getChargingGunCountMonitoring(@PathVariable Integer siteId){ ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId); return AjaxResult.success(chargingGunCountMonitoring); } @ResponseBody @GetMapping("/getChargingGunMonitoring") @ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"}) public AjaxResult<PageInfo<ChargingGunMonitoring>> getChargingGunMonitoring(GetChargingGunMonitoring query){ PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query); return AjaxResult.success(chargingGunMonitoring); } }
New file @@ -0,0 +1,25 @@ package com.ruoyi.chargingPile.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author zhibing.pu * @Date 2024/8/15 16:36 */ @Data @ApiModel public class ChargingGunCountMonitoring { @ApiModelProperty("空闲中") private Long leisure; @ApiModelProperty("已插枪") private Long loaded; @ApiModelProperty("充电中") private Long charging; @ApiModelProperty("离网") private Long offline; @ApiModelProperty("故障") private Long breakdown; } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingGunMonitoring.java
New file @@ -0,0 +1,38 @@ package com.ruoyi.chargingPile.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @author zhibing.pu * @Date 2024/8/15 13:58 */ @Data @ApiModel public class ChargingGunMonitoring { @ApiModelProperty("充电枪id") private Integer id; @ApiModelProperty("充电枪状态（1=离线，2=空闲，3=已插枪，4=占用（充电中），7=故障）") private Integer status; @ApiModelProperty("名称") private String name; @ApiModelProperty("充电比率") private BigDecimal chargingRatio; @ApiModelProperty("车位") private String parkingNumber; @ApiModelProperty("车牌号") private String licensePlate; @ApiModelProperty("电量") private String electricQuantity; @ApiModelProperty("当前SOC值") private String soc; @ApiModelProperty("实时A相电流") private String electricCurrent; @ApiModelProperty("实时A相电压") private String voltage; @ApiModelProperty("故障原因") private String faultCause; } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/GetChargingGunMonitoring.java
New file @@ -0,0 +1,28 @@ package com.ruoyi.chargingPile.dto; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @author zhibing.pu * @Date 2024/8/15 13:48 */ @Data @ApiModel public class GetChargingGunMonitoring extends BasePage { @ApiModelProperty("站带你id") private Integer siteId; @ApiModelProperty("充电枪状态（1=离线，2=空闲，3=已插枪，4=占用（充电中），7=故障）") private List<Integer> status; @ApiModelProperty("soc开始值") private Double socStart; @ApiModelProperty("soc结束值") private Double socEnd; @ApiModelProperty("终端名称") private String name; } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TChargingPileMapper.java
@@ -5,6 +5,8 @@ import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.query.PageChargingPileList; import com.ruoyi.chargingPile.api.vo.TChargingPileVO; import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -45,4 +47,15 @@ * @return */ List<TChargingPileVO> getChargingGunList(@Param("siteId")Integer siteId); /** * 获取充电枪监控数据 * @param pageInfo * @param siteIds * @param query * @return */ List<ChargingGunMonitoring> getChargingGunMonitoring(PageInfo<ChargingGunMonitoring> pageInfo, @Param("siteIds") Set<Integer> siteIds, @Param("query") GetChargingGunMonitoring query); } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TChargingPileService.java
@@ -7,6 +7,9 @@ import com.ruoyi.chargingPile.api.query.PageChargingPileList; import com.ruoyi.chargingPile.api.vo.TChargingPileVO; import com.ruoyi.chargingPile.dto.ChargeMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import org.springframework.web.bind.annotation.PathVariable; @@ -87,4 +90,21 @@ */ ChargeMonitoring chargeMonitoring(Integer siteId); /** * 获取充电枪各种状态汇总 * @param siteId 站点id * @return */ ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId); /** * 获取充电枪监控数据 * @param query * @return */ PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query); } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.api.feignClient.AppUserCarClient; import com.ruoyi.account.api.model.TAppUserCar; import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO; import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.chargingPile.api.model.TChargingGun; @@ -13,6 +15,9 @@ import com.ruoyi.chargingPile.api.vo.TChargingPileVO; import com.ruoyi.chargingPile.domain.SiteMenu; import com.ruoyi.chargingPile.dto.ChargeMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring; import com.ruoyi.chargingPile.dto.ChargingGunMonitoring; import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring; import com.ruoyi.chargingPile.mapper.TChargingPileMapper; import com.ruoyi.chargingPile.service.IPartnerService; import com.ruoyi.chargingPile.service.ISiteService; @@ -23,6 +28,8 @@ import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.other.api.feignClient.UserSiteClient; import com.ruoyi.system.api.domain.SysUser; @@ -68,6 +75,12 @@ @Resource private ChargingOrderAccountingStrategyClient chargingOrderAccountingStrategyClient; @Resource private ChargingOrderClient chargingOrderClient; @Resource private AppUserCarClient appUserCarClient; @@ -250,6 +263,7 @@ */ @Override public ChargeMonitoring chargeMonitoring(Integer siteId) { //获取当前登录账户的站点权限数据 Set<Integer> siteIds = new HashSet<>(); if(null == siteId){ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData(); @@ -292,14 +306,127 @@ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i); dates.add(sdf.format(calendar.getTime())); } List<List<Map<String, Object>>> value1 = chargingOrderAccountingStrategyClient.getTotalElectricQuantity(6).getData(); List<List<Map<String, Object>>> value1 = chargingOrderAccountingStrategyClient.getTotalElectricQuantity(6, siteIds).getData(); Map<String, Object> chargeTrend = new HashMap<>(); chargeTrend.put("date", dates); chargeTrend.put("value", value1); chargeMonitoring.setChargeTrend(chargeTrend); // chargeMonitoring.setUtilizationTrend(); //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时） List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, siteIds).eq(TChargingPile::getDelFlag, 0)); BigDecimal v = list.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN); List<Double> data = chargingOrderAccountingStrategyClient.getDailyChargingDegree(6, siteIds).getData(); List<Double> value2 = new ArrayList<>(); for (Double datum : data) { Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); value2.add(datum1); } Map<String, Object> utilizationTrend = new HashMap<>(); utilizationTrend.put("date", dates); utilizationTrend.put("value", value2); chargeMonitoring.setUtilizationTrend(utilizationTrend); return chargeMonitoring; } /** * 获取充电枪各种状态汇总 * @param siteId 站点id * @return */ @Override public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) { //获取当前登录账户的站点权限数据 Set<Integer> siteIds = new HashSet<>(); if(null == siteId){ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData(); Integer roleType = sysUser.getRoleType(); Integer objectId = sysUser.getObjectId(); if(2 == roleType){ siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST); }else{ //非管理员需要根据角色和用户配置查询允许的站点数据 if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData(); List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData(); data.addAll(data1); siteIds = new HashSet<>(data); } } }else{ siteIds.add(siteId); } List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0)); //空闲 long leisure = list.stream().filter(s -> s.getStatus().equals(2)).count(); //已插枪 long loaded = list.stream().filter(s -> Arrays.asList(3, 5, 6).contains(s.getStatus())).count(); //充电中 long charging = list.stream().filter(s -> s.getStatus().equals(4)).count(); //离网 long offline = list.stream().filter(s -> s.getStatus().equals(0)).count(); //故障 long breakdown = list.stream().filter(s -> s.getStatus().equals(7)).count(); ChargingGunCountMonitoring chargingGunCountMonitoring = new ChargingGunCountMonitoring(); chargingGunCountMonitoring.setLeisure(leisure); chargingGunCountMonitoring.setLoaded(loaded); chargingGunCountMonitoring.setCharging(charging); chargingGunCountMonitoring.setOffline(offline); chargingGunCountMonitoring.setBreakdown(breakdown); return chargingGunCountMonitoring; } /** * 获取充电枪监控数据 * @param query * @return */ @Override public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) { //获取当前登录账户的站点权限数据 Set<Integer> siteIds = new HashSet<>(); if(null == query.getSiteId()){ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData(); Integer roleType = sysUser.getRoleType(); Integer objectId = sysUser.getObjectId(); if(2 == roleType){ siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST); }else{ //非管理员需要根据角色和用户配置查询允许的站点数据 if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData(); List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData(); data.addAll(data1); siteIds = new HashSet<>(data); } } }else{ siteIds.add(query.getSiteId()); } // todo 待完善 if(null != query.getStatus() && 0 < query.getStatus().size()){ if(query.getStatus().contains(3)){ query.getStatus().add(6); query.getStatus().add(7); } } PageInfo<ChargingGunMonitoring> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize()); List<ChargingGunMonitoring> chargingGunMonitoring = this.baseMapper.getChargingGunMonitoring(pageInfo, siteIds, query); for (ChargingGunMonitoring gunMonitoring : chargingGunMonitoring) { Integer status = gunMonitoring.getStatus(); if(status == 5 || status == 6){ gunMonitoring.setStatus(3); } if(status == 4){ Integer id = gunMonitoring.getId(); //根据订单数据查询车牌号 TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData(); Integer appUserCarId = chargingOrder.getAppUserCarId(); if(null != appUserCarId){ TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0); gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate()); } } } return pageInfo.setRecords(chargingGunMonitoring); } } ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
@@ -79,4 +79,32 @@ select id,code, `name`, `number` from t_charging_pile where del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} and site_id = #{siteId} </select> <select id="getChargingGunMonitoring" resultType="com.ruoyi.chargingPile.dto.ChargingGunMonitoring"> select a.id, a.status, CONCAT(b.number, a.name) as name, a.parking_number as parkingNumber from t_charging_gun a left join t_charging_pile b on (a.charging_pile_id = b.id) where a.del_flag = 0 <if test="null != siteIds and siteIds.size() > 0"> and a.site_id in <foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </if> <if test="null != query.status and query.status.size() > 0"> and a.status in <foreach collection="query.status" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </if> <if test="null != query.name and '' != query.name"> and a.name like CONCAT('%', #{query.name}, '%') </if> </select> </mapper> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
@@ -9,6 +9,7 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.Set; /** * <p> @@ -34,8 +35,21 @@ */ @ResponseBody @GetMapping("/getTotalElectricQuantity/{days}") public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days){ List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days); public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){ List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days, siteIds); return R.ok(list); } /** * 获取给定天数每天的充电度数 * @param days 天数 * @return */ @ResponseBody @GetMapping("/getDailyChargingDegree/{days}") public R<List<Double>> getDailyChargingDegree(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){ List<Double> list = chargingOrderAccountingStrategyService.getDailyChargingDegree(days, siteIds); return R.ok(list); } } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -53,5 +53,16 @@ return R.ok(chargingOrderService.getById(orderId)); } /** * 根据充电枪id获取正在进行中的订单 * @param chargingGunId 充电枪id * @return */ @GetMapping(value = "/getOrderDetailByGunId") public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){ TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId) .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3)); return R.ok(one); } }
@@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy; import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; import java.util.Set; /** * <p> @@ -21,6 +23,13 @@ * @param days 天数 * @return */ List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days); List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds); /** * 获取给定天数每天的充电度数 * @param days 天数 * @return */ List<Double> getDailyChargingDegree(Integer days, Set<Integer> siteIds); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
@@ -14,8 +14,10 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.Duration; import java.util.*; import java.util.stream.Collectors; import java.util.stream.LongStream; /** * <p> @@ -39,14 +41,15 @@ * @return */ @Override public List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days) { public List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - days); String startTime = sdf.format(calendar.getTime()) + " 00:00:00"; List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStatus, 5) List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getStatus, 5) .eq(TChargingOrder::getDelFlag, 0).last(" and end_time between '" + startTime + "' and DATE_FORMAT('%Y-%m-%d %H:%i:%s', now())")); List<TChargingOrderAccountingStrategy> list1 = this.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().in(TChargingOrderAccountingStrategy::getChargingOrderId)); List<Long> orderId = list.stream().map(TChargingOrder::getId).collect(Collectors.toList()); List<TChargingOrderAccountingStrategy> list1 = this.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().in(TChargingOrderAccountingStrategy::getChargingOrderId, orderId)); List<List<Map<String, Object>>> list2 = new ArrayList<>(); Calendar nowDateTime = Calendar.getInstance(); @@ -88,4 +91,32 @@ } return list2; } /** * 获取给定天数每天的充电度数 * @param days 天数 * @return */ @Override public List<Double> getDailyChargingDegree(Integer days, Set<Integer> siteIds) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - days); String startTime = sdf.format(calendar.getTime()) + " 00:00:00"; List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getStatus, 5) .eq(TChargingOrder::getDelFlag, 0).last(" and end_time between '" + startTime + "' and DATE_FORMAT('%Y-%m-%d %H:%i:%s', now())")); List<Double> list2 = new ArrayList<>(); Calendar nowDateTime = Calendar.getInstance(); //遍历获取每天的数值 for (int i = days; i >= 0; i--) { nowDateTime.set(Calendar.DAY_OF_YEAR, nowDateTime.get(Calendar.DAY_OF_YEAR) - i); //充电量 BigDecimal reduce = list.stream().filter(s -> sdf.format(s.getEndTime()).equals(sdf.format(nowDateTime.getTime()))) .map(TChargingOrder::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add); list2.add(reduce.doubleValue()); } return list2; } } ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -14,6 +14,8 @@ <result column="parking_lot_id" property="parkingLotId" /> <result column="charging_pile_id" property="chargingPileId" /> <result column="charging_gun_id" property="chargingGunId" /> <result column="charging_capacity" property="chargingCapacity"/> <result column="charging_power" property="chargingPower"/> <result column="start_time" property="startTime" /> <result column="end_time" property="endTime" /> <result column="status" property="status" />
