feat(ucp): 新增 IStationInfoMonthService 接口- 添加了 IStationInfoMonthService 接口，继承自 IService<StationInfoMonth>

- 接口中定义了根据日期获取站点信息的方法，包括列表和字典形式的数据返回
- 为后续处理站点月度信息提供了基础服务接口

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApp.java

@@ -1,10 +1,14 @@
 package com.ruoyi;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.web.controller.JavaFunctionJobHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.ConfigurableApplicationContext;
 
 /**
  * 启动程序
@@ -18,7 +22,11 @@ import org.springframework.cache.annotation.EnableCaching;
 public class RuoYiApp {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApp.class, args);
+        ConfigurableApplicationContext run = SpringApplication.run(RuoYiApp.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  启动成功   ლ(´ڡ`ლ)ﾞ  ");
+        JavaFunctionJobHandler bean = run.getBean(JavaFunctionJobHandler.class);
+        DateTime parse = DateUtil.parse("2025-02-12");
+        //bean.calcTurbine5s2_ha(parse);
+        //bean.calcCzRxd(DateUtil.beginOfDay(parse), DateUtil.endOfDay(parse));
     }
 }

ruoyi-admin/src/test/java/com/ruoyi/NewTests.java

@@ -16,14 +16,17 @@ import com.ruoyi.ucp.service.IStationInfoDayService;
 import com.ruoyi.ucp.service.IStationInfoMinService;
 import com.ruoyi.ucp.util.DatePart;
 import com.ruoyi.ucp.util.SqlUtil;
+import com.ruoyi.ucp.util.TimeSeriesChart;
 import com.ruoyi.web.controller.JavaFunctionJobHandler;
 import org.apache.ibatis.reflection.property.PropertyNamer;
+import org.jfree.data.xy.XYSeries;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -42,12 +45,28 @@ public class NewTests {
     private IStationInfoDayService stationInfoDayService;
 
     public static void main(String[] args) {
-        //QueryWrapper<TurbineInfoDay> queryWrapper = new QueryWrapper<>();
-        //queryWrapper.lambda().select(TurbineInfoDay::getRecordDate);
-        //System.out.println();
-        List<Double> list = new ArrayList<>();
-        Double o = list.get(0);
-        System.out.println();
+        //XYSeries seriesAgc = new XYSeries("AGC");
+        //seriesAgc.add(1.0, 10.0);
+        //seriesAgc.add(2.0, 15.0);
+        //seriesAgc.add(3.0, 13.0);
+        //XYSeries seriesZs = new XYSeries("自算功率");
+        //seriesZs.add(1.0, 10.0);
+        //seriesZs.add(2.0, 15.0);
+        //seriesZs.add(3.0, 13.0);
+        //XYSeries seriesCx = new XYSeries("出线功率");
+        //seriesCx.add(1.0, 10.0);
+        //seriesCx.add(2.0, 15.0);
+        //seriesCx.add(3.0, 13.0);
+        //TimeSeriesChart example = new TimeSeriesChart("分析限电",seriesAgc,seriesZs,seriesCx);
+        //example.setSize(1280, 600);
+        //example.setLocationRelativeTo(null);
+        //example.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        //example.setVisible(true);
+        List<Double> xdl = new ArrayList<>();
+        xdl.add(0.0);
+        Double v = xdl.get(0);
+        v = v + 3;
+        System.out.println(xdl.get(0));
     }
 
     private static void aadd(SFunction<TurbineInfoDay, String> a) {
@@ -206,25 +225,25 @@ public class NewTests {
 
     @Test
     public void test4() {
-        //        while (true){
-        //            task.calcStationRealtimeLLgl();
-        //            ThreadUtil.sleep(60000);
-        //        }
-        DateTime start = DateUtil.parse("2023-12-01");
-        DateTime end = DateUtil.parse("2023-12-01");
-        DateRange range = DateUtil.range(start, end, DateField.MONTH);
-        List<String> stIds = new ArrayList<>();
-        stIds.add("GJNY_SXGS_FSG_FDC_STA");
-        stIds.add("GJNY_SXGS_JSL_FDC_STA");
-        stIds.add("GJNY_SXGS_CSL_FDC_STA");
-        stIds.add("GJNY_SXGS_ZZ_FDC_STA");
-        stIds.add("GJNY_SXGS_XZ_FDC_STA");
-        stIds.add("GJNY_SXGS_LJS_FDC_STA");
-        for (DateTime date : range) {
-            //            task.calcTurbineStateMin(date);
-            task.predictExaminBc(stIds, date);
-        }
-        //        task.calcGlqxnhSurplus(start, end);
+                while (true){
+                    task.calcStationRealtimeLLgl();
+                    ThreadUtil.sleep(6000);
+                }
+        //DateTime start = DateUtil.parse("2023-12-01");
+        //DateTime end = DateUtil.parse("2023-12-01");
+        //DateRange range = DateUtil.range(start, end, DateField.MONTH);
+        //List<String> stIds = new ArrayList<>();
+        //stIds.add("GJNY_SXGS_FSG_FDC_STA");
+        //stIds.add("GJNY_SXGS_JSL_FDC_STA");
+        //stIds.add("GJNY_SXGS_CSL_FDC_STA");
+        //stIds.add("GJNY_SXGS_ZZ_FDC_STA");
+        //stIds.add("GJNY_SXGS_XZ_FDC_STA");
+        //stIds.add("GJNY_SXGS_LJS_FDC_STA");
+        //for (DateTime date : range) {
+        //    //            task.calcTurbineStateMin(date);
+        //    task.predictExaminBc(stIds, date);
+        //}
+        ////        task.calcGlqxnhSurplus(start, end);
 
     }
 
@@ -333,8 +352,8 @@ public class NewTests {
     public void test10() {
         //        DateTime date = DateUtil.date();
         // 创建日期范围生成器
-        DateTime start = DateUtil.parse("2025-01-02");
-        DateTime end = DateUtil.parse("2025-01-15");
+        DateTime start = DateUtil.parse("2025-01-13");
+        DateTime end = DateUtil.parse("2025-01-13");
         DateRange range = DateUtil.range(start, end, DateField.DAY_OF_YEAR);
         for (DateTime date : range) {
             //System.out.println(DateUtil.date() + "：" + date);
@@ -343,7 +362,7 @@ public class NewTests {
             //task.calcLineRfdl_ha(date);
             //
             ////上网购网厂用电量
-            //task.calcStationSwGwCyRdl_ha(date);
+            task.calcStationSwGwCyRdl_ha(date);
             ////计算综合厂用电量
             //task.calcStationZhcyRfDl(date);
             ////风机日环境温度
@@ -353,7 +372,8 @@ public class NewTests {
             //
             //task.calcLineSwGWCyDl(date);
             //
-            //task.calcTurbine5s2_ha(date);
+            task.calcTurbine5s2_ha(date);
+            //task.calcTurbineLyxs(date.toJdkDate());
             ////风机状态时间
             //task.calcTurbineStateMin(date);
             ////风机日切入
@@ -369,16 +389,29 @@ public class NewTests {
             //task.calcTurbineJfplFxYxfssBll(date);
             //task.calcTurbineLyxs(date);
             //task.calcMeterDlHdl(date);
-            //task.calcHaBbHz(date);
-            task.calcHaBbHzSs(date);
+            //DateTime t2 = DateUtil.offsetMinute(date,-1);
+            //DateTime t1 = DateUtil.beginOfDay(t2);
+            DateTime b1 = DateUtil.offsetDay(date, -1);
+            DateTime b2 = DateUtil.endOfDay(b1);
+            //task.calcTurbineRFDL(t1, t2);
+            task.calcHaBbHz(date);
+            task.calcHaBbHzSs(b1, b2);
+            //task.calcRYNxdl(b, date);
+
+            //task.calcTurbineStateMin(date);
         }
+        //Date date = DateUtil.date();
     }
 
     @Test
     public void test11() {
         while (true) {
-            task.calcRealtimeTurbineZt();
-            ThreadUtil.sleep(100000);
+            try {
+                task.calcRealtimeTurbineZt();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            ThreadUtil.sleep(1000);
         }
     }
 
@@ -393,13 +426,39 @@ public class NewTests {
     public void test13() {
         DateTime end = DateUtil.date();
         DateTime begin = DateUtil.beginOfDay(end);
-        task.calcTurbineRFDL(begin, end);
-        task.calcTurbineStateMin(begin, end);
+        DateTime date = DateUtil.date();
+        DateTime yesterday = DateUtil.yesterday();
+        //DateTime begin = DateUtil.beginOfDay(end);
+        //task.calcTurbineRFDL(begin, end);
+        //task.calcTurbineStateMin(begin, end);
         task.calcTurbine5s(begin, end, 0.1);
-        task.calcTurbineLyxs(begin);
-        task.calcStationCftfsfxQfxdl(begin, end);
-        task.calcTurbineJfplFxYxfssBll(begin, end);
+        //task.calcTurbineLyxs(begin);
+        //task.calcStationCftfsfxQfxdl(begin, end);
+        //task.calcTurbineJfplFxYxfssBll(begin, end);
+
+        //DateTime end = DateUtil.beginOfDay(DateUtil.date());
+        //DateTime begin = DateUtil.offsetDay(end, -1);
+        //DateTime begin = DateUtil.beginOfDay(yesterday);
+        //DateTime end = DateUtil.endOfDay(yesterday);
+
+        //task.calcMtMonth(end);
+        //task.calcHaBbHzSs(begin, end);
+        //task.calcRYNxdl(begin, end);
+        //task.calcTurbineRFDL(begin, end);
     }
+
+    @Test
+    public void test15() {
+        DateTime begin = DateUtil.parse("2025-01-01");
+        DateTime end = DateUtil.parse("2025-01-19");
+        DateRange range = DateUtil.range(begin, end, DateField.DAY_OF_YEAR);
+        for (DateTime begin1 : range) {
+            DateTime end1 = DateUtil.endOfDay(begin1);
+            //task.calcTurbineLyxs(begin1, 10);
+            task.calcRYNxdl(begin1, end1);
+        }
+    }
+
     @Test
     public void test14() {
         DateTime start = DateUtil.parse("2025-01-01");
@@ -413,4 +472,28 @@ public class NewTests {
             System.out.println(sidR.get(0).getRfdlFj());
         }
     }
+
+    @Test
+    public void test16() {
+        SwingUtilities.invokeLater(() -> {
+
+        });
+        XYSeries seriesAgc = new XYSeries("AGC");
+        seriesAgc.add(1.0, 10.0);
+        seriesAgc.add(2.0, 15.0);
+        seriesAgc.add(3.0, 13.0);
+        XYSeries seriesZs = new XYSeries("自算功率");
+        seriesZs.add(1.0, 10.0);
+        seriesZs.add(2.0, 15.0);
+        seriesZs.add(3.0, 13.0);
+        XYSeries seriesCx = new XYSeries("出线功率");
+        seriesCx.add(1.0, 10.0);
+        seriesCx.add(2.0, 15.0);
+        seriesCx.add(3.0, 13.0);
+        TimeSeriesChart example = new TimeSeriesChart("分析限电", seriesAgc, seriesZs, seriesCx);
+        example.setSize(1280, 600);
+        example.setLocationRelativeTo(null);
+        example.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        example.setVisible(true);
+    }
 }

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/StationInfoMonth.java

@@ -0,0 +1,35 @@
+package com.ruoyi.ucp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author gfhd
+ * @since 2024-03-05
+ */
+@Data
+@TableName("station_info_month")
+public class StationInfoMonth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String stationId;
+
+    private Date recordDate;
+
+    private Double mtbf;
+
+    private Double mttr;
+}

