src/main/java/com/whyc/dto/paramter/BattinfPar.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BadBattMonService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BadbattMonMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/dto/paramter/BattinfPar.java
@@ -26,11 +26,20 @@ @ApiModelProperty(value = "省名") private String stationName1; private Integer battGroupId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") private Date battProductDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") private Date battProductDate1; @ApiModelProperty(value = "电池品牌") private String battProduct; @ApiModelProperty(value = "告警阈值") private float capAlarm; @ApiModelProperty(value = "更换阈值") private float capChange; @ApiModelProperty(value = "劣化1或损坏0") private String quailty; } src/main/java/com/whyc/service/BadBattMonService.java
@@ -39,6 +39,21 @@ //分页信息 PageHelper.startPage(pageNum, pageSize); UserInf userInf = ActionUtil.getUser(); float capAlarm = 0.8f; float capChange = 0.6f; //1.查询劣化(告警)和损坏(更换)的阈值 QueryWrapper<AlarmParam> alarmWrapper = new QueryWrapper(); alarmWrapper.and(wrapper -> { return wrapper.eq("alm_name", "Batt_Alarm_Type_CapAlarm").or().eq("alm_name", "Batt_Alarm_Type_CapChange"); }); alarmWrapper.orderByAsc("alm_id"); List<AlarmParam> paramList = alarmParamMapper.selectList(alarmWrapper); if (paramList.size() > 0) { capAlarm = paramList.get(0).getAlmLowCoe();//劣化参数0.8 capChange = paramList.get(1).getAlmLowCoe();//损坏参数0.6 } battinfPar.setCapAlarm(capAlarm); battinfPar.setCapChange(capChange); List<ReportBattBadDTO> list = badbattMonMapper.searchByInfo(battinfPar, userInf.getUId().intValue()); for (ReportBattBadDTO dto : list) { if (Integer.parseInt(dto.getBdmon().getNote()) == AlarmDaoFactory.Alarm_CapAlarm) { src/main/resources/mapper/BadbattMonMapper.xml
@@ -62,6 +62,12 @@ <if test="binf.battGroupId!=0"> and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId} </if> <if test="binf.quailty!=null and binf.quailty==0"> and real_cap < stdcap * #{binf.capChange} </if> <if test="binf.quailty!=null and binf.quailty==1"> and real_cap >= stdcap * #{binf.capChange} and real_cap <= stdcap * #{binf.capAlarm} </if> AND web_site.tb_badbatt_mon.battgroupid IN ( SELECT DISTINCT db_battinf.tb_battinf.battgroupid