update battRtState.battStateRate

whycrzh

2021-01-23 452d29df782fb1a91ce16d565fcb6e5cccadb82e

update battRtState.battStateRate

 src/main/java/com/fgkj/mapper/impl/Batt_rtstateMapper.java

@@ -143,7 +143,7 @@
    
    }*/
    @Select("SELECT  DISTINCT tb_batt_rtstate.BattGroupId,batt_state, " +
            "COUNT(tb_batt_rtstate.BattGroupId) as stateNum " +
            "COUNT(tb_batt_rtstate.BattGroupId) as batt_count " +
            "FROM db_ram_db.tb_batt_rtstate " +
            "GROUP BY tb_batt_rtstate.BattGroupId,batt_state " +
            "having db_ram_db.tb_batt_rtstate.BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid " +
@@ -153,7 +153,7 @@
            "and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
            "and db_user.tb_user_inf.uid=#{uId} ) " +
            "ORDER BY batt_state")
    public List<BattRtStateBean> serchBattStateRate(User_inf obj);
    public List<Batt_rtstate> serchBattStateRate(User_inf obj);

    //电池组实时情况+实时电池续航能力查询
    /*public List serchBattLife(Object obj) {

 src/main/java/com/fgkj/services/Batt_DevdischargeService.java

@@ -80,8 +80,6 @@
        binf.setMonCount(0);
        binf.setMonNum(0);
        List<Batt_Devdischarge> listN=mapper.serchMaxAndMinNum(binf);
        System.out.println("listN = " + listN);
        //TODO 待测试-数据库数据不足
        if(listN!=null&&listN.size()>0){
            float number=listN.get(listN.size()-1).getDev_curr();
            float maxnum=listN.get(listN.size()-1).getDev_power();

 src/main/java/com/fgkj/services/Batt_rtstateService.java

@@ -1,10 +1,12 @@
package com.fgkj.services;

import com.fgkj.dto.*;
import com.fgkj.mapper.BattTestData;
import com.fgkj.mapper.impl.Batt_rtdataMapper;
import com.fgkj.mapper.impl.Batt_rtstateMapper;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

import javax.annotation.Resource;
@@ -113,8 +115,49 @@
    //首页上饼状图电池状态比例
    public ServiceModel serchBattStateRate(User_inf obj){
        ServiceModel model = new ServiceModel();
        List list=mapper.serchBattStateRate(obj);
        List<Batt_rtstate> list=mapper.serchBattStateRate(obj);
        int test_plan0=0;//状态为无
        int test_plan1=0;//状态为浮充
        int test_plan2=0;//状态为充电
        int test_plan3=0;//状态为放电
        int test_plan4=0;//状态为均充
        if(list!=null&&list.size()>0){
            for (Batt_rtstate batt_rtstate : list) {
                if(batt_rtstate.getBatt_state()==BattTestData.test_plan0){
                    test_plan0+=batt_rtstate.getBatt_count();    // COUNT(tb_batt_rtstate.BattGroupId) batt_count
                }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan1){
                    test_plan1+=batt_rtstate.getBatt_count();
                }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan2){
                    test_plan2+=batt_rtstate.getBatt_count();
                }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan3){
                    test_plan3+=batt_rtstate.getBatt_count();
                }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan4){
                    test_plan4+=batt_rtstate.getBatt_count();
                }
            }
            list= new ArrayList<>();
            {
                Batt_rtstate bstate = new Batt_rtstate();
                bstate.setBatt_state(BattTestData.test_plan0);
                bstate.setNum(test_plan0);
                list.add(bstate);
                Batt_rtstate bstate1 = new Batt_rtstate();
                bstate1.setBatt_state(BattTestData.test_plan1);
                bstate1.setNum(test_plan1);
                list.add(bstate1);
                Batt_rtstate bstate2 = new Batt_rtstate();
                bstate2.setBatt_state(BattTestData.test_plan2);
                bstate2.setNum(test_plan2);
                list.add(bstate2);
                Batt_rtstate bstate3 = new Batt_rtstate();
                bstate3.setBatt_state(BattTestData.test_plan3);
                bstate3.setNum(test_plan3);
                list.add(bstate3);
                Batt_rtstate bstate4 = new Batt_rtstate();
                bstate4.setBatt_state(BattTestData.test_plan4);
                bstate4.setNum(test_plan4);
                list.add(bstate4);
            }
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
@@ -128,8 +171,19 @@
    //测试数据——实时查询中左下角的充放电统计(旧)
    public ServiceModel serchDisOrChargr(){
        ServiceModel model = new ServiceModel();
        List list=mapper.serchDisOrChargr();
        List<Batt_rtstate> list=mapper.serchDisOrChargr();
        if(list!=null&&list.size()>0){
            int charge=0;
            int dischar=0;
            for (Batt_rtstate brt: list) {
                if(brt.getBatt_test_type()==3){
                    dischar++;
                }else if(brt.getBatt_test_type()==2){
                    charge++;
                }
            }
            list.get(list.size()-1).setNum(charge);
            list.get(list.size()-1).setBatt_count(dischar);
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
@@ -146,8 +200,19 @@
    //测试数据——实时查询中左下角的充放电统计(用户管理的机房)
    public ServiceModel serchDisOrChargrNew(User_inf obj){
        ServiceModel model = new ServiceModel();
        List list=mapper.serchDisOrChargrNew(obj);
        List<Batt_rtstate> list=mapper.serchDisOrChargrNew(obj);
        if(list!=null&&list.size()>0){
            int charge=0;
            int dischar=0;
            for (Batt_rtstate brt: list) {
                if(brt.getBatt_test_type()==3){
                    dischar++;
                }else if(brt.getBatt_test_type()==2){
                    charge++;
                }
            }
            list.get(list.size()-1).setNum(charge);
            list.get(list.size()-1).setBatt_count(dischar);
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");