|
|
@ -7,6 +7,7 @@ import com.xydl.cac.repository.ZsbRepository;
|
|
|
|
import com.xydl.cac.service.ZsbService;
|
|
|
|
import com.xydl.cac.service.ZsbService;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@ -481,4 +482,25 @@ public class OldService {
|
|
|
|
List<CableWarningVo> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class));
|
|
|
|
List<CableWarningVo> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class));
|
|
|
|
return list;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<CableWarningVo> 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<CableWarningVo> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class));
|
|
|
|
|
|
|
|
return list;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|