后台监视系统功能修正

web/monitor-web-hb/pom.xml

@@ -363,11 +363,31 @@
             <version>8.18.0</version>
         </dependency>
         <!--http请求-->
+        <!--sentinel数据持久化-->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+        </dependency>
 
+        <!--sentinel-datasource-extension数据源扩展-->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-extension</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.18.Final</version>
+        </dependency>
+        <!--spring-cloud-starter-alibaba-sentinel-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -394,6 +414,10 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+
+
+
         </dependencies>
     </dependencyManagement>
 

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/benchmarking/BenchmarkingController.java

@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -66,14 +63,14 @@ public class BenchmarkingController {
 
     }
     /**按页查询等级评估日所有信息**/
-    @GetMapping("/gadaylistByPage")
+    @PostMapping("/gadaylistByPage")
     @ResponseBody
     @ApiOperation(value = "按页查询等级评估日所有信息", notes = "按页查询等级评估日所有信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult gadaylistByPage(Tablepar tablepar,String wpId, String recorddate) {
+    public AjaxResult gadaylistByPage(@RequestBody Tablepar tablepar, String wpId, String recorddate) {
 
         Date tempDate=null;
         if (StringUtils.isNotEmpty(recorddate))
@@ -87,7 +84,7 @@ public class BenchmarkingController {
 
     }
     /**按页查询等级评估月所有信息**/
-    @GetMapping("/gamonthlistByPage")
+    @PostMapping("/gamonthlistByPage")
     @ResponseBody
     @ApiOperation(value = "按页查询等级评估月所有信息", notes = "按页查询等级评估月所有信息")
     @ApiImplicitParams({
@@ -96,7 +93,7 @@ public class BenchmarkingController {
             @ApiImplicitParam(name = "year", value = "年", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult gamonthlistByPage(Tablepar tablepar,String wpId, String year,String month) {
+    public AjaxResult gamonthlistByPage(@RequestBody Tablepar tablepar,String wpId, String year,String month) {
 
 
         PageInfo<Windturbineinfodaytop2> ls=windturbineinfodaytop2Service.gamonthlistByPage(tablepar,wpId,year,month);
@@ -105,14 +102,14 @@ public class BenchmarkingController {
 
     }
     /**按页查询等级评估年所有信息**/
-    @GetMapping("/gayearlistByPage")
+    @PostMapping("/gayearlistByPage")
     @ResponseBody
     @ApiOperation(value = "按页查询等级评估年所有信息", notes = "按页查询等级评估年所有信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "year", value = "年", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult gayearlistByPage(Tablepar tablepar,String wpId, String year) {
+    public AjaxResult gayearlistByPage(@RequestBody Tablepar tablepar,String wpId, String year) {
 
 
         PageInfo<Windturbineinfodaytop2> ls=windturbineinfodaytop2Service.gayearlistByPage(tablepar,wpId,year);

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/contrast/ContrastController.java

@@ -45,11 +45,11 @@ public class ContrastController {
     /**
      * 查询性能对标列表
      **/
-    @GetMapping("/benchmarkLossList")
+    @PostMapping("/benchmarkLossList")
     @ResponseBody
     @ApiOperation(value = "查询性能对标列表", notes = "查询性能对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
@@ -80,11 +80,11 @@ public class ContrastController {
     /**
      * 查询场内对标列表信息
      **/
-    @GetMapping("/benchmarkWpList")
+    @PostMapping("/benchmarkWpList")
     @ResponseBody
     @ApiOperation(value = "查询场内对标列表", notes = "查询场内对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
@@ -114,11 +114,11 @@ public class ContrastController {
     /**
      * 查询场内风机列表信息
      **/
-    @GetMapping("/benchmarkWpInWtList")
+    @PostMapping("/benchmarkWpInWtList")
     @ResponseBody
     @ApiOperation(value = "查询场内对标风机对标列表", notes = "查询场内对标风机对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
@@ -149,11 +149,11 @@ public class ContrastController {
     /**
      * 查询场际对标列表信息
      **/
-    @GetMapping("/benchmarkWpOutList")
+    @PostMapping("/benchmarkWpOutList")
     @ResponseBody
     @ApiOperation(value = "查询场际对标列表", notes = "查询场际对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
@@ -229,11 +229,11 @@ public class ContrastController {
     /**
      * 查询项目对标列表信息
      **/
-    @GetMapping("/benchmarkPjList")
+    @PostMapping("/benchmarkPjList")
     @ResponseBody
     @ApiOperation(value = "查询项目对标列表", notes = "查询项目对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
@@ -293,11 +293,11 @@ public class ContrastController {
     /**
      * 查询线路对标列表信息
      **/
-    @GetMapping("/benchmarkLnList")
+    @PostMapping("/benchmarkLnList")
     @ResponseBody
     @ApiOperation(value = "查询线路对标列表", notes = "查询线路对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "lnId", value = "线路编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
@@ -356,11 +356,11 @@ public class ContrastController {
     /**
      * 查询风机列表信息
      **/
-    @GetMapping("/benchmarkWtList")
+    @PostMapping("/benchmarkWtList")
     @ResponseBody
     @ApiOperation(value = "查询风机对标列表", notes = "查询风机对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
@@ -391,11 +391,11 @@ public class ContrastController {
     /**
      * 新增值际对标
      **/
-    @GetMapping("/addBenchmarkZj")
+    @PostMapping("/addBenchmarkZj")
     @ResponseBody
     @ApiOperation(value = "新增值际对标", notes = "新增值际对标")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query"),
@@ -434,11 +434,11 @@ public class ContrastController {
     /**
      * 值际对标列表
      **/
-    @GetMapping("/benchmarkZjList")
+    @PostMapping("/benchmarkZjList")
     @ResponseBody
     @ApiOperation(value = "查询值际对标列表", notes = "查询值际对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")})
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query")})
 
     public AjaxResult benchmarkZjList(HttpServletRequest request,Tablepar tablepar) {
 
@@ -470,11 +470,11 @@ public class ContrastController {
     /**
      * 查询值际风机列表信息
      **/
-    @GetMapping("/benchmarkZjWtList")
+    @PostMapping("/benchmarkZjWtList")
     @ResponseBody
     @ApiOperation(value = "查询风机对标列表", notes = "查询风机对标列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "cid", value = "值际对标编号", required = true, dataType = "string", paramType = "query")})
 
     public AjaxResult benchmarkZjWtList(HttpServletRequest request,Tablepar tablepar, String cid) {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailLineChartController.java

@@ -20,10 +20,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -183,7 +180,7 @@ public class WindturbineDetailLineChartController {
     /*
      * 单台风机当日报警记录
      */
-    @GetMapping("/bjjllist")
+    @PostMapping("/bjjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日报警记录", notes = "单台风机当日报警记录")
     @ApiImplicitParams({
@@ -191,7 +188,7 @@ public class WindturbineDetailLineChartController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult bjjllist(Tablepar tablepar, String wtId, String recorddate) {
+    public AjaxResult bjjllist(@RequestBody Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<WarningRecords> resultList =new PageInfo<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
@@ -219,7 +216,7 @@ public class WindturbineDetailLineChartController {
     /*
      * 单台风机当日停机记录
      */
-    @GetMapping("/gzjllist")
+    @PostMapping("/gzjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日停机记录", notes = "单台风机当日停机记录")
     @ApiImplicitParams({
@@ -227,7 +224,7 @@ public class WindturbineDetailLineChartController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult gzjllist(Tablepar tablepar, String wtId, String recorddate) {
+    public AjaxResult gzjllist(@RequestBody Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<ShutdowneventVo> resultList =new PageInfo<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
@@ -255,7 +252,7 @@ public class WindturbineDetailLineChartController {
     /*
      * 单台风机当日限电记录
      */
-    @GetMapping("/xdjllist")
+    @PostMapping("/xdjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日限电记录", notes = "单台风机当日限电记录")
     @ApiImplicitParams({
@@ -263,7 +260,7 @@ public class WindturbineDetailLineChartController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult xdjllist(Tablepar tablepar, String wtId, String recorddate) {
+    public AjaxResult xdjllist(@RequestBody Tablepar tablepar, String wtId, String recorddate) {
 
         PageInfo<Brownoutsevent2> resultList = new PageInfo<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/goodness/WindturbineGoodnessDetailController.java

@@ -17,10 +17,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -151,7 +148,7 @@ public class WindturbineGoodnessDetailController {
     /*
      * 单台风机当月报警排行
      */
-    @GetMapping("/bjphlist")
+    @PostMapping("/bjphlist")
     @ResponseBody
     @ApiOperation(value = "单台风机当月报警排行", notes = "单台风机当月报警排行")
     @ApiImplicitParams({
@@ -159,7 +156,7 @@ public class WindturbineGoodnessDetailController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult bjphlist(Tablepar tablepar, String wtId, String recorddate) {
+    public AjaxResult bjphlist(@RequestBody Tablepar tablepar, String wtId, String recorddate) {
         List<SawVo> resultList =new ArrayList<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
         {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/goodness/WindturbinegoodnessController.java

@@ -15,8 +15,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -45,7 +45,7 @@ public class WindturbinegoodnessController {
      * @param recorddate
      * @return
      */
-    @GetMapping("/windturbinegoodness")
+    @PostMapping("/windturbinegoodness")
     @ResponseBody
     @ApiOperation(value = "获得单机性能总览列表信息", notes = "获得单机性能总览列表信息")
     @ApiImplicitParams({
@@ -53,7 +53,7 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult windturbinegoodness(Tablepar tablepar, String wpId, String recorddate) {
+    public AjaxResult windturbinegoodness(@RequestBody Tablepar tablepar, String wpId, String recorddate) {
 
         PageInfo<Windturbinegoodness> resultList = windturbinegoodnessService.windturbinegoodnessList(tablepar, wpId, recorddate);
         if (resultList != null) {
@@ -73,7 +73,7 @@ public class WindturbinegoodnessController {
      * @param endDate
      * @return
      */
-    @GetMapping("/goodhistorylist")
+    @PostMapping("/goodhistorylist")
     @ResponseBody
     @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
     @ApiImplicitParams({
@@ -82,7 +82,7 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult goodhistorylist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+    public AjaxResult goodhistorylist(@RequestBody Tablepar tablepar, String wtId, String beginDate, String endDate) {
         List<Windturbineanalysisday> resultList =new ArrayList<>();
         if(StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
         {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/health/EarlyWarnKnowledgeController.java

@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -28,7 +25,7 @@ public class EarlyWarnKnowledgeController {
     private Alertrule2ervice alertrule2ervice;
 
 
-    @GetMapping("/earlyWarnKnowledgeList")
+    @PostMapping("/earlyWarnKnowledgeList")
     @ResponseBody
     @ApiOperation(value = "预警知识列表", notes = "预警知识列表")
     @ApiImplicitParams({
@@ -36,7 +33,7 @@ public class EarlyWarnKnowledgeController {
             @ApiImplicitParam(name = "name", value = "预警名称", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "category", value = "预警类型", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "rank", value = "预警级别", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult earlyWarnKnowledgeList(Tablepar tablepar, String name, String category, String rank) {
+    public AjaxResult earlyWarnKnowledgeList(@RequestBody Tablepar tablepar, String name, String category, String rank) {
 
 
         PageInfo<Alertrule2> pageInfo = new PageInfo<>();

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/health/FaultKnowledgeController.java

@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -29,7 +26,7 @@ public class FaultKnowledgeController {
 
 
 
-    @GetMapping("/faultknowledgeList")
+    @PostMapping("/faultknowledgeList")
     @ResponseBody
     @ApiOperation(value = "故障知识列表", notes = "故障知识列表")
     @ApiImplicitParams({
@@ -37,7 +34,7 @@ public class FaultKnowledgeController {
             @ApiImplicitParam(name = "name", value = "故障名称", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "halttype", value = "停机类型", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "faultlevel", value = "故障级别", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult faultknowledgeList(Tablepar tablepar, String name, String halttype, String faultlevel) {
+    public AjaxResult faultknowledgeList(@RequestBody Tablepar tablepar, String name, String halttype, String faultlevel) {
 
 
         PageInfo<P3DeviceFault> pageInfo = new PageInfo<>();

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/health/WindTurbineCurveController.java

@@ -20,10 +20,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
@@ -45,7 +42,7 @@ public class WindTurbineCurveController {
 
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
     /**单机区间曲线偏差率**/
-    @GetMapping("/windTurbineCurveList")
+    @PostMapping("/windTurbineCurveList")
     @ResponseBody
     @ApiOperation(value = "单机区间曲线偏差率", notes = "单机区间曲线偏差率")
     @ApiImplicitParams({
@@ -53,7 +50,7 @@ public class WindTurbineCurveController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult windTurbineCurveList(Tablepar tablepar, String wpId, String recorddate) throws Exception {
+    public AjaxResult windTurbineCurveList(@RequestBody Tablepar tablepar, String wpId, String recorddate) throws Exception {
 
         List<QxpcVo> vos = new ArrayList<QxpcVo>();
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/leaderboard/LeaderboardController.java

@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -32,7 +29,7 @@ public class LeaderboardController {
     private LeaderboardService leaderboardService;
 
     /**查询拟合优度列表**/
-    @GetMapping("/fittingtoplist")
+    @PostMapping("/fittingtoplist")
     @ResponseBody
     @ApiOperation(value = "查询拟合优度列表", notes = "查询拟合优度列表")
     @ApiImplicitParams({
@@ -41,7 +38,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult fittingtoplist(Tablepar tablepar, String wpIps, String beginDate, String endDate) {
+    public AjaxResult fittingtoplist(@RequestBody Tablepar tablepar, String wpIps, String beginDate, String endDate) {
 
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -61,7 +58,7 @@ public class LeaderboardController {
             }
         }
 
-        if (tablepar.getOrderByColumn().equals("power")) {
+        if (StringUtils.notEmp(tablepar.getOrderByColumn()) &&  tablepar.getOrderByColumn().equals("power")) {
             if (tablepar.getIsAsc().equals("asc")) {
                 Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
                     public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
@@ -78,7 +75,7 @@ public class LeaderboardController {
 
                 });
             }
-        } else if (tablepar.getOrderByColumn().equals("speed")) {
+        } else if (StringUtils.notEmp(tablepar.getOrderByColumn()) &&  tablepar.getOrderByColumn().equals("speed")) {
             if (tablepar.getIsAsc().equals("asc")) {
                 Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
                     public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
@@ -139,7 +136,7 @@ public class LeaderboardController {
     }
 
     /**查询总发电量排行列表**/
-    @GetMapping("/totalPowerCapacityTopList")
+    @PostMapping("/totalPowerCapacityTopList")
     @ResponseBody
     @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
     @ApiImplicitParams({
@@ -148,7 +145,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult totalPowerCapacityTopList(Tablepar tablepar, String wpIps, String beginDate, String endDate) {
+    public AjaxResult totalPowerCapacityTopList(@RequestBody Tablepar tablepar, String wpIps, String beginDate, String endDate) {
 
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -163,7 +160,7 @@ public class LeaderboardController {
         List<StatisticalAnalysisTopVo> vos= leaderboardService.totalPowerCapacityTopList(wpIps, beginDate_d, endDate_d);
 
 
-        if (tablepar.getOrderByColumn().equals("power")) {
+        if (StringUtils.notEmp(tablepar.getOrderByColumn()) &&  tablepar.getOrderByColumn().equals("power")) {
             if (tablepar.getIsAsc().equals("asc")) {
                 Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
                     public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
@@ -180,7 +177,7 @@ public class LeaderboardController {
 
                 });
             }
-        } else if (tablepar.getOrderByColumn().equals("speed")) {
+        } else if (StringUtils.notEmp(tablepar.getOrderByColumn()) &&  tablepar.getOrderByColumn().equals("speed")) {
             if (tablepar.getIsAsc().equals("asc")) {
                 Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
                     public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
@@ -197,7 +194,7 @@ public class LeaderboardController {
 
                 });
             }
-        } else if (tablepar.getOrderByColumn().equals("generatingcapacity")) {
+        } else if (StringUtils.notEmp(tablepar.getOrderByColumn()) &&  tablepar.getOrderByColumn().equals("generatingcapacity")) {
             if (tablepar.getIsAsc().equals("asc")) {
                 Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
                     public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
@@ -226,7 +223,7 @@ public class LeaderboardController {
 
 
     /**查询利用率排行榜列表**/
-    @GetMapping("/utilizationList")
+    @PostMapping("/utilizationList")
     @ResponseBody
     @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
     @ApiImplicitParams({
@@ -236,7 +233,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult utilizationList(Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
+    public AjaxResult utilizationList(@RequestBody Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
 
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -261,7 +258,7 @@ public class LeaderboardController {
     }
 
     /**查询损失率排行榜列表**/
-    @GetMapping("/lossList")
+    @PostMapping("/lossList")
     @ResponseBody
     @ApiOperation(value = "查询损失率排行榜列表", notes = "查询损失率排行榜列表")
     @ApiImplicitParams({
@@ -271,7 +268,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult lossList(Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
+    public AjaxResult lossList(@RequestBody Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
 
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -295,7 +292,7 @@ public class LeaderboardController {
     }
 
     /**查询负荷率排行榜列表**/
-    @GetMapping("/loadfactortoplist")
+    @PostMapping("/loadfactortoplist")
     @ResponseBody
     @ApiOperation(value = "查询负荷率排行榜列表", notes = "查询负荷率排行榜列表")
     @ApiImplicitParams({
@@ -305,7 +302,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult loadfactortoplist(Tablepar tablepar,String type, String wpId, String beginDate, String endDate) {
+    public AjaxResult loadfactortoplist(@RequestBody Tablepar tablepar,String type, String wpId, String beginDate, String endDate) {
 
 
         Date beginDate_d=null;
@@ -383,7 +380,7 @@ public class LeaderboardController {
     }
 
     /**查询报警排行榜列表**/
-    @GetMapping("/querywarningStatistical")
+    @PostMapping("/querywarningStatistical")
     @ResponseBody
     @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
     @ApiImplicitParams({
@@ -392,7 +389,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult querywarningStatistical(Tablepar tablepar, String type, String beginDate, String endDate) {
+    public AjaxResult querywarningStatistical(@RequestBody Tablepar tablepar, String type, String beginDate, String endDate) {
 
         Date beginDate_d=null;
         Date endDate_d=null;
@@ -450,7 +447,7 @@ public class LeaderboardController {
     }
 /*******************************************************************************************************************************/
     /**查询日曲线偏差率列表**/
-    @GetMapping("/curvefittingmainList")
+    @PostMapping("/curvefittingmainList")
     @ResponseBody
     @ApiOperation(value = "查询日曲线偏差率列表", notes = "查询日曲线偏差率列表")
     @ApiImplicitParams({
@@ -458,7 +455,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult curvefittingmainList(Tablepar tablepar, String wpId, String recorddate) {
+    public AjaxResult curvefittingmainList(@RequestBody Tablepar tablepar, String wpId, String recorddate) {
         List<Curvefittingmain> vos=new ArrayList<>();
         if (StringUtils.isNotEmpty(recorddate))
         {
@@ -575,7 +572,7 @@ public class LeaderboardController {
 
     /*******************************************************************************************************************************/
     /**查询月曲线偏差率列表**/
-    @GetMapping("/curvefittingmonthmainList")
+    @PostMapping("/curvefittingmonthmainList")
     @ResponseBody
     @ApiOperation(value = "查询月曲线偏差率列表", notes = "查询月曲线偏差率列表")
     @ApiImplicitParams({
@@ -584,7 +581,7 @@ public class LeaderboardController {
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult curvefittingmonthmainList(Tablepar tablepar, String wpId, String year,String month) {
+    public AjaxResult curvefittingmonthmainList(@RequestBody Tablepar tablepar, String wpId, String year,String month) {
 
         List<Curvefittingmonthmain> vos= leaderboardService.curvefittingmonthmainList( tablepar, wpId, year, month);
 

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/outputspeed/OutputSpeedController.java

@@ -1,5 +1,6 @@
 package com.gyee.frame.controller.outputspeed;
 
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.auto.Inputoroutputspeedtotal;
@@ -12,15 +13,13 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 @Controller
 @RequestMapping("/outputspeed")
@@ -31,7 +30,7 @@ public class OutputSpeedController {
     private InputoroutputspeedtotalService inputoroutputspeedtotalService;
 
     /**切入切出列表**/
-    @GetMapping("/outputSpeedlist")
+    @PostMapping("/outputSpeedlist")
     @ResponseBody
     @ApiOperation(value = "切入切出列表", notes = "切入切出列表")
     @ApiImplicitParams({
@@ -39,9 +38,9 @@ public class OutputSpeedController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult outputSpeedlist(Tablepar tablepar, String wpId, String recorddate) {
+    public AjaxResult outputSpeedlist(@RequestBody Tablepar tablepar, String wpId, String recorddate) {
 
-        List<Inputoroutputspeedtotal> vos=new ArrayList<>();
+        PageInfo<Inputoroutputspeedtotal> vos=new PageInfo<Inputoroutputspeedtotal>();
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))
         {
             Date date=DateUtils.parseStrtoDate(recorddate);
@@ -57,7 +56,7 @@ public class OutputSpeedController {
     }
 
     /**切入切出历史列表**/
-    @GetMapping("/outputspeedhistorylist")
+    @PostMapping("/outputspeedhistorylist")
     @ResponseBody
     @ApiOperation(value = "切入切出历史列表", notes = "切入切出历史列表")
     @ApiImplicitParams({
@@ -67,9 +66,9 @@ public class OutputSpeedController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult outputspeedhistorylist(Tablepar tablepar, String wpId,String wtId, String beginDate,String endDate) {
+    public AjaxResult outputspeedhistorylist(@RequestBody Tablepar tablepar, String wpId,String wtId, String beginDate,String endDate) {
 
-        List<Inputoroutputspeedtotal> vos=new ArrayList<>();
+        PageInfo<Inputoroutputspeedtotal> vos=new PageInfo<Inputoroutputspeedtotal>();
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) &&  StringUtils.notEmp(endDate))
         {
 

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationAmonutController.java

@@ -34,12 +34,12 @@ public class PowerSaturationAmonutController {
     private WindturbinepowercurvefittingService windturbinepowercurvefittingService;
 
     /**总功率饱和列表**/
-    @GetMapping("/powersaturationamonutlist")
+    @PostMapping("/powersaturationamonutlist")
     @ResponseBody
     @ApiOperation(value = "查询总功率饱和列表", notes = "查询总功率饱和列表")
     @ApiImplicitParams({
 
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")})
 
     public AjaxResult powersaturationamonutlist(Tablepar tablepar, String wtId) {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationController.java

@@ -42,7 +42,7 @@ public class PowerSaturationController {
     @ApiOperation(value = "日功率饱和列表", notes = "日功率饱和列表")
     @ApiImplicitParams({
 
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationMonthController.java

@@ -35,12 +35,12 @@ public class PowerSaturationMonthController {
     private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
 
     /**月功率饱和列表**/
-    @GetMapping("/powersaturationmonthlist")
+    @PostMapping("/powersaturationmonthlist")
     @ResponseBody
     @ApiOperation(value = "月功率饱和列表", notes = "月功率饱和列表")
     @ApiImplicitParams({
 
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/recommen/RecommenController.java

@@ -92,7 +92,7 @@ public class RecommenController {
      * 确认推荐检修风机，并添加记录到生产系统
      * @param rid
      */
-    @GetMapping("/confirpush")
+    @PostMapping("/confirpush")
     @ResponseBody
     @ApiOperation(value = "确认推荐检修风机，并添加记录到生产系统", notes = "确认推荐检修风机，并添加记录到生产系统")
     @ApiImplicitParams({
@@ -114,7 +114,7 @@ public class RecommenController {
      * 全部确认不同时间段的推荐检修风机
      * @param typeid 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐
      */
-    @GetMapping("/confirpushAll")
+    @PostMapping("/confirpushAll")
     @ResponseBody
     @ApiOperation(value = "全部确认不同时间段的推荐检修风机", notes = "全部确认不同时间段的推荐检修风机")
     @ApiImplicitParams({
@@ -169,7 +169,7 @@ public class RecommenController {
      * 取消推荐检修风机
      * @param rid
      */
-    @GetMapping("/ignorepush")
+    @PostMapping("/ignorepush")
     @ResponseBody
     @ApiOperation(value = "取消推荐检修风机", notes = "取消推荐检修风机")
     @ApiImplicitParams({
@@ -191,7 +191,7 @@ public class RecommenController {
      * 全部取消不同时间段的推荐检修风机
      * @param typeid 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐
      */
-    @GetMapping("/ignorepushAll")
+    @PostMapping("/ignorepushAll")
     @ResponseBody
     @ApiOperation(value = "全部取消不同时间段的推荐检修风机", notes = "全部取消不同时间段的推荐检修风机")
     @ApiImplicitParams({
@@ -453,11 +453,11 @@ public class RecommenController {
      * 通过位置编号获得缺陷单信息
      * @return
      */
-    @GetMapping("/findWobugeqByLocation")
+    @PostMapping("/findWobugeqByLocation")
     @ResponseBody
     @ApiOperation(value = "通过位置编号获得缺陷单信息", notes = "通过位置编号获得缺陷单信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = false, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = false, dataType = "Tablepar", paramType = "query"),
             @ApiImplicitParam(name = "location", value = "位置", required = true, dataType = "string", paramType = "query")
     })
     public AjaxResult findWobugeqByLocation(Tablepar tablepar, String location) throws Exception {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/singleanalysis/SingleAnalysisController.java

@@ -11,10 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -36,7 +33,7 @@ public class SingleAnalysisController {
      * @return
      * @throws Exception
      */
-    @GetMapping("/singleanalysisMain")
+    @PostMapping("/singleanalysisMain")
     @ResponseBody
     @ApiOperation(value = "查询单机性能分析首页", notes = "查询单机性能分析首页")
     @ApiImplicitParams({
@@ -45,7 +42,7 @@ public class SingleAnalysisController {
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult singleanalysisMain(Tablepar tablepar, String wpId, String year, String month) throws Exception {
+    public AjaxResult singleanalysisMain(@RequestBody  Tablepar tablepar, String wpId, String year, String month) throws Exception {
 
         List<SingleAnalysisVo> vos =new ArrayList<>();
 

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/warn/MainBrownouts2Controller.java

@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -37,7 +34,7 @@ public class MainBrownouts2Controller {
     private Brownoutsevent2Service brownoutsevent2Service;
 
 
-    @GetMapping("/getBrownoutsList")
+    @PostMapping("/getBrownoutsList")
     @ResponseBody
     @ApiOperation(value = "限电事件查询", notes = "限电事件查询")
     @ApiImplicitParams({
@@ -46,7 +43,7 @@ public class MainBrownouts2Controller {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult getBrownoutsList(Tablepar tablepar, String wpId, String beginDate, String endDate) throws Exception {
+    public AjaxResult getBrownoutsList(@RequestBody Tablepar tablepar, String wpId, String beginDate, String endDate) throws Exception {
 
         PageInfo<MainBrownoutsVo> result=new PageInfo<>() ;
         if (StringUtils.notEmp(tablepar) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/warn/ShutdowneventController.java

@@ -13,8 +13,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -40,7 +40,7 @@ public class ShutdowneventController {
      * @return
      * @throws Exception
      */
-    @GetMapping("/getShutdownevent")
+    @PostMapping("/getShutdownevent")
     @ResponseBody
     @ApiOperation(value = "停机事件查询", notes = "停机事件查询")
     @ApiImplicitParams({
@@ -51,7 +51,7 @@ public class ShutdowneventController {
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型", required = false, dataType = "string", paramType = "query")})
 
-    public AjaxResult getShutdownevent(Tablepar tablepar, String wpId, String wtId, String beginDate, String endDate, String type) throws Exception {
+    public AjaxResult getShutdownevent(@RequestBody Tablepar tablepar, String wpId, String wtId, String beginDate, String endDate, String type) throws Exception {
 
         PageInfo<ShutdowneventVo> result=new PageInfo<>() ;
         if (StringUtils.notEmp(tablepar) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {

web/monitor-web-hb/src/main/java/com/gyee/frame/controller/weather/WeatherAnalysisController.java

@@ -109,7 +109,7 @@ public class WeatherAnalysisController {
     }
 
 
-    @GetMapping("/history/list")
+    @PostMapping("/history/list")
     @ResponseBody
     @ApiOperation(value = "气象历史数据查询", notes = "气象历史数据查询")
     public AjaxResult getWeatherHistory(Tablepar tablepar,

web/monitor-web-hb/src/main/java/com/gyee/frame/model/auto/Windturbinecurvefittingmonth.java

@@ -10,7 +10,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private Long id;
 
     /**
      *
@@ -91,7 +91,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
@@ -103,7 +103,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

web/monitor-web-hb/src/main/java/com/gyee/frame/service/InputoroutputspeedtotalService.java

@@ -1,5 +1,7 @@
 package com.gyee.frame.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.InputoroutputspeedtotalMapper;
@@ -9,9 +11,9 @@ import com.gyee.frame.model.custom.SingleAnalysisVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -94,7 +96,7 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 		return inputoroutputspeedtotalMapper.deleteByExample(example);
 	}
 
-	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(Tablepar tablepar, String wpId, Date recorddate) {
+	public PageInfo<Inputoroutputspeedtotal> getInputoroutputspeedtotal(Tablepar tablepar, String wpId, Date recorddate) {
 
 
 		List<Inputoroutputspeedtotal> list = null;
@@ -117,7 +119,7 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 			}else {
 				example.setOrderByClause("windturbineid ASC");
 			}
-
+            PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
 			if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
 
 				InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
@@ -127,12 +129,15 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 				criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
 				list = inputoroutputspeedtotalMapper.selectByExample(example);
 
+
 			} else {
 				list = new ArrayList<>();
 			}
 
 		}
-		return list;
+        PageInfo<Inputoroutputspeedtotal> pageInfo = new PageInfo<Inputoroutputspeedtotal>(list);
+
+        return pageInfo;
 
 	}
 	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(String wtId,Date recorddate) {
@@ -206,7 +211,7 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 
 	}
 
-	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(Tablepar tablepar,String wpId,String wtId,Date beginDate,Date endDate) {
+	public PageInfo<Inputoroutputspeedtotal> getInputoroutputspeedtotal(Tablepar tablepar,String wpId,String wtId,Date beginDate,Date endDate) {
 
 
 		List<Inputoroutputspeedtotal> list =  new ArrayList<>();
@@ -229,7 +234,7 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 			}else {
 				example.setOrderByClause("windturbineid ASC");
 			}
-
+            PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
 			InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
 			criteria.andWindpowerstationidEqualTo(wpId);
 
@@ -243,7 +248,8 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 
 
 		}
-		return list;
+        PageInfo<Inputoroutputspeedtotal> pageInfo = new PageInfo<Inputoroutputspeedtotal>(list);
+        return pageInfo;
 
 	}
 

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WarningInfoDayService.java

@@ -320,12 +320,22 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 				System.out.println(entry.getKey() + "--->" + entry.getValue());
 
 				List<WarningInfoDay> ls=entry.getValue();
+                SawVo item = new SawVo();
+                item.setNum(i++);
+
+				if(InitialRunner.warningmap.containsKey(entry.getKey()))
+                {
+                    Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
+                    item.setName(warning.getChinesetext());
+                }else
+                {
+
+                    item.setName(entry.getKey());
+                }
+
+
 
-				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
 
-				SawVo item = new SawVo();
-				item.setNum(i++);
-				item.setName(warning.getChinesetext());
 				int frequencyday=ls.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//合计
 				double totalhoursday=ls.stream().mapToDouble(WarningInfoDay::getTotalhoursday).sum();//合计
 				item.setFrequency(frequencyday);

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WindPowerstationTestingPoint2Service.java

@@ -141,7 +141,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	}
 
 	public WindPowerStationTestingPoint getWindPowerStationTestingPoint2(String wpId, String unicode)  {
-		WindPowerStationTestingPoint point=new WindPowerStationTestingPoint();
+		WindPowerStationTestingPoint point=null;
 
 		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
 		{

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WindTurbineTestingPointAiService.java

@@ -142,7 +142,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 
 	public WindTurbineTestingPointAi getWindTurbineTestingPointAi2(String wtId, String unicode)  {
 
-		WindTurbineTestingPointAi point=new WindTurbineTestingPointAi();
+		WindTurbineTestingPointAi point=null;
 		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
 		{
 			 if(InitialRunner.wtmap.containsKey(wtId))

web/monitor-web-hb/src/main/java/com/gyee/frame/service/health/HealthSubService.java

@@ -680,7 +680,11 @@ public class HealthSubService {
         if (!sjglls.isEmpty()) {
             for (int i = 0; i < sjglls.size() ; i++) {
                // timearr[i]=sjglls.get(i).getPointTime()*1000;
-                sjglarr[i] = MathUtil.twoBit(sjglls.get(i).getPointValueInDouble());
+                if(i<sjglarr.length-1)
+                {
+                    sjglarr[i] = MathUtil.twoBit(sjglls.get(i).getPointValueInDouble());
+                }
+
             }
         }
         WindTurbineTestingPointAi llgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_LLGL);
@@ -689,7 +693,11 @@ public class HealthSubService {
 
         if (!llglls.isEmpty()) {
             for (int i = 0; i < llglls.size() ; i++) {
-                llglarr[i] = MathUtil.twoBit(llglls.get(i).getPointValueInDouble());
+                if(i<sjglarr.length-1)
+                {
+                    llglarr[i] = MathUtil.twoBit(llglls.get(i).getPointValueInDouble());
+                }
+
             }
         }
 
@@ -699,7 +707,11 @@ public class HealthSubService {
 
         if (!ssfsls.isEmpty()) {
             for (int i = 0; i < ssfsls.size() ; i++) {
-                sjfsarr[i] = MathUtil.twoBit(ssfsls.get(i).getPointValueInDouble());
+                if(i<sjfsarr.length-1)
+                {
+                    sjfsarr[i] = MathUtil.twoBit(ssfsls.get(i).getPointValueInDouble());
+                }
+
             }
         }
 

web/monitor-web-hb/src/main/java/com/gyee/frame/service/health/WindTurbineHealthListService.java

@@ -4,7 +4,6 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.mapper.auto.AlarmsnapMapper;
 import com.gyee.frame.model.auto.WindTurbineTestingPointAi;
-import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.HealthmodelrecordsVo;
@@ -51,7 +50,7 @@ public class WindTurbineHealthListService {
 
 
 
-        Map<String, List<String>> ahmap =getAlarmhistoryLMap();
+        Map<String, List<String>> ahmap =getAlarmhistoryLMap(wpId);
 
         Map<String, String> altypemap = findAlertrulefailuresubMap();
 
@@ -175,7 +174,7 @@ public class WindTurbineHealthListService {
         return name;
     }
 
-    private Map<String, List<String>> getAlarmhistoryLMap() {
+    private Map<String, List<String>> getAlarmhistoryLMap(String wpId) {
 
         SimpleDateFormat sdf_no_underline = new SimpleDateFormat("yyyyMM");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -187,12 +186,12 @@ public class WindTurbineHealthListService {
         cal.add(Calendar.MINUTE, -3);
         Date beginDate = cal.getTime();
 
-        for (Windpowerstation wp : InitialRunner.wpls) {
-            if (wp.getId().endsWith("_FDC")) {
+//        for (Windpowerstation wp : InitialRunner.wpls) {
+            if (wpId.endsWith("_FDC")) {
 
                 StringBuilder tablename = new StringBuilder();
                 tablename.append("alarmhistory_");
-                tablename.append(wp.getId().split("_")[0]);
+                tablename.append(wpId.split("_")[0]);
                 tablename.append("_");
                 tablename.append(sdf_no_underline.format(endDate));
 
@@ -219,7 +218,7 @@ public class WindTurbineHealthListService {
                     }
                 }
             }
-        }
+//        }
 
         return map;
     }

web/monitor-web-hb/src/main/java/com/gyee/frame/service/leaderboard/LeaderboardService.java

@@ -701,6 +701,7 @@ public class LeaderboardService {
         List<String> wtIds=new ArrayList<>();
         if(StringUtils.notEmp(wpId) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
         {
+
             List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
             for(Windturbine wt:wtls)
             {

web/monitor-web-hb/src/main/java/com/gyee/frame/service/warn/TemperatureService.java

@@ -58,30 +58,34 @@ public class TemperatureService {
 					Windturbine wb = ws.get(i);
 					List<TemperatureVo> retValue = new ArrayList<TemperatureVo>();
 					for (int j = 0; j < codels.size(); j++) {
-						WindTurbineTestingPointaiyj ai = InitialRunner.wtpAiyjmap.get(wb.getId()).get(codels.get(j));
-						if (ai == null) {
-							continue;
-						}
-						String id = ai.getId();
-
-						PointData fs = realApiUtil.getRealData(id);
-						TemperatureVo vo = new TemperatureVo();
-						vo.setId(wb.getId() + codels.get(j));
-						if (wb.getProjectid().equals("XS01_GC") && codels.get(j).equals("AI018")) {
-							vo.setValue(MathUtil.decimal((Double.parseDouble(new DecimalFormat("#.000").format(fs.getPointValueInDouble())) / 100000), 2));
-						} else {
-							vo.setValue(Double.parseDouble(new DecimalFormat("#.000").format(fs.getPointValueInDouble())));
-						}
-
-						vo.setWtId(wb.getId());
-						vo.setName(ai.getName());
-						vo.setMaxValue(ai.getMaxval());
-						vo.setMiValue(ai.getMinval());
-						vo.setReasonableMaxVal(ai.getReasonablemaxval());
-						vo.setReasonableMinVal(ai.getReasonableminval());
-						vo.setColor("white");
-						changeColor(vo, codels.get(j));
-						retValue.add(vo);
+					    if(InitialRunner.wtpAiyjmap.containsKey(wb.getId()))
+                        {
+                            WindTurbineTestingPointaiyj ai = InitialRunner.wtpAiyjmap.get(wb.getId()).get(codels.get(j));
+                            if (ai == null) {
+                                continue;
+                            }
+                            String id = ai.getId();
+
+                            PointData fs = realApiUtil.getRealData(id);
+                            TemperatureVo vo = new TemperatureVo();
+                            vo.setId(wb.getId() + codels.get(j));
+                            if (wb.getProjectid().equals("XS01_GC") && codels.get(j).equals("AI018")) {
+                                vo.setValue(MathUtil.decimal((Double.parseDouble(new DecimalFormat("#.000").format(fs.getPointValueInDouble())) / 100000), 2));
+                            } else {
+                                vo.setValue(Double.parseDouble(new DecimalFormat("#.000").format(fs.getPointValueInDouble())));
+                            }
+
+                            vo.setWtId(wb.getId());
+                            vo.setName(ai.getName());
+                            vo.setMaxValue(ai.getMaxval());
+                            vo.setMiValue(ai.getMinval());
+                            vo.setReasonableMaxVal(ai.getReasonablemaxval());
+                            vo.setReasonableMinVal(ai.getReasonableminval());
+                            vo.setColor("white");
+                            changeColor(vo, codels.get(j));
+                            retValue.add(vo);
+                        }
+
 					}
 					vos.add(retValue);
 				}

web/monitor-web-hb/src/main/resources/application.yml

@@ -63,17 +63,31 @@ spring :
     active : dev
   application:
     name: monitor-web-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 192.168.56.1:8848
-          #server-addr: 192.168.2.216:8848
-          #server-addr: 10.83.68.97:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+  cloud:
+    sentinel:
+      transport:
+        dashboard: 192.168.56.1:8080
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 192.168.56.1:8848
+            data-id: ${spring.application.name}.json
+            group-id: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow
+      filter:
+        enabled: true
+      eager: true
+    nacos:
+      discovery:
+        server-addr: 192.168.56.1:8848
+        #server-addr: 192.168.2.216:8848
+        #server-addr: 10.83.68.97:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet: