From 83742e476be26188965380c0c7cebf03f867e204 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 09 十二月 2024 09:02:03 +0800
Subject: [PATCH] 远程监控功能中，显示设备报警信息同时也显示报警接收时间，修改相应的代码与SQL
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
index aa1a917..8115374 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
@@ -9,7 +9,6 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoUgResult;
-import com.dy.pipIrrGlobal.voUg.VoUgRtuResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -83,7 +82,8 @@
* @param response
*/
@RequestMapping(value = "/exportAll", method = RequestMethod.GET)
- public void exportUgFail(HttpServletResponse response, QueryUgResultVo vo) throws Exception {
+ @SsoAop()
+ public void exportAll(HttpServletResponse response, QueryUgResultVo vo) throws Exception {
if(vo.state != null && vo.state == 1){
//鏌ヨ鍗囩骇鎴愬姛鐨�
vo.fail = null ;
@@ -95,7 +95,7 @@
setExcelRespProp(response, "鍗囩骇缁撴灉鍒楄〃");
List<VoUgResult> rsList = this.sv.selectAll(vo);
EasyExcel.write(response.getOutputStream())
- .head(VoUgRtuResult.class)
+ .head(VoUgResult.class)
.excelType(ExcelTypeEnum.XLSX)
.sheet("鍗囩骇缁撴灉鍒楄〃")
.doWrite(rsList);
--
Gitblit v1.8.0