开发二级等保功能及心跳消息队列修改

Pu Zhibing

2025-05-15 7a4f9541331bef779a506b38a27ed5c3373c0bec

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -23,6 +23,8 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
@@ -59,10 +61,13 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -83,25 +88,13 @@
    private TSettlementConfirmService tSettlementConfirmService;
    @Resource
    private VipClient vipClient;
    @PostMapping(value = "/chargingList")
    @ApiOperation(value = "充电时段统计列表", tags = {"管理后台-财务结算"})
    public AjaxResult<ChargingOrderTimeVO> chargingList(@RequestBody ChargingListQuery dto) {
        ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
        return AjaxResult.success(res);
    }
    @GetMapping(value = "/chargingInfo")
    @ApiOperation(value = "充电时段统计列表-查看详情", tags = {"管理后台-财务结算"})
    public AjaxResult<ChargingOrderListInfoVO> chargingInfo(String uid) {
        ChargingOrderListInfoVO res = chargingOrderService.chargingInfo(uid);
        return AjaxResult.success(res);
    }
    @Autowired
    @Resource
    private SiteClient siteClient;
    @Autowired
    @Resource
    private AppUserClient appUserClient;
    @Autowired
    @Resource
    private ChargingGunClient chargingGunClient;
    @Autowired
    @Resource
    private AppUserCarClient appUserCarClient;
    @Resource
    private AccountingStrategyOrderService accountingStrategyOrderService;
