修改配置信息和多适配器切换

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

@@ -23,20 +23,24 @@ public class SpringbootStart {
 
 
 
-
-//        InitialPointEdosService initialPointEdosService= SpringUtils.getBean("initialPointEdosService");
+//              InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
 //
 //        System.out.println("开始导出风机测点。。。。。。");
-//        initialPointEdosService.initalFj();
+//        initialPointGoldenService.initalFj();
 //        System.out.println("结束导出风机测点。。。。。。");
 //
 //        System.out.println("开始导出风场测点。。。。。。");
-//        initialPointEdosService.initalFc(false);
+//        initialPointGoldenService.initalFc(false);
 //        System.out.println("结束导出风场测点。。。。。。");
 //
+//
 //        System.out.println("开始导出风功率测点。。。。。。");
-//        initialPointEdosService.initalFgl();
+//        initialPointGoldenService.initalFgl();
 //        System.out.println("结束导出风功率测点。。。。。。");
+//
+////        System.out.println("开始导出地调测点。。。。。。");
+////        initialPointEdosHfService.initalDd();
+////        System.out.println("结束导出地调测点。。。。。。");
 
 
         System.out.println("初始化结束！");

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

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

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/log/LogAspect.java

@@ -107,8 +107,16 @@ public class LogAspect
 
             if (e != null)
             {
-            	//错误日志
-            	operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+                if(StringUtils.notEmp(e.getMessage()))
+                {
+                    //错误日志
+                    operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+                }else
+                {
+                    //错误日志
+                    operLog.setErrorMsg(String.valueOf(e));
+                }
+
             }
             // 设置方法名称
             String className = joinPoint.getTarget().getClass().getName();

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/goodness/WindpowerDetailChartController.java

@@ -10,7 +10,6 @@ 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;
 
@@ -29,8 +28,7 @@ public class WindpowerDetailChartController {
     private WindturbinegoodnessService windturbinegoodnessService;
     @Resource
     private InputoroutputspeedtotalService inputoroutputspeedtotalServicenegoodnessService;
-    @Resource
-    private WarningRecordsService warningRecordsService;
+
     @Resource
     private Brownoutsevent2Service brownoutsevent2Service;
     @Resource
@@ -56,6 +54,7 @@ public class WindpowerDetailChartController {
     /*
      * 风场日最大风速
      */
+
     @GetMapping("/wprzdfs")
     @ResponseBody
     @ApiOperation(value = "风场日最大风速", notes = "风场日最大风速")

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

@@ -33,8 +33,11 @@ public class WindturbineGoodnessDetailController {
     private WindturbinegoodnessService windturbinegoodnessService;
     @Resource
     private InputoroutputspeedtotalService inputoroutputspeedtotalServicenegoodnessService;
+//    @Resource
+//    private WarningRecordsService warningRecordsService;
     @Resource
-    private WarningRecordsService warningRecordsService;
+    private AlarmsnapService alarmsnapService;
+
     @Resource
     private Brownoutsevent2Service brownoutsevent2Service;
     @Resource
@@ -170,7 +173,7 @@ public class WindturbineGoodnessDetailController {
             Date beginDate = cal.getTime();
             cal.add(Calendar.DAY_OF_MONTH, 1);
             Date endDate = cal.getTime();
-           resultList = warningRecordsService.getWarningRecordsTop5(tablepar, wtId, beginDate, endDate);
+           resultList = alarmsnapService.getWarningRecordsTop(tablepar, wtId, beginDate, endDate);
 
         }
         if (resultList != null) {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java

@@ -2,6 +2,7 @@ package com.gyee.frame.controller.monitor;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.log.Log;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.service.ForecastwindspeedService;
@@ -63,6 +64,7 @@ public class GenreSetPushController {
 
     }
 
+    @Log(title = "获取驾驶舱基础信息")
     @GetMapping("/findBasicDataInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/monitor/MonitorPushController.java

@@ -3,7 +3,11 @@ package com.gyee.frame.controller.monitor;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.custom.DataVo;
-import com.gyee.frame.service.websocket.*;
+import com.gyee.frame.model.custom.SimpleVo;
+import com.gyee.frame.service.websocket.CftInfoPushService;
+import com.gyee.frame.service.websocket.MatrixPushByWpService;
+import com.gyee.frame.service.websocket.PowerFirstPushService;
+import com.gyee.frame.service.websocket.WpInfoPushService;
 import com.gyee.frame.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,7 +15,6 @@ 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;
 
@@ -38,26 +41,26 @@ public class MonitorPushController {
     @GetMapping("/findCftInfo")
     @ResponseBody
     @ApiOperation(value = "获取测风塔信息", notes = "获取测风塔信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
 
     public AjaxResult findCftInfo(String wpId) throws Exception {
 
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            map =cftInfoPushService.findCftInfo(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            map = cftInfoPushService.findCftInfo(wpId);
         }
 
 
-        if (null!=map ){
-            return AjaxResult.successData(AjaxStatus.success.code, map );
+        if (null != map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
-            return AjaxResult.successData(AjaxStatus.error.code, map );
+            return AjaxResult.successData(AjaxStatus.error.code, map);
         }
 
     }
+
     @GetMapping("/monitor")
     @ResponseBody
     @ApiOperation(value = "状态监视", notes = "状态监视")
@@ -65,12 +68,12 @@ public class MonitorPushController {
     public AjaxResult monitor() throws Exception {
 
 
-        Map<String, Object> map=  new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
 
 
-        map=wpInfoPushService.findWpInfo();
+        map = wpInfoPushService.findWpInfo();
 
-        if (null!=map) {
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -86,15 +89,14 @@ public class MonitorPushController {
     public AjaxResult findWpInfoBywpId(String wpId) throws Exception {
 
 
-        Map<String, Object> map=  new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            map=wpInfoPushService.findWpInfoBy(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            map = wpInfoPushService.findWpInfoBy(wpId);
         }
 
 
-        if (null!=map) {
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -110,15 +112,14 @@ public class MonitorPushController {
     public AjaxResult findLossWpBar(String wpId) throws Exception {
 
 
-        List<DataVo> vos=  new ArrayList<>();
+        List<DataVo> vos = new ArrayList<>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            vos=wpInfoPushService.findLossWpBar(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            vos = wpInfoPushService.findLossWpBar(wpId);
         }
 
 
-        if (null!=vos) {
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -134,15 +135,14 @@ public class MonitorPushController {
     public AjaxResult findPowerWpBar(String wpId) throws Exception {
 
 
-        List<DataVo> vos=  new ArrayList<>();
+        List<DataVo> vos = new ArrayList<>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            vos=wpInfoPushService.findPowerWpBar(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            vos = wpInfoPushService.findPowerWpBar(wpId);
         }
 
 
-        if (null!=vos) {
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -158,15 +158,14 @@ public class MonitorPushController {
     public AjaxResult findMonthPowerWpBar(String wpId) throws Exception {
 
 
-        List<DataVo> vos=  new ArrayList<>();
+        List<DataVo> vos = new ArrayList<>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            vos=wpInfoPushService.findMonthPowerWpBar(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            vos = wpInfoPushService.findMonthPowerWpBar(wpId);
         }
 
 
-        if (null!=vos) {
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -183,15 +182,14 @@ public class MonitorPushController {
     public AjaxResult findPowerFirst(String wpId) throws Exception {
 
 
-        Map<String, Object> map=  new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
 
-        if(StringUtils.notEmp(wpId))
-        {
-            map=powerFirstPushService.findPowerFirst(wpId);
+        if (StringUtils.notEmp(wpId)) {
+            map = powerFirstPushService.findPowerFirst(wpId);
         }
 
 
-        if (null!=map) {
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -207,19 +205,66 @@ public class MonitorPushController {
     public AjaxResult findGeneralAppearance(String wpId) throws Exception {
 
 
-        Map<String, Object> map=  new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+
+        if (StringUtils.notEmp(wpId)) {
+            map = matrixPushByWpService.findGeneralAppearance(wpId);
+        }
+
+
+        if (null != map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @GetMapping("/findSameIndexList")
+    @ResponseBody
+    @ApiOperation(value = "获得风机共同指标", notes = "获得风机共同指标")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findSameIndexList(String wtId) throws Exception {
+
+
+        List<SimpleVo> list = new ArrayList<>();
+
+        if (StringUtils.notEmp(wtId)) {
+            list = matrixPushByWpService.findSameIndexList(wtId);
+        }
+
+
+        if (null != list) {
+            return AjaxResult.successData(AjaxStatus.success.code, list);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, list);
+        }
+
+    }
+
+    @GetMapping("/findSameIndexValueList")
+    @ResponseBody
+    @ApiOperation(value = "获得对应风机相关指标Map集合", notes = "获得对应风机相关指标Map集合")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "code", value = "指标编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findSameIndexValueList(String wtId, String code) throws Exception {
+
 
-        if(StringUtils.notEmp(wpId))
-        {
-            map=matrixPushByWpService.findGeneralAppearance(wpId);
+        Map<String, List<SimpleVo>> map = new HashMap<>();
+
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(code)) {
+            map = matrixPushByWpService.findSameIndexValueList(wtId, code);
         }
 
 
-        if (null!=map) {
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
         }
 
     }
-}
+
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/AlarmsnapMapper.java

@@ -2,6 +2,7 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.Alarmsnap;
 import com.gyee.frame.model.auto.AlarmsnapExample;
+import com.gyee.frame.model.custom.SawVo;
 import com.gyee.frame.model.custom.TotalNumVo;
 import com.gyee.frame.model.custom.TotalNumsVo;
 import org.apache.ibatis.annotations.Param;
@@ -99,7 +100,13 @@ public interface AlarmsnapMapper {
 
     List<TotalNumsVo> getAlarmhistoryList(@Param("tname") String tname, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
 
+
+
+    List<SawVo> getWarningRecordsTop(@Param("wtId") String wtId,@Param("tname") String tname, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
     List<TotalNumVo> findAlertrulefailuresubMap();
 
+    List<SawVo> getWarningRecordsList(@Param("wtId") String wtId,@Param("tname") String tname);
+
 
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/SawVo.java

@@ -1,5 +1,7 @@
 package com.gyee.frame.model.custom;
 
+import java.util.Date;
+
 public class SawVo implements java.io.Serializable {
 
 	// Fields
@@ -8,13 +10,20 @@ public class SawVo implements java.io.Serializable {
 
 	private Integer num;
 	private String name;
+    private Date time;
 	private Integer frequency;
 	private Integer frequencyday;
 	private Double totalhours;
-	
-	
-	
-	public Integer getFrequencyday() {
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Integer getFrequencyday() {
 		return frequencyday;
 	}
 	public void setFrequencyday(Integer frequencyday) {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/SimpleVo.java

@@ -5,6 +5,15 @@ public class SimpleVo {
     private String id;
     private String name;
     private Integer value;
+    private Double doubleValue;
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(Double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
 
     public String getId() {
         return id;

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/AlarmsnapService.java

@@ -1,13 +1,23 @@
 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.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.AlarmsnapMapper;
 import com.gyee.frame.model.auto.Alarmsnap;
 import com.gyee.frame.model.auto.AlarmsnapExample;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.model.custom.SawVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 
@@ -15,8 +25,8 @@ import java.util.List;
 public class AlarmsnapService implements BaseService<Alarmsnap, AlarmsnapExample> {
 	@Resource
 	private AlarmsnapMapper alarmsnapMapper;
-	
-
+    private final String  ALARMHISTORY="ALARMHISTORY";
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	@Override
 	public int deleteByPrimaryKey(String ids) {
 				
@@ -87,6 +97,75 @@ public class AlarmsnapService implements BaseService<Alarmsnap, AlarmsnapExample
 		
 		return alarmsnapMapper.deleteByExample(example);
 	}
-	
+
+    public List<SawVo> getWarningRecordsTop(Tablepar tablepar, String wtId, Date beginDate, Date endDate) {
+
+
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        PageInfo<SawVo> pageInfo = new PageInfo<SawVo>();
+
+        if (StringUtils.notEmp(wtId) && InitialRunner.wtmap.containsKey(wtId)) {
+            Windturbine wt=InitialRunner.wtmap.get(wtId);
+            String wpname=wt.getWindpowerstationid().substring(0,wt.getWindpowerstationid().indexOf("_"));
+            StringBuilder alerthistory=new StringBuilder(ALARMHISTORY).append("_").append(wpname).append("_");
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(beginDate);
+            int year=cal.get(Calendar.YEAR);
+            int month=cal.get(Calendar.MONTH)+1;
+
+            alerthistory.append(year);
+            if(month<10)
+            {
+                alerthistory.append("0").append(month);
+            }else
+            {
+                alerthistory.append(month);
+            }
+
+            List<SawVo> list=alarmsnapMapper.getWarningRecordsTop(wtId,String.valueOf(alerthistory),dateFormat.format(beginDate),dateFormat.format(endDate));
+            pageInfo = new PageInfo<SawVo>(list);
+        }
+
+
+
+
+        return pageInfo.getList();
+
+    }
+
+
+    public List<SawVo> getWarningRecordsList(String wtId) {
+
+
+        PageHelper.startPage(0, 1);
+        PageInfo<SawVo> pageInfo = new PageInfo<SawVo>();
+
+        if (StringUtils.notEmp(wtId) && InitialRunner.wtmap.containsKey(wtId)) {
+            Windturbine wt=InitialRunner.wtmap.get(wtId);
+            String wpname=wt.getWindpowerstationid().substring(0,wt.getWindpowerstationid().indexOf("_"));
+            StringBuilder alerthistory=new StringBuilder(ALARMHISTORY).append("_").append(wpname).append("_");
+            Calendar cal = Calendar.getInstance();
+            int year=cal.get(Calendar.YEAR);
+            int month=cal.get(Calendar.MONTH)+1;
+
+            alerthistory.append(year);
+            if(month<10)
+            {
+                alerthistory.append("0").append(month);
+            }else
+            {
+                alerthistory.append(month);
+            }
+
+            List<SawVo> list=alarmsnapMapper.getWarningRecordsList(wtId,String.valueOf(alerthistory));
+            pageInfo = new PageInfo<SawVo>(list);
+        }
+
+
+
+
+        return pageInfo.getList();
+
+    }
 
 }

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

@@ -125,10 +125,10 @@ public class WindturbinegoodnessService {
                 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())) {
+                        vos.get(i).setTime(sjglls.get(i ).getPointTime() * 1000);
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             temp = sjglls.get(i ).getPointValueInDouble();
                             if (Math.abs(temp) < 10000) {
@@ -156,7 +156,7 @@ public class WindturbinegoodnessService {
                 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())) {
-
+                        vos.get(i).setTime(bzglls.get(i ).getPointTime() * 1000);
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             temp = bzglls.get(i ).getPointValueInDouble();
                             if (Math.abs(temp) < 10000) {
@@ -182,9 +182,9 @@ public class WindturbinegoodnessService {
                 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 (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i ).getPointTime())) {
+                        vos.get(i).setTime(pjfsls.get(i ).getPointTime() * 1000);
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             temp = pjfsls.get(i ).getPointValueInDouble();
                             vos.get(i).setValue3(StringUtils.round(temp, 2));// 风速

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/singleanalysis/SingleAnalysisService.java

@@ -288,13 +288,20 @@ public class SingleAnalysisService {
             vo.setYxxs(StringUtils.round(yxfss, 2));
             vo.setGlyzxxs(StringUtils.round(glyzxxs, 2));
 
-            double gzss = vos.stream().mapToDouble(SingleAnalysisVo::getGzss).sum();//风机故障损失合计
-            double jxss = vos.stream().mapToDouble(SingleAnalysisVo::getJxss).sum();//风机检修损失合计
-            double xdss = vos.stream().mapToDouble(SingleAnalysisVo::getXdss).sum();//风机限电损失合计
-            double xnss = vos.stream().mapToDouble(SingleAnalysisVo::getXnss).sum();//风机性能损失时合计
-            double slss = vos.stream().mapToDouble(SingleAnalysisVo::getSlss).sum();//风机受累损失合计
+            double gzss =0.0;//风机故障损失合计
+            double jxss =0.0;//风机检修损失合计
+            double xdss =0.0;//风机限电损失合计
+            double xnss =0.0;//风机性能损失时合计
+            double slss =0.0;//风机受累损失合计
             double llfdl = fdl + gzss + jxss + xdss + xnss + slss;
 
+             gzss = vos.stream().filter(x -> x!=null).filter(x -> x.getGzss()!=null).mapToDouble(SingleAnalysisVo::getGzss).sum();//风机故障损失合计
+             jxss = vos.stream().filter(x -> x!=null).filter(x -> x.getJxss()!=null).mapToDouble(SingleAnalysisVo::getJxss).sum();//风机检修损失合计
+             xdss = vos.stream().filter(x -> x!=null).filter(x -> x.getXdss()!=null).mapToDouble(SingleAnalysisVo::getXdss).sum();//风机限电损失合计
+             xnss = vos.stream().filter(x -> x!=null).filter(x -> x.getXnss()!=null).mapToDouble(SingleAnalysisVo::getXnss).sum();//风机性能损失时合计
+             slss = vos.stream().filter(x -> x!=null).filter(x -> x.getSlss()!=null).mapToDouble(SingleAnalysisVo::getSlss).sum();//风机受累损失合计
+             llfdl = fdl + gzss + jxss + xdss + xnss + slss;
+
             vo.setGzss(StringUtils.round(gzss, 2));
             vo.setJxss(StringUtils.round(jxss, 2));
             vo.setXdss(StringUtils.round(xdss, 2));
@@ -303,6 +310,8 @@ public class SingleAnalysisService {
             vo.setLlfdl(StringUtils.round(llfdl, 2));
 
 
+
+
             if (xfqrnum != 0) {
                 double temp = new BigDecimal(xfqr).divide(new BigDecimal(xfqrnum), 2, RoundingMode.HALF_UP).doubleValue();
                 vo.setXfqr(temp);

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -1,13 +1,18 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.SimpleVo;
 import com.gyee.frame.service.*;
-import com.gyee.frame.util.*;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.MathUtil;
+import com.gyee.frame.util.RealTimeDataBaseFactory;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,7 +37,8 @@ public class MatrixPushByWpService {
     @Resource
     private WpMttrAndMtbMonthService wpMttrAndMtbMonthService;
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
-
+    @Resource
+    private WindturbinestandardpointService windturbinestandardpointService;
 
     public Map<String, Object> findMatrixById(String wpId) throws Exception {
         Map<String, Object> map =new HashMap<>();
@@ -988,6 +994,146 @@ public class MatrixPushByWpService {
 
             return fjvos;
     }
+
+
+
+    public List<SimpleVo> findSameIndexList(String wtId) throws Exception {
+
+
+
+        List<SimpleVo> vos=new ArrayList<>();
+        Map<Integer, Map<String,String>>smap=new HashMap<>();
+        if(StringUtils.notEmp(wtId))
+        {
+
+            String[] ids=wtId.split(",");
+
+            if(ids.length>=2)
+            {
+
+                List<Windturbinestandardpoint>  stpointls=windturbinestandardpointService.findAllList();
+                for(int i=0;i<ids.length;i++)
+                {
+                    Map<String,String> map=new HashMap<>();
+                    if(InitialRunner.wtPointmap.containsKey(ids[i]))
+                    {
+                        Map<String, Windturbinetestingpointnew> pointmap=InitialRunner.wtPointmap.get(ids[i]);
+
+                        if(StringUtils.notEmp(stpointls) && !stpointls.isEmpty())
+                        {
+                            for(Windturbinestandardpoint st:stpointls)
+                            {
+                                if(pointmap.containsKey(st.getUniformcode()))
+                                {
+                                    Windturbinetestingpointnew wtpoint=pointmap.get(st.getUniformcode());
+                                    if(StringUtils.notEmp(wtpoint.getCode()) && !V2Config.getInitialcode().equals(wtpoint.getCode()))
+                                    {
+                                        map.put(wtpoint.getUniformcode(),wtpoint.getUniformcode());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    smap.put(i,map);
+                }
+
+
+
+                for(Windturbinestandardpoint st:stpointls)
+                {
+                    boolean total=true;
+                    for(int i=0;i<ids.length;i++)
+                    {
+                        if(smap.containsKey(i))
+                        {
+                            Map<String,String> map=smap.get(i);
+                            if(!map.containsKey(st.getUniformcode()))
+                            {
+                                total=false;
+                            }
+                        }
+                    }
+
+
+                    if(total)
+                    {
+                        SimpleVo vo=new SimpleVo();
+                        vo.setId(st.getUniformcode());
+                        vo.setName(st.getName());
+                        vos.add(vo);
+                    }
+
+                }
+            }
+
+
+        }
+
+        return vos;
+    }
+
+
+    public Map<String,List<SimpleVo>> findSameIndexValueList(String wtId,String code) throws Exception {
+
+
+
+
+        Map<String,  List<SimpleVo> >smap=new HashMap<>();
+
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(code))
+        {
+
+            String[] ids=wtId.split(",");
+            String[] codes=code.split(",");
+            if(ids.length>0 && codes.length>0)
+            {
+
+
+                for(int i=0;i<ids.length;i++)
+                {
+                   List<String> list=new ArrayList<>();
+                    List<SimpleVo> vos=new ArrayList<>();
+                    if(InitialRunner.wtPointmap.containsKey(ids[i]))
+                    {
+                        Map<String, Windturbinetestingpointnew> pointmap=InitialRunner.wtPointmap.get(ids[i]);
+
+                        for(int j=0;j<codes.length;j++)
+                        {
+                            if(pointmap.containsKey(codes[j]))
+                            {
+                                Windturbinetestingpointnew wtpoint=pointmap.get(codes[j]);
+                                if(StringUtils.notEmp(wtpoint.getCode()) && !V2Config.getInitialcode().equals(wtpoint.getCode()))
+                                {
+                                    SimpleVo vo=new SimpleVo();
+                                    vo.setId(wtpoint.getUniformcode());
+                                    vo.setName(wtpoint.getName());
+                                    vos.add(vo);
+                                    list.add(wtpoint.getCode());
+                                }
+                            }
+                        }
+
+                        List<PointData> values=realApiUtil.getRealData(list);
+                        if(StringUtils.notEmp(values) && !values.isEmpty() && vos.size()==values.size())
+                        {
+                            for(int x=0;x<values.size();x++)
+                            {
+                                vos.get(x).setDoubleValue(values.get(x).getPointValueInDouble());
+                            }
+                        }
+
+                    }
+                    smap.put(ids[i],vos);
+                }
+
+
+            }
+
+
+        }
+
+        return smap;
+    }
 }
 
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -1,19 +1,15 @@
 package com.gyee.frame.service.websocket;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.google.common.collect.Maps;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.service.WarningRecordsService;
-import com.gyee.frame.service.WindTurbineTestingPointAiService;
-import com.gyee.frame.service.WindTurbineTestingPointDiService;
-import com.gyee.frame.service.WindturbineinfodayService;
+import com.gyee.frame.model.custom.SawVo;
+import com.gyee.frame.service.*;
 import com.gyee.frame.util.*;
-
-import cn.hutool.core.date.DateUtil;
-
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +28,9 @@ public class WtInfoPushService {
     private WindturbineinfodayService windturbineinfodayService;
     @Resource
     private WarningRecordsService warningRecordsService;
+
+    @Resource
+    private AlarmsnapService alarmsnapService;
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
     String QS_FDC = "QS_FDC";
@@ -105,8 +104,8 @@ public class WtInfoPushService {
                 zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RJXSSDL).getCode());// 风机日检修损失电量
                 zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RQFSSDL).getCode());// 风机日欠发损失电量
                 zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RXDSSDL).getCode());// 风机日限电损失电量
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RGZSSDL).getCode());// 日场内受累检修
-                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RJXSSDL).getCode());// 日场内受累故障
+                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RLZSSDL).getCode());// 日场内受累检修
+                zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RSZSSDL).getCode());// 日场内受累故障
                 zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RQFSSDL).getCode());// 日场外受累电网
                 zbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.RXDSSDL).getCode());// 日场外受累天气
 
@@ -703,8 +702,13 @@ public class WtInfoPushService {
                 List<Object> phls=new ArrayList<>();
                 List<Object> yyls=new ArrayList<>();
                 List<Object> jcls=new ArrayList<>();
-
-                List<PointData> zblist = realApiUtil.getRealData(zbls);
+                List<PointData> zblist = new ArrayList<>();
+                for(String str:zbls)
+                {
+                    PointData po=  realApiUtil.getRealData(str);
+                    zblist.add(po);
+                }
+//                List<PointData> zblist = realApiUtil.getRealData(zbls);
 
 
                 if (!zblist.isEmpty() && zblist.size() == zbls.size() && keyls.size() == zbls.size()) {
@@ -926,13 +930,20 @@ public class WtInfoPushService {
                 gxkmap.put("ytjxs", 0.0);
             }
 
-            WarningRecords warningRecords= warningRecordsService.getWarningRecords(id);
+//            WarningRecords warningRecords= warningRecordsService.getWarningRecords(id);
+//
+//            if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
+//            {
+//                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
+//                gxkmap.put("bjmc", warning2.getChinesetext());
+//                gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
+//            }
 
-            if(null !=warningRecords && null !=warningRecords.getWarningid() && InitialRunner.warningmap.containsKey(warningRecords.getWarningid()))
+            List<SawVo> ls=alarmsnapService.getWarningRecordsList(id);
+            if(!ls.isEmpty())
             {
-                Warning2 warning2=InitialRunner.warningmap.get(warningRecords.getWarningid());
-                gxkmap.put("bjmc", warning2.getChinesetext());
-                gxkmap.put("bjsj", DateUtils.formatDateTime(warningRecords.getWarningtime()));
+                gxkmap.put("bjmc", ls.get(0).getName());
+                gxkmap.put("bjsj", DateUtils.formatDateTime(ls.get(0).getTime()));
             }
             map.put("gxkmap", gxkmap);
 

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

@@ -12,15 +12,15 @@ spring:
         #        username: root
         #        password: 123456
 
-        url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-        #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
-        username: nxfdprod
-        password: gdnxfd123
-        driver-class-name: oracle.jdbc.driver.OracleDriver
-      #        url: jdbc:postgresql://10.81.3.151:5432/wisdom
-      #        username: gdprod
-      #        password: gd123
-      #        driver-class-name: org.postgresql.Driver
+        #        url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+        #        #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+        #        username: nxfdprod
+        #        password: gdnxfd123
+        #        driver-class-name: oracle.jdbc.driver.OracleDriver
+        url: jdbc:postgresql://10.81.3.151:5432/wisdom
+        username: gdprod
+        password: gd123
+        driver-class-name: org.postgresql.Driver
       #备数据源 #关闭
       slave:
         enabled: false

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

@@ -0,0 +1,210 @@
+# 项目相关配置
+gyee:
+  #名称
+  name: v2
+  #版本
+  version: 3.9
+  #版权年份
+  copyrightYear: 2020
+  #文件上传路径
+  defaultBaseDir: D:/v2file/
+  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
+  isstatic: Y
+  #开启存放静态文件夹后目录
+  isroot_dir: static/file_upload/
+  #邮件功能
+  #邮箱发送smtp
+  email_smtp: smtp.sina.com
+  #邮箱发送端口
+  email_port: 465
+  #发送邮箱登录账号
+  email_account: gyee@163.com
+  #发送邮箱登录密码
+  email_password: 1
+  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
+  demoEnabled: false
+  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
+  rollVerification: true
+  #实时数据库Url
+  baseurl: http://192.168.2.198:8011/ts
+
+  #API访问ip
+  #swaggerip: 49.4.50.80:8082
+  swaggerip: 192.168.2.198:8082
+  #默认小数位数
+  digit: 2
+  realtimedataBase: golden #数据查询模式 golden、hwy
+  weatherurl: http://192.168.2.198:7011
+  weatherqygs: hb_qygs
+  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
+  initialcode: INITIAL
+#tomcat config
+server :
+  port : 8171
+  session:
+    timeout: 7200
+  ##项目名字配置
+  #servlet :
+  #  context-path : /demo
+  tomcat :
+    maxHttpHeaderSize : 8192
+    max-threads : 128
+    min-spare-threads : 5
+    uri-encoding : UTF-8
+    #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-form-post-size: 9000000
+#dev环境  mysql7.0
+spring :
+  application:
+    name: monitor-hb-provider
+    cloud:
+      nacos:
+        discovery:
+          server-addr: 192.168.2.198:8848
+          #指定yaml格式的配置
+          file-extension: yaml
+          cluster-name: master
+        username: nacos
+        password: nacos
+    #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
+    #include: ftpHX,ftpCloud
+  servlet:
+    multipart:
+      #设置总上传的数据大小
+      max-request-size: 100MB
+      #单个文件大小
+      maxFileSize : 30MB
+      #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-post-size: 9000000
+  #热部署模块
+  devtools:
+    restart:
+      #热部署开关
+      enabled: true
+      #指定热部署的目录
+      additional-paths: src/main/java
+      #指定目录不更新
+      exclude: test/**
+
+  redis:
+    database: 19
+    host: 192.168.2.194
+    password:
+    pool:
+      maxTotal: 20
+      maxIdle: 20
+      maxwait: 600000
+      minIdle: 10
+    port: 6379
+    timeout: 600000
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    #    driverClassName: com.mysql.jdbc.Driver
+    #druid连接池配置
+    druid:
+      #主库数据源
+      master:
+        url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+        username: gdprod
+        password: gd123
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+      #备数据源 #关闭
+      slave:
+        enabled: false
+        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+        username: root
+        password: root
+        #两票数据源
+      ticket:
+        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
+
+        username: sa
+        password: ibs
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#mysql 8.0
+
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    #druid连接池配置
+#    druid:
+#     # 主库数据源
+#     master:
+#        url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #树熊数据源
+#     slave:
+#        enabled : false
+#        url: jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #配置初始化连接数大小
+#     initial-size: 10
+#     # 最大连接数
+#     max-active: 50
+#     #最小连接数
+#     min-idle: 10
+#     #获取连接等待超时时间
+#     max-wait: 5000
+#     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+#     max-pool-prepared-statement-per-connection-size: 20
+#     validation-query: SELECT 1 FROM DUAL
+#     validation-query-timeout: 20000
+#     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+#     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+#     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+#     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+#     stat-view-servlet:
+#      enabled: true
+#      url-pattern: /druid/*
+#      #可以增加访问账号密码【去掉注释就可以】
+#      #login-username: admin
+#      #login-password: admin
+#     filter:
+#      stat:
+#        log-slow-sql: true
+#        slow-sql-millis: 1000
+#        merge-sql: true
+#      wall:
+#        config:
+#          multi-statement-allow: true

web/monitor-web-sxjn/src/main/resources/application-hf.yml

@@ -0,0 +1,212 @@
+# 项目相关配置
+gyee:
+  #名称
+  name: v2
+  #版本
+  version: 3.9
+  #版权年份
+  copyrightYear: 2020
+  #文件上传路径
+  defaultBaseDir: D:/v2file/
+  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
+  isstatic: Y
+  #开启存放静态文件夹后目录
+  isroot_dir: static/file_upload/
+  #邮件功能
+  #邮箱发送smtp
+  email_smtp: smtp.sina.com
+  #邮箱发送端口
+  email_port: 465
+  #发送邮箱登录账号
+  email_account: gyee@163.com
+  #发送邮箱登录密码
+  email_password: 1
+  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
+  demoEnabled: false
+  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
+  rollVerification: true
+  #实时数据库Url
+  baseurl: http://192.168.56.1:8011/ts
+
+  #API访问ip
+  #swaggerip: 49.4.50.80:8082
+  swaggerip: 10.155.32.4:8082
+  #默认小数位数
+  digit: 2
+  realtimedataBase: golden #数据查询模式 golden、hwy
+  #weatherurl: http://123.60.213.70:7011
+  weatherurl: http://192.168.56.1:7011
+  #weatherurl: http://10.83.68.97:7011
+  weatherqygs: hb_qygs
+  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
+  initialcode: INITIAL
+#tomcat config
+server :
+  port : 8171
+  session:
+    timeout: 7200
+  ##项目名字配置
+  #servlet :
+  #  context-path : /demo
+  tomcat :
+    maxHttpHeaderSize : 8192
+    max-threads : 128
+    min-spare-threads : 5
+    uri-encoding : UTF-8
+    #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-form-post-size: 9000000
+#dev环境  mysql7.0
+spring :
+  application:
+    name: monitor-hb-provider
+    cloud:
+      nacos:
+        discovery:
+          server-addr: 192.168.56.1:8848
+          #指定yaml格式的配置
+          file-extension: yaml
+          cluster-name: master
+        username: nacos
+        password: nacos
+    #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
+    #include: ftpHX,ftpCloud
+  servlet:
+    multipart:
+      #设置总上传的数据大小
+      max-request-size: 100MB
+      #单个文件大小
+      maxFileSize : 30MB
+      #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-post-size: 9000000
+  #热部署模块
+  devtools:
+    restart:
+      #热部署开关
+      enabled: true
+      #指定热部署的目录
+      additional-paths: src/main/java
+      #指定目录不更新
+      exclude: test/**
+
+  redis:
+    database: 1
+    host: 10.0.118.73
+    password:
+    pool:
+      maxTotal: 20
+      maxIdle: 20
+      maxwait: 600000
+      minIdle: 10
+    port: 6379
+    timeout: 600000
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    #    driverClassName: com.mysql.jdbc.Driver
+    #druid连接池配置
+    druid:
+      #主库数据源
+      master:
+        url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+        username: gdprod
+        password: gd123
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+
+      #备数据源 #关闭
+      slave:
+        enabled: false
+        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+        username: root
+        password: root
+        #两票数据源
+      ticket:
+        url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
+        username: sa
+        password: Gd!123456
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#mysql 8.0
+
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    #druid连接池配置
+#    druid:
+#     # 主库数据源
+#     master:
+#        url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #树熊数据源
+#     slave:
+#        enabled : false
+#        url: jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #配置初始化连接数大小
+#     initial-size: 10
+#     # 最大连接数
+#     max-active: 50
+#     #最小连接数
+#     min-idle: 10
+#     #获取连接等待超时时间
+#     max-wait: 5000
+#     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+#     max-pool-prepared-statement-per-connection-size: 20
+#     validation-query: SELECT 1 FROM DUAL
+#     validation-query-timeout: 20000
+#     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+#     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+#     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+#     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+#     stat-view-servlet:
+#      enabled: true
+#      url-pattern: /druid/*
+#      #可以增加访问账号密码【去掉注释就可以】
+#      #login-username: admin
+#      #login-password: admin
+#     filter:
+#      stat:
+#        log-slow-sql: true
+#        slow-sql-millis: 1000
+#        merge-sql: true
+#      wall:
+#        config:
+#          multi-statement-allow: true

web/monitor-web-sxjn/src/main/resources/application-hwy.yml

@@ -0,0 +1,209 @@
+# 项目相关配置
+gyee:
+  #名称
+  name: v2
+  #版本
+  version: 3.9
+  #版权年份
+  copyrightYear: 2020
+  #文件上传路径
+  defaultBaseDir: D:/v2file/
+  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
+  isstatic: Y
+  #开启存放静态文件夹后目录
+  isroot_dir: static/file_upload/
+  #邮件功能
+  #邮箱发送smtp
+  email_smtp: smtp.sina.com
+  #邮箱发送端口
+  email_port: 465
+  #发送邮箱登录账号
+  email_account: gyee@163.com
+  #发送邮箱登录密码
+  email_password: 1
+  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
+  demoEnabled: false
+  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
+  rollVerification: true
+  #实时数据库Url
+  baseurl: http://123.60.213.70:8011/ts
+
+  #API访问ip
+  swaggerip: 123.60.213.70:8082
+  #默认小数位数
+  digit: 2
+  realtimedataBase: golden #数据查询模式 golden、hwy
+  weatherurl: http://123.60.213.70:7011
+  weatherqygs: hb_qygs
+  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
+  initialcode: INITIAL
+#tomcat config
+server :
+  port : 8171
+  session:
+    timeout: 7200
+  ##项目名字配置
+  #servlet :
+  #  context-path : /demo
+  tomcat :
+    maxHttpHeaderSize : 8192
+    max-threads : 128
+    min-spare-threads : 5
+    uri-encoding : UTF-8
+    #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-form-post-size: 9000000
+#dev环境  mysql7.0
+spring :
+  application:
+    name: monitor-hb-provider
+    cloud:
+      nacos:
+        discovery:
+          server-addr: 123.60.213.70:8848
+          #指定yaml格式的配置
+          file-extension: yaml
+          cluster-name: master
+        username: nacos
+        password: nacos
+    #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
+    #include: ftpHX,ftpCloud
+  servlet:
+    multipart:
+      #设置总上传的数据大小
+      max-request-size: 100MB
+      #单个文件大小
+      maxFileSize : 30MB
+      #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-post-size: 9000000
+  #热部署模块
+  devtools:
+    restart:
+      #热部署开关
+      enabled: true
+      #指定热部署的目录
+      additional-paths: src/main/java
+      #指定目录不更新
+      exclude: test/**
+
+  redis:
+    database: 1
+    host: 192.168.2.202
+    password: gdnxfd123
+    pool:
+      maxTotal: 20
+      maxIdle: 20
+      maxwait: 600000
+      minIdle: 10
+    port: 6379
+    timeout: 600000
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    #    driverClassName: com.mysql.jdbc.Driver
+    #druid连接池配置
+    druid:
+      #主库数据源
+      master:
+        url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+        username: nxfdprod
+        password: gdnxfd123
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+
+      #备数据源 #关闭
+      slave:
+        enabled: false
+        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+        username: root
+        password: root
+        #两票数据源
+      ticket:
+        url: jdbc:sqlserver://123.60.213.70:1434;DatabaseName=fdeamnew
+        username: sa
+        password: Gyee@321#!
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#mysql 8.0
+
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    #druid连接池配置
+#    druid:
+#     # 主库数据源
+#     master:
+#        url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #树熊数据源
+#     slave:
+#        enabled : false
+#        url: jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #配置初始化连接数大小
+#     initial-size: 10
+#     # 最大连接数
+#     max-active: 50
+#     #最小连接数
+#     min-idle: 10
+#     #获取连接等待超时时间
+#     max-wait: 5000
+#     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+#     max-pool-prepared-statement-per-connection-size: 20
+#     validation-query: SELECT 1 FROM DUAL
+#     validation-query-timeout: 20000
+#     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+#     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+#     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+#     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+#     stat-view-servlet:
+#      enabled: true
+#      url-pattern: /druid/*
+#      #可以增加访问账号密码【去掉注释就可以】
+#      #login-username: admin
+#      #login-password: admin
+#     filter:
+#      stat:
+#        log-slow-sql: true
+#        slow-sql-millis: 1000
+#        merge-sql: true
+#      wall:
+#        config:
+#          multi-statement-allow: true

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -0,0 +1,212 @@
+# 项目相关配置
+gyee:
+  #名称
+  name: v2
+  #版本
+  version: 3.9
+  #版权年份
+  copyrightYear: 2020
+  #文件上传路径
+  defaultBaseDir: D:/v2file/
+  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
+  isstatic: Y
+  #开启存放静态文件夹后目录
+  isroot_dir: static/file_upload/
+  #邮件功能
+  #邮箱发送smtp
+  email_smtp: smtp.sina.com
+  #邮箱发送端口
+  email_port: 465
+  #发送邮箱登录账号
+  email_account: gyee@163.com
+  #发送邮箱登录密码
+  email_password: 1
+  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
+  demoEnabled: false
+  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
+  rollVerification: true
+  #实时数据库Url
+  baseurl: http://10.81.3.155:8011/ts
+
+  #API访问ip
+  #swaggerip: 49.4.50.80:8082
+  swaggerip: 10.81.3.155:8082
+  #默认小数位数
+  digit: 2
+  realtimedataBase: golden #数据查询模式 golden、hwy
+  weatherurl: http://10.81.3.155:7011
+  weatherqygs: hb_qygs
+  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
+  initialcode: INITIAL
+#tomcat config
+server :
+  port : 8171
+  session:
+    timeout: 7200
+  ##项目名字配置
+  #servlet :
+  #  context-path : /demo
+  tomcat :
+    maxHttpHeaderSize : 8192
+    max-threads : 128
+    min-spare-threads : 5
+    uri-encoding : UTF-8
+    #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-form-post-size: 9000000
+#dev环境  mysql7.0
+spring :
+  application:
+    name: monitor-hb-provider
+    cloud:
+      nacos:
+        discovery:
+          server-addr: 10.81.3.155:8848
+          #指定yaml格式的配置
+          file-extension: yaml
+          cluster-name: master
+        username: nacos
+        password: nacos
+    #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
+    #include: ftpHX,ftpCloud
+  servlet:
+    multipart:
+      #设置总上传的数据大小
+      max-request-size: 100MB
+      #单个文件大小
+      maxFileSize : 30MB
+      #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-post-size: 9000000
+  #热部署模块
+  devtools:
+    restart:
+      #热部署开关
+      enabled: true
+      #指定热部署的目录
+      additional-paths: src/main/java
+      #指定目录不更新
+      exclude: test/**
+
+  redis:
+    database: 0
+    host: 10.81.3.155
+    password:
+    pool:
+      maxTotal: 20
+      maxIdle: 20
+      maxwait: 600000
+      minIdle: 10
+    port: 6379
+    timeout: 600000
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    #    driverClassName: com.mysql.jdbc.Driver
+    #druid连接池配置
+    druid:
+      #主库数据源
+      master:
+        url: jdbc:postgresql://10.81.3.151:5432/wisdom
+        username: gdprod
+        password: gd123
+        driver-class-name: org.postgresql.Driver
+      #备数据源 #关闭
+      slave:
+#        enabled: false
+#        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+#        username: root
+#        password: root
+        #两票数据源
+      ticket:
+#        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
+#        username: sa
+#        password: ibs
+#        #password: Gd!123456
+#        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#mysql 8.0
+
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    #druid连接池配置
+#    druid:
+#     # 主库数据源
+#     master:
+#        url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #树熊数据源
+#     slave:
+#        enabled : false
+#        url: jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #配置初始化连接数大小
+#     initial-size: 10
+#     # 最大连接数
+#     max-active: 50
+#     #最小连接数
+#     min-idle: 10
+#     #获取连接等待超时时间
+#     max-wait: 5000
+#     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+#     max-pool-prepared-statement-per-connection-size: 20
+#     validation-query: SELECT 1 FROM DUAL
+#     validation-query-timeout: 20000
+#     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+#     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+#     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+#     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+#     stat-view-servlet:
+#      enabled: true
+#      url-pattern: /druid/*
+#      #可以增加访问账号密码【去掉注释就可以】
+#      #login-username: admin
+#      #login-password: admin
+#     filter:
+#      stat:
+#        log-slow-sql: true
+#        slow-sql-millis: 1000
+#        merge-sql: true
+#      wall:
+#        config:
+#          multi-statement-allow: true

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

@@ -1,143 +1,7 @@
-# 项目相关配置
-gyee:
-  #名称
-  name: v2
-  #版本
-  version: 3.9
-  #版权年份
-  copyrightYear: 2020
-  #文件上传路径
-  defaultBaseDir: D:/v2file/
-  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
-  isstatic: Y
-  #开启存放静态文件夹后目录
-  isroot_dir: static/file_upload/
-  #邮件功能
-  #邮箱发送smtp
-  email_smtp: smtp.sina.com
-  #邮箱发送端口
-  email_port: 465
-  #发送邮箱登录账号
-  email_account: gyee@163.com
-  #发送邮箱登录密码
-  email_password: 1
-  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
-  demoEnabled: false
-  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
-  rollVerification: true
-  #实时数据库Url
-  #baseurl: http://10.0.118.73:8011/ts
-  baseurl: http://123.60.213.70:8011/ts
-  #baseurl: http://10.81.3.155:8011/ts
-
-  #API访问ip
-  #swaggerip: 49.4.50.80:8082
-  swaggerip: 10.155.32.4:8082
-  #默认小数位数
-  digit: 2
-  realtimedataBase: golden #数据查询模式 golden、hwy
-  weatherurl: http://123.60.213.70:7011
-  #weatherurl: http://10.81.3.155:7011
-  #weatherurl: http://10.83.68.97:7011
-  weatherqygs: jn_qygs
-  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
-  initialcode: INITIAL
-#tomcat config
-server :
-  port : 8171
-  session:
-    timeout: 7200
-  ##项目名字配置
-  #servlet :
-  #  context-path : /demo
-  tomcat :
-    maxHttpHeaderSize : 8192
-    max-threads : 128
-    min-spare-threads : 5
-    uri-encoding : UTF-8
-    #shiro 报错修改的地方
-    max-connections: 200000
-    max-http-form-post-size: 9000000
 spring :
   # 环境 dev|test|prod
   profiles :
-    active : dev
-  application:
-    name: monitor-web-hb-provider
-    cloud:
-      nacos:
-        discovery:
-          server-addr: 192.168.56.1:8848
-          #server-addr: 10.81.3.155: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:
-    multipart:
-      #设置总上传的数据大小
-      max-request-size: 100MB
-      #单个文件大小
-      maxFileSize : 30MB
-      #shiro 报错修改的地方
-    max-connections: 200000
-    max-http-post-size: 9000000
-  #热部署模块
-  devtools:
-    restart:
-      #热部署开关
-      enabled: true
-      #指定热部署的目录
-      additional-paths: src/main/java
-      #指定目录不更新
-      exclude: test/**
-  mvc:   #静态文件
-    static-path-pattern : /static/**
-    async.request-timeout : 20000 #接口访问超时设置20秒
-  #模板引擎
-  thymeleaf:
-    model: HTML5
-    prefix: classpath:/templates/
-    suffix: .html
-    #指定编码
-    encoding: utf-8
-    #禁用缓存 默认false
-    cache: false
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  redis:
-    database: 1
-    host: 123.60.213.70
-    #host: 10.81.3.155
-    #host: 10.0.118.73
-    password: gdnxfd123
-    pool:
-      maxTotal: 20
-      maxIdle: 20
-      maxwait: 600000
-      minIdle: 10
-    port: 6379
-    timeout: 600000
-#mybatis:
-#  #配置mapper的扫描，找到所有的mapper.xml映射文件
-#  mapperLocations : classpath*:mybatis/*/*.xml
-#  #mybatis提供三种sql执行器，分别是SIMPLE、REUSE、BATCH。
-#  executor-type : reuse
-#  #搜索指定包别名
-#  typeAliasesPackage : com.*.model
-#  #该配置项就是指将带有下划线的表字段映射为驼峰格式的实体类属性。
-#  configuration :
-#    map-underscore-to-camel-case : true
-#mybatis:
-#  configuration:
-#    #开启MyBatis的二级缓存
-#    cache-enabled: false
-#pagehelper分页插件
+    active : jn
 
 
 asyncThreadPool:

web/monitor-web-sxjn/src/main/resources/mybatis/auto/AlarmsnapMapper.xml

@@ -525,4 +525,29 @@
 
   </select>
 
+
+    <select id="getWarningRecordsTop" resultType="com.gyee.frame.model.custom.SawVo">
+
+
+
+        select row_number() over (order by count(*) desc) num,b.alerttext name,count(*) frequency from ${tname} a,alarmsnap b
+        where a.snapid = b.id and category1='windturbine'
+
+        and b.windturbineid='${wtId}'
+        and a.alerttime>= to_date('${beginDate}','YYYY-MM-DD HH24:MI:SS') and a.alerttime &lt; to_date('${endDate}','YYYY-MM-DD HH24:MI:SS')
+
+        group by  b.windturbineid,b.alerttext order by c desc
+    </select>
+
+
+    <select id="getWarningRecordsList" resultType="com.gyee.frame.model.custom.SawVo">
+
+ select  b.alerttext name, a.alerttime time from ${tname} a,alarmsnap b
+        where a.snapid = b.id and category1='windturbine'  and b.windturbineid='${wtId}' order by  a.alerttime desc
+
+
+
+
+    </select>
+
 </mapper>

web/monitor-web-sxjn/src/test/java/test/InitialPointServiceTest.java

@@ -2,7 +2,7 @@ package test;
 
 import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.service.initialpoint.InitialPointEdosService;
+import com.gyee.frame.service.initialpoint.InitialPointEdosHfService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
@@ -18,20 +18,24 @@ public class InitialPointServiceTest {
 
 
 
-        InitialPointEdosService initialPointEdosService= SpringUtils.getBean("initialPointEdosService");
+        InitialPointEdosHfService initialPointEdosHfService= SpringUtils.getBean("initialPointEdosHfService");
 
-        System.out.println("开始导出风机测点。。。。。。");
-        initialPointEdosService.initalFj();
-        System.out.println("结束导出风机测点。。。。。。");
+//        System.out.println("开始导出风机测点。。。。。。");
+//        initialPointEdosHfService.initalFj();
+//        System.out.println("结束导出风机测点。。。。。。");
 
         System.out.println("开始导出风场测点。。。。。。");
-        initialPointEdosService.initalFc(false);
+        initialPointEdosHfService.initalFc(false);
         System.out.println("结束导出风场测点。。。。。。");
-
-
-        System.out.println("开始导出风功率测点。。。。。。");
-        initialPointEdosService.initalFgl();
-        System.out.println("结束导出风功率测点。。。。。。");
+//
+//
+//        System.out.println("开始导出风功率测点。。。。。。");
+//        initialPointEdosHfService.initalFgl();
+//        System.out.println("结束导出风功率测点。。。。。。");
+//
+//        System.out.println("开始导出地调测点。。。。。。");
+//        initialPointEdosHfService.initalDd();
+//        System.out.println("结束导出地调测点。。。。。。");
 
         System.out.println("初始化结束！");
     }