From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalysisController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalysisController.java
similarity index 61%
rename from zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
rename to zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalysisController.java
index 8766e28..7b55dae 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalysisController.java
@@ -2,36 +2,41 @@
import com.zhitan.alarm.domain.dto.AlarmAnalysisDTO;
import com.zhitan.alarm.domain.vo.AlarmAnalysisVO;
-import com.zhitan.alarm.services.IAlarmAnalyisisService;
+import com.zhitan.alarm.services.IAlarmAnalysisService;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
-geng * description 鎶ヨ鍒嗘瀽鐩稿叧鍔熻兘
+* description 鎶ヨ鍒嗘瀽鐩稿叧鍔熻兘
*
- * @author hmj
- * @date 2024-10-26 17:31
+ * @author zhitan
+ * @date
*/
@RestController
@RequestMapping("/alarmAnalysis")
-public class AlarmAnalyisisController extends BaseController {
+public class AlarmAnalysisController extends BaseController {
@Autowired
- private IAlarmAnalyisisService alarmAnalyisisService;
+ private IAlarmAnalysisService alarmAnalysisService;
@GetMapping("/getByNodeId")
public AjaxResult getByNodeId(@Validated AlarmAnalysisDTO alarmAnalysisDTO){
- AlarmAnalysisVO alarmAnalysisVO = alarmAnalyisisService.getByNodeId(alarmAnalysisDTO);
+ AlarmAnalysisVO alarmAnalysisVO = alarmAnalysisService.getByNodeId(alarmAnalysisDTO);
return AjaxResult.success(alarmAnalysisVO);
}
@GetMapping("/getCountInfo")
public AjaxResult getCountInfo(@Validated AlarmAnalysisDTO alarmAnalysisDTO){
- AlarmAnalysisVO alarmAnalysisVO = alarmAnalyisisService.getCountInfo(alarmAnalysisDTO);
+
+ if(ObjectUtils.isEmpty(alarmAnalysisDTO.getModelCode())){
+ return AjaxResult.error("妯″瀷缂栫爜涓嶈兘涓虹┖");
+ }
+ AlarmAnalysisVO alarmAnalysisVO = alarmAnalysisService.getCountInfo(alarmAnalysisDTO);
return AjaxResult.success(alarmAnalysisVO);
}
}
--
Gitblit v1.9.3