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

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

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

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

@@ -238,8 +238,8 @@ public final class ExcelExport {
 
         if(StringUtils.notEmp(filename))
         {
- //           StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
-            StringBuilder sb=new StringBuilder("d:\\");
+            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/spring/InitialRunner.java

@@ -1,6 +1,5 @@
 package com.gyee.frame.common.spring;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.gyee.frame.common.cache.IGlobalCache;
@@ -196,19 +195,19 @@ public class InitialRunner implements CommandLineRunner {
             }
         }
 
-        String wpString = JSON.toJSONString(globalCache.get("PRODUCT-WP"));
-        wpPointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
-        });
-        String pjString = JSON.toJSONString(globalCache.get("PRODUCT-PJ"));
-        pjPointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
-        });
-        String lnString = JSON.toJSONString(globalCache.get("PRODUCT-LN"));
-        lnPointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
-        });
-
-        String wtString = JSON.toJSONString(globalCache.get("PRODUCT-WT"));
-        wtPointmap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
-        });
+//        String wpString = JSON.toJSONString(globalCache.get("PRODUCT-WP"));
+//        wpPointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        });
+//        String pjString = JSON.toJSONString(globalCache.get("PRODUCT-PJ"));
+//        pjPointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        });
+//        String lnString = JSON.toJSONString(globalCache.get("PRODUCT-LN"));
+//        lnPointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        });
+//
+//        String wtString = JSON.toJSONString(globalCache.get("PRODUCT-WT"));
+//        wtPointmap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
+//        });
         String wpcmapString = (String)(globalCache.get("wpcmap"));
         wpcmap = JSONObject.parseObject(wpcmapString, new TypeReference<Map<String, Map<Double, Windturbinepowercurvefitting>>>() {
         });
@@ -460,45 +459,72 @@ public class InitialRunner implements CommandLineRunner {
         }
 //
 
