监视模块产品化计算服务修改

web/monitor-web-hbnew/pom.xml

@@ -20,6 +20,7 @@
         <tomcat.version>9.0.35</tomcat.version>
         <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
         <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
+        <pgsql.version>42.2.5</pgsql.version>
     </properties>
 
     <!-- https://mvnrepository.com/ 查找jar网站 -->
@@ -368,6 +369,11 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${pgsql.version}</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

web/monitor-web-hbnew/src/main/java/com/gyee/SpringbootStart.java

@@ -1,5 +1,7 @@
 package com.gyee;
 
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.service.initialpoint.InitialPointEdosService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -22,5 +24,34 @@ public class SpringbootStart {
         SpringApplication.run(SpringbootStart.class, args);
 
 
+
+
+        InitialPointEdosService initialPointEdosService= SpringUtils.getBean("initialPointEdosService");
+
+
+
+//        InitialRedis initialRedis=new InitialRedis();
+//        System.out.println("初始化开始！");
+//        initialRedis.intialWindturbinepowercurvefitting();
+//        initialRedis.intialWpScatter();
+//        initialRedis.intialPjScatter();
+//        initialRedis.intialLnScatter();
+//        initialRedis.intialWtScatter();
+//        System.out.println("初始化完成！");
+
+//        System.out.println("开始导出风机测点。。。。。。");
+//        initialPointEdosService.initalFj();
+//        System.out.println("结束导出风机测点。。。。。。");
+//
+//        System.out.println("开始导出风场测点。。。。。。");
+//        initialPointEdosService.initalFc(false);
+//        System.out.println("结束导出风场测点。。。。。。");
+//
+//
+//        System.out.println("开始导出风功率测点。。。。。。");
+//        initialPointEdosService.initalFgl();
+//        System.out.println("结束导出风功率测点。。。。。。");
+
+        System.out.println("初始化结束！");
     }
 }

web/monitor-web-hbnew/src/main/java/com/gyee/frame/common/file/ExcelExport.java

@@ -238,7 +238,7 @@ public final class ExcelExport {
 
         if(StringUtils.notEmp(filename))
         {
-            StringBuilder sb=new StringBuilder("d:\\");
+            StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
             sb.append(filename);
             sb.append(".xls");
 

web/monitor-web-hbnew/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -209,7 +209,7 @@ public class InitialRunner implements CommandLineRunner {
 
         WindpowerstationExample windpowerstationExample = new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
-        //windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
+        windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
         wpallls = windpowerstationService.selectByExample(windpowerstationExample);
         if (!wpallls.isEmpty()) {
             for (Windpowerstation wp : wpallls) {
@@ -226,7 +226,7 @@ public class InitialRunner implements CommandLineRunner {
 
         ProjectExample projectExample = new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");
-       // projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
+        projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
         pjallls = projectService.selectByExample(projectExample);
 
         if (!pjallls.isEmpty()) {

web/monitor-web-hbnew/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-hbnew/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-hbnew/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-hbnew/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-hbnew/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-hbnew/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-hbnew/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-hbnew/src/main/java/com/gyee/frame/controller/health/WindTurbineCurveController.java

@@ -20,9 +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.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
@@ -44,7 +42,7 @@ public class WindTurbineCurveController {
 
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
     /**单机区间曲线偏差率**/
-    @GetMapping("/windTurbineCurveList")
+    @PostMapping("/windTurbineCurveList")
     @ResponseBody
     @ApiOperation(value = "单机区间曲线偏差率", notes = "单机区间曲线偏差率")
     @ApiImplicitParams({
@@ -52,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-hbnew/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;
@@ -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;
@@ -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-hbnew/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-hbnew/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-hbnew/src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationController.java

@@ -37,12 +37,12 @@ public class PowerSaturationController {
     private WindturbinecurvefittingService windturbinecurvefittingService;
 
     /**日功率饱和列表**/
-    @GetMapping("/powersaturationlist")
+    @PostMapping("/powersaturationlist")
     @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 = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 

web/monitor-web-hbnew/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-hbnew/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-hbnew/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,16 +33,16 @@ public class SingleAnalysisController {
      * @return
      * @throws Exception
      */
-    @GetMapping("/singleanalysisMain")
+    @PostMapping("/singleanalysisMain")
     @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")})
 
-    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-hbnew/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-hbnew/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-hbnew/src/main/java/com/gyee/frame/controller/weather/WeatherAnalysisController.java

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

web/monitor-web-hbnew/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-hbnew/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-hbnew/src/main/java/com/gyee/frame/service/WindturbinetestingpointnewService.java

@@ -48,6 +48,15 @@ public class WindturbinetestingpointnewService implements BaseService<Windturbin
 	        return  pageInfo;
 	 }
 
+
+    public List<Windturbinetestingpointnew> findAllList(){
+        WindturbinetestingpointnewExample testExample=new WindturbinetestingpointnewExample();
+        testExample.setOrderByClause("id ASC");
+          List<Windturbinetestingpointnew> list= windturbinetestingpointnewMapper.selectByExample(testExample);
+
+        return  list;
+    }
+
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				

web/monitor-web-hbnew/src/main/java/com/gyee/frame/service/goodness/WindturbinegoodnessService.java

@@ -120,71 +120,82 @@ public class WindturbinegoodnessService {
 
         if (null != sjgl) {
             List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                vos.get(i).setTime(sjglls.get(i ).getPointTime() * 1000);
+            if(!sjglls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    vos.get(i).setTime(sjglls.get(i ).getPointTime() * 1000);
+
+                    if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i ).getPointTime())) {
 
-                if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i ).getPointTime())) {
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = sjglls.get(i ).getPointValueInDouble();
+                            if (Math.abs(temp) < 10000) {
+                                vos.get(i).setValue1(StringUtils.round(temp, 2));// 实际功率
+                            }
 
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = sjglls.get(i ).getPointValueInDouble();
-                        if (Math.abs(temp) < 10000) {
-                            vos.get(i).setValue1(StringUtils.round(temp, 2));// 实际功率
+                            count++;
+                        } else {
+                            vos.get(i).setValue1(0d);// 实际功率
                         }
 
-                        count++;
-                    } else {
-                        vos.get(i).setValue1(0d);// 实际功率
                     }
-
                 }
             }
 
+
         }
 
         if (null != bzgl) {
             List<PointData> bzglls = realApiUtil.getHistoryDatasSnap(bzgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                // vos.get(i).setTime(bzglls.get(i).getPointTime() * 1000);
-                if (i < bzglls.size() && StringUtils.notEmp(bzglls.get(i ).getPointTime())) {
-
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = bzglls.get(i ).getPointValueInDouble();
-                        if (Math.abs(temp) < 10000) {
-                            vos.get(i).setValue2(StringUtils.round(temp, 2));// 保证功率
+            if(!bzglls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    // vos.get(i).setTime(bzglls.get(i).getPointTime() * 1000);
+                    if (i < bzglls.size() && StringUtils.notEmp(bzglls.get(i ).getPointTime())) {
+
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = bzglls.get(i ).getPointValueInDouble();
+                            if (Math.abs(temp) < 10000) {
+                                vos.get(i).setValue2(StringUtils.round(temp, 2));// 保证功率
+                            }
+
+                            count++;
+                        } else {
+                            vos.get(i).setValue2(0d);// 保证功率
                         }
 
-                        count++;
-                    } else {
-                        vos.get(i).setValue2(0d);// 保证功率
                     }
-
                 }
             }
 
+
         }
 
         if (null != pjfs) {
             List<PointData> pjfsls = realApiUtil.getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
+            if(!pjfsls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    vos.get(i).setTime(pjfsls.get(i ).getPointTime() * 1000);
+                    if (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i ).getPointTime())) {
 
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                vos.get(i).setTime(pjfsls.get(i ).getPointTime() * 1000);
-                if (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i ).getPointTime())) {
-
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = pjfsls.get(i ).getPointValueInDouble();
-                        vos.get(i).setValue3(StringUtils.round(temp, 2));// 风速
-                        count++;
-                    } else {
-                        vos.get(i).setValue3(0d);// 实际功率
-                    }
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = pjfsls.get(i ).getPointValueInDouble();
+                            vos.get(i).setValue3(StringUtils.round(temp, 2));// 风速
+                            count++;
+                        } else {
+                            vos.get(i).setValue3(0d);// 实际功率
+                        }
 
+                    }
                 }
+
             }
 
         }

web/monitor-web-hbnew/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());
+                }
+
             }
         }
         Windturbinetestingpointnew 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<llglarr.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-hbnew/src/main/java/com/gyee/frame/service/health/WindTurbineHealthListService.java

