From 498718ad129e8a9010e6f2af2fde2f9d4508fd32 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 09 六月 2023 10:41:49 +0800
Subject: [PATCH] 修改本月预警报警统计接口
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 7 +++++--
src/main/java/com/yssh/scheduled/ReadCsvTask.java | 3 +++
src/main/java/com/yssh/controller/WarningAnalyseController.java | 4 ++--
src/main/resources/mapping/WarningDetailMapper.xml | 8 +++++++-
说明.txt | 21 ++++++++++++++-------
5 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 2070733..4fd7aca 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -98,8 +98,8 @@
public Result monthTop10() {
//return Result.OK(warningService.selectThisMonthLocationValueDataTop10());
- String key = dateFormat.format(new Date()) + "_top10";
- Object obj = CacheUtils.get(key);
+ //String key = dateFormat.format(new Date()) + "_top10";
+ //Object obj = CacheUtils.get(key);
List<Qxsh> list;
//if (null != obj) {
diff --git a/src/main/java/com/yssh/scheduled/ReadCsvTask.java b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
index f419bca..3e2e27d 100644
--- a/src/main/java/com/yssh/scheduled/ReadCsvTask.java
+++ b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
@@ -80,6 +80,7 @@
addFileMd5(md5);
try {
+ logger.info("loadVocSync:" + filePath);
EasyCsv.read(filePath, VocVals.class, new VocParser(vocValsService, calendar.getTime())).doRead();
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -117,6 +118,8 @@
suYuanService.createNewTable(newTableName);
dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));
+
+ logger.info("loadCsvSync:" + filePath);
EasyCsv.read(filePath, SuYuan.class, new CsvParser(suYuanService, time)).doRead();
try {
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 92ae1fc..55af0f0 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -206,20 +206,23 @@
public Map<String, Integer> countThisMonthAlarmAndWarning() {
Map<String, Integer> result = new HashMap<>();
Map<String, Object> param = new HashMap<>();
+ param.put("startTime", ymdhms.format(DateUtils.getMonthStart()));
+ param.put("endTime", ymdhms.format(DateUtils.getMonthEnd()));
+
param.put("type", 0);
- param.put("startTime", DateUtils.getMonthStart());
- param.put("endTime", DateUtils.getMonthEnd());
List<WarningVo> alarms = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(alarms)) {
alarms = new ArrayList<>();
}
result.put("alarmNumber", alarms.size());
+
param.put("type", 1);
List<WarningVo> warnings = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(warnings)) {
warnings = new ArrayList<>();
}
result.put("warningNumber", warnings.size());
+
return result;
}
diff --git a/src/main/resources/mapping/WarningDetailMapper.xml b/src/main/resources/mapping/WarningDetailMapper.xml
index 69be83f..cb188c0 100644
--- a/src/main/resources/mapping/WarningDetailMapper.xml
+++ b/src/main/resources/mapping/WarningDetailMapper.xml
@@ -27,7 +27,7 @@
AND type = #{type}
</select>
- <select id="selectWarningDetailByMap" parameterType="java.util.Map" resultMap="WarningVoResult">
+ <select id="selectWarningDetailByMap_old" parameterType="java.util.Map" resultMap="WarningVoResult">
SELECT location_name, su_yuan_id, value
FROM warning_detail
WHERE date_format(create_time, '%Y%m%d%H%I%S') >= date_format(#{startTime}, '%Y%m%d%H%I%S')
@@ -35,6 +35,12 @@
AND type = #{type}
</select>
+ <select id="selectWarningDetailByMap" parameterType="java.util.Map" resultMap="WarningVoResult">
+ select location_name, su_yuan_id, value
+ from warning_detail
+ where create_time between #{startTime} and #{endTime} and type = #{type};
+ </select>
+
<select id="selectWarningDayCountByMap_old" parameterType="java.util.Map" resultType="java.util.Map">
SELECT date_format(create_time,'%Y%m%d') AS createTime, count(id) AS num
FROM warning_detail
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 3ab957a..9cd4189 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -1,14 +1,21 @@
+-----------------------------------------------------
1.MySQL鏃ュ織锛�
show binary logs;
reset master;
+2.澶栫綉浜戠櫥褰曟柟寮忥細
+>1.鐧诲綍澶栫綉浜戯紝鐢ㄦ埛鍚嶆槸maxy628 123.114.233.55锛岃緭鍏ラ獙璇佺爜
+>2.杩涘叆浜戞闈� 锛屾祻瑙堝櫒璁块棶10.101.3.183 杩涘叆鍫″瀿鏈虹郴缁�
+ 鐢ㄦ埛璐﹀彿锛歮axy628.yssh 瀵嗙爜锛歽ssh1234@#..
+>3. 鍏ㄥ眬鎼滅储 98銆�101銆�102銆�103
+3.瀹㈡埛绔湴鍧�锛�
+https://vmware-horizon-client.en.softonic.com/
+-----------------------------------------------------
+1.鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10
+/warning/monthTop10 鈫� QxshMapper.xml 鈫� selectMonthTop10 鈫� yssh_qxsh
+2.鏈湀棰勮銆佹姤璀︾粺璁�
+/warning/monthCount 鈫� WarningDetailMapper.xml 鈫� selectWarningDetailByMap 鈫� warning_detail
-
-
-
-
-
-
-
+-----------------------------------------------------
--
Gitblit v1.9.3