线路测点生成修改，首页BUG调试

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -1174,165 +1174,6 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                 allpoints.addAll(points);
 
-//                List<ProBasicCompany> companys = proBasicCompanyService.list().stream().filter(i -> i.getGroupId().equals(group.getId())).collect(Collectors.toList());
-//                if (!companys.isEmpty()) {
-//                    for (ProBasicCompany cs : companys) {
-//                        sba = new StringBuilder();
-//                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
-///********************************************区域公司测点**************************************************/
-//                        points = new ArrayList<>();
-//                        for (int i = 0; i < pointls.size(); i++) {
-//                            ProEconTestingPoint stp = pointls.get(i);
-//                            if (cs.getId().equals("SXJ_KGDL_FLFD_ZGS") && stp.getTypeId().equals("gcc") || cs.getId().equals("SXJ_KGDL_GFFD_ZGS") && stp.getTypeId().equals("fcc") ||
-//                                    cs.getId().equals("NMM_KGDL_QH_ZGS") && stp.getTypeId().equals("gcc")|| cs.getIsAble().equals(2)) {
-//                                continue;
-//                            }
-//                            StringBuilder sb = new StringBuilder();
-//                            StringBuilder sbtable = new StringBuilder();
-//                            sbtable.append("NEM_");
-//                            sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//
-//                            sb.append(String.valueOf(sba));
-//                            sb.append("XXX_X_XX_XX_XXXX_");
-//                            sb.append(stp.getTypeId().toUpperCase()).append("_");
-//                            sb.append("CI");
-//                            sb.append(stp.getNemCode());
-//
-//
-//                            sbtable.append("JSFW.");
-//                            sbtable.append(sb);
-//
-//                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                            po.setId(StringUtils.getUUID());
-//                            po.setNemCode(String.valueOf(sbtable));
-//                            sb = new StringBuilder();
-//                            sb.append(cs.getName()).append(stp.getName());//子公司表
-//                            po.setName(String.valueOf(sb));
-//                            po.setModel(null);
-//                            po.setModelId(null);
-//
-//                            StringBuilder tempsb = new StringBuilder();
-//
-//                            if (StringUtils.notEmp(group.getNemCode())) {
-//                                tempsb.append(group.getNemCode()).append("0");
-//                            } else {
-//                                tempsb.append("0");
-//                            }
-//
-//                            po.setWindpowerstationId(String.valueOf(tempsb));
-//                            po.setUniformCode(stp.getUniformCode());
-//                            po.setTypeId(stp.getTypeId());//逻辑表-fcc
-//                            po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//
-//                            points.add(po);
-//                        }
-//
-//                        allpoints.addAll(points);
-///*******************************************区域公司测点*******************************************************/
-///********************************************风电场公司测点**************************************************/
-//                        points = new ArrayList<>();
-//
-//                        sba = new StringBuilder();
-//                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
-//                        for (int i = 0; i < fdpointls.size(); i++) {
-//
-//                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
-//                            if(null == groupFCCompany || groupFCCompany.size()<=0){
-//                                break;
-//                            }
-//                            ProEconTestingPoint stp = fdpointls.get(i);
-//                            StringBuilder sb = new StringBuilder();
-//                            StringBuilder sbtable = new StringBuilder();
-//                            sbtable.append("NEM_");
-//                            sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//                            sb.append(String.valueOf(sba));
-//                            sb.append("XXX_F_XX_XX_XXXX_");
-//                            sb.append(stp.getTypeId().toUpperCase()).append("_");
-//                            sb.append("CI");
-//                            sb.append(stp.getNemCode());
-//
-//
-//                            sbtable.append("JSFW.");
-//                            sbtable.append(sb);
-//
-//                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                            po.setId(StringUtils.getUUID());
-//                            po.setNemCode(String.valueOf(sbtable));
-//                            sb = new StringBuilder();
-//                            sb.append(cs.getName()).append("风电").append(stp.getName());
-//                            po.setName(String.valueOf(sb));
-//                            po.setModel(null);
-//                            po.setModelId(null);
-//
-//                            StringBuilder tempsb = new StringBuilder();
-//                            if (StringUtils.notEmp(group.getNemCode())) {
-//                                tempsb.append(group.getNemCode()).append("-1");
-//                            } else {
-//                                tempsb.append("-1");
-//                            }
-//                            po.setWindpowerstationId(String.valueOf(tempsb));
-//                            po.setUniformCode(stp.getUniformCode());
-//                            po.setTypeId(stp.getTypeId());
-//                            po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//
-//                            points.add(po);
-//                        }
-//
-//                        allpoints.addAll(points);
-//                        /*******************************************风电测点生成*******************************************************/
-//
-//
-///*********************************************光伏测点生成*****************************************************/
-//                        sba = new StringBuilder();
-//                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
-//                        points = new ArrayList<>();
-//                        for (int i = 0; i < gfpointls.size(); i++) {
-//
-//                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
-//                            if(null == groupGCCompany || groupGCCompany.size()<=0){
-//                                break;
-//                            }
-//                            ProEconTestingPoint stp = gfpointls.get(i);
-//                            StringBuilder sb = new StringBuilder();
-//                            StringBuilder sbtable = new StringBuilder();
-//                            sbtable.append("NEM_");
-//                            sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//                            sb.append(String.valueOf(sba));
-//                            sb.append("XXX_G_XX_XX_XXXX_");
-//                            sb.append(stp.getTypeId().toUpperCase()).append("_");
-//                            sb.append("CI");
-//                            sb.append(stp.getNemCode());
-//
-//
-//                            sbtable.append("JSFW.");
-//                            sbtable.append(sb);
-//
-//                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                            po.setId(StringUtils.getUUID());
-//                            po.setNemCode(String.valueOf(sbtable));
-//                            sb = new StringBuilder();
-//                            sb.append(cs.getName()).append("光伏").append(stp.getName());
-//                            po.setName(String.valueOf(sb));
-//                            po.setModel(null);
-//                            po.setModelId(null);
-//                            StringBuilder tempsb = new StringBuilder();
-//
-//                            if (StringUtils.notEmp(group.getNemCode())) {
-//                                tempsb.append(group.getNemCode()).append("-2");
-//                            } else {
-//                                tempsb.append("-2");
-//                            }
-//
-//                            po.setWindpowerstationId(String.valueOf(tempsb));
-//                            po.setUniformCode(stp.getUniformCode());
-//                            po.setTypeId(stp.getTypeId());
-//                            po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//                            points.add(po);
-//                        }
-//
-//                        allpoints.addAll(points);
-//                    }
-//                }
             }
         }
 
