From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 16:46:24 +0800
Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容； 2、虚拟卡状态写入时机进行修改，由原来的阶段写簇变成随时写入。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index c68002e..161a2d3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -12,6 +12,7 @@
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrGlobal.voPr.VoControllerSimple;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.result.ProjectResultCode;
import io.swagger.v3.oas.annotations.Operation;
@@ -226,19 +227,12 @@
@SneakyThrows(IOException.class)
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(HttpServletResponse response, QueryVo vo) {
- //setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
List<VoController> controllerList = controllerSv.export(vo);
ExcelUtil.setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�" + LocalDate.now());
EasyExcel.write(response.getOutputStream(), VoController.class)
.registerWriteHandler(new CellWriteHandler("鎺у埗鍣ㄥ垪琛�"))
.sheet("鎺у埗鍣�")
.doWrite(controllerList);
-
- //EasyExcel.write(response.getOutputStream())
- // .head(VoController.class)
- // .excelType(ExcelTypeEnum.XLSX)
- // .sheet("鎺у埗鍣ㄥ垪琛�")
- // .doWrite(memberList);
}
/**
@@ -251,5 +245,19 @@
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
}
-
+ /**
+ * 涓嶅垎椤佃幏鍙栧叏閮ㄦ湭鍒犻櫎鐨勯榾鎺у櫒鍒楄〃
+ * @return
+ */
+ @GetMapping(path = "/getSimpleControllers")
+ @SsoAop()
+ public BaseResponse<List<VoControllerSimple>> getSimpleControllers() {
+ try {
+ List<VoControllerSimple> res = controllerSv.getSimpleControllers();
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鏈畬鐨勮鍒掑紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0