增加首页、线路信息、负荷接入分析后台接口；数据类部分调用修改

jinyun/availCap/src/main/java/com/jinyun/cap/AvailCapMain.java

@@ -550,7 +550,7 @@ public class AvailCapMain {
                 // loadPosSeason为负荷接入分析结果列表，属性substation;feederName;canIn;tfName;phase;time对应界面表格的
                 // loadPosSeason为负荷接入分析结果列表，属性substation;feederName;canIn;tfName;phase;time对应界面表格的
                 // 变电站、线路名称、能否接入、接入点、接入相别、分析时间
                 // 变电站、线路名称、能否接入、接入点、接入相别、分析时间
                 SqliteDb sqliteDb = new SqliteDb(args[1]);
                 SqliteDb sqliteDb = new SqliteDb(args[1]);
-                List<LoadPosSeason> loadPosSeason = sqliteDb.queryLoadPosSeason(loadPosTable, 1);
+                List<LoadPosSeason> loadPosSeason = sqliteDb.queryLoadPosSeason(loadPosTable, 1,-1,-1);
                 System.out.println(loadPosSeason.size());
                 System.out.println(loadPosSeason.size());
                 break;
                 break;
             }
             }

jinyun/availCap/src/main/java/com/jinyun/cap/SqliteDb.java

@@ -1293,17 +1293,52 @@ public class SqliteDb {
         return tfOverLoadRates;
         return tfOverLoadRates;
     }
     }
 
 
+
+    /**
+     * 按季节查询负荷接入分析结果总数
+     * @param tableName 表名
+     * @param season 季节
+     * @return
+     */
+    public int queryLoadPosSeasonCount(String tableName, int season) {
+        Connection conn = createConn();
+        String sql;
+        sql = "select count(*) from " + tableName + " where season=" + season;
+        Statement stmt = null;
+        ResultSet rs = null;
+        int count = 0;
+        try {
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql);
+            rs.next();
+            count = rs.getInt(1);
+        } catch (SQLException e) {
+            System.out.println(e.getMessage());
+            e.printStackTrace();
+        } finally {
+            try {
+                rs.close();
+                stmt.close();
+            } catch (SQLException e) {
+            }
+        }
+        return count;
+    }
+
     /**
     /**
      * 按季节查询负荷接入分析结果总表
      * 按季节查询负荷接入分析结果总表
      * @param tableName 表名
      * @param tableName 表名
      * @param season 季节
      * @param season 季节
      * @return
      * @return
      */
      */
-    public List<LoadPosSeason> queryLoadPosSeason(String tableName, int season) {
+    public List<LoadPosSeason> queryLoadPosSeason(String tableName, int season,int page,int rows) {
         List<LoadPosSeason> loadPosSeasons = new LinkedList<>();
         List<LoadPosSeason> loadPosSeasons = new LinkedList<>();
         Connection conn = createConn();
         Connection conn = createConn();
         String sql;
         String sql;
         sql = "select * from " + tableName + " where season=" + season;
         sql = "select * from " + tableName + " where season=" + season;
+        if(page>0 && rows>0){
+            sql +=" limit " + (page-1)*rows + "," + rows;
+        }
         Statement stmt = null;
         Statement stmt = null;
         ResultSet rs = null;
         ResultSet rs = null;
         try {
         try {

jinyun/web/src/main/java/com/jinyun/web/controller/DataImportController.java

@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 @Api(value = "desc of class", tags="DataImport",description = "数据导入")
 @Api(value = "desc of class", tags="DataImport",description = "数据导入")
-@RestController
+//@RestController
 @RequestMapping("import")
 @RequestMapping("import")
 public class DataImportController {
 public class DataImportController {
     @Autowired
     @Autowired

jinyun/web/src/main/java/com/jinyun/web/controller/LoadPosController.java

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -21,30 +23,62 @@ public class LoadPosController {
     @Autowired
     @Autowired
     CapService capService;
     CapService capService;
 
 
-    @ApiOperation(value = "接入分析", notes = "")
+    @ApiOperation(value = "分析结果列表", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "页码", dataType = "int", paramType = "query",required = true),
+            @ApiImplicitParam(name = "rows", value = "行数", dataType = "int", paramType = "query",required = true),
+    })
     @RequestMapping(value = "/loadPosList",method = RequestMethod.GET)
     @RequestMapping(value = "/loadPosList",method = RequestMethod.GET)
-    public Object loadPosSeason() {
-        List result = capService.loadPosList();
+    public Object loadPosSeason(@RequestParam("page") int page,@RequestParam("rows") int rows) {
+        int total = capService.loadPosListCout();
+        List loadPosList = new ArrayList();
+        if(total>0){
+            loadPosList = capService.loadPosList(page,rows);
+        }
+        Map<String,Object> result = new HashMap<>();
+        result.put("total",total);
+        result.put("rows",loadPosList);
+        return result;
+    }
+
+    @ApiOperation(value = "线路名称列表", notes = "")
+    @RequestMapping(value = "/lineNameList",method = RequestMethod.GET)
+    public Object lineNameList() {
+        List result = capService.lineNameList();
         return result;
         return result;
     }
     }
 
 
+    @ApiOperation(value = "负荷接入分析", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lineName", value = "线路名称", dataType = "string", paramType = "query",required = true),
+            @ApiImplicitParam(name = "cap", value = "负荷容量", dataType = "int", paramType = "query",required = true),
+            @ApiImplicitParam(name = "type", value = "负荷特征(1为峰用电，2为谷用电，3为峰谷用电)", dataType = "int", paramType = "query",required = true),
+    })
+    @RequestMapping(value = "/loadPosAnalysis",method = RequestMethod.GET)
+    public Object loadPosAnalysis(@RequestParam("lineName") String lineName,@RequestParam("cap") int cap,@RequestParam("type") int type) {
+        Object result = capService.loadPosAnalysis(lineName, cap, type);
+        if(result != null)
+            return "分析完成";
+        else return "分析失败";
+    }
+
     @ApiOperation(value = "高压负荷接入分析结果", notes = "")
     @ApiOperation(value = "高压负荷接入分析结果", notes = "")
     @ApiImplicitParams({
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mRID", value = "负荷ID", dataType = "string", paramType = "query",required = true),
+            @ApiImplicitParam(name = "loadId", value = "负荷ID", dataType = "string", paramType = "query",required = true),
     })
     })
     @RequestMapping(value = "/loadPosSw",method = RequestMethod.GET)
     @RequestMapping(value = "/loadPosSw",method = RequestMethod.GET)
-    public Object loadPosSw(@RequestParam("mRID") String mRID) {
-        Object result = capService.loadPosSw(mRID);
+    public Object loadPosSw(@RequestParam("loadId") String loadId) {
+        Object result = capService.loadPosSw(loadId);
         return result;
         return result;
     }
     }
 
 
     @ApiOperation(value = "低压负荷接入分析结果", notes = "")
     @ApiOperation(value = "低压负荷接入分析结果", notes = "")
     @ApiImplicitParams({
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mRID", value = "负荷ID", dataType = "string", paramType = "query",required = true),
+            @ApiImplicitParam(name = "loadId", value = "负荷ID", dataType = "string", paramType = "query",required = true),
     })
     })
     @RequestMapping(value = "/loadPosTf",method = RequestMethod.GET)
     @RequestMapping(value = "/loadPosTf",method = RequestMethod.GET)
