修改bug

Pu Zhibing

2025-12-09 e667c60c93ef9fb1c7480e0425b41c31ef6fa8fa

修改bug

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java

@@ -20,7 +20,7 @@
     * 分页参数，每页数量
     */
    @ApiModelProperty(value = "分页参数，每页数量，默认为10")
    private Integer pageSize = 10;
    private Integer pageSize = 50;

    public Integer getPageCurr() {
//        if(null != pageCurr){

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java

@@ -136,25 +136,25 @@
        baseRequest.setData(data);
        baseRequest.setSig(hmacMD5);
        String request_json = JacksonUtils.toJson(baseRequest);
        log.info("获取三方平台授权token请求地址：" + post.getUrl());
        log.info("获取三方平台授权token请求参数：" + request_json);
        log.info("获取三方平台授权token请求Data：" + jsonString);
        log.info("【省监管平台】获取三方平台授权token请求地址：" + post.getUrl());
        log.info("【省监管平台】获取三方平台授权token请求参数：" + request_json);
        log.info("【省监管平台】获取三方平台授权token请求Data：" + jsonString);
        post.body(request_json);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("获取三方平台授权token失败：" + execute.body());
            log.error("【省监管平台】获取三方平台授权token失败：" + execute.body());
            return null;
        }
        log.info("获取三方平台授权token响应参数：" + execute.body());
        log.info("【省监管平台】获取三方平台授权token响应参数：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("获取三方平台授权token失败：" + baseResult.getMsg());
            log.error("【省监管平台】获取三方平台授权token失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("获取三方平台授权token响应Data：" + decrypt);
        log.info("【省监管平台】获取三方平台授权token响应Data：" + decrypt);
        QueryTokenResult queryTokenResult = JSON.parseObject(decrypt, QueryTokenResult.class);
        String token = queryTokenResult.getAccessToken();
//        Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + queryTokenResult.getTokenAvailab
@@ -207,19 +207,19 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方平台设备状态失败：" + execute.body());
            log.error("【省监管平台】推送三方平台设备状态失败：" + execute.body());
            return null;
        }
        log.info("推送三方平台设备状态响应：" + execute.body());
        log.info("【省监管平台】推送三方平台设备状态响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台设备状态失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送三方平台设备状态失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送三方平台设备状态Data：" + decrypt);
        log.info("【省监管平台】推送三方平台设备状态Data：" + decrypt);
        NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class);
        return notificationStationStatusResult;
    }
@@ -235,19 +235,19 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方平台充电状态失败：" + execute.body());
            log.error("【省监管平台】推送三方平台充电状态失败：" + execute.body());
            return null;
        }
        log.info("推送三方平台充电状态响应：" + execute.body());
        log.info("【省监管平台】推送三方平台充电状态响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台充电状态失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送三方平台充电状态失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送三方平台充电状态Data：" + decrypt);
        log.info("【省监管平台】推送三方平台充电状态Data：" + decrypt);
        NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class);
        return notificationEquipChargeStatusResult;
    }
@@ -291,19 +291,19 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方平台充电订单信息失败：" + execute.body());
            log.error("【省监管平台】推送三方平台充电订单信息失败：" + execute.body());
            return null;
        }
        log.info("推送三方平台充电订单信息响应：" + execute.body());
        log.info("【省监管平台】推送三方平台充电订单信息响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台充电订单信息失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送三方平台充电订单信息失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送三方平台充电订单信息Data：" + decrypt);
        log.info("【省监管平台】推送三方平台充电订单信息Data：" + decrypt);
        NotificationChargeOrderInfoResult notificationChargeOrderInfoResult = JSON.parseObject(decrypt, NotificationChargeOrderInfoResult.class);
        return notificationChargeOrderInfoResult;
    }