@@ -109,30 +102,57 @@
    private TChargingOrderAccountingStrategyService tChargingOrderAccountingStrategyService;
    @Resource
    private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;

    
    
    
    @RequiresPermissions(value = {"/chargingPeriodStatistics"}, logical = Logical.OR)
    @PostMapping(value = "/chargingList")
    @ApiOperation(value = "充电时段统计列表", tags = {"管理后台-财务结算"})
    public AjaxResult<ChargingOrderTimeVO> chargingList(@RequestBody ChargingListQuery dto) {
        ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
        return AjaxResult.success(res);
    }
    
    
    @RequiresPermissions(value = {"/chargingPeriodStatistics/order_info", "/chargingPeriodStatistics/charging_curve"}, logical = Logical.OR)
    @GetMapping(value = "/chargingInfo")
    @ApiOperation(value = "充电时段统计列表-查看详情", tags = {"管理后台-财务结算"})
    public AjaxResult<ChargingOrderListInfoVO> chargingInfo(String uid) {
        ChargingOrderListInfoVO res = chargingOrderService.chargingInfo(uid);
        return AjaxResult.success(res);
    }
    
    @RequiresPermissions(value = {"/chargingPeriodStatistics/export"}, logical = Logical.OR)
    @ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
    @PutMapping("/export")
    public void export(@RequestBody ChargingListQuery dto) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
        List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
        List<ChargingOrderListVO> exportList = res.getList().getRecords();
        int i = 0;
        List<ChargingOrderListVO> exportList = res.getExportList();
        int i = 1;
        List<TChargingGun> data = chargingGunClient.getAllGun().getData();
        List<Site> data9 = siteClient.getSiteAll().getData();
        List<TAppUser> data6 = appUserClient.getAllUser().getData();
        List<Partner> data7 = siteClient.getAllPartner().getData();
        List<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery()
                .list();
        List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(
                );
        List<TVip> data5 = vipClient.getAllVip().getData();
        List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
        for (ChargingOrderListVO chargingOrderListVO : exportList) {
            TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();

            List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrderListVO.getSiteId())).getData();
            TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
            TChargingGun data4 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
            if (data!=null&&(!data.isEmpty())){
                tChargingOrderExport.setSiteCode(data.get(0).getCode());
            Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
            TAppUser data3 = data6.stream().filter(e->e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
            TChargingGun data4 = data.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
            if (site!=null){
                tChargingOrderExport.setSiteCode(site.getCode());
                tChargingOrderExport.setSiteName(chargingOrderListVO.getSiteName());
                tChargingOrderExport.setCity(data.get(0).getCity());
                tChargingOrderExport.setCityName(data.get(0).getDistricts());
                tChargingOrderExport.setSiteType(data.get(0).getSiteType());
                tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
                Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
                tChargingOrderExport.setCity(site.getCity());
                tChargingOrderExport.setCityName(site.getDistricts());
                tChargingOrderExport.setSiteType(site.getSiteType());
                tChargingOrderExport.setStatus(site.getStatus()+"");
                Partner data2 = data7.stream().filter(e->e.getId().equals(site.getPartnerId())).findFirst().orElse(null);
                if (data2!=null){
                    tChargingOrderExport.setPartner(data2.getName());
                }
@@ -143,9 +163,9 @@
            tChargingOrderExport.setCode(chargingOrderListVO.getCode());
            tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName());
            // 查询这笔订单的计费策略名称
            List<AccountingStrategyOrder> list = accountingStrategyOrderService.lambdaQuery()
                    .eq(AccountingStrategyOrder::getChargingOrderId, chargingOrderListVO.getId())
                    .list();
            List<AccountingStrategyOrder> list = listAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());


            if (!list.isEmpty()){
                tChargingOrderExport.setName(list.get(0).getName());
            }
@@ -153,21 +173,41 @@
            tChargingOrderExport.setStartType("扫码");
            tChargingOrderExport.setOne("小程序");
            if (chargingOrderListVO.getRechargePaymentType()!=null){
                switch (chargingOrderListVO.getRechargePaymentType()){
                    case 1:
                        tChargingOrderExport.setTwo("微信小程序");
                        break;
                    case 2:
                        tChargingOrderExport.setTwo("支付宝小程序");
                        break;
                if (chargingOrderListVO.getOrderSource()!=null&&chargingOrderListVO.getOrderSource().equals(2)){
                    if (chargingOrderListVO.getTripartitePlatformName().equals("XinDianTu")){
                        tChargingOrderExport.setTwo("新电途");
                        tChargingOrderExport.setOne("互联互通");

                    }
                    if (chargingOrderListVO.getTripartitePlatformName().equals("KuaiDian")){
                        tChargingOrderExport.setTwo("快电");
                        tChargingOrderExport.setOne("互联互通");

                    }
                }else{
                    switch (chargingOrderListVO.getRechargePaymentType()){
                        case 1:
                            tChargingOrderExport.setTwo("微信小程序");
                            break;
                        case 2:
                            tChargingOrderExport.setTwo("支付宝小程序");
                            break;
                    }
                }

            }
            String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
            String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
            String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
            tChargingOrderExport.setCreateTime(s1);
            tChargingOrderExport.setStartTime(s2);
            tChargingOrderExport.setEndTime(s3);
            if (chargingOrderListVO.getCreateTime()!=null){
                String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
                tChargingOrderExport.setCreateTime(s1);
            }
            if (chargingOrderListVO.getStartTime()!=null){
                String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
                tChargingOrderExport.setStartTime(s2);
            }
            if (chargingOrderListVO.getEndTime()!=null){
                String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
                tChargingOrderExport.setEndTime(s3);
            }
            tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
            tChargingOrderExport.setType("充电订单");
            tChargingOrderExport.setChargingType("单桩双充");
@@ -178,9 +218,7 @@
            tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+"");
            tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+"");
            tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+"");
            List<TChargingOrderAccountingStrategy> stageCost = tChargingOrderAccountingStrategyService.list(
                    new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
                            .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()));
            List<TChargingOrderAccountingStrategy> stageCost = stageCostAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
            if (!stageCost.isEmpty()){
                // 累加时段电费单价 取平均值
                BigDecimal bigDecimal1 = new BigDecimal("0");
@@ -200,12 +238,12 @@
                tChargingOrderExport.setServiceChargePrice(divide2+"");
                tChargingOrderExport.setServiceChargePriceLook(divide3+"");
            }
            // 获取充电时间
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
            if (data5!=null){
                if (data5.getTime_remaining()!=null){
                    tChargingOrderExport.setCumulativeChargingTime(data5.getCumulative_charging_time()+"");
                }
            if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
                LocalDateTime startTime = chargingOrderListVO.getStartTime();
                LocalDateTime endTime = chargingOrderListVO.getEndTime();
                // 计算时间差 单位秒
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                tChargingOrderExport.setCumulativeChargingTime((between*60)+"");
            }
            tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
            tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
