| src/main/java/com/whyc/mapper/BattMaintDealarmMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/BattMaintDealarmService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/StandardFeatureCurveService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/SubTablePageInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/BattMaintDealarmMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BattMaintDealarmMapper.java
@@ -19,7 +19,7 @@ //电池单体统计分析查询 List<ReportBattResultDTO> searchByBattGroupId(@Param("dto") ReportBattDTO dto); List<ReportBattResultDTO> searchByBattGroupId5(@Param("dto")ReportBattDTO dto); //List<ReportBattResultDTO> searchByBattGroupId5(@Param("dto")ReportBattDTO dto); } src/main/java/com/whyc/service/BattMaintDealarmService.java
@@ -10,6 +10,7 @@ import com.whyc.pojo.Battinf; import com.whyc.pojo.BatttestdataInf; import com.whyc.util.PageInfoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -36,6 +37,9 @@ @Resource private BatttestdataInfService batttestdataInfService; @Autowired private SubTablePageInfoService subService; public Response searchLow(ReportBattDTO tinf, int userId) { Response res = new Response(); @@ -181,7 +185,8 @@ list = mapper.searchByBattGroupId(dto); } if (dto.getTestType() == 5) { list = mapper.searchByBattGroupId5(dto); //list = mapper.searchByBattGroupId5(dto); list = subService.searchByBattGroupId5(dto); } //添加内阻测试设置为标准值的那一笔，如果没有则拿最新的一笔 List listRes = new ArrayList(); src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -2,6 +2,7 @@ import cn.hutool.json.JSONUtil; import com.whyc.dto.InterfaceParam; import com.whyc.dto.ReportBattDTO; import com.whyc.dto.Response; import com.whyc.dto.StandardFeatureCurve; import com.whyc.dto.paramter.AlarmPar; @@ -576,7 +577,7 @@ ld9inf.setTestRecordCount(1); //List list= subService.getLD9AllGroupByTestRecordCount(ld9inf); Map map= subService.getLD9AllGroupTimeLong(ld9inf);*/ /*37*/ /*37 //float vol=subService.calcAvgVol_stop(1000028,1); //BattTestDataStop btsp=subService.findByMonNum(1000028,1); BattTestDataStop stop=new BattTestDataStop(); @@ -585,7 +586,15 @@ stop.setTestRecordCount(1); stop.setMonVol(1.0f); //float cap= subService.getRealCap(stop); List list= subService.getTestDataStop(1000028,date5); List list= subService.getTestDataStop(1000028,date5);*/ /*38*/ ReportBattDTO dto=new ReportBattDTO(); dto.setBattGroupId(1000007); dto.setTestType(5); dto.setMonNum(0); dto.setStationName("山西省-太原市-迎泽区-局机房119-局机房站-2"); dto.setStationName1("山西省"); List list= subService.searchByBattGroupId5(dto); return new Response().setII(1,true,list,null); } } src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -1,11 +1,13 @@ package com.whyc.service; import com.whyc.dto.InterfaceParam; import com.whyc.dto.ReportBattDTO; import com.whyc.dto.StandardFeatureCurve; import com.whyc.dto.paramter.AlarmPar; import com.whyc.dto.paramter.DevAlarmPar; import com.whyc.dto.result.AlarmRes; import com.whyc.dto.result.RealDateDTO; import com.whyc.dto.result.ReportBattResultDTO; import com.whyc.mapper.CallBack; import com.whyc.pojo.*; import com.whyc.util.ActionUtil; @@ -2812,4 +2814,63 @@ return list; } //38-BattMaintDealarmMapper.xml;226行 public List<ReportBattResultDTO> searchByBattGroupId5(ReportBattDTO dto){ String sql=" select distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel " + " ,db_batt_testdata.tb_battresdata_inf.battgroupid,db_batt_testdata.tb_battresdata_inf.test_record_count " + " ,db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+".group_vol,db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+".test_curr" + " ,db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+".test_starttime,mon_num,mon_vol,mon_tmp,mon_res,mon_ser,conn_res " + " from " + " db_battinf.tb_battinf,db_batt_testdata.tb_battresdata_inf,db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+" " + " where " + " db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_battresdata_inf.BattGroupId " + " and " + " db_batt_testdata.tb_battresdata_inf.BattGroupId=db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+".battgroupid " + " and " + " db_batt_testdata.tb_battresdata_inf.test_record_count=db_batt_testdata.tb_battresdata_"+dto.getBattGroupId()+".test_record_count " + " and db_battinf.tb_battinf.battgroupid="+dto.getBattGroupId()+" and " + " db_batt_testdata.tb_battresdata_inf.data_available=1 and " + " db_batt_testdata.tb_battresdata_inf.test_type="+dto.getTestType()+" " ; if(dto.getMonNum()!=0){ sql+=" and db_batt_testdata.tb_battresdata_"+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_battresdata_"+dto.getBattGroupId()+".test_record_count asc,db_batt_testdata.tb_battresdata_"+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.setTestRecordCount(rs.getInt("test_record_count")); ph.setTestStartTime(rs.getTimestamp("test_starttime")); ph.setGroupVol(rs.getFloat("group_vol")); ph.setTestCurr(rs.getFloat("test_curr")); ph.setMonNum(rs.getInt("mon_num")); ph.setMonVol(rs.getFloat("mon_vol")); ph.setMonTmp(rs.getFloat("mon_tmp")); ph.setMonSer(rs.getFloat("mon_ser")); ph.setMonRes(rs.getFloat("mon_res")); ph.setConnRes(rs.getFloat("conn_res")); list.add(ph); } return list; } }); return list; } } src/main/resources/mapper/BattMaintDealarmMapper.xml
@@ -207,7 +207,7 @@ </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 id="searchByBattGroupId5" resultType="com.whyc.dto.result.ReportBattResultDTO" parameterType="com.whyc.dto.ReportBattDTO"> <!--<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 ,db_batt_testdata.tb_battresdata_inf.battgroupid,db_batt_testdata.tb_battresdata_inf.test_record_count @@ -233,5 +233,5 @@ and stationname=#{dto.stationName} </if> order by db_batt_testdata.tb_battresdata_${dto.battGroupId}.test_record_count asc,db_batt_testdata.tb_battresdata_${dto.battGroupId}.mon_num asc </select> </select>--> </mapper>
