diff --git a/src/main/java/com/xydl/cac/old/CableCirculationController.java b/src/main/java/com/xydl/cac/old/CableCirculationController.java index c83b708..709d8bc 100644 --- a/src/main/java/com/xydl/cac/old/CableCirculationController.java +++ b/src/main/java/com/xydl/cac/old/CableCirculationController.java @@ -73,18 +73,18 @@ public class CableCirculationController { return AjaxResult.success(service.selectPages(dto)); } -// /** -// * 获取二级告警信息 -// * -// * @param dto -// * @return -// */ -// @ApiOperation(value = "获取二级告警信息") -// @PostMapping(value = "/secondPage") -// public AjaxResult getSecondPage(@RequestBody CableWarningDto dto) { -// return AjaxResult.success(circulationService.getWarningPage(dto)); -// } -// + /** + * 获取二级告警信息 + * + * @param dto + * @return + */ + @ApiOperation(value = "获取二级告警信息") + @PostMapping(value = "/secondPage") + public AjaxResult getSecondPage(@RequestBody CableWarningDto dto) { + return AjaxResult.success(service.getWarningPage(dto)); + } + // /** // * 处理告警信息 // */ diff --git a/src/main/java/com/xydl/cac/old/OldService.java b/src/main/java/com/xydl/cac/old/OldService.java index 28493ac..82047d1 100644 --- a/src/main/java/com/xydl/cac/old/OldService.java +++ b/src/main/java/com/xydl/cac/old/OldService.java @@ -7,6 +7,7 @@ import com.xydl.cac.repository.ZsbRepository; import com.xydl.cac.service.ZsbService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.Page; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -481,4 +482,25 @@ public class OldService { List list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class)); return list; } + + List getWarningPage(CableWarningDto dto) { + String sql = "SELECT w.id,w.eqmid,w.warn_time,w.warning_value,w.threadval,w.warn_desc,w.warn_level," + + " w.state,w.process,w.process_user,w.process_time,COUNT(w.id) AS warningCount,v.NAME" + + " FROM warning w" + + " LEFT JOIN vw_sb v ON v.id = w.eqmid" + + " LEFT JOIN vw_jg j ON j.id = v.jgid" + + " LEFT JOIN i2relation i ON v.id = i.eqmid WHERE 1=1 "; + if (StringUtils.isNotBlank(dto.getState())) { + sql = sql + " AND w.state=" + dto.getState(); + } + if (StringUtils.isNotBlank(dto.getStartTime())) { + sql = sql + " AND w.warn_time>='" + dto.getStartTime() + " 00:00:00'"; + } + if (StringUtils.isNotBlank(dto.getEndTime())) { + sql = sql + " AND w.warn_time<='" + dto.getEndTime() + " 23:59:59'"; + } + sql = sql + " GROUP BY w.eqmid"; + List list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class)); + return list; + } }