From 45fdeee912088efbd07a748a011682c6c6d1ce51 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 15 十一月 2023 14:55:02 +0800
Subject: [PATCH] 1. 修改风险值的查询逻辑；
---
src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java | 3 +
src/main/resources/mapper/ds1/RiskValueMapper.xml | 2
src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java | 1
src/main/java/com/flightfeather/monitor/domain/ds1/entity/RiskValue.java | 3 +
src/main/java/com/flightfeather/monitor/pojo/RiskValuePojo.kt | 46 +----------------------
src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java | 2
src/main/java/com/flightfeather/monitor/domain/util/MyMapper.java | 1
src/main/resources/application.yml | 16 ++++----
8 files changed, 18 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java b/src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java
index c641125..aea5d13 100644
--- a/src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/Vue3FumeController.java
@@ -8,6 +8,7 @@
import java.util.List;
+// FIXME: 2023/11/15 绫诲悕涓嶅悎閫�, 鍚勫嚱鏁扮殑鍒嗙被涓嶅悎閫�, 闇�瑕佹牴鎹笟鍔℃媶鍒嗘垚澶氫釜service
@Slf4j
@RequestMapping("/fume")
@CrossOrigin
diff --git a/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java b/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
index c3d4288..e3f443e 100644
--- a/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
@@ -30,7 +30,7 @@
*/
@GetMapping("/month")
public Result queryRiskDataByMonth(
- @RequestParam String mnCode,
+ @RequestParam(required = false) String mnCode,
@RequestParam String month,
@RequestParam String type
) {
diff --git a/src/main/java/com/flightfeather/monitor/domain/ds1/entity/RiskValue.java b/src/main/java/com/flightfeather/monitor/domain/ds1/entity/RiskValue.java
index 4dc559a..9679473 100644
--- a/src/main/java/com/flightfeather/monitor/domain/ds1/entity/RiskValue.java
+++ b/src/main/java/com/flightfeather/monitor/domain/ds1/entity/RiskValue.java
@@ -1,5 +1,7 @@
package com.flightfeather.monitor.domain.ds1.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import javax.persistence.*;
@@ -17,6 +19,7 @@
/**
* 鏃堕棿
*/
+ @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "YYYY-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date lst;
/**
diff --git a/src/main/java/com/flightfeather/monitor/domain/util/MyMapper.java b/src/main/java/com/flightfeather/monitor/domain/util/MyMapper.java
index 7040342..f7a9028 100644
--- a/src/main/java/com/flightfeather/monitor/domain/util/MyMapper.java
+++ b/src/main/java/com/flightfeather/monitor/domain/util/MyMapper.java
@@ -31,6 +31,5 @@
* 缁ф壙鑷繁鐨凪yMapper
*/
public interface MyMapper<T> extends Mapper<T>, MySqlMapper<T> {
- //TODO
//FIXME 鐗瑰埆娉ㄦ剰锛岃鎺ュ彛涓嶈兘琚壂鎻忓埌锛屽惁鍒欎細鍑洪敊
}
diff --git a/src/main/java/com/flightfeather/monitor/pojo/RiskValuePojo.kt b/src/main/java/com/flightfeather/monitor/pojo/RiskValuePojo.kt
index 80a6e86..63c56ee 100644
--- a/src/main/java/com/flightfeather/monitor/pojo/RiskValuePojo.kt
+++ b/src/main/java/com/flightfeather/monitor/pojo/RiskValuePojo.kt
@@ -1,52 +1,10 @@
package com.flightfeather.monitor.pojo
-import java.util.*
+import com.flightfeather.monitor.domain.ds1.entity.RiskValue
-class RiskValuePojo {
- var id: Int? = null
-
- /**
- * 鐩戞祴鐐圭紪鍙�
- */
- var mnCode: String? = null
-
+class RiskValuePojo : RiskValue() {
/**
* 鐩戞祴鐐瑰悕绉�
*/
var name: String? = null
-
- /**
- * 鏃堕棿
- */
- var lst: Date? = null
-
- /**
- * 鍦ㄧ嚎鐜囬闄╁��
- */
- var onlineRisk: Double? = null
-
- /**
- * 鏈夋晥鐜囬闄╁��
- */
- var validRisk: Double? = null
-
- /**
- * 瓒呮爣椋庨櫓鍊�
- */
- var exceedRisk: Double? = null
-
- /**
- * 寮傚父绫诲瀷鑱氶泦搴�
- */
- var exceptionTypeAggregation: Double? = null
-
- /**
- * 鍏稿瀷寮傚父澶嶇幇鐜�
- */
- var typicalExceptionRepetitionRate: Double? = null
-
- /**
- * 缁熻绫诲瀷锛堟棩缁熻鎴栨湀缁熻锛�,day month
- */
- var type: String? = null
}
\ No newline at end of file
diff --git a/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java
index 2187418..a3aa216 100644
--- a/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java
+++ b/src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java
@@ -25,7 +25,8 @@
LocalDate date = LocalDate.parse(month);
if (date != null) {
date = date.withDayOfMonth(1);
- return riskValueMapper.queryRiskDataByMonth(mnCode, date, type);
+ List<RiskValuePojo> res = riskValueMapper.queryRiskDataByMonth(mnCode, date, type);
+ return res;
// return riskValueRep.select(mnCode, date, type);
} else {
return new ArrayList<>();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dd7bceb..358ae74 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,21 +3,21 @@
ds1:
driver-class-name: com.mysql.cj.jdbc.Driver
# 鐢熶骇鐜
-# url: jdbc:mysql://localhost:3306/fume
-# username: fume
-# password: fume_feiyu2023
+ url: jdbc:mysql://localhost:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
+ username: fume
+ password: fume_feiyu2023
-# url: jdbc:mysql://localhost:3306/qianduan_sql
+# url: jdbc:mysql://localhost:3306/qianduan_sql?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
# username: root
# password: 1234
-# url: jdbc:mysql://localhost:3306/fume
+# url: jdbc:mysql://localhost:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
# username: root
# password: 123456
- url: jdbc:mysql://114.215.109.124:3306/fume
- username: fumeRemote
- password: feiyu2023
+# url: jdbc:mysql://114.215.109.124:3306/fume?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&allowMultiQueries=true&useSSL=false
+# username: fumeRemote
+# password: feiyu2023
mybatis:
configuration:
diff --git a/src/main/resources/mapper/ds1/RiskValueMapper.xml b/src/main/resources/mapper/ds1/RiskValueMapper.xml
index 2fc827f..ebdb8b8 100644
--- a/src/main/resources/mapper/ds1/RiskValueMapper.xml
+++ b/src/main/resources/mapper/ds1/RiskValueMapper.xml
@@ -28,7 +28,7 @@
from du_js_t_risk_value as a left join ja_t_dust_site_info as b on a.mn_code = b.mn_code
<where>
<if test="mnCode != null and mnCode != '' ">
- b.name = #{mnCode}
+ a.mn_code = #{mnCode}
</if>
<if test="month != null">
--
Gitblit v1.9.3