universal-computing-platform/src/main/java/com/ruoyi/ucp/mapper/StationInfoMonthMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.ucp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.ucp.entity.StationInfoMonth;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author gfhd
+ * @since 2024-03-05
+ */
+public interface StationInfoMonthMapper extends BaseMapper<StationInfoMonth> {
+
+}

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/IStationInfoMonthService.java

@@ -0,0 +1,23 @@
+package com.ruoyi.ucp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.ucp.entity.PointInfo;
+import com.ruoyi.ucp.entity.StationInfoMonth;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author gfhd
+ * @since 2024-03-05
+ */
+public interface IStationInfoMonthService extends IService<StationInfoMonth> {
+    List<StationInfoMonth> getInfoByDate(Date date);
+    List<StationInfoMonth> getInfoByDate(Date date, List<PointInfo> entity);
+    Map<String, StationInfoMonth> getInfoByDateMap(Date date, List<PointInfo> entity);
+}

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/StationInfoMonthServiceImpl.java

@@ -0,0 +1,67 @@
+package com.ruoyi.ucp.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.ucp.entity.PointInfo;
+import com.ruoyi.ucp.entity.StationInfoMonth;
+import com.ruoyi.ucp.mapper.StationInfoMonthMapper;
+import com.ruoyi.ucp.service.IStationInfoMonthService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author gfhd
+ * @since 2024-03-05
+ */
+@Service
+@DataSource(DataSourceType.SLAVE)
+public class StationInfoMonthServiceImpl extends ServiceImpl<StationInfoMonthMapper, StationInfoMonth> implements IStationInfoMonthService {
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<StationInfoMonth> entityList) {
+        return super.saveOrUpdateBatch(entityList);
+    }
+
+    @Override
+    public List<StationInfoMonth> list(Wrapper<StationInfoMonth> queryWrapper) {
+        return super.list(queryWrapper);
+    }
+
+    public List<StationInfoMonth> getInfoByDate(Date date) {
+        QueryWrapper<StationInfoMonth> wrapper = new QueryWrapper<>();
+        wrapper.eq("record_date", date);
+        return super.list(wrapper);
+    }
+
+    public List<StationInfoMonth> getInfoByDate(Date date, List<PointInfo> entity) {
+        List<StationInfoMonth> list = getInfoByDate(date);
+        if (CollUtil.isEmpty(list)) {
+            entity.forEach(pi -> {
+                StationInfoMonth day = new StationInfoMonth();
+                day.setStationId(pi.getStationId());
+                day.setRecordDate(date);
+                list.add(day);
+            });
+        }
+        return list;
+    }
+
+    public Map<String, StationInfoMonth> getInfoByDateMap(Date date, List<PointInfo> entity) {
+        List<StationInfoMonth> list = getInfoByDate(date, entity);
+        return list.stream().collect(Collectors.toMap(StationInfoMonth::getStationId, Function.identity()));
+    }
+}

