src/main/java/com/gkhy/fourierSpecialGasMonitor/entity/DeviceExceptionLog.java

@@ -24,4 +24,6 @@
    private LocalDateTime time;

    private String execDesc;

    private Integer delFlag;
}

 src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java

@@ -97,6 +97,7 @@
        logger.info("【##】开始生成日报 ,时间："+startTime);
        OPCPackage opcPackage = null;
        //加载文档
        logger.info("【##】获取模版并创建相关文件");
        XWPFDocument doc = null;
        try {
            ClassLoader classLoader = Application.class.getClassLoader();
@@ -130,6 +131,7 @@
        } catch (IOException e) {
            e.printStackTrace();
        }
        logger.info("【##】获取相关数据，并填充数据");
        Map<String, Object> map = dataMap(gasCategories);
        List<XWPFParagraph> paragraphList = doc.getParagraphs();
        for (XWPFParagraph par : paragraphList) {
@@ -154,6 +156,7 @@
                }
            }
        }
        logger.info("【##】生成相关文件信息，保存相关文件");
        String format = now.format(reportNameFormatter);
        String fileName = "富城能源气体监测日报"+format+".docx";
        String fileurl = reportFilePathConfig.getDcPath()+fileName;
@@ -188,6 +191,7 @@
        List<GasConcentration> gasConcentrations = gasConcentrationService.listDatabyTimeSlot(LocalDateTime.of(now.minusDays(1).toLocalDate(), LocalTime.MIN)
                ,  LocalDateTime.of(now.minusDays(1).toLocalDate(), LocalTime.MAX));
        // 绘制折线图
        logger.info("【##】 开始绘制折线图 ");
        if (!CollectionUtils.isEmpty(gasConcentrations)) {
            List<GasCategory> gasCategoryForReport = gasCategoryService.findGasCategoryForReport();
            for (int i = 0; i < gasCategoryForReport.size(); i++) {
@@ -198,7 +202,7 @@
        }
        //List<GasFlux> gasFluxes = gasFluxService.listYesterday();
        List<GasFlux> gasFluxes = gasFluxService.listYesterdayTenAmToSixPm();
        List<Integer> areaNum = gasFluxes.stream().map(GasFlux::getAreaId).distinct().collect(Collectors.toList());
        List<Integer> areaNum = gasFluxes.stream().map(GasFlux::getAreaId).distinct().sorted().collect(Collectors.toList());

        List<Region> allRegion = regionService.findAll();
        if (CollectionUtils.isEmpty(allRegion))
@@ -216,14 +220,16 @@
//                    drawBarChart(gasFluxesByArea, fileurl, regionMap.get(i), gasCategories.get(j).getMolecularFormula(), i, j + 1);
//                }
//            }
                for (int i = 1; i <= areaNum.size(); i++) {
            logger.info("【##】 开始绘制柱状图");
                for (int i = 0; i < areaNum.size(); i++) {
                    //for (int j = 0; j < 20; j++) {
                    int finalI = i;
                    int finalI = areaNum.get(i);
                    List<GasFlux> gasFluxesByArea = gasFluxes.stream().filter(gasFlux -> gasFlux.getAreaId() == finalI)
                            .collect(Collectors.toList());
                    drawBarChart(gasFluxesByArea, fileurl, regionMap.get(i), gasCategories.get(0).getMolecularFormula(), i, 1);
                    drawBarChart(gasFluxesByArea, fileurl, regionMap.get(areaNum.get(i)), gasCategories.get(0).getMolecularFormula(), areaNum.get(i), 1);
                }
        }
        logger.info("保存相关信息到数据库");
        String endTime = LocalDateTime.now().format(execformatter);
        long execTime = ChronoUnit.SECONDS.between(now, LocalDateTime.now());
        MonitorDailyReport report = new MonitorDailyReport();
@@ -408,31 +414,179 @@
    }