-    public Object loadPosTf(@RequestParam("mRID") String mRID) {
-        Object result = capService.loadPosTf(mRID);
+    public Object loadPosTf(@RequestParam("loadId") String loadId) {
+        Object result = capService.loadPosTf(loadId);
         return result;
         return result;
     }
     }
 }
 }

jinyun/web/src/main/java/com/jinyun/web/controller/LowMarginWarnController.java

+package com.jinyun.web.controller;
+
+import com.jinyun.web.service.CapService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(value = "desc of class", tags="LowMarginWarn",description = "低裕度预警分析")
+@RestController
+@RequestMapping("lowMarginWarn")
+public class LowMarginWarnController {
+    @Autowired
+    CapService capService;
+
+    @ApiOperation(value = "lowMarginAnalysis", notes = "")
+    @RequestMapping(value = "/lowMarginAnalysis",method = RequestMethod.GET)
+    public Object lowMarginAnalysis() {
+        Map<String, Object> result = capService.lowMarginAnalysis();
+        return result;
+    }
+
+}

jinyun/web/src/main/java/com/jinyun/web/controller/MainPageController.java

@@ -69,7 +69,7 @@ public class MainPageController {
     @ApiOperation(value = "配变三相不平衡度列表", notes = "")
     @ApiOperation(value = "配变三相不平衡度列表", notes = "")
     @RequestMapping(value = "/transformerUnbalanceList",method = RequestMethod.GET)
     @RequestMapping(value = "/transformerUnbalanceList",method = RequestMethod.GET)
     public Object transformerUnbalanceList() {
     public Object transformerUnbalanceList() {
-        Map<String,Object> result = capService.transformerUnbalanceList();
+        List result = capService.transformerUnbalanceList();
         return result;
         return result;
     }
     }
 
 
@@ -90,7 +90,7 @@ public class MainPageController {
     @ApiOperation(value = "线路可开放容量大小", notes = "")
     @ApiOperation(value = "线路可开放容量大小", notes = "")
     @RequestMapping(value = "/maxMinAvailCap",method = RequestMethod.GET)
     @RequestMapping(value = "/maxMinAvailCap",method = RequestMethod.GET)
     public Object maxMinAvailCap() {
     public Object maxMinAvailCap() {
-        List result = capService.maxMinAvailCap();
+        Map<String, Object> result = capService.maxMinAvailCap();
         return result;
         return result;
     }
     }
 }
 }

jinyun/web/src/main/java/com/jinyun/web/entity/LinePassRateWeb.java

+package com.jinyun.web.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LinePassRateWeb {
+    String feederName;
+    String substation;
+    double springRate;
+    double summerRate;
+    double autumnRate;
+    double winterRate;
+}

jinyun/web/src/main/java/com/jinyun/web/entity/TfOverLoadRateWeb.java

+package com.jinyun.web.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TfOverLoadRateWeb {
+    String feederName;
+    String devName;
+    String mRID;
+    String lineName;
+    String lineMRID;
+    String substation;
+    double springRate;
+    double summerRate;
+    double autumnRate;
+    double winterRate;
+}

jinyun/web/src/main/resources/application.yaml

 server:
 server:
-  port: 6112
+  port: 8080
 spring:
 spring:
   datasource:
   datasource:
     driverClassName: org.sqlite.JDBC
     driverClassName: org.sqlite.JDBC