接口更新

whyczh

2022-01-14 73fa5efb84f35bfa1c31aa2e11d5723f21bbb2e2

接口更新

 src/main/java/com/whyc/controller/BatttestdataInfController.java

@@ -34,16 +34,16 @@
    public Response searchBattLastHrDataById(@RequestParam int battGroupId) {
        return service.searchBattLastHrDataById(battGroupId);
    }
    @PostMapping("/searchBattLife")
    @ApiOperation(value = "电池组历史放电数据续航能力查询",notes = "Batttestdata_infAction!serchBattLife")
    public Response searchBattLife(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody Battinf binf){
        if (binf.getBattGroupId()==0){
            return service.searchBattLifeNow(pageNum,pageSize,binf);
        }
        if(binf.getBattGroupId()==1){
            return service.searchBattLife(pageNum,pageSize,binf);
        }
        return new Response().set(1,false,"参数错误");
    }
    //@PostMapping("/searchBattLife")
    //@ApiOperation(value = "电池组历史放电数据续航能力查询",notes = "Batttestdata_infAction!serchBattLife")
    //public Response searchBattLife(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody Battinf binf){
    //    if (binf.getBattGroupId()==0){
    //        return service.searchBattLifeNow(pageNum,pageSize,binf);
    //    }
    //    if(binf.getBattGroupId()==1){
    //        return service.searchBattLife(pageNum,pageSize,binf);
    //    }
    //    return new Response().set(1,false,"参数错误");
    //}

}

 src/main/java/com/whyc/mapper/BatttestdataInfMapper.java

@@ -18,7 +18,7 @@
    List<BatttestdataInf> searchDischargeTest(@Param("tinf") BatttestdataInf tinf);

    //机房历史放电数据续航能力查询(实时)
    List<BattState> searchBattLifeNow(@Param("binf")Battinf binf);
    //机房历史放电数据续航能力查询(历史)
    List searchBattLife(@Param("binf")Battinf binf);
    //List<BattState> searchBattLifeNow(@Param("binf")Battinf binf);
    ////机房历史放电数据续航能力查询(历史)
    //List searchBattLife(@Param("binf")Battinf binf);
}

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