@@ -3,7 +3,6 @@ package com.gyee.frame.service.health;
 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.Windpowerstation;
 import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.auto.Windturbinetestingpointnew;
 import com.gyee.frame.model.custom.DNAVal;
@@ -31,7 +30,7 @@ public class WindTurbineHealthListService {
 
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
     private final int digit = 2;
-    
+
     public List<HealthmodelrecordsVo> windTurbineHealthList(String wpId) throws Exception {
 
         List<String> codels = new ArrayList<String>();
@@ -46,12 +45,12 @@ public class WindTurbineHealthListService {
         cal.set(Calendar.MINUTE, 0);
         cal.set(Calendar.SECOND, 0);
 
-     
+
         Date beginDate = cal.getTime();
 
 
 
-        Map<String, List<String>> ahmap =getAlarmhistoryLMap();
+        Map<String, List<String>> ahmap =getAlarmhistoryLMap(wpId);
 
         Map<String, String> altypemap = findAlertrulefailuresubMap();
 
@@ -74,7 +73,7 @@ public class WindTurbineHealthListService {
                 for (int i = 0; i < codels.size(); i++) {
 
                     Windturbinetestingpointnew ai =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(),codels.get(i));
-                    points[i] = ai.getCode();
+                    points[i] = ai.getId();
                 }
 
                 // 获得风机健康状态结果数组
@@ -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,39 +186,39 @@ 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("_");
-                tablename.append(sdf_no_underline.format(endDate));
+            StringBuilder tablename = new StringBuilder();
+            tablename.append("alarmhistory_");
+            tablename.append(wpId.split("_")[0]);
+            tablename.append("_");
+            tablename.append(sdf_no_underline.format(endDate));
 
 
 
-                List<TotalNumsVo> list = alarmsnapMapper.getAlarmhistoryList(String.valueOf(tablename),sdf.format(beginDate),sdf.format(endDate));
+            List<TotalNumsVo> list = alarmsnapMapper.getAlarmhistoryList(String.valueOf(tablename),sdf.format(beginDate),sdf.format(endDate));
 
-                if (!list.isEmpty()) {
+            if (!list.isEmpty()) {
 
-                    for (TotalNumsVo vo : list) {
-
-                        if(map.containsKey(vo.getWindturbineid()))
-                        {
-                            List<String> ls=map.get(vo.getWindturbineid());
-                            ls.add(String.valueOf(vo.getAlertvalue()));
-                            map.put(vo.getWindturbineid(), ls);
-                        }else
-                        {
-                            List<String> ls=new ArrayList<>();
-                            ls.add(String.valueOf(vo.getAlertvalue()));
-                            map.put(vo.getWindturbineid(), ls);
-                        }
+                for (TotalNumsVo vo : list) {
 
+                    if(map.containsKey(vo.getWindturbineid()))
+                    {
+                        List<String> ls=map.get(vo.getWindturbineid());
+                        ls.add(String.valueOf(vo.getAlertvalue()));
+                        map.put(vo.getWindturbineid(), ls);
+                    }else
+                    {
+                        List<String> ls=new ArrayList<>();
+                        ls.add(String.valueOf(vo.getAlertvalue()));
+                        map.put(vo.getWindturbineid(), ls);
                     }
+
                 }
             }
         }
+//        }
 
         return map;
     }

web/monitor-web-hbnew/src/main/java/com/gyee/frame/service/initialpoint/InitialPointEdosService.java

@@ -32,10 +32,10 @@ public class InitialPointEdosService implements  IinitialPoint{
     @Resource
     private WindsubstationstandardpointService windsubstationstandardpointService;
     @Resource
-    private Windsubstationtestingpoint2Service windsubstationtestingpoint2Service;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
 
     @Resource
-    private WindturbinestandardpointsService windturbinestandardpointsService;
+    private WindturbinetestingpointnewService windturbinetestingpointnewService;
 
     private final  String AI="AI";
     private final  String DI="DI";
@@ -49,6 +49,8 @@ public class InitialPointEdosService implements  IinitialPoint{
 
         //   windPowerstationTestingPointService.deleteAll();
 
+
+
         List<Windpowerstationstandardpoint>  stpointls=windpowerstationstandardpointService.findAllList();
 
         List<Region> regions=regionService.findAllList();
@@ -265,12 +267,19 @@ public class InitialPointEdosService implements  IinitialPoint{
             }
         }
 
-        //创建一个数组用于设置表头
-        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
-                "合理最小值","统一编码","短ID","长ID","风场编号","实时配置编号"};
-        String heardName="场站测点表";
-        //调用Excel导出工具类
-        ExcelExport.exportToPath(allpoints,arr,heardName,6,"场站测点");
+        if(!allpoints.isEmpty())
+        {
+            for(Windpowerstationpointnew wp:allpoints)
+            {
+                windPowerstationTestingPoint2Service.insertSelective(wp);
+            }
+        }
+//        //创建一个数组用于设置表头
+//        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
+//                "合理最小值","统一编码","短ID","长ID","风场编号","实时配置编号"};
+//        String heardName="场站测点表";
+//        //调用Excel导出工具类
+//        ExcelExport.exportToPath(allpoints,arr,heardName,6,"场站测点");
     }
 
     private void createWpPoints(Windpowerstation wp, List<Windpowerstationstandardpoint> stpointls,List<Windpowerstationpointnew> allpoints) {
@@ -721,12 +730,19 @@ public class InitialPointEdosService implements  IinitialPoint{
 
 //        }
 
-        //创建一个数组用于设置表头
-        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
-                "合理最小值","统一编码","短ID","长ID","风场编号","实时配置编号"};
-        String heardName="风功率测点表";
-        //调用Excel导出工具类
-        ExcelExport.exportToPath(allpoints,arr,heardName,6,"风功率测点");
+        if(!allpoints.isEmpty())
+        {
+            for(Windpowerstationpointnew wp:allpoints)
+            {
+                windPowerstationTestingPoint2Service.insertSelective(wp);
+            }
+        }
+//        //创建一个数组用于设置表头
+//        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
+//                "合理最小值","统一编码","短ID","长ID","风场编号","实时配置编号"};
+//        String heardName="风功率测点表";
+//        //调用Excel导出工具类
+//        ExcelExport.exportToPath(allpoints,arr,heardName,6,"风功率测点");
     }
 
 
@@ -734,10 +750,12 @@ public class InitialPointEdosService implements  IinitialPoint{
 
         // windturbinetestingpointService.deleteAll();
 
+
+
         List<Windturbinestandardpoint>  stpointls=windturbinestandardpointService.findAllList();
 
 //        Map<String, List<Windturbinestandardpoints>> wpsmap=windturbinestandardpointsService.findAllMap();
-        List<Windturbinetestingpoint> allpoints=new ArrayList<>();
+        List<Windturbinetestingpointnew> allpoints=new ArrayList<>();
 //            for (Windpowerstation wp:InitialRunner.wpls)
 //            {
 //
@@ -751,7 +769,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                    {
 //                        for(Windturbine wt:wtls)
 //                        {
-//                            List<Windturbinetestingpoint> points=new ArrayList<>();
+//                            List<Windturbinetestingpointnew> points=new ArrayList<>();
 //                            for(int i=0;i<stpointls.size();i++)
 //                            {
 //
@@ -795,7 +813,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                                sb.append(stp.getOrdernum());
 //
 //
-//                                Windturbinetestingpoint po=new Windturbinetestingpoint();
+//                                Windturbinetestingpointnew po=new Windturbinetestingpointnew();
 //                                po.setId(String.valueOf(sb));
 //                                po.setCode(String.valueOf(sb));
 //                                sb =new StringBuilder();
@@ -858,7 +876,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                    {
 //                        List<Windturbinestandardpoints> wpsls=wpsmap.get(wt.getModelid());
 
-                        List<Windturbinetestingpoint> points=new ArrayList<>();
+                        List<Windturbinetestingpointnew> points=new ArrayList<>();
                         for(int i=0;i<stpointls.size();i++)
                         {
 
@@ -901,7 +919,7 @@ public class InitialPointEdosService implements  IinitialPoint{
 //                            sb.append(stp.getOrdernum());
 
 
-                            Windturbinetestingpoint po=new Windturbinetestingpoint();
+                            Windturbinetestingpointnew po=new Windturbinetestingpointnew();
                             po.setId(StringUtils.getUUID());
                             po.setCode(V2Config.getInitialcode());
                             sb =new StringBuilder();
@@ -939,12 +957,20 @@ public class InitialPointEdosService implements  IinitialPoint{
 
 
         }
-        //创建一个数组用于设置表头
-        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
-                "合理最小值","风机编号","统一编码","短ID","长ID","风场编号","实时配置编号"};
-        String heardName="风机测点表";
-        //调用Excel导出工具类
-        ExcelExport.exportToPath(allpoints,arr,heardName,6,"风机测点");
+        
+        if(!allpoints.isEmpty())
+        {
+            for(Windturbinetestingpointnew wt:allpoints)
+            {
+                windturbinetestingpointnewService.insertSelective(wt);
+            }
+        }
+//        //创建一个数组用于设置表头
+//        String[] arr = new String[]{"编号","编码","名称","型号","单位","英文名称","类型编号","所属型号","最大值","最小值","合理最大值",
+//                "合理最小值","风机编号","统一编码","短ID","长ID","风场编号","实时配置编号"};
+//        String heardName="风机测点表";
+//        //调用Excel导出工具类
+//        ExcelExport.exportToPath(allpoints,arr,heardName,6,"风机测点");
 
     }
 

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

@@ -19,145 +19,149 @@ import java.util.List;
 @Service
 public class TemperatureService {
 
-	IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
+    IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
     public List<List<TemperatureVo>> temperatureQuery(String wpId,String type) throws Exception {
 
-		List<List<TemperatureVo>> vos = new ArrayList<List<TemperatureVo>>();
-
-		List<String> codels=new ArrayList<String>();
-		switch(type) {
-			case "bj" :
-				codels= TemperatureConfig.getBj();
-				break;
-			case "yyz" :
-				codels= TemperatureConfig.getYyz();
-				break;
-			case "clx" :
-				codels= TemperatureConfig.getClx();
-				break;
-			case "fdj" :
-				codels= TemperatureConfig.getFdj();
-				break;
-			case "qt" :
-				codels= TemperatureConfig.getQt();
-				break;
-			case "zz" :
-				codels= TemperatureConfig.getZz();
-				break;
-			case "zd" :
-				codels= TemperatureConfig.getZd();
-				break;
-
-			default:
-				break;
-		}
-			if (InitialRunner.wp_wtmap.containsKey(wpId)) {
-				List<Windturbine> ws = InitialRunner.wp_wtmap.get(wpId);
-				for (int i = 0; i < ws.size(); i++) {
-					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);
-					}
-					vos.add(retValue);
-				}
-			}
-
-
-
-		return vos;
+        List<List<TemperatureVo>> vos = new ArrayList<List<TemperatureVo>>();
+
+        List<String> codels=new ArrayList<String>();
+        switch(type) {
+            case "bj" :
+                codels= TemperatureConfig.getBj();
+                break;
+            case "yyz" :
+                codels= TemperatureConfig.getYyz();
+                break;
+            case "clx" :
+                codels= TemperatureConfig.getClx();
+                break;
+            case "fdj" :
+                codels= TemperatureConfig.getFdj();
+                break;
+            case "qt" :
+                codels= TemperatureConfig.getQt();
+                break;
+            case "zz" :
+                codels= TemperatureConfig.getZz();
+                break;
+            case "zd" :
+                codels= TemperatureConfig.getZd();
+                break;
+
+            default:
+                break;
+        }
+        if (InitialRunner.wp_wtmap.containsKey(wpId)) {
+            List<Windturbine> ws = InitialRunner.wp_wtmap.get(wpId);
+            for (int i = 0; i < ws.size(); i++) {
+                Windturbine wb = ws.get(i);
+                List<TemperatureVo> retValue = new ArrayList<TemperatureVo>();
+                for (int j = 0; j < codels.size(); j++) {
+                    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);
+            }
+        }
+
+
+
+        return vos;
     }
 
-	private void setVoField(TemperatureVo vo, String point) {
-		int ai=Integer.parseInt(point.substring(2));
-		switch(ai){
-			case 45:
-			case 46:
-			case 47:
-			case 48:
-			case 49:
-			case 50:
-				vo.setReasonableMaxVal(165d);
-				vo.setReasonableMinVal(120d);
-				vo.setMaxValue(165d);
-				vo.setMiValue(0d);
-				break;
-			case 52:
-			case 53:
-				vo.setReasonableMaxVal(95d);
-				vo.setReasonableMinVal(80d);
-				vo.setMaxValue(95d);
-				vo.setMiValue(0d);
-				break;
-			case 69:
-			case 70:
-				vo.setReasonableMaxVal(55d);
-				vo.setReasonableMinVal(50d);
-				vo.setMaxValue(55d);
-				vo.setMiValue(0d);
-				break;
-			case 39:
-				vo.setReasonableMaxVal(170d);
-				vo.setReasonableMinVal(129d);
-				vo.setMaxValue(170d);
-				vo.setMiValue(125d);
-				break;
-			case 41:
-				vo.setReasonableMaxVal(80d);
-				vo.setReasonableMinVal(70d);
-				vo.setMaxValue(80d);
-				vo.setMiValue(10d);
-				break;
-			case 242:
-			case 243:
-			case 244:
-				vo.setReasonableMaxVal(65d);
-				vo.setReasonableMinVal(55d);
-				vo.setMaxValue(65d);
-				vo.setMiValue(-10d);
-				break;
-		}
-
-	}
-
-
-	private void changeColor(TemperatureVo vo,String point) {
-		if(vo.getMaxValue()==null || vo.getMaxValue()==0d){
-			setVoField(vo,point);
-
-		} else {
-			if (vo.getMaxValue() != null) {
-				if (vo.getValue() > vo.getReasonableMaxVal()) {
-					vo.setColor("yellow");
-				}
-				if (vo.getValue() >= vo.getMaxValue()) {
-					vo.setColor("red");
-				}
-			}
-		}
-	}
+    private void setVoField(TemperatureVo vo, String point) {
+        int ai=Integer.parseInt(point.substring(2));
+        switch(ai){
+            case 45:
+            case 46:
+            case 47:
+            case 48:
+            case 49:
+            case 50:
+                vo.setReasonableMaxVal(165d);
+                vo.setReasonableMinVal(120d);
+                vo.setMaxValue(165d);
+                vo.setMiValue(0d);
+                break;
+            case 52:
+            case 53:
+                vo.setReasonableMaxVal(95d);
+                vo.setReasonableMinVal(80d);
+                vo.setMaxValue(95d);
+                vo.setMiValue(0d);
+                break;
+            case 69:
+            case 70:
+                vo.setReasonableMaxVal(55d);
+                vo.setReasonableMinVal(50d);
+                vo.setMaxValue(55d);
+                vo.setMiValue(0d);
+                break;
+            case 39:
+                vo.setReasonableMaxVal(170d);
+                vo.setReasonableMinVal(129d);
+                vo.setMaxValue(170d);
+                vo.setMiValue(125d);
+                break;
+            case 41:
+                vo.setReasonableMaxVal(80d);
+                vo.setReasonableMinVal(70d);
+                vo.setMaxValue(80d);
+                vo.setMiValue(10d);
+                break;
+            case 242:
+            case 243:
+            case 244:
+                vo.setReasonableMaxVal(65d);
+                vo.setReasonableMinVal(55d);
+                vo.setMaxValue(65d);
+                vo.setMiValue(-10d);
+                break;
+        }
+
+    }
+
+
+    private void changeColor(TemperatureVo vo,String point) {
+        if(vo.getMaxValue()==null || vo.getMaxValue()==0d){
+            setVoField(vo,point);
+
+        } else {
+            if (vo.getMaxValue() != null) {
+                if (vo.getValue() > vo.getReasonableMaxVal()) {
+                    vo.setColor("yellow");
+                }
+                if (vo.getValue() >= vo.getMaxValue()) {
+                    vo.setColor("red");
+                }
+            }
+        }
+    }
 }

web/monitor-web-hbnew/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -164,7 +164,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 } else {
                                     PointData data = new PointData();
                                     data.setEdnaId(point.getCode());
-                                    data.setPointTime(snapItem.getPointTime());
+                                    data.setPointTime(0l);
                                     data.setPointValue("0");
                                     data.setPointName("1");
                                     data.setPointValueInDouble(0.0);
@@ -173,7 +173,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                             } else {
                                 PointData data = new PointData();
                                 data.setEdnaId(point.getCode());
-                                data.setPointTime(snapItem.getPointTime());
+                                data.setPointTime(0l);
                                 data.setPointValue("0");
                                 data.setPointName("1");
                                 data.setPointValueInDouble(0.0);
@@ -451,7 +451,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 } else {
                                     PointData data = new PointData();
                                     data.setEdnaId(point.getCode());
-                                    data.setPointTime(snapItem.getPointTime());
+                                    data.setPointTime(0l);
                                     data.setPointValue("0");
                                     data.setPointName("1");
                                     data.setPointValueInDouble(0.0);
@@ -460,7 +460,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                             } else {
                                 PointData data = new PointData();
                                 data.setEdnaId(point.getCode());
-                                data.setPointTime(snapItem.getPointTime());
+                                data.setPointTime(0l);
                                 data.setPointValue("0");
                                 data.setPointName("1");
                                 data.setPointValueInDouble(0.0);
@@ -611,7 +611,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty())
+            if(!idls.isEmpty()  )
             {
                 String pointIdString = StringUtil.join(idls.toArray(), ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);
@@ -631,17 +631,27 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         HashMap<String, PointData> pointDataHashMap = new HashMap<>();
                         for (int i = 0; i < len; i++) {
 
-                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
-                                PointData pd = new PointData();
-                                pd.setPointName(idls.get(i));
-                                pd.setEdnaId(idls.get(i));
-                                result.add(pd);
 
-                                pointDataHashMap.put(pd.getPointName(), pd);
-                            }
-                            else{
-                                result.add(pointDataHashMap.get(idls.get(i)));
-                            }
+                            PointData pd = new PointData();
+                            pd.setPointName(pointids[i]);
+                            pd.setEdnaId(pointids[i]);
+                            pd.setPointValueInDouble(0.0);
+                            pd.setPointTime(0l);
+                            result.add(pd);
+
+                            pointDataHashMap.put(pd.getPointName(), pd);
+
+//                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
+//                                PointData pd = new PointData();
+//                                pd.setPointName(idls.get(i));
+//                                pd.setEdnaId(idls.get(i));
+//                                result.add(pd);
+//
+//                                pointDataHashMap.put(pd.getPointName(), pd);
+//                            }
+//                            else{
+//                                result.add(pointDataHashMap.get(idls.get(i)));
+//                            }
 
                         }
                         Iterator<String> sIterator = jsonObject.keySet().iterator();
@@ -746,7 +756,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty())
+            if(!idls.isEmpty()   )
             {
                 String pointIdString = StringUtil.join(idls.toArray(), ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);
@@ -765,21 +775,32 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
 
                         //对结果进行有序返回
-                        int len = idls.size();
+                        int len = pointids.size();
                         List<PointData> result = new ArrayList<>();
                         HashMap<String, PointData> pointDataHashMap = new HashMap<>();
                         for (int i = 0; i < len; i++) {
-                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
-                                PointData pd = new PointData();
-                                pd.setPointName(idls.get(i));
-                                pd.setEdnaId(idls.get(i));
-                                result.add(pd);
 
-                                pointDataHashMap.put(pd.getPointName(), pd);
-                            }
-                            else{
-                                result.add(pointDataHashMap.get(idls.get(i)));
-                            }
+                            PointData pd = new PointData();
+                            pd.setPointName(pointids.get(i));
+                            pd.setEdnaId(pointids.get(i));
+                            pd.setPointValueInDouble(0.0);
+                            pd.setPointTime(0l);
+                            result.add(pd);
+
+                            pointDataHashMap.put(pd.getPointName(), pd);
+
+
+//                            if (pointDataHashMap.containsKey(idls.get(i)) == false){
+//                                PointData pd = new PointData();
+//                                pd.setPointName(idls.get(i));
+//                                pd.setEdnaId(idls.get(i));
+//                                result.add(pd);
+//
+//                                pointDataHashMap.put(pd.getPointName(), pd);
+//                            }
+//                            else{
+//                                result.add(pointDataHashMap.get(idls.get(i)));
+//                            }
                         }
                         Iterator<String> sIterator = jsonObject.keySet().iterator();
                         while (sIterator.hasNext()) {
@@ -880,7 +901,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty())
+            if(!idls.isEmpty()  )
             {
                 String pointIdString = StringUtil.join(pointids, ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);
@@ -1024,7 +1045,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 } else {
                                     PointData data = new PointData();
                                     data.setEdnaId(pointid);
-                                    data.setPointTime(snapItem.getPointTime());
+                                    data.setPointTime(0l);
                                     data.setPointValue("0");
                                     data.setPointName("1");
                                     data.setPointValueInDouble(0.0);
@@ -1033,7 +1054,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                             } else {
                                 PointData data = new PointData();
                                 data.setEdnaId(pointid);
-                                data.setPointTime(snapItem.getPointTime());
+                                data.setPointTime(0l);
                                 data.setPointValue("0");
                                 data.setPointName("1");
                                 data.setPointValueInDouble(0.0);
@@ -1439,84 +1460,44 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception {
 
 
-        if(StringUtils.notEmp(tagNames) )
-        {
-            List<String> idls=new ArrayList<>();
-            for(String str:tagNames)
-            {
-                if(StringUtils.notEmp(str) && !V2Config.getInitialcode().equals(str))
-                {
-                    idls.add(str);
-                }
-            }
-            if(!idls.isEmpty())
-            {
-                String pointIdString = StringUtil.join(tagNames, ",");
-                Optional<String> keys = Optional.ofNullable(pointIdString);
-                String url = baseURL + "/latest?null=0";
-                try {
-                    if (keys.isPresent())
-                        url = url + "&keys=" + keys.get();
-                    else
-                        return null;
+        if (StringUtils.notEmp(tagNames) && tagNames.length > 0) {
 
-                    ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
-                    JSONObject jsonObject = resp.getBody();
-                    if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty()){
-                        return JsonObjectHelper.phraseDNAVal(jsonObject,tagNames);
-                    } else {
-                        DNAVal[] errorResult = new DNAVal[tagNames.length];
-                        for(int i=0;i<tagNames.length;i++)
-                        {
-                            DNAVal val = new DNAVal();
-                            val.Status = 0;
-                            errorResult[i] = val;
-                        }
-                        return errorResult;
-                    }
 
-                } catch (HttpClientErrorException exception) {
-                    if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                        //System.out.println("404请求错误");
-                        DNAVal[] errorResult = new DNAVal[tagNames.length];
-                        for(int i=0;i<tagNames.length;i++)
-                        {
-                            DNAVal val = new DNAVal();
-                            val.Status = 0;
-                            errorResult[i] = val;
-                        }
-                        return errorResult;
-                    } else {
-                        throw exception;
+            DNAVal[] result = new DNAVal[tagNames.length];
+            for (int i = 0; i < tagNames.length; i++) {
+                if (StringUtils.notEmp(tagNames[i]) && !V2Config.getInitialcode().equals(tagNames[i])) {
+                    PointData po = getRealData(tagNames[i]);
+                    DNAVal val = new DNAVal();
+                    val.DValue = po.getPointValueInDouble();
+                    if(StringUtils.notEmp(po.getPointTime()))
+                    {
+                        val.Time = Integer.valueOf(String.valueOf(po.getPointTime()));
+                    }else
+                    {
+                        val.Time = 0;
                     }
-                }
-            }else
-            {
 
-                DNAVal[] errorResult = new DNAVal[tagNames.length];
-                for(int i=0;i<tagNames.length;i++)
-                {
+                    val.Status = 1;
+                    result[i] = val;
+                } else {
                     DNAVal val = new DNAVal();
                     val.Status = 0;
-                    errorResult[i] = val;
+                    result[i] = val;
                 }
-                return errorResult;
-            }
 
-        }else
-        {
-
-            DNAVal[] errorResult = new DNAVal[tagNames.length];
-            for(int i=0;i<tagNames.length;i++)
-            {
+            }
+            return result;
+        } else {
+            DNAVal[] result = new DNAVal[tagNames.length];
+            for (int i = 0; i < tagNames.length; i++) {
                 DNAVal val = new DNAVal();
                 val.Status = 0;
-                errorResult[i] = val;
+                result[i] = val;
+
             }
-            return errorResult;
+            return result;
         }
 
-
     }
 
     @Override
@@ -1617,7 +1598,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty())
+            if(!idls.isEmpty()  && idls.size()==nameList.length)
             {
                 String tagNameString = StringUtil.join(nameList, ",");
                 Long time = Long.valueOf(tTime);

web/monitor-web-hbnew/src/main/resources/application-dev.yml

@@ -1,6 +1,7 @@
 #dev环境  mysql7.0
 spring:
   datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     #    driverClassName: com.mysql.jdbc.Driver
     #druid连接池配置
@@ -12,11 +13,15 @@ spring:
         #        password: 123456
 
         #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-        url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+        #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
         #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+#        username: gdprod
+#        password: gd123
+#        driver-class-name: oracle.jdbc.driver.OracleDriver
+        url: jdbc:postgresql://10.81.3.151:5432/wisdom
         username: gdprod
         password: gd123
-        driver-class-name: oracle.jdbc.driver.OracleDriver
+        driver-class-name: org.postgresql.Driver
       #备数据源 #关闭
       slave:
         enabled: false
@@ -25,12 +30,12 @@ spring:
         password: root
         #两票数据源
       ticket:
-        #url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
+        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
         #url: jdbc:sqlserver://10.83.68.98:1434;DatabaseName=fdeamnew
-        url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
+        #url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
         username: sa
-        #password: ibs
-        password: Gd!123456
+        password: ibs
+        #password: Gd!123456
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
         #配置初始化连接数大小
       initial-size: 10

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

@@ -26,9 +26,9 @@ gyee:
   #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
   rollVerification: true
   #实时数据库Url
-  baseurl: http://10.0.118.73:8011/ts
+  #baseurl: http://10.0.118.73:8011/ts
   #baseurl: http://10.83.68.205:8011/ts
-  #baseurl: http://192.168.2.205:8011/ts
+  baseurl: http://192.168.2.205:8011/ts
 
   #API访问ip
   #swaggerip: 49.4.50.80:8082
@@ -36,8 +36,8 @@ gyee:
   #默认小数位数
   digit: 2
   realtimedataBase: golden #数据查询模式 golden、hwy
-  weatherurl: http://123.60.213.70:7011
-  #weatherurl: http://192.168.2.216:7011
+  #weatherurl: http://123.60.213.70:7011
+  weatherurl: http://192.168.2.216:7011
   #weatherurl: http://10.83.68.97:7011
   weatherqygs: nx_qygs
   hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
@@ -63,18 +63,18 @@ spring :
   profiles :
     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
+    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
     #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
     #include: ftpHX,ftpCloud
   servlet:
@@ -111,10 +111,10 @@ spring :
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 1
-    #host: 192.168.2.202
+    database: 19
+    host: 192.168.2.202
     #host: 10.83.68.94
-    host: 10.0.118.73
+    #host: 10.0.118.73
     password:
     pool:
       maxTotal: 20

web/monitor-web-hbnew/src/main/resources/logback.xml

@@ -1,192 +1,193 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-scan：当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true。
-scanPeriod：设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒当scan为true时，此属性生效。默认的时间间隔为1分钟。
-debug：当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。
--->
-<configuration scan="true" scanPeriod="60 seconds" debug="false"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd">
-	
-	
-	<!-- 定义日志的根目录 -->
-    <property name="LOG_HOME" value="d:\\Gyee_Frame_HF-log" />
-	  <!-- 定义日志文件名称 -->
-    <property name="appName" value="Gyee_Frame_HF"></property>
-     
-     
-     <!-- 控制台输出 -->
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
+<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
+                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
+<configuration  scan="true" scanPeriod="10 seconds">
+    <contextName>logback</contextName>
+
+    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
+    <property name="log.path" value="/usr/local/gyee/monitor/logs/" />
+
+    <!--0. 日志格式和颜色渲染 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
 
-	<!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<!--
-        	日志输出格式：
-            %d表示日期时间，
-            %thread表示线程名，
-            %-5level：级别从左显示5个字符宽度
-            %logger{50} 表示logger名字最长50个字符，否则按照句点分割。
-            %msg：日志消息，
-            %n是换行符
-        -->
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <!--<springProfile name="dev">-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} -> [%thread] -> %-5level %logger{50} - %msg%n</pattern>
-            <!--</springProfile>-->
-            <!--<springProfile name="!dev">-->
-                <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
-            <!--</springProfile>-->
-        </layout>
-	</appender>
-	
-	<!-- 控制台输出 END -->
-	
-	
-	<!-- 文件输出 -->
-	 <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 -->
-    <appender name="appLogAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 指定日志文件的名称 -->
-        <file>${LOG_HOME}/${appName}.log</file>
-        <!-- 如果是 true，日志被追加到文件结尾，如果是 false，清空现存文件，默认是true。 -->
-　　　　	<append>true</append> 
-        <!--
-	       	 当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名
-	        TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动。
-        -->
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/web_debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--
-            	滚动时产生的文件的存放位置及文件名称 %d{yyyy-MM-dd}：按天进行日志滚动
-            	%i：当文件大小超过maxFileSize时，按照i进行文件滚动
-            -->
-            <fileNamePattern>${LOG_HOME}/${appName}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <!--
-			            可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件。假设设置每天滚动，
-			            且maxHistory是30，则只保存最近30天的文件，删除之前的旧文件。注意，删除旧文件是时，
-			            那些为了归档而创建的目录也会被删除。
-            -->
-            <MaxHistory>30</MaxHistory>
-            <!--
-			            当日志文件超过maxFileSize指定的大小时，根据上面提到的%i进行日志文件滚动
-			            注意此处配置SizeBasedTriggeringPolicy是无法实现按文件大小进行滚动的，必须配置timeBasedFileNamingAndTriggeringPolicy
-            -->
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>50MB</maxFileSize>
+                <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <!-- 日志输出格式： -->
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [ %thread ] - [ %-5level ] [ %logger{50} : %line ] - %msg%n</pattern>
-        </layout>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
-	
-	<!-- 文件输出-END -->
-	
-	
-	
-	
-	
-	 
-	<!--
-        logger主要用于存放日志对象，也可以定义日志类型、级别
-        name：表示匹配的logger类型前缀，也就是包的前半部分
-        level：要记录的日志级别，包括 TRACE < DEBUG < INFO < WARN < ERROR
-        additivity：作用在于children-logger是否使用 rootLogger配置的appender进行输出，也可以理解为是否向上传递
-        false：表示只用当前logger的appender-ref，
-        true：表示当前logger的appender-ref和rootLogger的appender-ref都有效
-    -->
-    
-	<!-- mybatis logger -->
-    <logger name="org.mybatis" level="error"/>
-    <logger name="java.sql.Connection" level="DEBUG"/>
-    <logger name="java.sql.Statement" level="DEBUG"/>
-    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
-	<!-- 自己项目的 -->
-	<logger name="com.gyee" level="DEBUG"/>
-	
-	
-	<!--
-    	root与logger是父子关系，没有特别定义则默认为root，任何一个类只会和一个logger对应，
-    	要么是定义的logger，要么是root，判断的关键在于找到这个logger，然后判断这个logger的appender和level。
-    -->
-    
-
-	<!-- dev环境 -->
-	<springProfile name="dev">
-	    <root level="INFO">
-			<!-- 控制台 -->
-			<appender-ref ref="console" />
-	    </root>
-	</springProfile>
-	
-	 <!-- 生产环境 -->
-    <springProfile name="prod">
-	    <root level="INFO">
-	        <appender-ref ref="appLogAppender"/>
-	    </root>
-	</springProfile>
-
-</configuration>
-
-
-
-
 
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/web_info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 
-<!-- 
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/web_warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/web_error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 
-idea好像会报错解决方案
+    <!--
+        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
+        以及指定<appender>。<logger>仅有一个name属性，
+        一个可选的level和一个可选的addtivity属性。
+        name:用来指定受此logger约束的某一个包或者具体的某一个类。
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
+              如果未设置此属性，那么当前logger将会继承上级的级别。
+        addtivity:是否向上级logger传递打印信息。默认是true。
+        <logger name="org.springframework.web" level="info"/>
+        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
+    -->
 
-<springProfile name="dev">
-    <root level="INFO">
-		<appender-ref ref="console" />
-    </root>
-</springProfile>
+    <!--
+        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
+        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
+        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
+        【logging.level.org.mybatis=debug logging.level.dao=debug】
+     -->
+
+    <!--
+        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+        不能设置为INHERITED或者同义词NULL。默认是DEBUG
+        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
+    -->
 
-   <springProfile name="prod">
-    <root level="INFO">
-        <appender-ref ref="appLogAppender"/>
+    <!-- 4. 最终的策略 -->
+    <!-- 4.1 开发环境:打印控制台-->
+    <springProfile name="dev">
+        <logger name="com.sdcm.pmp" level="debug"/>
+    </springProfile>
+
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="DEBUG_FILE" />
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="WARN_FILE" />
+        <appender-ref ref="ERROR_FILE" />
     </root>
-</springProfile>
-
-改为
-<root level="INFO">
-	<appender-ref ref="console" />
-</root>
-或者
-<root level="INFO">
-      <appender-ref ref="appLogAppender"/>
-</root>
-
-
-使用方法：
-
-1、根据自己实际项目路径修改地址
-
-<property name="LOG_HOME" value="d:\\Gyee_Frame_HF-log" />
-
-
-2、
-dev环境   与    生产环境  根据application.yml 里面的
-spring :
-  # 环境 dev|test|prod
-  profiles :
-    active : prod
-    
-来进行配置的  
-
-
-3、如果改变了的目录结构需要修改 上面的 name为自己的项目目录
-
-<logger name="com.gyee" level="DEBUG"/>
-
-
-
-4、注意事项
-开发环境只输出到控制台
-生成环境生成log日志
-
-最后，这样一改真好!!!!!
-
-
 
- -->
+    <!-- 4.2 生产环境:输出到文档
+    <springProfile name="pro">
+        <root level="info">
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="WARN_FILE" />
+        </root>
+    </springProfile> -->
+
+</configuration>