From 29dbf6ba6409e3139e5f2e36588106945dd0cec2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 13 十一月 2024 17:29:29 +0800
Subject: [PATCH] 实现查询RTU远程升级任务执行结果功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 44694c6..151ef98 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -1,17 +1,17 @@
package com.dy.pipIrrProject.intake;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.excel.CellWriteHandler;
+import com.dy.pipIrrGlobal.excel.ExcelUtil;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
-import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +35,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -125,11 +126,7 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
try {
- QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
- if (res == null) {
- return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
- }
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(intakeSv.getIntakes(vo));
} catch (Exception e) {
log.error("鑾峰彇鍙栨按鍙ｈ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -240,8 +237,6 @@
log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
-
-
}
/**
@@ -252,16 +247,15 @@
*/
@SneakyThrows(IOException.class)
@GetMapping(value = "exportIntakes")
+ @SsoAop()
public void exportIntakes(HttpServletResponse response, QueryVo vo) {
- setExcelRespProp(response, "鍙栨按鍙ｅ垪琛�");
- //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
- List<VoIntake> memberList = intakeSv.exportIntakes(vo);
+ List<VoIntake> intakeList = intakeSv.exportIntakes(vo);
- EasyExcel.write(response.getOutputStream())
- .head(VoIntake.class)
- .excelType(ExcelTypeEnum.XLSX)
- .sheet("鍙栨按鍙ｅ垪琛�")
- .doWrite(memberList);
+ ExcelUtil.setExcelRespProp(response, "鍙栨按鍙ｅ垪琛�" + LocalDate.now());
+ EasyExcel.write(response.getOutputStream(), VoIntake.class)
+ .registerWriteHandler(new CellWriteHandler("鍙栨按鍙ｅ垪琛�"))
+ .sheet("鍙栨按鍙�")
+ .doWrite(intakeList);
}
/**
@@ -291,14 +285,13 @@
}
/**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroCtrl涓�
* 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
- *
* @param qo
* @return
- */
- @GetMapping(path = "all_intakes")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
+ @GetMapping(path = "all_intakes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
try {
QueryResultVo<List<VoOnLineIntake>> res = intakeSv.selectOnLineIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
@@ -306,8 +299,8 @@
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
- }
-
+ }
+ */
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
*
--
Gitblit v1.8.0