From af68ac0a16d176674e38920db4a11ddf36b2c4fd Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期日, 27 十月 2024 20:46:21 +0800 Subject: [PATCH] bug修改 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 205 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 196 insertions(+), 9 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java index 4170703..8c10da3 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java @@ -2,18 +2,25 @@ import java.time.LocalDateTime; import java.math.BigDecimal; +import com.ruoyi.account.api.feignClient.AppUserCarClient; +import com.ruoyi.account.api.feignClient.AppUserClient; +import com.ruoyi.account.api.model.TAppUser; +import com.ruoyi.account.api.model.TAppUserCar; +import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient; import com.ruoyi.chargingPile.api.feignClient.SiteClient; import com.ruoyi.chargingPile.api.model.Partner; import com.ruoyi.chargingPile.api.model.Site; +import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.common.core.utils.WebUtils; import com.ruoyi.common.core.web.domain.BasePojo; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient; +import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData; import com.ruoyi.order.api.model.ExportUidDto; import com.ruoyi.order.api.feignClient.OrderClient; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TSettlementConfirm; -import com.ruoyi.order.api.vo.AccountListVO; -import com.ruoyi.order.api.vo.ChargingBillListVO; +import com.ruoyi.order.api.vo.*; import com.alibaba.excel.EasyExcel; @@ -45,8 +52,8 @@ import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import com.ruoyi.order.api.model.ChargingListQuery; -import com.ruoyi.order.api.vo.ChargingBillVO; -import com.ruoyi.order.api.vo.SettlementTotalVO; +import com.ruoyi.other.api.feignClient.OtherClient; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.apache.commons.codec.CharEncoding; import org.springframework.beans.BeanUtils; @@ -61,11 +68,10 @@ import java.net.URL; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; +import java.time.format.DateTimeFormatter; +import java.util.*; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * <p> @@ -88,6 +94,12 @@ private OrderClient orderClient; @Resource private SiteClient siteClient; + @Resource + private ChargingGunClient chargingGunClient; + @Resource + private AppUserClient appUserClient; + @Resource + private AppUserCarClient appUserCarClient; @Autowired public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService, TokenService tokenService, RedisService redisService) { @@ -366,12 +378,186 @@ } return R.ok(); } + @Resource + private OtherClient otherClient; + @Resource + private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient; @ApiOperation(value = "下载", tags = {"管理后台-结算表记录"}) @PutMapping("/downloadSettlement") @Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT) public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response) { TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData(); + for (TChargingOrder chargingOrder : data.getList()) { + SettlementExportVO settlementExportVO = new SettlementExportVO(); + + BeanUtils.copyProperties(data, settlementExportVO); + List<Site> data3 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData(); + if (data3!=null && (!data3.isEmpty())){ + TAppUser data4 = appUserClient.getUserById(chargingOrder.getAppUserId()).getData(); + if (data4.getVipId()== null ){ + settlementExportVO.setVipType("非会员"); + }else{ + List<Integer> vipIds = new ArrayList<>(); + //获取会员map + R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds); + settlementExportVO.setVipType(vipMap.getData().get(data4.getVipId())); + } + settlementExportVO.setPhone(data4.getPhone()); + settlementExportVO.setRealName(data4.getName()); + if (chargingOrder.getAppUserCarId()!=null){ + List<TAppUserCar> data5 = appUserCarClient.getCarByIds(Arrays.asList(chargingOrder.getAppUserCarId())).getData(); + if (!data5.isEmpty()){ + settlementExportVO.setLicensePlate(data5.get(0).getLicensePlate()); + settlementExportVO.setVehicleModel(data5.get(0).getVehicleModel()); + settlementExportVO.setVehicleBrand(data5.get(0).getVehicleBrand()); + } + + } + settlementExportVO.setSiteCode(data3.get(0).getCode()); + settlementExportVO.setSiteName(data3.get(0).getName()); + settlementExportVO.setCity(data3.get(0).getCity()); + settlementExportVO.setDistricts(data3.get(0).getDistricts()); + Partner data1 = siteClient.getPartnerR(data3.get(0).getPartnerId()).getData(); + if (data1!=null){ + settlementExportVO.setPartnerName(data1.getName()); + } + switch (data3.get(0).getSiteType()){ + case 0: + settlementExportVO.setSiteType("其他"); + break; + case 1: + settlementExportVO.setSiteType("公共"); + break; + case 2: + settlementExportVO.setSiteType("个人"); + break; + case 3: + settlementExportVO.setSiteType("公交(专业)"); + break; + case 4: + settlementExportVO.setSiteType("环卫(专用)"); + break; + case 5: + settlementExportVO.setSiteType("物流(专用)"); + break; + case 6: + settlementExportVO.setSiteType("出租车(专用)"); + break; + } + switch (data3.get(0).getStatus()){ + case 1: + settlementExportVO.setSiteStatus("正常使用"); + break; + case 2: + settlementExportVO.setSiteStatus("维修中"); + break; + case 3: + settlementExportVO.setSiteStatus("关闭下线"); + break; + } + switch (data3.get(0).getBusinessCategory()){ + case 1: + settlementExportVO.setBusinessCategory("直营"); + break; + case 2: + settlementExportVO.setBusinessCategory("非直营"); + break; + } + // todo 查询站点计费策略名称 +// settlementExportVO.setAccountingStrategy(); + + + } + TChargingGun data4 = chargingGunClient.getChargingGunById(settlementExportVO.getChargingGunId()) + .getData(); + if (data4!=null){ + settlementExportVO.setName(data4.getName()); + settlementExportVO.setDeviceCode(data4.getCode()); + } + + settlementExportVO.setElectronicType("转售"); + settlementExportVO.setPayTypeName("线上结算"); + LocalDateTime createTime = settlementExportVO.getCreateTime(); + LocalDateTime startTime = settlementExportVO.getStartTime(); + LocalDateTime endTime = settlementExportVO.getEndTime(); + settlementExportVO.setCreateTime1(createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + settlementExportVO.setStartTime1(startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + settlementExportVO.setEndTime1(endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + switch (settlementExportVO.getStatus()){ + case 0: + settlementExportVO.setStatusName("未知"); + break; + case 1: + settlementExportVO.setStatusName("等待中/已插枪"); + break; + case 2: + settlementExportVO.setStatusName("启动中"); + break; + case 3: + settlementExportVO.setStatusName("充电中"); + break; + case 4: + settlementExportVO.setStatusName("停止中"); + break; + case 5: + settlementExportVO.setStatusName("已结束"); + break; + + } + settlementExportVO.setOrderTypeName("充电订单"); + settlementExportVO.setChargingType("单桩双充"); + settlementExportVO.setIsFree("否"); + settlementExportVO.setAverageElectronic(""); + settlementExportVO.setAverageServiceChargeReal(""); + settlementExportVO.setAverageServiceCharge(""); + // 获取充电时间 + UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData(); + if (data5!=null){ + if (data5.getCumulative_charging_time()!=null){ + settlementExportVO.setChargingSecond(data5.getCumulative_charging_time()+""); + + } + } + // 获取开始SOC 结束soc + if (chargingOrder.getCode()!=null){ + List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData(); + if (data6!=null && !data6.isEmpty()){ + // 第一条数据soc为开始 最后一条数据soc为结束soc + settlementExportVO.setStartSoc(data6.get(0).getSoc()+"%"); + settlementExportVO.setEndSoc(data6.get(data6.size()-1).getSoc()+"%"); + } + } + settlementExportVO.setIsSoc("否"); + settlementExportVO.setSocType(""); + settlementExportVO.setSocValue(""); + settlementExportVO.setUserType("普通个人用户"); + + if (chargingOrder.getVipDiscountAmount()!=null && chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0){ + settlementExportVO.setIsPlus("是"); + + }else { + settlementExportVO.setIsPlus("否"); + + } + settlementExportVO.setUserCode(""); + + + settlementExportVO.setConfirmCode(data.getConfirmCode()); + settlementExportVO.setCompanyName("四川明星新能源有限科技公司"); + settlementExportVO.setMoneyType("线上计费"); + settlementExportVO.setDeviceType("设备直连(自由集控)"); + settlementExportVO.setBeforePayType("先付后退"); + settlementExportVO.setIsSafe("是"); + // 顶部合计数据 + data.setServiceChargeTotal(data.getServiceCharge().add(data.getVenue()) + .add(data.getVenue()).add(data.getMaintain()).add(data.getClean())+""); + + data.setServicePartnerString(data.getServicePartner()+"%"); + BigDecimal bigDecimal = new BigDecimal("100"); + data.setPlatformString(bigDecimal.subtract(data.getServicePartner())+"%"); + } + List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData(); if (!data1.isEmpty()){ data.setSiteName(data1.get(0).getName()); @@ -400,10 +586,11 @@ WriteSheet writeSheet = EasyExcel.writerSheet().build(); WriteSheet writeSheet2 = EasyExcel.writerSheet().build(); WriteSheet writeSheet3 = EasyExcel.writerSheet().build(); - FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build(); + FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build(); excelWriter.fill(new FillWrapper("data1", chargingBillVOS), fillConfig, writeSheet); excelWriter.fill(new FillWrapper("data2", chargingBillVOS), fillConfig, writeSheet2); excelWriter.fill(new FillWrapper("data3", data.getList()), fillConfig, writeSheet3); + excelWriter.fill(new FillWrapper("data4", data.getList()), fillConfig, writeSheet3); excelWriter.finish(); } catch (Exception e) { return R.fail("excel导出失败!"); -- Gitblit v1.7.1