//    public void drawBarChartExec(XWPFChart chart, String[] series, String[] categories,
//                                  List<Number[]> values, String chartTitle,String molecularFormula) {
//        final List<XDDFChartData> data = chart.getChartSeries();
//
//        final XDDFBarChartData line = (XDDFBarChartData) data.get(0);//这里一般获取第一个,我们这里是折线图就是XDDFLineChartData
//        line.getCategoryAxis().setTitle(chartTitle);
//        line.getValueAxes().get(0).setTitle(molecularFormula+" Emission Rate (ug/m^2/s)");
//        final int numOfPoints = categories.length;
//
//        final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0));
//
//        final XDDFDataSource<?> categoriesData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange, 0);
//        for (int i = 0; i < values.size(); i++) {
//            final String valuesDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, i + 1, i + 1));
//            Number[] value = values.get(i);
//            final XDDFNumericalDataSource<? extends Number> valuesData = XDDFDataSourcesFactory.fromArray(value, valuesDataRange, i + 1);
//            XDDFChartData.Series ser;//图表中的系列
//            ser = line.getSeries().get(i);
//            ser.replaceData(categoriesData, valuesData);
//            CellReference cellReference = chart.setSheetTitle(series[i], 1);//修改系列标题
//            ser.setTitle(series[i], cellReference);
//        }
//        chart.plot(line);
//        chart.setTitleText("");//折线图标题
//        chart.setTitleOverlay(false);
//    }

    public void drawBarChartExec(XWPFChart chart, String[] series, String[] categories,
                                  List<Number[]> values, String chartTitle,String molecularFormula) {
        final List<XDDFChartData> data = chart.getChartSeries();

        final XDDFBarChartData line = (XDDFBarChartData) data.get(0);//这里一般获取第一个,我们这里是折线图就是XDDFLineChartData
        line.getCategoryAxis().setTitle(chartTitle);
        line.getValueAxes().get(0).setTitle(molecularFormula+" Emission Rate (ug/m^2/s)");
        final int numOfPoints = categories.length;

        final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0));

        final XDDFDataSource<?> categoriesData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange, 0);
        for (int i = 0; i < values.size(); i++) {
            final String valuesDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, i + 1, i + 1));
            Number[] value = values.get(i);
            final XDDFNumericalDataSource<? extends Number> valuesData = XDDFDataSourcesFactory.fromArray(value, valuesDataRange, i + 1);
            XDDFChartData.Series ser;//图表中的系列
            ser = line.getSeries().get(i);
            ser.replaceData(categoriesData, valuesData);
            CellReference cellReference = chart.setSheetTitle(series[i], 1);//修改系列标题
            ser.setTitle(series[i], cellReference);
                                 List<Number[]> values, String chartTitle, String molecularFormula) {
        // 1. 基础参数非空校验
        if (chart == null) {
            logger.error("绘制柱状图失败：图表对象（chart）为null");
            return;
        }
        chart.plot(line);
        chart.setTitleText("");//折线图标题
        chart.setTitleOverlay(false);
        if (series == null || series.length == 0) {
            logger.error("绘制柱状图失败：系列名称（series）为空或长度为0");
            return;
        }
        if (categories == null || categories.length == 0) {
            logger.error("绘制柱状图失败：分类轴数据（categories）为空或长度为0");
            return;
        }
        if (values == null || values.isEmpty()) {
            logger.error("绘制柱状图失败：数值数据（values）为空或长度为0");
            return;
        }
        // 校验系列数与数值列表长度一致
        if (series.length != values.size()) {
            logger.error("绘制柱状图失败：系列数（{}）与数值列表长度（{}）不匹配", series.length, values.size());
            return;
        }

        try {
            // 2. 获取图表数据系列（防御性处理）
            List<XDDFChartData> data = chart.getChartSeries();
            if (data == null || data.isEmpty()) {
                logger.error("绘制柱状图失败：图表中未找到数据系列（data is empty）");
                return;
            }
            // 强制转换为柱状图数据（若类型不匹配会抛出ClassCastException，后续捕获）
            XDDFBarChartData barChartData = (XDDFBarChartData) data.get(0);

            // 3. 设置坐标轴标题（处理空字符串）
            barChartData.getCategoryAxis().setTitle(Objects.toString(chartTitle, "分类轴")); // 空标题时用默认值
            String valueAxisTitle = (molecularFormula != null ? molecularFormula : "气体") + " Emission Rate (ug/m^2/s)";
            barChartData.getValueAxes().get(0).setTitle(valueAxisTitle);

            // 4. 校验分类轴数据长度（numOfPoints必须≥1，否则范围无效）
            int numOfPoints = categories.length;
            if (numOfPoints < 1) {
                logger.error("绘制柱状图失败：分类轴数据长度（numOfPoints={}）小于1，无法生成有效范围", numOfPoints);
                return;
            }

            // 5. 生成分类轴数据范围（避免起止行颠倒）
            int startRow = 1;
            int endRow = numOfPoints;
            if (startRow > endRow) {
                logger.warn("分类轴数据范围起止行颠倒（{} > {}），自动修正", startRow, endRow);
                // 交换起止行（避免CellRangeAddress抛出异常）
                int temp = startRow;
                startRow = endRow;
                endRow = temp;
            }
            CellRangeAddress categoryRange = new CellRangeAddress(startRow, endRow, 0, 0);
            String categoryDataRange;
            try {
                categoryDataRange = chart.formatRange(categoryRange);
            } catch (Exception e) {
                logger.error("格式化分类轴数据范围失败：startRow={}, endRow={}, columns=[0,0]", startRow, endRow, e);
                return;
            }

            // 6. 处理分类轴数据源
            XDDFDataSource<?> categoriesData;
            try {
                categoriesData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange, 0);
            } catch (Exception e) {
                logger.error("创建分类轴数据源失败", e);
                return;
            }

            // 7. 循环处理每个系列的数值数据
            for (int i = 0; i < values.size(); i++) {
                // 校验当前系列的数值数组非空
                Number[] valueArray = values.get(i);
                if (valueArray == null) {
                    logger.warn("第{}个系列的数值数组为null，跳过处理", i);
                    continue;
                }
                // 校验数值数组长度与分类轴长度一致（否则图表可能显示异常）
                if (valueArray.length != numOfPoints) {
                    logger.warn("第{}个系列的数值长度（{}）与分类轴长度（{}）不匹配，可能导致图表异常",
                            i, valueArray.length, numOfPoints);
                }

                // 生成当前系列的数值范围
                CellRangeAddress valueRange = new CellRangeAddress(startRow, endRow, i + 1, i + 1);
                String valuesDataRange;
                try {
                    valuesDataRange = chart.formatRange(valueRange);
                } catch (Exception e) {
                    logger.error("格式化第{}个系列的数值范围失败：startRow={}, endRow={}, columns=[{},{}]",
                            i, startRow, endRow, i + 1, i + 1, e);
                    continue; // 跳过当前系列，处理下一个
                }

                // 创建数值数据源
                XDDFNumericalDataSource<? extends Number> valuesData;
                try {
                    valuesData = XDDFDataSourcesFactory.fromArray(valueArray, valuesDataRange, i + 1);
                } catch (Exception e) {
                    logger.error("创建第{}个系列的数值数据源失败", i, e);
                    continue;
                }

                // 更新系列数据（确保系列存在）
                List<XDDFChartData.Series> chartSeries = barChartData.getSeries();
                if (i >= chartSeries.size()) {
                    logger.error("第{}个系列不存在（图表仅包含{}个系列），跳过处理", i, chartSeries.size());
                    continue;
                }
                XDDFChartData.Series ser = chartSeries.get(i);
                ser.replaceData(categoriesData, valuesData);

                // 设置系列标题
                String seriesName = series[i] != null ? series[i] : "系列" + i; // 处理空标题
                try {
                    CellReference cellReference = chart.setSheetTitle(seriesName, 1);
                    ser.setTitle(seriesName, cellReference);
                } catch (Exception e) {
                    logger.error("设置第{}个系列标题（{}）失败", i, seriesName, e);
                    // 标题设置失败不影响数据，继续执行
                }
            }

            // 8. 绘制图表并清除标题
            chart.plot(barChartData);
            chart.setTitleText(""); // 清除图表标题
            chart.setTitleOverlay(false);

            logger.debug("柱状图绘制完成：标题={}, 系列数={}, 数据点数量={}", chartTitle, series.length, numOfPoints);

        } catch (ClassCastException e) {
            // 图表数据类型不匹配（如预期是柱状图，实际是折线图）
            logger.error("绘制柱状图失败：图表数据类型不匹配（预期XDDFBarChartData）", e);
        } catch (IndexOutOfBoundsException e) {
            // 坐标轴或系列索引越界（如getValueAxes()为空）
            logger.error("绘制柱状图失败：索引越界（可能坐标轴未初始化）", e);
        } catch (Exception e) {
            // 捕获其他未预期异常
            logger.error("绘制柱状图时发生未知异常", e);
        }
    }

    public void drawLineChartExec(XWPFChart chart, String[] series, String[] categories,
@@ -471,6 +625,7 @@
    }

    private Map<String, Object> dataMap(List<GasCategory> gasCategories){
        logger.info("【##】 生成相关数据");
        LocalDateTime now = LocalDateTime.now();
        String today = now.format(formatter);
        String yesterday = LocalDateTime.now().minusDays(1).format(formatter);

 src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/HeartbeatSchedule.java

@@ -66,6 +66,7 @@
                    deviceExceptionLog.setTime(now);
                    deviceExceptionLog.setContent(content);
                    deviceExceptionLog.setExecDesc(HeartbeatExecEnum.GAS_CONCENTRATION.getDesc());
                    deviceExceptionLog.setDelFlag(0);
                    DeviceExceptionLog save =  deviceExceptionLogService.save(deviceExceptionLog);
                    if (save == null)
                        throw new BusinessException(this.getClass(), ResultCode.SYSTEM_ERROR_DATABASE_FAIL.getCode(),"设备异常日志保存失败");
@@ -92,6 +93,7 @@
                    deviceExceptionLog.setTime(now);
                    deviceExceptionLog.setContent(content);
                    deviceExceptionLog.setExecDesc(HeartbeatExecEnum.GAS_FLUX.getDesc());
                    deviceExceptionLog.setDelFlag(0);
                    DeviceExceptionLog save =  deviceExceptionLogService.save(deviceExceptionLog);
                    if (save == null)
                        throw new BusinessException(this.getClass(), ResultCode.SYSTEM_ERROR_DATABASE_FAIL.getCode(),"设备异常日志保存失败");

 src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java

@@ -231,6 +231,7 @@
            log.setContent(content);
            log.setTime(now);
            log.setExecDesc(execInfo);
            log.setDelFlag(0);
            DeviceExceptionLog save =  deviceExceptionLogService.save(log);
            if (save == null) {
                logger.info("【警告】设备异常日志保存>>>>>>>>>>>>>>>>>>失败");

 src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DeviceExceptionLogServiceImpl.java

@@ -59,6 +59,7 @@
                if (searchParams != null && searchParams.getStartTime() != null && searchParams.getEndTime() != null){
                    predicateList.add(criteriaBuilder.between(root.get("time").as(LocalDateTime.class),searchParams.getStartTime(),searchParams.getEndTime()));
                }
                predicateList.add(criteriaBuilder.equal(root.get("delFlag"),0));
                return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
            }
        };

 src/main/resources/config/application-dev.yaml