-//        WindPowerStationTestingPoint2Example windPowerstationTestingPointExample=new WindPowerStationTestingPoint2Example();
-//        windPowerstationTestingPointExample.createCriteria().getAllCriteria();
-//        List<WindPowerStationTestingPoint2> wpPointlist= windPowerstationTestingPoint2Service.selectByExample(windPowerstationTestingPointExample);
-//
-//        Map<String,WindPowerStationTestingPoint2> items=null;
-//        if(wpPointlist!=null && !wpPointlist.isEmpty()){
-//            for(int i=0;i<wpPointlist.size();i++){
-//                WindPowerStationTestingPoint2 point=wpPointlist.get(i);
-//                if(stationPointmap.containsKey(point.getWindpowerstationid())){
-//                    items=stationPointmap.get(point.getWindpowerstationid());
-//                    items.put(point.getUniformcode(), point);
-//                }
-//                else{
-//                    items=new HashMap<String,WindPowerStationTestingPoint2>();
-//                    stationPointmap.put(point.getWindpowerstationid(), items);
-//                    items.put(point.getUniformcode(), point);
-//                }
-//
-//            }
-//        }
-//
-//        WindTurbineTestingPointAi2Example windTurbineTestingPointAiExample=new WindTurbineTestingPointAi2Example();
-//        windTurbineTestingPointAiExample.createCriteria().getAllCriteria();
-//        List<WindTurbineTestingPointAi2> wtAilist= windTurbineTestingPointAiService.selectByExample(windTurbineTestingPointAiExample);
-//
-//        Map<String, WindTurbineTestingPointAi2> map = null;
-//
-//        if(wtAilist != null && !wtAilist.isEmpty()){
-//            for(WindTurbineTestingPointAi2 mp : wtAilist){
-//                if(wtpAimap.containsKey(mp.getWindturbineid())){
-//                    map = wtpAimap.get(mp.getWindturbineid());
-//                    map.put(mp.getUniformcode(), mp);
-//                }else{
-//                    map = new HashMap<String, WindTurbineTestingPointAi2>();
-//                    map.put(mp.getUniformcode(), mp);
-//                    wtpAimap.put(mp.getWindturbineid(), map);
-//                }
-//            }
-//        }
+        WindpowerstationpointnewExample windPowerstationTestingPointExample=new WindpowerstationpointnewExample();
+        windPowerstationTestingPointExample.createCriteria().getAllCriteria();
+        List<Windpowerstationpointnew> wpPointlist= windPowerstationTestingPoint2Service.selectByExample(windPowerstationTestingPointExample);
+
+        Map<String,Windpowerstationpointnew> items=null;
+        if(wpPointlist!=null && !wpPointlist.isEmpty()){
+            for(int i=0;i<wpPointlist.size();i++){
+
+                 if(pjmap.containsKey(wpPointlist.get(i).getWindpowerstationid()))
+                {
+                    Windpowerstationpointnew point=wpPointlist.get(i);
+                    if(pjPointmap.containsKey(point.getWindpowerstationid())){
+                        items=pjPointmap.get(point.getWindpowerstationid());
+                        items.put(point.getUniformcode(), point);
+                    }
+                    else{
+                        items=new HashMap<String,Windpowerstationpointnew>();
+                        pjPointmap.put(point.getWindpowerstationid(), items);
+                        items.put(point.getUniformcode(), point);
+                    }
+                }else if(lnmap.containsKey(wpPointlist.get(i).getWindpowerstationid()))
+                {
+                    Windpowerstationpointnew point=wpPointlist.get(i);
+                    if(lnPointmap.containsKey(point.getWindpowerstationid())){
+                        items=lnPointmap.get(point.getWindpowerstationid());
+                        items.put(point.getUniformcode(), point);
+                    }
+                    else{
+                        items=new HashMap<String,Windpowerstationpointnew>();
+                        lnPointmap.put(point.getWindpowerstationid(), items);
+                        items.put(point.getUniformcode(), point);
+                    }
+                }else
+                {
+                    Windpowerstationpointnew point=wpPointlist.get(i);
+                    if(wpPointmap.containsKey(point.getWindpowerstationid())){
+                        items=wpPointmap.get(point.getWindpowerstationid());
+                        items.put(point.getUniformcode(), point);
+                    }
+                    else{
+                        items=new HashMap<String,Windpowerstationpointnew>();
+                        wpPointmap.put(point.getWindpowerstationid(), items);
+                        items.put(point.getUniformcode(), point);
+                    }
+                }
+            }
+        }
+
+        WindturbinetestingpointnewExample windTurbineTestingPointAiExample=new WindturbinetestingpointnewExample();
+        windTurbineTestingPointAiExample.createCriteria().getAllCriteria();
+        List<Windturbinetestingpointnew> wtAilist= windTurbineTestingPointAiService.selectByExample(windTurbineTestingPointAiExample);
+
+        Map<String, Windturbinetestingpointnew> map = null;
+
+        if(wtAilist != null && !wtAilist.isEmpty()){
+            for(Windturbinetestingpointnew mp : wtAilist){
+                if(wtPointmap.containsKey(mp.getWindturbineid())){
+                    map = wtPointmap.get(mp.getWindturbineid());
+                    map.put(mp.getUniformcode(), mp);
+                }else{
+                    map = new HashMap<String, Windturbinetestingpointnew>();
+                    map.put(mp.getUniformcode(), mp);
+                    wtPointmap.put(mp.getWindturbineid(), map);
+                }
+            }
+        }
 
         EquipmentmodelExample example = new EquipmentmodelExample();
         List<Equipmentmodel> mlls = equipmentmodelService.selectByExample(example);

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

