From 59478e6b937532b9051bd07400159786d1b8d2ea Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 28 七月 2023 20:47:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 22 +++-------------------
src/main/java/com/yssh/mapper/QxshMapper.java | 2 ++
src/main/java/com/yssh/service/WarningAnalyseService.java | 4 +++-
src/main/java/com/yssh/entity/Report.java | 11 +++++++++++
src/main/resources/mapper/QxshMapper.xml | 10 +++++++++-
5 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index eecb6f7..87fd2bb 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -93,31 +93,15 @@
@ApiOperation(value = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10", notes = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10鏁伴噺鍒楄〃")
@GetMapping("/monthTop10")
public Result monthTop10() {
- //return Result.OK(warningService.selectThisMonthLocationValueDataTop10());
-
- //String key = dateFormat.format(new Date()) + "_top10";
- //Object obj = CacheUtils.get(key);
- List<Qxsh> list;
-
- //if (null != obj) {
- // list = (List<Qxsh>) obj;
- //} else {
- //list = warningService.selectThisMonthLocationValueDataTop10();
- list = warningService.selectMonthTop10();
- // if (null != list && list.size() > 0) {
- // CacheUtils.put(key, list);
- // }
- //}
-
- return Result.ok(list);
+ return Result.ok(warningService.selectMonthTop10());
}
@ApiOperationSupport(order = 5)
@ApiOperation(value = "鏍规嵁鏃堕棿鑾峰彇鎶ヨ鍜岄璀︿俊鎭�", notes = "鏍规嵁鏃堕棿鑾峰彇鎶ヨ鍜岄璀︿俊鎭�")
@GetMapping("/getAlarmAndWarnByTime")
public Result getAlarmAndWarnByTime(
- @RequestParam(value = "begin", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date begin,
- @RequestParam(value = "end", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
+ @RequestParam(value = "begin") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date begin,
+ @RequestParam(value = "end") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
if (null == begin || null == end) {
return Result.error(null);
}
diff --git a/src/main/java/com/yssh/entity/Report.java b/src/main/java/com/yssh/entity/Report.java
index e582283..bff838d 100644
--- a/src/main/java/com/yssh/entity/Report.java
+++ b/src/main/java/com/yssh/entity/Report.java
@@ -54,6 +54,9 @@
@ApiModelProperty(value = "鏈�澶у�肩殑鍦板悕")
private String maxAddr;
+ @ApiModelProperty(value = "婧簮绫�")
+ private SuYuan700 su;
+
public Report() {
}
@@ -224,4 +227,12 @@
public void setMaxAddr(String maxAddr) {
this.maxAddr = maxAddr;
}
+
+ public SuYuan700 getSu() {
+ return su;
+ }
+
+ public void setSu(SuYuan700 su) {
+ this.su = su;
+ }
}
diff --git a/src/main/java/com/yssh/mapper/QxshMapper.java b/src/main/java/com/yssh/mapper/QxshMapper.java
index d7e9677..d13bffa 100644
--- a/src/main/java/com/yssh/mapper/QxshMapper.java
+++ b/src/main/java/com/yssh/mapper/QxshMapper.java
@@ -22,4 +22,6 @@
public List<Qxsh> selectByBeginAndEnd(@Param("start") Integer start, @Param("end") Integer end);
public Double selectLastYearVal(@Param("time") Integer time, @Param("name") String name);
+
+ public Qxsh selectByTimeAndName(@Param("time") Integer time, @Param("name") String name);
}
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 4f174d9..15f7a0d 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -329,7 +329,6 @@
public List<Qxsh> selectMonthTop10() {
String time = DateUtils.getYyyyMm(new Date());
-
List<Qxsh> list = qxshMapper.selectMonthTop10(time + "%");
return list;
@@ -381,6 +380,9 @@
Report report = Report.calcReport(wd, suYuan, suMax);
report.setLastVal(lastVal);
+ SuYuan700 su = suYuanMapper.selectSuYuan46ById(suYuanId, qxsh.getTime().substring(0, 4) + "-" + qxsh.getTime().substring(4, 6) + "-" + qxsh.getTime().substring(6, 8) + " " + qxsh.getTime().substring(8, 10) + ":00:00");
+ report.setSu(su);
+
list.add(report);
}
diff --git a/src/main/resources/mapper/QxshMapper.xml b/src/main/resources/mapper/QxshMapper.xml
index 3585815..15e26ab 100644
--- a/src/main/resources/mapper/QxshMapper.xml
+++ b/src/main/resources/mapper/QxshMapper.xml
@@ -40,6 +40,14 @@
<select id="selectLastYearVal" resultType="java.lang.Double">
select format(value, 2) "value"
from yssh_qxsh
- where name = #{name} and time = #{time}
+ where time = #{time} and name = #{name}
+ limit 1;
+ </select>
+
+ <select id="selectByTimeAndName" resultType="com.yssh.entity.Qxsh">
+ select id, name, lon, lat, format(value, 2) "value", time
+ from yssh_qxsh
+ where time = #{time} and name = #{name}
+ limit 1;
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3