@@ -1578,7 +1419,12 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         po.setWindpowerstationId(ln.getId());
                         po.setUniformCode(stp.getUniformCode());
                         po.setTypeId(stp.getTypeId());
-                        po.setRealtimeId("INITIAL".equals(sbtable) ? String.valueOf(sbtable).substring(0,sbtable.indexOf(".")):"");
+//                        po.setRealtimeId("INITIAL".equals(sbtable) ? String.valueOf(sbtable).substring(0,sbtable.indexOf(".")):"");
+                        if (sbtable.toString().equals("INITIAL")){
+                            po.setRealtimeId(sbtable.toString());
+                        } else {
+                            po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+                        }
 
                         points.add(po);
                     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -19,6 +19,8 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.gyee.runeconomy.init.CacheContext.pjls;
+
 @Service
 public class MonitorService {
     private static Logger logger = LoggerFactory.getLogger(MonitorService.class);
@@ -111,7 +113,7 @@ public class MonitorService {
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
-                        xx.put("gl", gl);
+                        xx.put("gl", MathUtil.twoBit(gl));
                     }else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")){
                         xx.put("zczjts", Double.valueOf(wp.getJrquantityZc()));
                         xx.put("jzzjts", Double.valueOf(wp.getJrquantityJz()));
@@ -119,7 +121,7 @@ public class MonitorService {
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
-                        xx.put("gl", gl);
+                        xx.put("gl", MathUtil.twoBit(gl));
                     }
                     station.put(id, xx);
                 }
@@ -130,19 +132,26 @@ public class MonitorService {
 
             /**********************************************首页穿透线路信息统计**********************************************************/
 
-            Map<String, Double> xl = new LinkedHashMap<>();
+
             Map<String, Object> xlmap = new LinkedHashMap<>();
+
             if (!wpls1.isEmpty()) {
-                for (ProBasicLine ls : CacheContext.lnls) {
+                double xlgl = 0.0;
+                double i = 0;
+                for (ProBasicLine ls :  CacheContext.lnls) {
+                    Map<String, Double> xl = new LinkedHashMap<>();
                     String lineid = ls.getId();
-                    double xlgl = 0.0;
+                    i++;
                     ProBasicPowerstationPoint xlglvalue = proBasicPowerstationPointService.getPowerstationPoint(lineid, ContantXk.SSZGL);
                     xlgl = edosUtil.getRealData(xlglvalue).getPointValueInDouble();
-                    xl.put("xlgl", xlgl);
+                    xl.put("i",i);
+                    xl.put("xlgl", MathUtil.twoBit(xlgl));
                     xlmap.put(lineid, xl);
                 }
             }
             map.put("xlmap", xlmap);
+
+
             /**********************************************首页穿透线路信息统计**********************************************************/
 
 
@@ -334,12 +343,12 @@ public class MonitorService {
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
 
             }
-            qt.put("aqts", aqts);
-            qt.put("sjgl", sjgl);
-            qt.put("jys", jys);
-            qt.put("jym", jym);
-            qt.put("co2", co2);
-            qt.put("so2", so2);
+            qt.put("aqts", MathUtil.twoBit(aqts));
+            qt.put("sjgl", MathUtil.twoBit(sjgl));
+            qt.put("jys", MathUtil.twoBit(jys));
+            qt.put("jym", MathUtil.twoBit(jym));
+            qt.put("co2", MathUtil.twoBit(co2));
+            qt.put("so2", MathUtil.twoBit(so2));
 
             map.put("qt", qt);
             /**********************************************首页安全天数、实时功率及节能减排等信息统计**********************************************************/