From 3ba74e7692143fd6dcf4dd885f80f95dfef8387e Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 16:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature-risk_analysis' into feature-risk_analysis
---
src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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 f88eb3e..e3f443e 100644
--- a/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java
@@ -3,6 +3,7 @@
import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
import com.flightfeather.monitor.pojo.Result;
+import com.flightfeather.monitor.pojo.RiskValuePojo;
import com.flightfeather.monitor.service.RiskValueService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,11 +30,11 @@
*/
@GetMapping("/month")
public Result queryRiskDataByMonth(
- @RequestParam String mnCode,
+ @RequestParam(required = false) String mnCode,
@RequestParam String month,
@RequestParam String type
) {
- List<RiskValue> list = riskValueService.queryRiskDataByMonth(mnCode, month, type);
+ List<RiskValuePojo> list = riskValueService.queryRiskDataByMonth(mnCode, month, type);
return Result.success(list);
}
}
--
Gitblit v1.9.3