添加场站监视页面上网电量和购网电量数据

src/main/java/com/gyee/frame/service/initialpoint/InitialPointEdosService.java

@@ -70,7 +70,7 @@ public class InitialPointEdosService implements  IinitialPoint{
                         List<WindPowerStationTestingPoint> points=new ArrayList<>();
                         for(int i=0;i<stpointls.size();i++)
                         {
-                            StringBuilder sbtable =new StringBuilder();
+
 
                             Windpowerstationstandardpoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
@@ -78,13 +78,13 @@ public class InitialPointEdosService implements  IinitialPoint{
                             sb.append("XXX_XX_XX_XX_XXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
-                            if(stp.getCode().equals(CI))
-                            {
-                                sbtable.append("JSFW.");
-                                sbtable.append(sb);
-                            }
+//                            if(stp.getCode().equals(CI))
+//                            {
+//                                sbtable.append("JSFW.");
+//                                sbtable.append(sb);
+//                            }
                             WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                            po.setCode(String.valueOf(sbtable));
+                            po.setCode(String.valueOf(sb));
                             sb =new StringBuilder();
                             sb.append(re.getName()).append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -127,13 +127,13 @@ public class InitialPointEdosService implements  IinitialPoint{
                             sb.append("FDC_XX_XX_XX_XXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
-                            if(stp.getCode().equals(CI))
-                            {
-                                sbtable.append("JSFW.");
-                                sbtable.append(sb);
-                            }
+//                            if(stp.getCode().equals(CI))
+//                            {
+//                                sbtable.append("JSFW.");
+//                                sbtable.append(sb);
+//                            }
                             WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                            po.setCode(String.valueOf(sbtable));
+                            po.setCode(String.valueOf(sb));
                             sb =new StringBuilder();
                             sb.append(re.getName()).append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -170,7 +170,7 @@ public class InitialPointEdosService implements  IinitialPoint{
                             points=new ArrayList<>();
                             for(int i=0;i<stpointls.size();i++)
                             {
-                                StringBuilder sbtable =new StringBuilder();
+
 
                                 Windpowerstationstandardpoint stp=stpointls.get(i);
                                 StringBuilder sb =new StringBuilder();
@@ -178,13 +178,13 @@ public class InitialPointEdosService implements  IinitialPoint{
                                 sb.append("GDC_XX_XX_XX_XXX_");
                                 sb.append(CI);
                                 sb.append(stp.getOrdernum());
-                                if(stp.getCode().equals(CI))
-                                {
-                                    sbtable.append("JSFW.");
-                                    sbtable.append(sb);
-                                }
+//                                if(stp.getCode().equals(CI))
+//                                {
+//                                    sbtable.append("JSFW.");
+//                                    sbtable.append(sb);
+//                                }
                                 WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                                po.setCode(String.valueOf(sbtable));
+                                po.setCode(String.valueOf(sb));
                                 sb =new StringBuilder();
                                 sb.append(re.getName()).append(stp.getName());
                                 po.setName(String.valueOf(sb));
@@ -249,7 +249,7 @@ public class InitialPointEdosService implements  IinitialPoint{
         List<WindPowerStationTestingPoint> points=new ArrayList<>();
         for(int i=0;i<stpointls.size();i++)
         {
-            StringBuilder sbtable =new StringBuilder();
+
 
             Windpowerstationstandardpoint stp=stpointls.get(i);
             StringBuilder sb =new StringBuilder();
@@ -258,11 +258,11 @@ public class InitialPointEdosService implements  IinitialPoint{
 
             if(wp.getId().endsWith("FDC"))
             {
-                sbtable.append(temp).append("FC");
+
                 sb.append(temp).append("F_").append("JS_XX_XX_XXX_");
             }else   if(wp.getId().endsWith("GDC"))
             {
-                sbtable.append(temp).append("GC");
+
                 sb.append(temp).append("G_").append("JS_XX_XX_XXX_");
             }
 
@@ -272,14 +272,14 @@ public class InitialPointEdosService implements  IinitialPoint{
 
             sb.append(stp.getOrdernum());
 
-            if(stp.getCode().equals(CI))
-            {
-                sbtable.append("JSFW.");
-                sbtable.append(sb);
-            }
+//            if(stp.getCode().equals(CI))
+//            {
+//                sbtable.append("JSFW.");
+//                sbtable.append(sb);
+//            }
 
             WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-            po.setCode(String.valueOf(sbtable));
+            po.setCode(String.valueOf(sb));
             sb =new StringBuilder();
             sb.append(wp.getName()).append(stp.getName());
             po.setName(String.valueOf(sb));
@@ -312,15 +312,15 @@ public class InitialPointEdosService implements  IinitialPoint{
                 List<WindPowerStationTestingPoint> points=new ArrayList<>();
                 for(int i=0;i<stpointls.size();i++)
                 {
-                    StringBuilder sbtable =new StringBuilder();
+
 
                     Windpowerstationstandardpoint stp=stpointls.get(i);
                     StringBuilder sb =new StringBuilder();
                     sb.append(wp.getPhoto());
                     String temp=wp.getId().substring(0,wp.getId().indexOf("_"));
 
-                    sbtable.append(temp).append("FC");
-                    sb.append(temp).append("F_").append("FJ_");
+
+                    sb.append(temp).append("F_").append("JS_");
                     temp=pj.getId().substring(0,pj.getId().lastIndexOf("_"));
                     sb.append("P").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
                     sb.append("XX_XXX_");
@@ -328,14 +328,14 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                     sb.append(stp.getOrdernum());
 
-                    if(stp.getCode().equals(CI))
-                    {
-                        sbtable.append("JSFW.");
-                        sbtable.append(sb);
-                    }
+//                    if(stp.getCode().equals(CI))
+//                    {
+//                        sbtable.append("JSFW.");
+//                        sbtable.append(sb);
+//                    }
 
                     WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                    po.setCode(String.valueOf(sbtable));
+                    po.setCode(String.valueOf(sb));
                     sb =new StringBuilder();
                     sb.append(pj.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -372,15 +372,15 @@ public class InitialPointEdosService implements  IinitialPoint{
                     List<WindPowerStationTestingPoint> points=new ArrayList<>();
                     for(int i=0;i<stpointls.size();i++)
                     {
-                        StringBuilder sbtable =new StringBuilder();
+
 
                         Windpowerstationstandardpoint stp=stpointls.get(i);
                         StringBuilder sb =new StringBuilder();
                         sb.append(wp.getPhoto());
                         String temp=wp.getId().substring(0,wp.getId().indexOf("_"));
 
-                        sbtable.append(temp).append("FC");
-                        sb.append(temp).append("F_").append("FJ_");
+
+                        sb.append(temp).append("F_").append("JS_");
                         temp=pj.getId().substring(0,pj.getId().lastIndexOf("_"));
                         sb.append("P").append(Integer.valueOf(temp.substring(temp.length()-2))).append("_");
                         temp=ln.getId().substring(0,ln.getId().lastIndexOf("_"));
@@ -390,14 +390,14 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                         sb.append(stp.getOrdernum());
 
-                        if(stp.getCode().equals(CI))
-                        {
-                            sbtable.append("JSFW.");
-                            sbtable.append(sb);
-                        }
+//                        if(stp.getCode().equals(CI))
+//                        {
+//                            sbtable.append("JSFW.");
+//                            sbtable.append(sb);
+//                        }
 
                         WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                        po.setCode(String.valueOf(sbtable));
+                        po.setCode(String.valueOf(sb));
                         sb =new StringBuilder();
                         sb.append(ln.getName()).append(stp.getName());
                         po.setName(String.valueOf(sb));
@@ -498,16 +498,16 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                         sb.append(stp.getOrdernum());
 
-                        if(stp.getCode().equals(CI))
-                        {
-                            sbtable.append("JSFW.");
-                            sbtable.append(sb);
-                        }else
-                        {
-                            sbtable.append(".").append(sb);
-                        }
+//                        if(stp.getCode().equals(CI))
+//                        {
+//                            sbtable.append("JSFW.");
+//                            sbtable.append(sb);
+//                        }else
+//                        {
+//                            sbtable.append(".").append(sb);
+//                        }
                         Windsubstationtestingpoint2 po=new Windsubstationtestingpoint2();
-                        po.setCode(String.valueOf(sbtable));
+                        po.setCode(String.valueOf(sb));
                         sb =new StringBuilder();
                         sb.append(wsub.getAname()).append(stp.getName());
                         po.setName(String.valueOf(sb));
@@ -556,7 +556,7 @@ public class InitialPointEdosService implements  IinitialPoint{
                 List<WindPowerStationTestingPoint> points=new ArrayList<>();
                 for(int i=0;i<stpointls.size();i++)
                 {
-                    StringBuilder sbtable =new StringBuilder();
+
 
                     Forecaststationtandardpoint stp=stpointls.get(i);
                     StringBuilder sb =new StringBuilder();
@@ -565,11 +565,11 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                     if(wp.getId().endsWith("FDC"))
                     {
-                        sbtable.append(temp).append("FGL");
+
                         sb.append(temp).append("F_").append("YC_XX_XX_XXX_");
                     }else   if(wp.getId().endsWith("GDC"))
                     {
-                        sbtable.append(temp).append("GGL");
+
                         sb.append(temp).append("G_").append("YC_XX_XX_XXX_");
                     }
 
@@ -582,11 +582,9 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                     sb.append(stp.getOrdernum());
 
-                    sbtable.append(".");
-                    sbtable.append(sb);
 
                     WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
-                    po.setCode(String.valueOf(sbtable));
+                    po.setCode(String.valueOf(sb));
                     sb =new StringBuilder();
                     sb.append(wp.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -643,15 +641,23 @@ public class InitialPointEdosService implements  IinitialPoint{
                             List<Windturbinetestingpoint> points=new ArrayList<>();
                             for(int i=0;i<stpointls.size();i++)
                             {
-                                StringBuilder sbtable =new StringBuilder();
+
 
                                 Windturbinestandardpoint stp=stpointls.get(i);
                                 StringBuilder sb =new StringBuilder();
                                 sb.append(wp.getPhoto());
                                 String temp=wp.getId().substring(0,wp.getId().indexOf("_"));
 
-                                sbtable.append(temp).append("FJ");
-                                sb.append(temp).append("F_").append("FJ_");
+
+                              //  sb.append(temp).append("F_").append("FJ_");
+
+                                if(stp.getCode().equals(CI))
+                                {
+                                    sb.append(temp).append("F_").append("JS_");
+                                }else
+                                {
+                                    sb.append(temp).append("F_").append("FJ_");
+                                }
                                 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("_"));
@@ -675,17 +681,10 @@ public class InitialPointEdosService implements  IinitialPoint{
 
                                 sb.append(stp.getOrdernum());
 
-                                if(stp.getCode().equals(CI))
-                                {
-                                    sbtable.append("JSFW.");
-                                    sbtable.append(sb);
-                                }else
-                                {
-                                    sbtable.append(".").append(sb);
-                                }
+
                                 Windturbinetestingpoint po=new Windturbinetestingpoint();
-                                po.setId(String.valueOf(sbtable));
-                                po.setCode(String.valueOf(sbtable));
+                                po.setId(String.valueOf(sb));
+                                po.setCode(String.valueOf(sb));
                                 sb =new StringBuilder();
                                 sb.append(wt.getName()).append(stp.getName());
                                 po.setName(String.valueOf(sb));