universal-computing-platform/src/main/java/com/ruoyi/ucp/util/TimeSeriesChart.java

@@ -0,0 +1,97 @@
+package com.ruoyi.ucp.util;
+
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.StandardChartTheme;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYSeriesCollection;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class TimeSeriesChart extends JFrame {
+    private XYSeriesCollection dataset;
+
+    public TimeSeriesChart(String title, XYSeries... series) {
+        super(title);
+        // 将XYSeries添加到XYSeriesCollection中
+        dataset = new XYSeriesCollection();
+        for (XYSeries xySeries : series) {
+            dataset.addSeries(xySeries);
+        }
+        //创建主题样式
+        StandardChartTheme standardChartTheme = new StandardChartTheme("CN");
+        //设置标题字体
+        standardChartTheme.setExtraLargeFont(new Font("隶书", Font.BOLD, 20));
+        //设置图例的字体
+        standardChartTheme.setRegularFont(new Font("宋书", Font.PLAIN, 15));
+        //设置轴向的字体
+        standardChartTheme.setLargeFont(new Font("宋书", Font.PLAIN, 15));
+        //应用主题样式
+        ChartFactory.setChartTheme(standardChartTheme);
+        // 创建图表
+        JFreeChart chart = ChartFactory.createXYLineChart(
+                "功率曲线",
+                "时间", // X轴标签
+                "功率", // Y轴标签
+                dataset,
+                PlotOrientation.VERTICAL,
+                true, true, true // 显示图例、工具提示、URL生成
+        );
+        //chart.getTitle().setFont(new Font("微软雅黑", Font.PLAIN, 16));
+        //XYPlot plot = chart.getXYPlot();
+        //plot.getDomainAxis().setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
+        //plot.getRangeAxis().setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
+        //XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer();
+        //renderer.setSeriesShapesVisible(0, false);
+        //plot.setRenderer(renderer);
+        //plot.getDomainAxis().setTickLabelFont(new Font("微软雅黑", Font.PLAIN, 10));
+        //plot.getRangeAxis().setTickLabelFont(new Font("微软雅黑", Font.PLAIN, 10));
+        // 将图表放入面板中
+        ChartPanel chartPanel = new ChartPanel(chart);
+        chartPanel.setPreferredSize(new Dimension(1920, 900));
+        setContentPane(chartPanel);
+    }
+
+    public TimeSeriesChart(String title) {
+        super(title);
+        //创建主题样式
+        StandardChartTheme standardChartTheme = new StandardChartTheme("CN");
+        //设置标题字体
+        standardChartTheme.setExtraLargeFont(new Font("隶书", Font.BOLD, 20));
+        //设置图例的字体
+        standardChartTheme.setRegularFont(new Font("宋书", Font.PLAIN, 15));
+        //设置轴向的字体
+        standardChartTheme.setLargeFont(new Font("宋书", Font.PLAIN, 15));
+        //应用主题样式
+        ChartFactory.setChartTheme(standardChartTheme);
+    }
+
+    public void add(XYSeries series) {
+        // 将XYSeries添加到XYSeriesCollection中
+        if (dataset == null) dataset = new XYSeriesCollection();
+        dataset.addSeries(series);
+    }
+    public void create(){
+        // 创建图表
+        JFreeChart chart = ChartFactory.createXYLineChart(
+                "功率曲线",
+                "时间", // X轴标签
+                "功率", // Y轴标签
+                dataset,
+                PlotOrientation.VERTICAL,
+                true, true, true // 显示图例、工具提示、URL生成
+        );
+        // 将图表放入面板中
+        ChartPanel chartPanel = new ChartPanel(chart);
+        chartPanel.setPreferredSize(new Dimension(1920, 900));
+        setContentPane(chartPanel);
+
+        setSize(1920, 900);
+        setLocationRelativeTo(null);
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        setVisible(true);
+    }
+}