agc功能数据核对并修改

src/main/java/com/gyee/frame/service/websocket/AgcService.java

@@ -123,14 +123,51 @@ public class AgcService {
                             data = ednaApiUtil.getRealData(ai);
                             if (data != null) {
 
-                                if(i==0)
-                                {
-                                    double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).doubleValue();
-                                    resultmap.put( agcPoints[i],llgl);
-                                }else
-                                {
+                                if(i==0) {
+                                    if (wp.getId().equals("MHS_FDC") || wp.getId().equals("NSS_FDC") || wp.getId().equals("XS_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else{
+                                        resultmap.put( agcPoints[i],
+                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
+                                    }
+                                }else if(i==2){
+                                    if (wp.getId().equals("SBQ_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else{
+                                        resultmap.put( agcPoints[i],
+                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
+                                    }
+                                }else if(i==4){
+                                    if (wp.getId().equals("MHS_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else if(wp.getId().equals("NSS_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else{
+                                        resultmap.put( agcPoints[i],
+                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
+                                    }
+                                }
+                                else if(i==5){
+                                    if (wp.getId().equals("MHS_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else if(wp.getId().equals("NSS_FDC")){
+                                        double  llgl = new BigDecimal(data.getPointValueInDouble()).divide(new BigDecimal(10), 2, RoundingMode.HALF_UP).doubleValue();
+                                        resultmap.put( agcPoints[i],llgl);
+                                    }else{
+                                        resultmap.put( agcPoints[i],
+                                                MathUtil.decimal(data.getPointValueInDouble(), 2));
+                                    }
+                                }
+                                else {
                                     resultmap.put( agcPoints[i],
                                             MathUtil.decimal(data.getPointValueInDouble(), 2));
+
+
                                 }
 
 
@@ -190,7 +227,7 @@ public class AgcService {
                 tempmap2.put("ZZSGL", MathUtil.decimal(xlllgl/1000,2));
 
                 tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
-                tempmap.put("ZZSGL", MathUtil.decimal(nwllgl,2));
+                tempmap.put("ZZSGL", MathUtil.decimal(nwllgl/1000,2));
                 tempmap.put("AGC001", MathUtil.decimal(nwcxgl,2));
                 tempmap.put("AGC002", MathUtil.decimal(nwxdzl,2));
                 tempmap.put("AGC003", MathUtil.decimal(nwygsx,2));
@@ -245,7 +282,7 @@ public class AgcService {
                 double sjgl = ednaApiUtil.getRealData("QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0134").getPointValueInDouble();
                 tempmap.put("SSZGL", MathUtil.decimal(sjgl,2));
 
-                tempmap.put("ZZSGL", MathUtil.decimal(slllgl, 2));
+                tempmap.put("ZZSGL", MathUtil.decimal(slllgl/1000, 2));
                 tempmap.put("AGC001", MathUtil.decimal(slcxgl, 2));
                 tempmap.put("AGC002", MathUtil.decimal(slxdzl, 2));
                 tempmap.put("AGC003", MathUtil.decimal(slygsx, 2));
@@ -403,8 +440,14 @@ public class AgcService {
                     if (i < xdglls.size() && StringUtils.notEmp(xdglls.get(i).getPointTime())) {
 
                         if (vos.get(i).getTime() <= new Date().getTime()) {
-                            temp1 = xdglls.get(i).getPointValueInDouble();
-                            vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
+                            if (wp.getId().equals("SBQ_FDC")){
+                                temp1 = xdglls.get(i).getPointValueInDouble()/1000;
+                                vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
+                            }else {
+                                temp1 = xdglls.get(i).getPointValueInDouble();
+                                vos.get(i).setXdzl(StringUtils.round(temp1, 2));// 限电功率
+                            }
+
                         } else {
                             vos.get(i).setXdzl(0d);// 限电功率
                         }