更新

whycxzp

2022-11-09 d38f9ab24ed18c8e17c7114cbe524cda719fe88c

更新

 src/main/java/com/whyc/service/BattRtdataService.java

@@ -10,9 +10,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -47,12 +45,19 @@
        return new Response().setII(1,list.size()>0?true:false,pageInfo,"");
    }

    public Map<Integer, List<BattRtdata>> getByDevId(int devId) {
    public List<List<BattRtdata>>  getByDevId(int devId) {
        List<List<BattRtdata>> list = new LinkedList<>();
        List<BattRtdata> dataList = mapper.getByDevId(devId);
        if(dataList!=null && dataList.size()>0) {
            return dataList.stream().collect(Collectors.groupingBy(BattRtdata::getBattGroupId));
        }else{
            return new HashMap<>();
            Map<Long, List<BattRtdata>>  map =  dataList.stream().collect(Collectors.groupingBy(BattRtdata::getNum));
            Set<Long> keySet = map.keySet();
            Iterator<Long> iterator = keySet.iterator();
            while (iterator.hasNext()){
                Long next = iterator.next();
                List<BattRtdata> battRtdataList = map.get(next);
                list.add(next.intValue(),battRtdataList);
            }
        }
        return list;
    }
}

 src/main/java/com/whyc/webSocket/Dev60870InverterSocket.java

@@ -74,9 +74,9 @@
                        Dev60870InverterState state = stateService.getByDevId(devId);
                        Map<String,Object> map = new HashMap<>();
                        Fbs9100State fbs9100State = (Fbs9100State) fbs9100StateService.serchContactorState(devId).getData2();
                        Map<Integer, List<BattRtdata>> battRtDataMap = battRtdataService.getByDevId(devId);
                        List<List<BattRtdata>> battRtDataList = battRtdataService.getByDevId(devId);
                        map.put("fbs9100State",fbs9100State);
                        map.put("battRtDataMap",battRtDataMap);
                        map.put("battRtDataMap",battRtDataList);
                        if (session.isOpen()) {
                            //推送信息
                            synchronized (session) {

 src/main/resources/mapper/BattRtdataMapper.xml

@@ -40,7 +40,7 @@

  </select>
    <select id="getByDevId" resultType="com.whyc.pojo.BattRtdata">
      SELECT r.BattGroupId batt_group_id,r.mon_vol,r.mon_tmp,r.mon_res FROM db_ram_db.tb_batt_rtdata r,db_battinf.tb_battinf b where r.BattGroupId = b.BattGroupId and b.FBSDeviceId = #{devId}
      SELECT b.GroupIndexInFBSDevice as num,r.BattGroupId batt_group_id,r.mon_vol,r.mon_tmp,r.mon_res FROM db_ram_db.tb_batt_rtdata r,db_battinf.tb_battinf b where r.BattGroupId = b.BattGroupId and b.FBSDeviceId = #{devId} order by b.GroupIndexInFBSDevice asc
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">