@@ -2,27 +2,26 @@
  port: 17080

spring:
  #    enable-logging: false
#  enable-logging: true
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.0.52:3306/fourier_specialgas_monitor.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
    username: gkhy_dev_team
    password: Sjscn783fsDsa21
    url: jdbc:mysql://192.168.2.90:7006/fourier_specialgas_monitor.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
    username: root
    password: 2farwL3yPXfbH2AP
    master:
      driver-class-name: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.0.52:3306/fourier_specialgas_monitor.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
      username: gkhy_dev_team
      password: Sjscn783fsDsa21
      url: jdbc:mysql://192.168.2.90:7006/fourier_specialgas_monitor.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
      username: root
      password: 2farwL3yPXfbH2AP
      type: com.alibaba.druid.pool.DruidDataSource
  jpa:
    hibernate:
      ddl-auto: none
#      ddl-auto: update #自动更新
    show-sql: false  #日志中显示sql语句
    show-sql: true  #日志中显示sql语句

  redis:
#    host: 192.168.0.52
#    port: 6371
#    password: SEF98uvs98dUAUEF90Udssa      # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
#    database: 0           # Redis 数据库号，默认为 0
@@ -116,4 +115,8 @@
    enabled: false



logging:
  config: classpath:config/log4j2-spring.xml  # 指向新创建的Log4j2配置文件
  level:
    root: INFO
    org.com.gkhy: DEBUG  # 保持原日志级别配置

 src/main/resources/config/application-online-uat.yaml