@@ -143,53 +143,53 @@
        return list1;
    }

    public Response searchBattLifeNow(int pageNum,int pageSize,Battinf binf){
        PageHelper.startPage(pageNum,pageSize);
        List<BattState> list = mapper.searchBattLifeNow(binf);
        PageInfo<BattState> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo,"查询成功");
    }

    public Response searchBattLife(int pageNum,int pageSize,Battinf binf){
        PageHelper.startPage(pageNum,pageSize);
        List<ReportBattTestDTO> list = mapper.searchBattLife(binf);
        float param = 0;//容量有效参数
        double STDAH = 0;//标存容量
        BattParamLow capLow=new BattParamLow();
        capLow.setLowType(BattCapFactory.CapType_type);;
        capLow.setLowNametype(BattCapFactory.CapType_name);
        capLow.setLowMethod(BattCapFactory.CapType_method);
        List<BattParamLow> listC = battParamLowMapper.serchByLow(capLow);
        if (listC!=null && listC.size()>0){
            param = listC.get(listC.size()-1).getLowValue();
        }
        int flag=0;//该次放电是否有效判断
        List<ReportBattTestDTO> listE=new ArrayList();//存放放电有效的测试
        if (list!=null &&list.size()>0){
            for(int i=0;i<list.size();i++){
                STDAH=list.get(i).getBinf().getMonCapStd();
                float testCap=list.get(i).getTdata().getTestCap();//此次放电量统计
                //System.out.println(list.get(i).getTdata().getBattGroupId()+"  "+list.get(i).getTdata().getTest_record_count()+"   "+testCap+"  "+param+"  "+STDAH);
                flag=BattCapFactory.Judge(testCap, param, STDAH);
                if(flag==1){
                    if(listE.size()>0){
                        int tdata_battgroupid=list.get(i).getTdata().getBattGroupId();
                        int e_battgroupid=listE.get(listE.size()-1).getTdata().getBattGroupId();
                        if(tdata_battgroupid!=e_battgroupid){
                            listE.add(list.get(i));
                        }else{
                            continue;
                        }
                    }else{
                        listE.add(list.get(i));
                    }
                    flag=0;
                }
            }
        }
        PageInfo<ReportBattTestDTO> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo,"查询成功");
    }
    //public Response searchBattLifeNow(int pageNum,int pageSize,Battinf binf){
    //    PageHelper.startPage(pageNum,pageSize);
    //    List<BattState> list = mapper.searchBattLifeNow(binf);
    //    PageInfo<BattState> pageInfo = new PageInfo<>(list);
    //    return new Response().set(1,pageInfo,"查询成功");
    //}
    //
    //public Response searchBattLife(int pageNum,int pageSize,Battinf binf){
    //    PageHelper.startPage(pageNum,pageSize);
    //    List<ReportBattTestDTO> list = mapper.searchBattLife(binf);
    //    float param = 0;//容量有效参数
    //    double STDAH = 0;//标存容量
    //    BattParamLow capLow=new BattParamLow();
    //    capLow.setLowType(BattCapFactory.CapType_type);;
    //    capLow.setLowNametype(BattCapFactory.CapType_name);
    //    capLow.setLowMethod(BattCapFactory.CapType_method);
    //    List<BattParamLow> listC = battParamLowMapper.serchByLow(capLow);
    //    if (listC!=null && listC.size()>0){
    //        param = listC.get(listC.size()-1).getLowValue();
    //    }
    //    int flag=0;//该次放电是否有效判断
    //    List<ReportBattTestDTO> listE=new ArrayList();//存放放电有效的测试
    //    if (list!=null &&list.size()>0){
    //        for(int i=0;i<list.size();i++){
    //            STDAH=list.get(i).getBinf().getMonCapStd();
    //            float testCap=list.get(i).getTdata().getTestCap();//此次放电量统计
    //            //System.out.println(list.get(i).getTdata().getBattGroupId()+"  "+list.get(i).getTdata().getTest_record_count()+"   "+testCap+"  "+param+"  "+STDAH);
    //            flag=BattCapFactory.Judge(testCap, param, STDAH);
    //            if(flag==1){
    //                if(listE.size()>0){
    //                    int tdata_battgroupid=list.get(i).getTdata().getBattGroupId();
    //                    int e_battgroupid=listE.get(listE.size()-1).getTdata().getBattGroupId();
    //                    if(tdata_battgroupid!=e_battgroupid){
    //                        listE.add(list.get(i));
    //                    }else{
    //                        continue;
    //                    }
    //                }else{
    //                    listE.add(list.get(i));
    //                }
    //                flag=0;
    //            }
    //        }
    //    }
    //    PageInfo<ReportBattTestDTO> pageInfo = new PageInfo<>(list);
    //    return new Response().set(1,pageInfo,"查询成功");
    //}


}

 src/main/resources/mapper/BatttestdataInfMapper.xml

@@ -17,13 +17,13 @@
    <result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
    <result column="test_timelong" jdbcType="INTEGER" property="testTimelong" />
    <result column="test_stoptype" jdbcType="INTEGER" property="testStoptype" />
    <result column="group_vol" jdbcType="REAL" property="groupVol" />
    <result column="test_curr" jdbcType="REAL" property="testCurr" />
    <result column="test_cap" jdbcType="REAL" property="testCap" />
    <result column="group_vol" jdbcType="FLOAT" property="groupVol" />
    <result column="test_curr" jdbcType="FLOAT" property="testCurr" />
    <result column="test_cap" jdbcType="FLOAT" property="testCap" />
    <result column="max_monnum" jdbcType="INTEGER" property="maxMonnum" />
    <result column="max_monvol" jdbcType="REAL" property="maxMonvol" />
    <result column="max_monvol" jdbcType="FLOAT" property="maxMonvol" />
    <result column="min_monnum" jdbcType="INTEGER" property="minMonnum" />
    <result column="min_monvol" jdbcType="REAL" property="minMonvol" />
    <result column="min_monvol" jdbcType="FLOAT" property="minMonvol" />
    <result column="mon_num" jdbcType="INTEGER" property="monNum" />
    <result column="mon_vol" jdbcType="REAL" property="monVol" />
    <result column="upload_usr_id" jdbcType="INTEGER" property="uploadUsrId" />
