src/main/java/com/yssh/controller/WarningAnalyseController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/yssh/dao/QxshMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/yssh/service/IWarningAnalyseService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapping/QxshMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -1,5 +1,6 @@ package com.yssh.controller; import com.yssh.entity.Qxsh; import com.yssh.utils.CacheUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -98,12 +99,13 @@ String key = dateFormat.format(new Date()) + "_top10"; Object obj = CacheUtils.get(key); List<Map<String, Object>> list; List<Qxsh> list; if (null != obj) { list = (List<Map<String, Object>>) obj; list = (List<Qxsh>) obj; } else { list = warningService.selectThisMonthLocationValueDataTop10(); //list = warningService.selectThisMonthLocationValueDataTop10(); list = warningService.selectMonthTop10(); if (null != list && list.size() > 0) { CacheUtils.put(key, list); } src/main/java/com/yssh/dao/QxshMapper.java
@@ -13,4 +13,6 @@ @Mapper public interface QxshMapper { public List<Qxsh> selectByTime(String time); public List<Qxsh> selectMonthTop10(String time); } src/main/java/com/yssh/service/IWarningAnalyseService.java
@@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.yssh.entity.Qxsh; import com.yssh.entity.WarningDetail; import com.yssh.entity.vo.WarningVo; @@ -25,5 +26,7 @@ List<Map<String, Object>> selectThisMonthLocationValueDataTop10(); List<Qxsh> selectMonthTop10(); List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end); } src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -10,21 +10,14 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import com.yssh.dao.*; import com.yssh.entity.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.yssh.dao.AlertConfigMapper; import com.yssh.dao.DictRecordMapper; import com.yssh.dao.SuYuanMapper; import com.yssh.dao.WarningDetailMapper; import com.yssh.entity.DictRecord; import com.yssh.entity.MonitorPointPosition; import com.yssh.entity.SuYuan2d; import com.yssh.entity.SuYuanMonitorData; import com.yssh.entity.WarningDetail; import com.yssh.entity.vo.WarningVo; import com.yssh.service.IAsyncService; import com.yssh.service.ICommonService; @@ -57,6 +50,11 @@ @Resource private IAsyncService asyncService; @Resource private QxshMapper qxshMapper; private SimpleDateFormat ym = new SimpleDateFormat("yyyyMM%"); private SimpleDateFormat ymdh = new SimpleDateFormat("yyyyMMddHH"); @@ -366,6 +364,15 @@ } @Override public List<Qxsh> selectMonthTop10() { String time = ym.format(new Date()); List<Qxsh> list = qxshMapper.selectMonthTop10(time); return list; } @Override public List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end) { List<WarningVo> list = new ArrayList<>(); List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d()); src/main/resources/mapping/QxshMapper.xml
@@ -4,7 +4,15 @@ <select id="selectByTime" resultType="com.yssh.entity.Qxsh"> select id, name, lon, lat, value, time from yssh_qxsh where time =#{time} where time = #{time} order by name; </select> <select id="selectMonthTop10" resultType="com.yssh.entity.Qxsh"> select id, name, format(value, 2) "value", time from yssh_qxsh where time like #{time} and name like 'AI-%' order by value desc limit 10; </select> </mapper>