bug修改

puzhibing

2024-10-26 ef42cacddb804ed978b26ea3025596dee88b2a12

bug修改

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java

@@ -21,6 +21,7 @@
public class ChargingOrderAndUploadRealTimeMonitoringDataDto extends BaseModel {

    private String id;
    private Integer index;
    private String transaction_serial_number; // 交易流水号
    private String charging_pile_code; // 桩编码
    private String charging_gun_code; // 抢号

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

@@ -804,7 +804,7 @@
//        }
//        Set<String> strings = map.keySet();


        mongoChargingOrderQuery.setPageSize(2);
        List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();

        List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
@@ -820,13 +820,16 @@
                    BeanUtils.copyProperties(chargingOrderVO, dataDto);
                }
                BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);

                dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
                dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
                dtos.add(dataDto);
            }else {
                continue;
            }
        }

        for (int i = 0; i < dtos.size(); i++) {
            dtos.get(i).setIndex(i);
        }

        return R.ok(dtos);
    }

 ruoyi-service/ruoyi-order/src/main/resources/logback.xml

@@ -60,9 +60,9 @@
    <!-- 系统模块日志级别控制  -->
    <logger name="com.ruoyi" level="info" />
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="warn" />
    <logger name="org.springframework" level="debug" />

    <root level="info">
    <root level="debug">
        <appender-ref ref="console" />
    </root>