【NEW】增加接口

railway-admin/src/main/resources/application-dev.yml

@@ -3,11 +3,9 @@ railway:
   # 名称
   name: Railway
   # 版本
-  version: 1.0.0
+  version: 2.0.0
   # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
+  copyrightYear: 2023
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

railway-admin/src/main/resources/application-local.yml

@@ -3,11 +3,9 @@ railway:
   # 名称
   name: Railway
   # 版本
-  version: 1.0.0
+  version: 2.0.0
   # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
+  copyrightYear: 2023
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

railway-admin/src/main/resources/application-prod.yml

@@ -3,11 +3,9 @@ railway:
   # 名称
   name: Railway
   # 版本
-  version: 1.0.0
+  version: 2.0.0
   # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
+  copyrightYear: 2023
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

railway-business/src/main/java/com/railway/business/bi/controller/ChartController.java

@@ -47,6 +47,15 @@ public class ChartController extends BaseController {
     return ajax;
   }
 
+  @ApiOperation(value = "检修本月兑现情况", notes = "获取检修本月兑现情况图表数据")
+  @GetMapping("/jxdxqkby")
+  public AjaxResult getChartJxdxqkby() {
+    ChartVO info = chartService.getChartJxdxqkby();
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
   @ApiOperation(value = "试验计划兑现情况", notes = "获取试验计划兑现情况图表数据")
   @GetMapping("/syjhdxqk")
   public AjaxResult getChartSyjhdxqk() {
@@ -92,6 +101,33 @@ public class ChartController extends BaseController {
     return ajax;
   }
 
+  @ApiOperation(value = "电力远动调试本月兑现情况", notes = "获取电力远动调试本月兑现情况图表数据")
+  @GetMapping("/dlydtsby")
+  public AjaxResult getChartDlydtsby() {
+    ChartVO info = chartService.getChartDlydtsby();
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "电力受电线路本月兑现情况", notes = "获取电力受电线路本月兑现情况图表数据")
+  @GetMapping("/dlsdxlby")
+  public AjaxResult getChartDlsdxlby() {
+    ChartVO info = chartService.getChartDlsdxlby();
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "电力变配电所本月兑现情况", notes = "获取电力变配电所本月兑现情况图表数据")
+  @GetMapping("/dlbpdsby")
+  public AjaxResult getChartDlbpdsby() {
+    ChartVO info = chartService.getChartDlbpdsby();
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
   @ApiOperation(value = "牵变、电力设备巡检兑现（本月）", notes = "获取牵变、电力设备巡检兑现（本月）图表数据")
   @GetMapping("/qbdlsbxjdx")
   public AjaxResult getChartQbdlsbxjdx() {

railway-business/src/main/java/com/railway/business/bi/service/IChartService.java

@@ -24,6 +24,12 @@ public interface IChartService {
      */
     ChartVO getChartJxdxqk();
 
+    /**
+     * 获取检修本月兑现情况图表数据
+     * @return 图表数据对象
+     */
+    ChartVO getChartJxdxqkby();
+
     /**
      * 获取试验计划兑现情况图表数据
      * @return 图表数据对象
@@ -54,6 +60,24 @@ public interface IChartService {
      */
     ChartVO getChartDlbpds();
 
+    /**
+     * 获取电力远动调试本月兑现情况图表数据
+     * @return 图表数据对象
+     */
+    ChartVO getChartDlydtsby();
+
+    /**
+     * 获取电力受电线路本月兑现情况图表数据
+     * @return 图表数据对象
+     */
+    ChartVO getChartDlsdxlby();
+
+    /**
+     * 获取电力变配电所本月兑现情况图表数据
+     * @return 图表数据对象
+     */
+    ChartVO getChartDlbpdsby();
+
     /**
      * 获取牵变、电力设备巡检兑现（本月）图表数据
      * @return 图表数据对象

railway-business/src/main/java/com/railway/business/bi/service/impl/ChartServiceImpl.java

@@ -59,8 +59,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartJxdxqk() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("检修兑现情况");
+        String [] xAxis = new String[]{"检修兑现情况"};
 
         List<Integer> jhData = new ArrayList<>();
         jhData.add(31);
@@ -77,6 +76,30 @@ public class ChartServiceImpl implements IChartService {
         return createChartVO(xAxis, series, name);
     }
 
+    /**
+     * 获取检修本月兑现情况图表数据
+     *
+     * @return 图表数据对象
+     */
+    @Override
+    public ChartVO getChartJxdxqkby() {
+        String [] xAxis = new String[]{"检修本月兑现情况"};
+
+        List<Integer> jhData = new ArrayList<>();
+        jhData.add(7);
+        List<Integer> wcData = new ArrayList<>();
+        wcData.add(4);
+
+        List<SeriesDTO> series = new ArrayList<>();
+        SeriesDTO jh = createSeriesDTO(xAxis, jhData, "检修");
+        SeriesDTO wc = createSeriesDTO(xAxis, wcData, "剩余");
+        series.add(jh);
+        series.add(wc);
+
+        String name = "检修本月兑现情况";
+        return createChartVO(xAxis, series, name);
+    }
+
     /**
      * 获取试验计划兑现情况图表数据
      *
@@ -84,11 +107,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartSyjhdxqk() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("一季度");
-        xAxis.add("二季度");
-        xAxis.add("三季度");
-        xAxis.add("四季度");
+        List<String> xAxis = createYearAxis();
 
         List<Integer> kgfhjhData = new ArrayList<>();
         kgfhjhData.add(145);
@@ -135,8 +154,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartSyjhbydxqk() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("本月");
+        String [] xAxis = new String[]{"本月"};
 
         List<Integer> kgfhbyjhData = new ArrayList<>();
         kgfhbyjhData.add(142);
@@ -188,11 +206,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartDlydts() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("一季度");
-        xAxis.add("二季度");
-        xAxis.add("三季度");
-        xAxis.add("四季度");
+        List<String> xAxis = createYearAxis();
 
         List<Integer> jhData = new ArrayList<>();
         jhData.add(12);
@@ -223,11 +237,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartDlsdxl() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("一季度");
-        xAxis.add("二季度");
-        xAxis.add("三季度");
-        xAxis.add("四季度");
+        List<String> xAxis = createYearAxis();
 
         List<Integer> jhData = new ArrayList<>();
         jhData.add(9);
@@ -258,11 +268,7 @@ public class ChartServiceImpl implements IChartService {
      */
     @Override
     public ChartVO getChartDlbpds() {
-        List<String> xAxis = new ArrayList<>();
-        xAxis.add("一季度");
-        xAxis.add("二季度");
-        xAxis.add("三季度");
-        xAxis.add("四季度");
+        List<String> xAxis = createYearAxis();
 
         List<Integer> jhData = new ArrayList<>();
         jhData.add(6);
@@ -286,6 +292,81 @@ public class ChartServiceImpl implements IChartService {
         return createChartVO(xAxis, series, name);
     }
 
+    /**
+     * 获取电力远动调试本月兑现情况图表数据
+     *
+     * @return 图表数据对象
+     */
+    @Override
+    public ChartVO getChartDlydtsby() {
+        String [] xAxis = new String[]{"远动调试"};
+
+        List<Integer> jhData = new ArrayList<>();
+        jhData.add(12);
+
+        List<Integer> wcData = new ArrayList<>();
+        wcData.add(4);
+
+        List<SeriesDTO> series = new ArrayList<>();
+        SeriesDTO jh = createSeriesDTO(xAxis, jhData, "本月计划");
+        SeriesDTO wc = createSeriesDTO(xAxis, wcData, "本月完成");
+        series.add(jh);
+        series.add(wc);
+
+        String name = "电力远动调试";
+        return createChartVO(xAxis, series, name);
+    }
+
+    /**
+     * 获取电力受电线路本月兑现情况图表数据
+     *
+     * @return 图表数据对象
+     */
+    @Override
+    public ChartVO getChartDlsdxlby() {
+        String [] xAxis = new String[]{"电力受电线路"};
+
+        List<Integer> jhData = new ArrayList<>();
+        jhData.add(7);
+
+        List<Integer> wcData = new ArrayList<>();
+        wcData.add(0);
+
+        List<SeriesDTO> series = new ArrayList<>();
+        SeriesDTO jh = createSeriesDTO(xAxis, jhData, "本月计划");
+        SeriesDTO wc = createSeriesDTO(xAxis, wcData, "本月完成");
+        series.add(jh);
+        series.add(wc);
+
+        String name = "电力受电线路";
+        return createChartVO(xAxis, series, name);
+    }
+
+    /**
+     * 获取电力变配电所本月兑现情况图表数据
+     *
+     * @return 图表数据对象
+     */
+    @Override
+    public ChartVO getChartDlbpdsby() {
+        String [] xAxis = new String[]{"电力变配电所"};
+
+        List<Integer> jhData = new ArrayList<>();
+        jhData.add(4);
+
+        List<Integer> wcData = new ArrayList<>();
+        wcData.add(0);
+
+        List<SeriesDTO> series = new ArrayList<>();
+        SeriesDTO jh = createSeriesDTO(xAxis, jhData, "本月计划");
+        SeriesDTO wc = createSeriesDTO(xAxis, wcData, "本月完成");
+        series.add(jh);
+        series.add(wc);
+
+        String name = "电力变配电所";
+        return createChartVO(xAxis, series, name);
+    }
+
     /**
      * 获取牵变、电力设备巡检兑现（本月）图表数据
      *
@@ -324,8 +405,26 @@ public class ChartServiceImpl implements IChartService {
         return createChartVO(xAxis, series, name);
     }
 
+    private List<String> createYearAxis(){
+        List<String> xAxis = new ArrayList<>();
+        xAxis.add("一季度");
+        xAxis.add("二季度");
+        xAxis.add("三季度");
+        xAxis.add("四季度");
+        return xAxis;
+    }
+
     private SeriesDTO createSeriesDTO(List<String> xAxis, List<Integer> data, String name){
         int size = xAxis.size();
+        return createSeriesDTO(data, name, size);
+    }
+
+    private SeriesDTO createSeriesDTO(String [] xAxisArray, List<Integer> data, String name){
+        int size = xAxisArray.length;
+        return createSeriesDTO(data, name, size);
+    }
+
+    private SeriesDTO createSeriesDTO(List<Integer> data, String name, int size){
         SeriesDTO dto = new SeriesDTO();
         dto.setData(data.toArray(new Integer[size]));
         dto.setName(name);
@@ -333,9 +432,13 @@ public class ChartServiceImpl implements IChartService {
     }
 
     private ChartVO createChartVO(List<String> xAxis, List<SeriesDTO> series, String name){
-        ChartVO chart = new ChartVO();
         String[] xAxisArray = new String[xAxis.size()];
         xAxis.toArray(xAxisArray);
+        return createChartVO(xAxisArray, series, name);
+    }
+
+    private ChartVO createChartVO(String [] xAxisArray, List<SeriesDTO> series, String name){
+        ChartVO chart = new ChartVO();
         chart.setXAxis(xAxisArray);
 
         SeriesDTO[] seriesArray = new SeriesDTO[series.size()];

railway-common/src/main/java/com/railway/common/config/RailwayConfig.java

@@ -29,11 +29,6 @@ public class RailwayConfig {
    */
   private String copyrightYear;
 
-  /**
-   * 实例演示开关
-   */
-  private boolean demoEnabled;
-
   private static String filePath;
 
   /**