@@ -98,4 +98,8 @@
  send:
    enabled: true


logging:
  config: classpath:config/log4j2-spring.xml  # 指向新创建的Log4j2配置文件
  level:
    root: INFO
    org.com.gkhy: DEBUG  # 保持原日志级别配置

 src/main/resources/config/log4j2-spring.xml

New file
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" monitorInterval="30">
    <!-- 变量定义（对应原Logback的property） -->
    <Properties>
        <!-- 应用名称（从Spring环境变量获取，默认值同原配置） -->
        <Property name="APP_NAME">${spring:spring.application.name:-fourierSpecialGasMonitor}</Property>
        <!-- 日志格式 -->
        <Property name="log.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Property>
        <!-- 日志路径 -->
        <Property name="log.path">./logs</Property>
    </Properties>

    <!-- 输出源配置（对应原Logback的appender） -->
    <Appenders>
        <!-- 控制台输出 -->
        <Console name="CONSOLE" target="SYSTEM_OUT">
            <PatternLayout pattern="${log.pattern}" charset="UTF-8"/>
        </Console>

        <!-- 主日志文件（INFO及以上级别，滚动策略） -->
        <RollingFile name="FILE_MAIN" fileName="${log.path}/${APP_NAME}.log"
                     filePattern="${log.path}/${APP_NAME}-%d{yyyy-MM-dd}-%i.log">
            <PatternLayout pattern="${log.pattern}" charset="UTF-8"/>
            <!-- 滚动策略（大小+时间） -->
            <Policies>
                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                <SizeBasedTriggeringPolicy size="100MB"/>
            </Policies>
            <!-- 保留策略 -->
            <DefaultRolloverStrategy max="30">
                <Delete basePath="${log.path}" maxDepth="1">
                    <IfFileName glob="${APP_NAME}-*.log"/>
                    <IfLastModified age="30d"/>
                </Delete>
            </DefaultRolloverStrategy>
        </RollingFile>

        <!-- SQL日志文件（DEBUG级别，滚动策略） -->
        <RollingFile name="FILE_SQL" fileName="${log.path}/${APP_NAME}-sql.log"
                     filePattern="${log.path}/${APP_NAME}-sql-%d{yyyy-MM-dd}-%i.log">
            <PatternLayout pattern="${log.pattern}" charset="UTF-8"/>
            <Policies>
                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                <SizeBasedTriggeringPolicy size="50MB"/>
            </Policies>
            <DefaultRolloverStrategy max="7">
                <Delete basePath="${log.path}" maxDepth="1">
                    <IfFileName glob="${APP_NAME}-sql-*.log"/>
                    <IfLastModified age="7d"/>
                </Delete>
            </DefaultRolloverStrategy>
        </RollingFile>

        <!-- 错误日志文件（仅ERROR级别） -->
        <RollingFile name="FILE_ERROR" fileName="${log.path}/${APP_NAME}-error.log"
                     filePattern="${log.path}/${APP_NAME}-error-%d{yyyy-MM-dd}-%i.log">
            <PatternLayout pattern="${log.pattern}" charset="UTF-8"/>
            <!-- 仅接受ERROR级别 -->
            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
            <Policies>
                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                <SizeBasedTriggeringPolicy size="50MB"/>
            </Policies>
            <DefaultRolloverStrategy max="90">
                <Delete basePath="${log.path}" maxDepth="1">
                    <IfFileName glob="${APP_NAME}-error-*.log"/>
                    <IfLastModified age="90d"/>
                </Delete>
            </DefaultRolloverStrategy>
        </RollingFile>
    </Appenders>

    <!-- 日志器配置（对应原Logback的logger和root） -->
    <Loggers>
        <!-- Hibernate SQL日志（仅输出到SQL文件） -->
        <Logger name="org.hibernate.SQL" level="DEBUG" additivity="false">
            <AppenderRef ref="FILE_SQL"/>
            <!-- 若需在控制台显示SQL，添加此行：<AppenderRef ref="CONSOLE"/> -->
        </Logger>

        <!-- 其他框架日志级别控制 -->
        <Logger name="org.springframework" level="INFO" additivity="false">
            <AppenderRef ref="CONSOLE"/>
            <AppenderRef ref="FILE_MAIN"/>
            <AppenderRef ref="FILE_ERROR"/>
        </Logger>
        <Logger name="org.hibernate" level="INFO" additivity="false">
            <AppenderRef ref="CONSOLE"/>
            <AppenderRef ref="FILE_MAIN"/>
            <AppenderRef ref="FILE_ERROR"/>
        </Logger>

        <!-- 自定义包日志级别（开发环境DEBUG） -->
        <Logger name="org.com.gkhy" level="DEBUG" additivity="false">
            <AppenderRef ref="CONSOLE"/>
            <AppenderRef ref="FILE_MAIN"/>
            <AppenderRef ref="FILE_ERROR"/>
        </Logger>

        <!-- 根日志（默认INFO级别） -->
        <Root level="INFO">
            <AppenderRef ref="CONSOLE"/>
            <AppenderRef ref="FILE_MAIN"/>
            <AppenderRef ref="FILE_ERROR"/>
        </Root>
    </Loggers>
</Configuration>