中-46-BattMaintDealarmMapper.xml;199行

lxw

2023-10-31 a67f69b40bbd4770a2db208ba919f6549df0f5c6

中-46-BattMaintDealarmMapper.xml;199行

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

@@ -17,7 +17,7 @@

    List searchByBattGroupIdCondition();
    //电池单体统计分析查询
    List<ReportBattResultDTO> searchByBattGroupId(@Param("dto") ReportBattDTO dto);
    //List<ReportBattResultDTO> searchByBattGroupId(@Param("dto") ReportBattDTO dto);

    //List<ReportBattResultDTO> searchByBattGroupId5(@Param("dto")ReportBattDTO dto);


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

@@ -182,7 +182,8 @@
    public Response searchMonNum(ReportBattDTO dto) {
        List list = new ArrayList();
        if (dto.getTestType() == 3) {
            list = mapper.searchByBattGroupId(dto);
            //list = mapper.searchByBattGroupId(dto);
            list = subService.searchByBattGroupId(dto);
        }
        if (dto.getTestType() == 5) {
            //list = mapper.searchByBattGroupId5(dto);

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

@@ -595,9 +595,17 @@
        dto.setStationName("山西省-太原市-迎泽区-局机房119-局机房站-2");
        dto.setStationName1("山西省");
        List list= subService.searchByBattGroupId5(dto);*/
        /*45*/
        /*45
        //List list= subService.getList_fbo(1000048,5);
        int monCount=subService.getMonCuntBytestRecordCount(1000048,5);
        return  new Response().setII(1,true,monCount,null);
        int monCount=subService.getMonCuntBytestRecordCount(1000048,5);*/
        /*46*/
        ReportBattDTO dto=new ReportBattDTO();
        dto.setBattGroupId(1000007);
        dto.setTestType(2);
        dto.setMonNum(0);
        dto.setStationName("山西省-太原市-迎泽区-局机房119-局机房站-2");
        dto.setStationName1("山西省");
        List list= subService.searchByBattGroupId(dto);
        return  new Response().setII(1,true,list,null);
    }
}

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

@@ -2926,5 +2926,71 @@
        }
        return monCount;
    }
    
    //46-BattMaintDealarmMapper.xml;199行
    public List<ReportBattResultDTO> searchByBattGroupId(ReportBattDTO dto){
        String sql="select    distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel" +
                "        ,db_batt_testdata.tb_batttestdata_inf.battgroupid,max_monvol,min_monvol,db_batt_testdata.tb_batttestdata_inf.test_record_count" +
                "        ,db_batt_testdata.tb_batttestdata_inf.test_type,db_batt_testdata.tb_batttestdata_inf.test_record_count" +
                "        ,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_starttime,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".record_time" +
                "       ,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_timelong,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".group_vol" +
                "        ,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_curr,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_cap" +
                "        ,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".mon_num,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".mon_vol" +
                "        from" +
                "        db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+" " +
                "        where" +
                "        db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId " +
                "        and" +
                "        db_batt_testdata.tb_batttestdata_inf.BattGroupId=db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".battgroupid " +
                "        and" +
                "        db_batt_testdata.tb_batttestdata_inf.test_record_count=db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_record_count " +
                "        and" +
                "        db_batt_testdata.tb_batttestdata_inf.record_num=db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".record_num " +
                "        and db_battinf.tb_battinf.battgroupid="+dto.getBattGroupId()+" and " +
                "        db_batt_testdata.tb_batttestdata_inf.data_available=1" +
                "        and db_batt_testdata.tb_batttestdata_inf.test_type="+dto.getTestType()+" and " +
                "        db_batt_testdata.tb_batttestdata_inf.test_starttype=3 " ;
        if(dto.getMonNum()!=0){
            sql+=" and db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".mon_num="+dto.getMonNum()+" ";
        }
        if(dto.getStationName1()!=null&&!dto.getStationName1().isEmpty()){
            sql+=" and stationname1='"+dto.getStationName1()+"' ";
        }
        if(dto.getStationName()!=null&&!dto.getStationName().isEmpty()){
            sql+=" and stationname='"+dto.getStationName()+"' ";
        }
        sql+="  order by db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".test_record_count asc,db_batt_testdata.tb_batttestdatastop_"+dto.getBattGroupId()+".mon_num asc ";
        List<ReportBattResultDTO> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ReportBattResultDTO> list=new ArrayList<>();
                while (rs.next()){
                    ReportBattResultDTO ph=new ReportBattResultDTO();
                    ph.setBattGroupId(rs.getInt("battGroupId"));
                    ph.setMonCount(rs.getInt("moncount"));
                    ph.setMonCapStd(rs.getFloat("moncapstd"));
                    ph.setMonVolStd(rs.getFloat("monvolstd"));
                    ph.setMonResStd(rs.getFloat("monresstd"));
                    ph.setMonSerStd(rs.getFloat("monserstd"));
                    ph.setFloatVolLevel(rs.getFloat("FloatVolLevel"));
                    ph.setOfflineVolLevel(rs.getFloat("OfflineVolLevel"));
                    ph.setMaxMonVol(rs.getFloat("max_monvol"));
                    ph.setMinMonVol(rs.getFloat("min_monvol"));
                    ph.setTestRecordCount(rs.getInt("test_record_count"));
                    ph.setTestStartTime(rs.getTimestamp("test_starttime"));
                    ph.setRecordTime(rs.getTimestamp("record_time"));
                    ph.setTestTimeLong(rs.getInt("test_timelong"));
                    ph.setGroupVol(rs.getFloat("group_vol"));
                    ph.setTestCurr(rs.getFloat("test_curr"));
                    ph.setTestCap(rs.getFloat("test_cap"));
                    ph.setMonNum(rs.getInt("mon_num"));
                    ph.setMonVol(rs.getFloat("mon_vol"));
                    list.add(ph);
                }
                return list;
            }
        });
        return list;
    }

}

 src/main/resources/mapper/BattMaintDealarmMapper.xml

@@ -177,7 +177,7 @@
        order by StationName1 asc,db_battinf.tb_battinf.BattgroupId asc,test_starttime asc
    </select>
    <!--BattinfThirdImpl中的serchByCondition-->
    <select id="searchByBattGroupId" resultType="com.whyc.dto.result.ReportBattResultDTO" parameterType="com.whyc.dto.ReportBattDTO">
   <!-- <select id="searchByBattGroupId" resultType="com.whyc.dto.result.ReportBattResultDTO" parameterType="com.whyc.dto.ReportBattDTO">
        select
        distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel
        ,db_batt_testdata.tb_batttestdata_inf.battgroupid,max_monvol,min_monvol,db_batt_testdata.tb_batttestdata_inf.test_record_count,db_batt_testdata.tb_batttestdata_inf.test_type,db_batt_testdata.tb_batttestdata_inf.test_record_count
@@ -206,7 +206,7 @@
            and stationname=#{dto.stationName}
        </if>
        order by db_batt_testdata.tb_batttestdatastop_${dto.battGroupId}.test_record_count asc,db_batt_testdata.tb_batttestdatastop_${dto.battGroupId}.mon_num asc
    </select>
    </select>-->
    <!--<select id="searchByBattGroupId5" resultType="com.whyc.dto.result.ReportBattResultDTO" parameterType="com.whyc.dto.ReportBattDTO">
        select
        distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel