From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 16 七月 2025 13:49:13 +0800 Subject: [PATCH] 中间件修改内容: 1、当没农业综合站时即没相关配置项目内容为空时,启动时会产生bug; 2、整理优化代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java index 146c7c0..8bba068 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java @@ -12,7 +12,8 @@ import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram; import com.dy.pipIrrGlobal.pojoUg.UgRtuTask; import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw; -import com.dy.pipIrrGlobal.voUg.VoUgRtuResult; +import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Failure; +import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Success; import com.dy.pipIrrGlobal.voUg.VoWatch; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -50,7 +51,7 @@ private RtuUpgradeSv sv ; @Autowired - RtuUpgradeResSv resSv ; + private RtuUpgradeResSv resSv ; @Autowired private Environment env; @@ -233,9 +234,9 @@ @RequestMapping(value = "/exportUgFail", method = RequestMethod.GET) public void exportUgFail(HttpServletResponse response) throws Exception { setExcelRespProp(response, "鍗囩骇澶辫触RTU鍒楄〃"); - List<VoUgRtuResult> rsList = resSv.exportUgFail(); + List<VoUgRtuResult4Failure> rsList = resSv.exportUgFail(); EasyExcel.write(response.getOutputStream()) - .head(VoUgRtuResult.class) + .head(VoUgRtuResult4Failure.class) .excelType(ExcelTypeEnum.XLSX) .sheet("鍗囩骇澶辫触RTU鍒楄〃") .doWrite(rsList); @@ -249,9 +250,9 @@ @RequestMapping(value = "/exportUgSuccess", method = RequestMethod.GET) public void exportUgSuccess(HttpServletResponse response) throws Exception { setExcelRespProp(response, "鍗囩骇鎴愬姛RTU鍒楄〃"); - List<VoUgRtuResult> rsList = resSv.exportUgSuccess(); + List<VoUgRtuResult4Success> rsList = resSv.exportUgSuccess(); EasyExcel.write(response.getOutputStream()) - .head(VoUgRtuResult.class) + .head(VoUgRtuResult4Success.class) .excelType(ExcelTypeEnum.XLSX) .sheet("鍗囩骇鎴愬姛RTU鍒楄〃") .doWrite(rsList); -- Gitblit v1.8.0