@@ -97,113 +97,113 @@
        </if>
      </where>
    </select>
    <select id="searchBattLifeNow" resultType="com.whyc.dto.BattState" resultMap="resultLifeNow">
      SELECT tb_batt_rtstate.BattGroupId,batt_count,tb_batt_rtstate.rec_datetime,online_vol,group_vol,group_curr,batt_state,
      batt_test_type,batt_test_starttime,batt_test_recordtime,batt_test_tlong,
      batt_test_cap,batt_real_cap,batt_rest_cap,batt_rest_power1_time,batt_rest_power2_time
      ,tb_batt_rtdata.BattGroupId,tb_batt_rtdata.rec_datetime,mon_num,mon_vol,mon_tmp,
      mon_res,mon_ser,mon_conn_res,mon_cap
      ,BINARY(curr1+curr2+curr3) AS curr
      ,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd
      ,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName
      ,MAX(binary tb_batt_rtdata.mon_vol) as maxmonvol,MIN(binary tb_batt_rtdata.mon_vol) as minmonvol
      FROM  db_ram_db.tb_batt_rtstate
      LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId
      LEFT OUTER JOIN db_battinf.tb_battinf  ON tb_batt_rtstate.BattGroupId = db_battinf.tb_battinf.BattGroupId
      LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id
      <where>
        <if test="binf.num!=100">
          and batt_state=#{binf.num}
        </if>
        <if test="binf.num==100">
          and batt_state!=100
        </if>
      </where>
      GROUP BY tb_batt_rtstate.BattGroupId
      order by db_battinf.tb_battinf.stationid asc
    </select>
  <select id="searchBattLife"  parameterType="com.whyc.pojo.Battinf" resultMap="resultLifeDTO">
    SELECT  DISTINCT(tb_batttestdata_inf.BattGroupId),tb_batttestdata_inf.test_starttime,tb_batttestdata_inf.record_time,tb_batttestdata_inf.test_cap,
    tb_batttestdata_inf.max_monvol,tb_batttestdata_inf.min_monvol,tb_batttestdata_inf.test_record_count,tb_batttestdata_inf.test_curr
    ,db_battinf.tb_battinf.load_curr AS curr
    ,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname
    FROM  db_batt_testdata.tb_batttestdata_inf
    LEFT OUTER JOIN db_battinf.tb_battinf ON db_batt_testdata.tb_batttestdata_inf.BattGroupId=db_battinf.tb_battinf.BattGroupId
    <where>
      db_batt_testdata.tb_batttestdata_inf.data_available=1
      <if test="binf.battProductDate!=null and binf.battProductDate1!=null">
      and tb_batttestdata_inf.test_starttime>=#{binf.battProductDate} and tb_batttestdata_inf.test_starttime&lt;=#{binf.battProductDate1}
      </if>
     <if test="binf.stationName!=null and binf.stationName!=''">
       AND db_battinf.tb_battinf.stationname like CONCAT('%',#{binf.stationName},'%')
     </if>
      <if test="binf.stationName1!=null and binf.stationName1!=''">
        AND db_battinf.tb_battinf.stationname1 like CONCAT('%',#{binf.stationName1},'%')
      </if>
    </where>
    ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc
  </select>
<!--    <select id="searchBattLifeNow" resultType="com.whyc.dto.BattState" resultMap="resultLifeNow">-->
<!--      SELECT tb_batt_rtstate.BattGroupId,batt_count,tb_batt_rtstate.rec_datetime,online_vol,group_vol,group_curr,batt_state,-->
<!--      batt_test_type,batt_test_starttime,batt_test_recordtime,batt_test_tlong,-->
<!--      batt_test_cap,batt_real_cap,batt_rest_cap,batt_rest_power1_time,batt_rest_power2_time-->
<!--      ,tb_batt_rtdata.BattGroupId,tb_batt_rtdata.rec_datetime,mon_num,mon_vol,mon_tmp,-->
<!--      mon_res,mon_ser,mon_conn_res,mon_cap-->
<!--      ,BINARY(curr1+curr2+curr3) AS curr-->
<!--      ,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd-->
<!--      ,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName-->
<!--      ,MAX(binary tb_batt_rtdata.mon_vol) as maxmonvol,MIN(binary tb_batt_rtdata.mon_vol) as minmonvol-->
<!--      FROM  db_ram_db.tb_batt_rtstate-->
<!--      LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId-->
<!--      LEFT OUTER JOIN db_battinf.tb_battinf  ON tb_batt_rtstate.BattGroupId = db_battinf.tb_battinf.BattGroupId-->
<!--      LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id-->
<!--      <where>-->
<!--        <if test="binf.num!=100">-->
<!--          and batt_state=#{binf.num}-->
<!--        </if>-->
<!--        <if test="binf.num==100">-->
<!--          and batt_state!=100-->
<!--        </if>-->
<!--      </where>-->
<!--      GROUP BY tb_batt_rtstate.BattGroupId-->
<!--      order by db_battinf.tb_battinf.stationid asc-->
<!--    </select>-->
<!--  <select id="searchBattLife"  parameterType="com.whyc.pojo.Battinf" resultMap="resultLifeDTO">-->
<!--    SELECT  DISTINCT(tb_batttestdata_inf.BattGroupId),tb_batttestdata_inf.test_starttime,tb_batttestdata_inf.record_time,tb_batttestdata_inf.test_cap,-->
<!--    tb_batttestdata_inf.max_monvol,tb_batttestdata_inf.min_monvol,tb_batttestdata_inf.test_record_count,tb_batttestdata_inf.test_curr-->
<!--    ,db_battinf.tb_battinf.load_curr AS curr-->
<!--    ,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname-->
<!--    FROM  db_batt_testdata.tb_batttestdata_inf-->
<!--    LEFT OUTER JOIN db_battinf.tb_battinf ON db_batt_testdata.tb_batttestdata_inf.BattGroupId=db_battinf.tb_battinf.BattGroupId-->
<!--    <where>-->
<!--      db_batt_testdata.tb_batttestdata_inf.data_available=1-->
<!--      <if test="binf.battProductDate!=null and binf.battProductDate1!=null">-->
<!--      and tb_batttestdata_inf.test_starttime>=#{binf.battProductDate} and tb_batttestdata_inf.test_starttime&lt;=#{binf.battProductDate1}-->
<!--      </if>-->
<!--     <if test="binf.stationName!=null and binf.stationName!=''">-->
<!--       AND db_battinf.tb_battinf.stationname like CONCAT('%',#{binf.stationName},'%')-->
<!--     </if>-->
<!--      <if test="binf.stationName1!=null and binf.stationName1!=''">-->
<!--        AND db_battinf.tb_battinf.stationname1 like CONCAT('%',#{binf.stationName1},'%')-->
<!--      </if>-->
<!--    </where>-->
<!--    ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc-->
<!--  </select>-->

  <resultMap id="resultLifeDTO" type="com.whyc.dto.result.ReportBattTestDTO">
    <association property="binf" javaType="com.whyc.pojo.Battinf">
      <result column="maxmonvol" jdbcType="REAL" property="battGroupId" />
      <result column="minmonvol" jdbcType="REAL" property="stationId" />
      <result column="monCapStd" jdbcType="REAL" property="monCapStd" />
      <result column="MonVolStd" jdbcType="REAL" property="monVolStd" />
      <result column="battGroupName" jdbcType="REAL" property="battGroupName" />
      <result column="stationName" jdbcType="REAL" property="stationName" />
      <result column="stationName1" jdbcType="REAL" property="stationName1" />
    </association>
    <association property="tdata" javaType="com.whyc.pojo.BatttestdataInf">
      <result column="battGroupId" javaType="REAL" property="battGroupId"/>
      <result column="test_starttime" jdbcType="TIMESTAMP" property="testStarttime" />
      <result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
      <result column="test_cap" jdbcType="REAL" property="testCap" />
      <result column="max_monvol" jdbcType="REAL" property="maxMonvol" />
      <result column="min_monvol" jdbcType="REAL" property="minMonvol" />
      <result column="test_record_count" jdbcType="REAL" property="testRecordCount" />
      <result column="curr" jdbcType="REAL" property="testCurr" />
    </association>
  </resultMap>
<!--  <resultMap id="resultLifeDTO" type="com.whyc.dto.result.ReportBattTestDTO">-->
<!--    <association property="binf" javaType="com.whyc.pojo.Battinf">-->
<!--      <result column="maxmonvol" jdbcType="FLOAT" property="battGroupId" />-->
<!--      <result column="minmonvol" jdbcType="FLOAT" property="stationId" />-->
<!--      <result column="monCapStd" jdbcType="FLOAT" property="monCapStd" />-->
<!--      <result column="MonVolStd" jdbcType="FLOAT" property="monVolStd" />-->
<!--      <result column="battGroupName" jdbcType="String" property="battGroupName" />-->
<!--      <result column="stationName" jdbcType="String" property="stationName" />-->
<!--      <result column="stationName1" jdbcType="String" property="stationName1" />-->
<!--    </association>-->
<!--    <association property="tdata" javaType="com.whyc.pojo.BatttestdataInf">-->
<!--      <result column="battGroupId" javaType="String" property="battGroupId"/>-->
<!--      <result column="test_starttime" jdbcType="TIMESTAMP" property="testStarttime" />-->
<!--      <result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />-->
<!--      <result column="test_cap" jdbcType="FLOAT" property="testCap" />-->
<!--      <result column="max_monvol" jdbcType="FLOAT" property="maxMonvol" />-->
<!--      <result column="min_monvol" jdbcType="FLOAT" property="minMonvol" />-->
<!--      <result column="test_record_count" jdbcType="Integer" property="testRecordCount" />-->
<!--      <result column="curr" jdbcType="REAL" property="testCurr" />-->
<!--    </association>-->
<!--  </resultMap>-->


  <resultMap id="resultLifeNow" type="com.whyc.dto.BattState">
    <association property="bstate" javaType="com.whyc.pojo.BattRtstate">
      <id column="num" jdbcType="BIGINT" property="num" />
      <result column="BattRtstate.BattGroupId" jdbcType="INTEGER" property="battGroupId" />
      <result column="batt_count" jdbcType="INTEGER" property="battCount" />
      <result column="BattRtstate.rec_datetime" jdbcType="TIMESTAMP" property="recDatetime" />
      <result column="online_vol" jdbcType="REAL" property="onlineVol" />
      <result column="group_vol" jdbcType="REAL" property="groupVol" />
      <result column="group_tmp" jdbcType="REAL" property="groupTmp" />
      <result column="group_curr" jdbcType="REAL" property="groupCurr" />
      <result column="batt_state" jdbcType="INTEGER" property="battState" />
      <result column="batt_test_type" jdbcType="INTEGER" property="battTestType" />
      <result column="batt_test_starttime" jdbcType="TIMESTAMP" property="battTestStarttime" />
      <result column="batt_test_recordtime" jdbcType="TIMESTAMP" property="battTestRecordtime" />
      <result column="batt_test_tlong" jdbcType="INTEGER" property="battTestTlong" />
      <result column="batt_test_cap" jdbcType="REAL" property="battTestCap" />
      <result column="batt_real_cap" jdbcType="REAL" property="battRealCap" />
      <result column="batt_rest_cap" jdbcType="REAL" property="battRestCap" />
      <result column="batt_rest_power1_time" jdbcType="INTEGER" property="battRestPower1Time" />
      <result column="batt_rest_power2_time" jdbcType="INTEGER" property="battRestPower2Time" />
      <result column="test_loadertype" jdbcType="INTEGER" property="testLoadertype" />
      <result column="test_recordnum" jdbcType="INTEGER" property="testRecordnum" />
    </association>
    <association property="bdata" javaType="com.whyc.pojo.BattRtdata">
      <result column="maxmonvol" jdbcType="REAL" property="monVol" />
      <result column="minmonvol" jdbcType="REAL" property="monTmp" />
    </association>
    <association property="binf" javaType="com.whyc.pojo.Battinf">
      <result column="maxmonvol" jdbcType="REAL" property="battGroupId" />
      <result column="minmonvol" jdbcType="REAL" property="stationId" />
      <result column="monCapStd" jdbcType="REAL" property="monCapStd" />
      <result column="MonVolStd" jdbcType="REAL" property="monVolStd" />
      <result column="battGroupName" jdbcType="REAL" property="battGroupName" />
      <result column="deviceName" jdbcType="REAL" property="deviceName" />
      <result column="stationName" jdbcType="REAL" property="stationName" />
      <result column="stationName1" jdbcType="REAL" property="stationName1" />
      <result column="batt_state" jdbcType="REAL" property="num" />
    </association>
  </resultMap>
<!--  <resultMap id="resultLifeNow" type="com.whyc.dto.BattState">-->
<!--    <association property="bstate" javaType="com.whyc.pojo.BattRtstate">-->
<!--      <id column="num" jdbcType="BIGINT" property="num" />-->
<!--      <result column="BattRtstate.BattGroupId" jdbcType="INTEGER" property="battGroupId" />-->
<!--      <result column="batt_count" jdbcType="INTEGER" property="battCount" />-->
<!--      <result column="BattRtstate.rec_datetime" jdbcType="TIMESTAMP" property="recDatetime" />-->
<!--      <result column="online_vol" jdbcType="FLOAT" property="onlineVol" />-->
<!--      <result column="group_vol" jdbcType="FLOAT" property="groupVol" />-->
<!--      <result column="group_tmp" jdbcType="FLOAT" property="groupTmp" />-->
<!--      <result column="group_curr" jdbcType="FLOAT" property="groupCurr" />-->
<!--      <result column="batt_state" jdbcType="INTEGER" property="battState" />-->
<!--      <result column="batt_test_type" jdbcType="INTEGER" property="battTestType" />-->
<!--      <result column="batt_test_starttime" jdbcType="TIMESTAMP" property="battTestStarttime" />-->
<!--      <result column="batt_test_recordtime" jdbcType="TIMESTAMP" property="battTestRecordtime" />-->
<!--      <result column="batt_test_tlong" jdbcType="INTEGER" property="battTestTlong" />-->
<!--      <result column="batt_test_cap" jdbcType="FLOAT" property="battTestCap" />-->
<!--      <result column="batt_real_cap" jdbcType="FLOAT" property="battRealCap" />-->
<!--      <result column="batt_rest_cap" jdbcType="FLOAT" property="battRestCap" />-->
<!--      <result column="batt_rest_power1_time" jdbcType="INTEGER" property="battRestPower1Time" />-->
<!--      <result column="batt_rest_power2_time" jdbcType="INTEGER" property="battRestPower2Time" />-->
<!--      <result column="test_loadertype" jdbcType="INTEGER" property="testLoadertype" />-->
<!--      <result column="test_recordnum" jdbcType="INTEGER" property="testRecordnum" />-->
<!--    </association>-->
<!--    <association property="bdata" javaType="com.whyc.pojo.BattRtdata">-->
<!--      <result column="maxmonvol" jdbcType="FLOAT" property="monVol" />-->
<!--      <result column="minmonvol" jdbcType="FLOAT" property="monTmp" />-->
<!--    </association>-->
<!--    <association property="binf" javaType="com.whyc.pojo.Battinf">-->
<!--      <result column="maxmonvol" jdbcType="FLOAT" property="battGroupId" />-->
<!--      <result column="minmonvol" jdbcType="FLOAT" property="stationId" />-->
<!--      <result column="monCapStd" jdbcType="FLOAT" property="monCapStd" />-->
<!--      <result column="MonVolStd" jdbcType="FLOAT" property="monVolStd" />-->
<!--      <result column="battGroupName" jdbcType="VARCHAR" property="battGroupName" />-->
<!--      <result column="deviceName" jdbcType="VARCHAR" property="deviceName" />-->
<!--      <result column="stationName" jdbcType="VARCHAR" property="stationName" />-->
<!--      <result column="stationName1" jdbcType="VARCHAR" property="stationName1" />-->
<!--      <result column="batt_state" jdbcType="integer" property="num" />-->
<!--    </association>-->
<!--  </resultMap>-->
</mapper>