From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
index a82b724..5ac0ebf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
@@ -40,6 +40,9 @@
public BaseResponse<Boolean> isOnLine4Rtu(String rtuAddr) {
try {
Boolean res = monitorSv.isOnLine4Rtu(rtuAddr);
+ if(res == null){
+ res = false ;
+ }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鍛戒护鎵ц寮傚父", e);
@@ -50,14 +53,17 @@
/**
* 鏌ヨ璁惧鏄惁鍦ㄧ嚎
*
- * @param rtuAddr
+ * @param fboxId
* @return
*/
@GetMapping(path = "isOnLine4Mqtt")
@SsoAop()
- public BaseResponse<Boolean> isOnLine4Mqtt(String rtuAddr) {
+ public BaseResponse<Boolean> isOnLine4Mqtt(String fboxId) {
try {
- Boolean res = monitorSv.isOnLine4Mqtt(rtuAddr);
+ Boolean res = monitorSv.isOnLine4Mqtt(fboxId);
+ if(res == null){
+ res = false ;
+ }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鍛戒护鎵ц寮傚父", e);
--
Gitblit v1.8.0