@@ -346,9 +346,9 @@
        baseRequest.setSig(hmacMD5);
        String request_json = JacksonUtils.toJson(baseRequest);
        post.body(request_json);
        log.info("推送三方平台请求地址：" + post.getUrl());
        log.info("推送三方平台请求参数：" + request_json);
        log.info("推送三方平台请求Data：" + jsonString);
        log.info("【省监管平台】推送三方平台请求地址：" + post.getUrl());
        log.info("【省监管平台】推送三方平台请求参数：" + request_json);
        log.info("【省监管平台】推送三方平台请求Data：" + jsonString);
    }
    /**
     * 构建请求参数和消息头
@@ -378,9 +378,9 @@
        baseRequest.setSig(hmacMD5);
        String request_json = JacksonUtils.toJson(baseRequest);
        post.body(request_json);
        log.info("推送三方平台请求地址：" + post.getUrl());
        log.info("推送三方平台请求参数：" + request_json);
        log.info("推送三方平台请求Data：" + request_json1);
        log.info("【省监管平台】推送三方平台请求地址：" + post.getUrl());
        log.info("【省监管平台】推送三方平台请求参数：" + request_json);
        log.info("【省监管平台】推送三方平台请求Data：" + request_json1);
    }

    /**
@@ -394,19 +394,19 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送充电用能统计失败：" + execute.body());
            log.error("【省监管平台】推送充电用能统计失败：" + execute.body());
            return ;
        }
        log.info("推送充电用能统计信息响应：" + execute.body());
        log.info("【省监管平台】推送充电用能统计信息响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送充电用能统计信息失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送充电用能统计信息失败：" + baseResult.getMsg());
            return ;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送充电用能统计信息Data：" + decrypt);
        log.info("【省监管平台】推送充电用能统计信息Data：" + decrypt);

    }
    /**
@@ -420,19 +420,19 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送充换电站信息失败：" + execute.body());
            log.error("【省监管平台】推送充换电站信息失败：" + execute.body());
            return ;
        }
        log.info("推送充换电站信息信息响应：" + execute.body());
        log.info("【省监管平台】推送充换电站信息信息响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送充换电站信息失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送充换电站信息失败：" + baseResult.getMsg());
            return ;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送充换电站信息信息Data：" + decrypt);
        log.info("【省监管平台】推送充换电站信息信息Data：" + decrypt);
    }
    /**
     * 充换电站功率信息
@@ -445,19 +445,19 @@
        buildBodyStatus(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送充换电站实时功率失败：" + execute.body());
            log.error("【省监管平台】推送充换电站实时功率失败：" + execute.body());
            return ;
        }
        log.info("推送充换电站实时功率信息响应：" + execute.body());
        log.info("【省监管平台】推送充换电站实时功率信息响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送充换电站实时功率信息失败：" + baseResult.getMsg());
            log.error("【省监管平台】推送充换电站实时功率信息失败：" + baseResult.getMsg());
            return ;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
        log.info("推送充换电站实时功率信息Data：" + decrypt);
        log.info("【省监管平台】推送充换电站实时功率信息Data：" + decrypt);
    }

    public static void main(String[] args) {

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/util/GBSignUtils.java

@@ -21,12 +21,12 @@
                    sb.append(value);
                }
            }
            logger.debug("需要签名的内容：{},密钥{}", sb.toString(), secret);
            System.out.println("需要签名的内容：" + sb.toString() + ",密钥" + secret);
//            logger.debug("需要签名的内容：{},密钥{}", sb.toString(), secret);
//            System.out.println("需要签名的内容：" + sb.toString() + ",密钥" + secret);
            byte[] md5Digest = HmacMD5Encrypt(sb.toString(), secret);
            String result = Encodes.encodeHex(md5Digest).toUpperCase();
            logger.debug("HmacSHA1的签名内容：{}", result);
            System.out.println("HmacSHA1的签名内容：" + result);
//            logger.debug("HmacSHA1的签名内容：{}", result);
//            System.out.println("HmacSHA1的签名内容：" + result);
            return result;
        } catch (Exception e) {
            throw new RuntimeException("数据签名出错", e);

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

@@ -223,35 +223,6 @@
    @ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
    public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
        return chargingOrderService.payOrderQuery(payOrderQueryDto);

//        List<TChargingOrder> list = chargingOrderService.list();
//        List<TParkingRecord> parkingRecord = parkingLotClient.getSiteIdAll().getData();
//        for (PayOrderDto record : data.getRecords()) {
//            if (record.getType() == 1){
//                TChargingOrder chargingOrder = list.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
//                if (chargingOrder!=null){
//                    record.setSiteId(chargingOrder.getSiteId());
//                }
//            }
//            if (record.getType()==4){
//                TParkingRecord tParkingRecord = parkingRecord.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
//                if (tParkingRecord!=null){
//                    record.setSiteId(tParkingRecord.getSiteId());
//                }
//            }
//            if (roleType==1||(record.getType()!=1&&record.getType()!=4)){
//                res.add(record);
//                continue;
//            }
//            if (roleType==2 && (record.getType()==1||record.getType()==4) && siteIds.contains(record.getSiteId())){
//                res.add(record);
//            }
//
//        }
//        List<PayOrderDto> res1 = testing5(res.size(), pageCurr, pageSize, res);
//        data.setTotal(res.size());
//        data.setRecords(res1);
//        return R.ok(data);
    }



 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -2560,7 +2560,10 @@
                }
            }
            chargingOrder.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
            chargingOrder.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));

            List<UploadRealTimeMonitoringData> dataList = uploadRealTimeMonitoringDataService.getDataByOrderCode(chargingOrder.getCode());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            chargingOrder.setStartTime(LocalDateTime.parse(sdf.format(dataList.get(dataList.size() - 1).getCreate_time()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
            chargingOrder.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
            chargingOrder.setStatus(5);
            chargingOrder.setOrderAmount(orderAmount.setScale(2, RoundingMode.HALF_EVEN));
@@ -2735,8 +2738,8 @@
                    //构建退款明细
                    TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                    chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    chargingOrderRefund.setRefundCode("CDF" + sdf1.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                    chargingOrderRefund.setRefundAmount(refundAmount);
                    chargingOrderRefund.setPayType(rechargePaymentType);
                    chargingOrderRefund.setRefundStatus(1);
@@ -2797,8 +2800,8 @@
                    //构建退款明细
                    TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                    chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    chargingOrderRefund.setRefundCode("CDF" + sdf1.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                    chargingOrderRefund.setRefundAmount(refundAmount);
                    chargingOrderRefund.setRefundStatus(2);
                    chargingOrderRefund.setPayType(rechargePaymentType);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -188,7 +188,9 @@
                if(null != one){
                    log.info("定时任务执行，查询到停止中的订单账单数据：{}", JSON.toJSONString(one));
                    if(null == order.getStartTime()){
                        order.setStartTime(LocalDateTime.parse(one.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));
                        List<UploadRealTimeMonitoringData> dataList = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        order.setStartTime(LocalDateTime.parse(sdf.format(dataList.get(dataList.size() - 1).getCreate_time()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));
                    }
                    if(null == order.getEndTime()){
                        order.setEndTime(LocalDateTime.parse(one.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));
@@ -211,7 +213,9 @@
                if(null != one && StringUtils.isNotEmpty(one.getResult())){
                    log.info("定时任务执行，查询到充电中的订单账单数据：{}", JSON.toJSONString(one));
                    if(null == order.getStartTime()){
                        order.setStartTime(LocalDateTime.parse(one.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));
                        List<UploadRealTimeMonitoringData> dataList = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        order.setStartTime(LocalDateTime.parse(sdf.format(dataList.get(dataList.size() - 1).getCreate_time()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));
                    }
                    if(null == order.getEndTime()){
                        order.setEndTime(LocalDateTime.parse(one.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS").withZone(ZoneId.systemDefault())));