@@ -23,7 +23,6 @@ public class InitialPointGoldenService implements  IinitialPoint{
     private WindturbinestandardpointService windturbinestandardpointService;
     @Resource
     private WindpowerstationstandardpointService windpowerstationstandardpointService;
-
     @Resource
     private ForecaststationtandardpointService forecaststationtandardpointService;
     @Resource
@@ -32,9 +31,10 @@ public class InitialPointGoldenService implements  IinitialPoint{
     private WindsubstationstandardpointService windsubstationstandardpointService;
     @Resource
     private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
-
     @Resource
     private WindturbinetestingpointnewService windturbinetestingpointnewService;
+    @Resource
+    private PhotovoltaicStandardPointService photovoltaicStandardPointService;
 
     private final  String AI="AI";
     private final  String DI="DI";
@@ -84,7 +84,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             Windpowerstationstandardpoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(re.getCode()).append(cs.getId());
+//                            sbtable.append(re.getCode()).append(cs.getId());
                             sb.append(String.valueOf(sba));
                             sb.append("XXXX_XX_XX_XX_XXX_");
                             sb.append(CI);
@@ -149,14 +149,15 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             Windpowerstationstandardpoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(re.getCode()).append(cs.getId());
+//                            sbtable.append(re.getCode()).append(cs.getId());
                             sb.append(String.valueOf(sba));
                             sb.append(re.getCode()).append("F_XX_XX_XX_XXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
                             if(stp.getCode().equals(CI))
                             {
-                                sbtable.append("FC").append("JSFW.");
+//                                sbtable.append("FC").append("JSFW.");
+                                sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
                             Windpowerstationpointnew po=new Windpowerstationpointnew();
@@ -216,14 +217,15 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             Windpowerstationstandardpoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(re.getCode()).append(cs.getId());
+//                            sbtable.append(re.getCode()).append(cs.getId());
                             sb.append(String.valueOf(sba));
                             sb.append(re.getCode()).append("G_XX_XX_XX_XXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
                             if(stp.getCode().equals(CI))
                             {
-                                sbtable.append("GF").append("JSFW.");
+//                                sbtable.append("GF").append("JSFW.");
+                                sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
                             Windpowerstationpointnew po=new Windpowerstationpointnew();
@@ -846,7 +848,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
             List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wp.getId());
 
 
-            if(!stpointls.isEmpty())
+            if(!stpointls.isEmpty() && wp.getId().endsWith("FDC"))
             {
                 for(Windturbine wt:wtls)
                 {
@@ -918,7 +920,7 @@ public class InitialPointGoldenService implements  IinitialPoint{
                             sba.append(wpId).append("FJ");
                         }else   if(wp.getId().endsWith("GDC"))
                         {
-                            sba.append(wpId).append("FJ");
+                            sba.append(wpId).append("GF");
                         }
 
                         StringBuilder sbtable =new StringBuilder();
@@ -999,4 +1001,178 @@ public class InitialPointGoldenService implements  IinitialPoint{
 
     }
 
+
+    public void initalNbq() throws IOException {
+
+        // windturbinetestingpointService.deleteAll();
+
+
+
+        List<PhotovoltaicStandardPoint>  stpointls=photovoltaicStandardPointService.findAllList();
+
+//        Map<String, List<Windturbinestandardpoints>> wpsmap=windturbinestandardpointsService.findAllMap();
+        List<Windturbinetestingpointnew> allpoints=new ArrayList<>();
+
+
+
+
+        for (Windpowerstation wp:InitialRunner.wpallls)
+        {
+
+
+            List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wp.getId());
+
+
+            if(!stpointls.isEmpty() && wp.getId().endsWith("GDC"))
+            {
+                for(Windturbine wt:wtls)
+                {
+
+//                    if(wpsmap.containsKey(wt.getModelid()))
+//                    {
+//                        List<Windturbinestandardpoints> wpsls=wpsmap.get(wt.getModelid());
+
+                    List<Windturbinetestingpointnew> points=new ArrayList<>();
+                    for(int i=0;i<stpointls.size();i++)
+                    {
+
+
+                        PhotovoltaicStandardPoint stp=stpointls.get(i);
+                        StringBuilder sb =new StringBuilder();
+                        sb.append(wp.getPhoto());
+                        String wpId=wp.getId().substring(0,wp.getId().indexOf("_"));
+
+
+                        if(wp.getId().endsWith("FDC"))
+                        {
+
+                            if(stp.getCode().equals(CI))
+                            {
+                                sb.append(wpId).append("F_").append("JS_");
+                            }else
+                            {
+                                sb.append(wpId).append("F_").append("FJ_");
+                            }
+                        }else
+                        {
+                            if(stp.getCode().equals(CI))
+                            {
+                                sb.append(wpId).append("G_").append("JS_");
+                            }else
+                            {
+                                sb.append(wpId).append("G_").append("FJ_");
+                            }
+                        }
+
+                        String temp=null;
+                        temp=wt.getProjectid().substring(0,wt.getProjectid().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
+                        temp=wt.getLineid().substring(0,wt.getProjectid().lastIndexOf("_"));
+                        sb.append("L").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
+
+                        temp=wt.getId().substring(wt.getId().lastIndexOf("_")+1);
+
+                        if(temp.length()==1)
+                        {
+                            sb.append("00").append(temp).append("_");
+                        }else if(temp.length()==2)
+                        {
+                            sb.append("0").append(temp).append("_");
+                        }else
+                        {
+                            sb.append(temp).append("_");
+                        }
+
+
+                        sb.append(stp.getCode());
+
+                        sb.append(stp.getOrdernum());
+
+                        StringBuilder sba =new StringBuilder();
+
+                        if(wp.getId().endsWith("FDC"))
+                        {
+                            sba.append(wpId).append("FJ");
+                        }else   if(wp.getId().endsWith("GDC"))
+                        {
+                            sba.append(wpId).append("GF");
+                        }
+
+                        StringBuilder sbtable =new StringBuilder();
+
+
+                        if(stp.getCode().equals(CI))
+                        {
+                            sbtable.append(sba).append("JSFW.");
+                            sbtable.append(sb);
+                        }else
+                        {
+                            sbtable.append(sba).append(".");
+                            sbtable.append(sb);
+                        }
+
+                        Windturbinetestingpointnew po=new Windturbinetestingpointnew();
+                        po.setId(StringUtils.getUUID());
+//                        po.setCode(V2Config.getInitialcode());
+                        po.setCode(String.valueOf(sbtable));
+                        sb =new StringBuilder();
+                        sb.append(wt.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(wt.getModelid());
+                        po.setModelid(wt.getModelid());
+                        po.setWindturbineid(wt.getId());
+                        po.setUniformcode(stp.getUniformcode());
+                        po.setWindpowerstationid(wt.getWindpowerstationid());
+
+                        if(stp.getCode().equals(CI))
+                        {
+                            sb =new StringBuilder();
+
+                            if(StringUtils.notEmp(wp.getPhoto()))
+                            {
+                                sb.append(wp.getPhoto().replace("_","")).append(".JSFW").append(sba);
+                            }
+
+                            po.setRealtimeid(String.valueOf(sb));
+                        }else
+                        {
+                            sb =new StringBuilder();
+
+                            if(StringUtils.notEmp(wp.getPhoto()))
+                            {
+                                sb.append(wp.getPhoto().replace("_","")).append(".").append(sba);
+                            }
+
+                            po.setRealtimeid(String.valueOf(sb));
+                        }
+
+                        points.add(po);
+
+
+//                               allpoints.addAll(points);
+                    }
+                    allpoints.addAll(points);
+                }
+
+            }
+//            }
+
+
+        }
+
+//        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-sxjn/src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java

@@ -317,7 +317,7 @@ public class MatrixDetialPushService {
                 //功率
                 fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FJGL).getCode());
 
-                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.QSTPOINT_WT_FDJZS).getCode());
+                fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.TPOINT_WT_FDJZS).getCode());
 
 
             }

web/monitor-web-sxjn/src/main/resources/mybatis-generator.xml

@@ -51,20 +51,20 @@
 <!--                userId="root"-->
 <!--                password="123456">-->
 <!--        </jdbcConnection>-->
-<!--        <jdbcConnection-->
-<!--                driverClass="oracle.jdbc.driver.OracleDriver"-->
-<!--                connectionURL="jdbc:oracle:thin:@10.0.118.71:1521:gdsj"-->
-<!--                userId="gdprod"-->
-<!--                password="gd123">-->
-<!--        </jdbcConnection>-->
-
         <jdbcConnection
                 driverClass="oracle.jdbc.driver.OracleDriver"
-                connectionURL="jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd"
-                userId="nxfdprod"
-                password="gdnxfd123">
+                connectionURL="jdbc:oracle:thin:@10.0.118.71:1521:gdsj"
+                userId="gdprod"
+                password="gd123">
         </jdbcConnection>
 
+<!--        <jdbcConnection-->
+<!--                driverClass="oracle.jdbc.driver.OracleDriver"-->
+<!--                connectionURL="jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd"-->
+<!--                userId="nxfdprod"-->
+<!--                password="gdnxfd123">-->
+<!--        </jdbcConnection>-->
+
 <!--                <jdbcConnection-->
 <!--                        driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"-->
 <!--                        connectionURL="jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam"-->