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

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

@@ -2,7 +2,6 @@ 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;
@@ -44,6 +43,7 @@ public class GenreSetPushController {
     private AgcService agcService;
     @Resource
     private ForecastwindspeedService forecastwindspeedService;
+
     @GetMapping("/getAgcValues")
     @ResponseBody
     @ApiOperation(value = "获取AGC信息", notes = "获取AGC信息")
@@ -64,7 +64,6 @@ public class GenreSetPushController {
 
     }
 
-    @Log(title = "获取驾驶舱基础信息")
     @GetMapping("/findBasicDataInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
@@ -86,6 +85,138 @@ public class GenreSetPushController {
 
     }
 
+
+
+    @GetMapping("/findBasicDataInfo_fcmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_fcmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_fcmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+
+    @GetMapping("/findBasicDataInfo_mxztmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_mxztmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_mxztmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+
+    @GetMapping("/findBasicDataInfo_jczbmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_jczbmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_jczbmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+
+    @GetMapping("/findBasicDataInfo_tqmap_xtmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_tqmap_xtmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_tqmap_xtmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+
+    @GetMapping("/findBasicDataInfo_wxssmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_wxssmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_wxssmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
+    @GetMapping("/findBasicDataInfo_gxkmap")
+    @ResponseBody
+    @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findBasicDataInfo_gxkmap(String id) throws Exception {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if(StringUtils.notEmp(id))
+        {
+            map=genreSetPushService.findBasicDataInfo_gxkmap(id);
+        }
+
+        if (null!=map){
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, map);
+        }
+
+    }
+
     @GetMapping("/findPowerInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱功率曲线图和电量柱状图信息", notes = "获取驾驶舱功率曲线图和电量柱状图信息")
@@ -264,8 +395,8 @@ public class GenreSetPushController {
     public AjaxResult findGLDetail(String id, String targetName) throws Exception {
 
 
-       List<Object> vos = new ArrayList<Object>();
- //       Map<String, List> vos = new HashMap<String, List>();
+        List<Object> vos = new ArrayList<Object>();
+        //       Map<String, List> vos = new HashMap<String, List>();
 
         if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
             vos = realPowerPushService.findGLDetail(id,targetName);

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

@@ -236,7 +236,8 @@ public class MatrixPushService {
                     MatrixVo vo = new MatrixVo();
                     vo.setWtId(wt.getId());
                     if (StringUtils.notEmp(wt.getStatus())) {
-                        String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                       // String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                        String num = wt.getStatus().substring(wt.getId().indexOf("_")+1);
                         vo.setWtnum(num);
 
                     }

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

@@ -831,20 +831,24 @@ public class WtInfoPushService {
                             if(namemap.containsKey(keyls.get(i)))
                             {
                                 String[] temparr=namemap.get(keyls.get(i));
-                                if (keyls.get(i).equals("FDJZS")) {
-                                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
-                                    Double fdjzs = (zblist.get(num).getPointValueInDouble());
-                                    if (model.getPowerproduction() == 2000) {
-                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs * 9.55, 2));
-                                    } else {
-                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs, 2));
-                                    }
-                                }else{
-                                    temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
+//                                if (keyls.get(i).equals("FDJZS")) {
+//                                    Equipmentmodel model = InitialRunner.mlmap.get(wt.getModelid());
+//                                    Double fdjzs = (zblist.get(num).getPointValueInDouble());
+//                                    if (model.getPowerproduction() == 2000) {
+//                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs * 9.55, 2));
+//                                    } else {
+//                                        temparr[3]=String.valueOf(StringUtils.round(fdjzs, 2));
+//                                    }
+//                                }else{
+//                                    temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
+//                                }
+                                temparr[3]=String.valueOf(MathUtil.twoBit(zblist.get(num).getPointValueInDouble()));
+//                                jcmap.put(keyls.get(i),temparr);//
+                                if(!jcls.contains(temparr))
+                                {
+                                    jcls.add(temparr);
                                 }
 
-//                                jcmap.put(keyls.get(i),temparr);//
-                                jcls.add(temparr);
                             }