@@ -213,9 +251,8 @@
            tChargingOrderExport.setIsSocType("");
            tChargingOrderExport.setIsSocNum("0");
            tChargingOrderExport.setUserType("普通个人用户");
            TAppUser data2 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
            if (data2!=null&&data2.getVipId()!=null){
                TVip data1 = vipClient.getInfo1(data2.getVipId()).getData();
            if (data3!=null&&data3.getVipId()!=null){
                TVip data1 = data5.stream().filter(e->e.getId().equals(data3.getVipId())).findFirst().orElse(null);
                if (data1!=null){
                    tChargingOrderExport.setVipType(data1.getName());
                }
@@ -230,15 +267,13 @@
                tChargingOrderExport.setDeviceCode(data4.getCode());
            }
            tChargingOrderExport.setAccountType("个人");
            List<TAppUserCar> data1 = appUserCarClient.getCarByIds(Arrays.asList(chargingOrderListVO.getAppUserCarId())).getData();
            if (data1!=null&&(!data1.isEmpty())){
                tChargingOrderExport.setCarNumber(data1.get(0).getLicensePlate());
                tChargingOrderExport.setCarType(data1.get(0).getVehicleModel());
                tChargingOrderExport.setCarBrand(data1.get(0).getVehicleBrand());


            TAppUserCar tAppUserCar = data8.stream().filter(e -> e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
            if (tAppUserCar!=null){
                tChargingOrderExport.setCarNumber(tAppUserCar.getLicensePlate());
                tChargingOrderExport.setCarType(tAppUserCar.getVehicleModel());
                tChargingOrderExport.setCarBrand(tAppUserCar.getVehicleBrand());
            }
            tChargingOrderExport.setOrderCode(chargingOrderListVO.getCode());
            tChargingOrderExport.setOrderCode(chargingOrderListVO.getStartChargeSeq());
            tChargingOrderExport.setIsSingle("是");
            tChargingOrderExport.setPayTime(chargingOrderListVO.getPayTime()+"");
            tChargingOrderExport.setElectrovalenceSiteName("四川明星新能源科技有限公司");
@@ -274,6 +309,10 @@
            }
        }
    }
    
    
    
    @RequiresPermissions(value = {"/summarySettlement"}, logical = Logical.OR)
    @GetMapping(value = "/settlementTotal")
    @ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
    @ApiParam(name = "time", value = "汇报时间2024-01")
@@ -282,30 +321,45 @@
        SettlementTotalVO res = chargingOrderService.settlementTotal(time);
        return AjaxResult.success(res);
    }
    
    
    
    @GetMapping(value = "/settlementTotalR/{time}/{userId}")
    public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId) {
        time = time+"-01 00:00:00";
        SettlementTotalVO res = chargingOrderService.settlementTotalR(time,userId);
        return R.ok(res);
    }
    
    
    @RequiresPermissions(value = {"/generateStatement"}, logical = Logical.OR)
    @PostMapping(value = "/settlementAdd")
    @ApiOperation(value = "结算确认表-生成/保存结算确认表", tags = {"管理后台-财务结算"})
    public R<TSettlementConfirm> settlementAdd(@RequestBody SettlementConfirmAdd dto) {
        TSettlementConfirm res = chargingOrderService.settlementAdd(dto);
        return R.ok(res);
    }
    
    
    @RequiresPermissions(value = {"/balanceSheetRecord"}, logical = Logical.OR)
    @PostMapping(value = "/settlementList")
    @ApiOperation(value = "结算表记录-列表查询", tags = {"管理后台-财务结算"})
    public R<PageInfo<TSettlementConfirm>> settlementList(@RequestBody SettlementListQuery dto) {
        PageInfo<TSettlementConfirm> res = chargingOrderService.settlementList(dto);
        return R.ok(res);
    }
    
    
    @RequiresPermissions(value = {"/balanceSheetRecord/del"}, logical = Logical.OR)
    @GetMapping(value = "/deleteSettlement")
    @ApiOperation(value = "结算表记录-删除", tags = {"管理后台-财务结算"})
    public R deleteSettlement(String uid) {
        tSettlementConfirmService.removeById(uid);
        return R.ok();
    }
    
    
    
    @GetMapping(value = "/downloadSettlement/{uid}")
    public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid) {
        TSettlementConfirm byId = tSettlementConfirmService.getById(uid);