逆变器集合修改

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

@@ -16,6 +16,7 @@ import com.gyee.frame.service.*;
 import com.gyee.frame.service.photovolatic.JunctionboxService;
 import com.gyee.frame.service.photovolatic.PhotovoltaicTestingPointNewService;
 import com.gyee.frame.util.*;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
@@ -308,6 +309,55 @@ public class WtInfoPushService {
                                 }
 
                             }
+                            List<WtTargetConfigVo> di=new ArrayList<>();
+                            List<WtTargetConfigVo> ai=new ArrayList<>();
+                            List<WtTargetConfigVo> ci=new ArrayList<>();
+                            if (!vos.isEmpty()){
+                                for (WtTargetConfigVo w1:vos){
+                                    if(StringUtils.notEmp(w1.getPointtype()))
+                                    {
+                                        if (w1.getPointtype().endsWith("di")){
+                                            WtTargetConfigVo vo=new WtTargetConfigVo();
+                                            vo.setCode(w1.getCode());
+                                            vo.setModelid(w1.getModelid());
+                                            vo.setName(w1.getName());
+                                            vo.setPointtype(w1.getPointtype());
+                                            vo.setRate(w1.getRate());
+                                            vo.setUnit(w1.getUnit());
+                                            vo.setValue(w1.getValue());
+                                            vo.setTypes(w1.getTypes());
+                                            di.add(vo);
+                                        }
+                                        if (w1.getPointtype().endsWith("ai")){
+                                            WtTargetConfigVo vo1=new WtTargetConfigVo();
+                                            vo1.setCode(w1.getCode());
+                                            vo1.setModelid(w1.getModelid());
+                                            vo1.setName(w1.getName());
+                                            vo1.setPointtype(w1.getPointtype());
+                                            vo1.setRate(w1.getRate());
+                                            vo1.setUnit(w1.getUnit());
+                                            vo1.setValue(w1.getValue());
+                                            vo1.setTypes(w1.getTypes());
+                                            ai.add(vo1);
+                                        }
+                                        if (w1.getPointtype().endsWith("ci")){
+                                            WtTargetConfigVo vo2=new WtTargetConfigVo();
+                                            vo2.setCode(w1.getCode());
+                                            vo2.setModelid(w1.getModelid());
+                                            vo2.setName(w1.getName());
+                                            vo2.setPointtype(w1.getPointtype());
+                                            vo2.setRate(w1.getRate());
+                                            vo2.setUnit(w1.getUnit());
+                                            vo2.setValue(w1.getValue());
+                                            vo2.setTypes(w1.getTypes());
+                                            ci.add(vo2);
+                                        }
+                                    }
+                                }
+                            }
+                        map.put("ai",ai);
+                        map.put("di",di);
+                        map.put("ci",ci);
                             map.put(entry.getKey(), vos);
                         }
                     }