导出优化、告警日志方法增加

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessDeployController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.controller;
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
@@ -12,6 +13,7 @@ import com.ruoyi.system.service.IEpsBusinessDeployService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -42,6 +44,20 @@ public class EpsBusinessDeployController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 导出
+     * @param response
+     * @param epsBusinessDeploy
+     */
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody EpsBusinessDeploy epsBusinessDeploy)
+    {
+        List<EpsBusinessDeploy> list = epsBusinessDeployService.selectEpsBusinessDeployList(epsBusinessDeploy);
+        ExcelUtil<EpsBusinessDeploy> util = new ExcelUtil<EpsBusinessDeploy>(EpsBusinessDeploy.class);
+        util.showColumn(epsBusinessDeploy.getProperties());
+        util.exportExcel(response, list, "业务下发管理");
+    }
+
 
     /**
      * 获取业务下发管理详细信息

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsTaskStatisticsController.java

@@ -52,7 +52,7 @@ public class EpsTaskStatisticsController extends BaseController
     @RequiresPermissions("system:taskStatistics:export")
     @Log(title = "业务95值计算任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EpsTaskStatistics epsTaskStatistics)
+    public void export(HttpServletResponse response, @RequestBody EpsTaskStatistics epsTaskStatistics)
     {
         List<EpsTaskStatistics> list = epsTaskStatisticsService.selectEpsTaskStatisticsList(epsTaskStatistics);
         ExcelUtil<EpsTaskStatistics> util = new ExcelUtil<EpsTaskStatistics>(EpsTaskStatistics.class);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java

@@ -88,7 +88,7 @@ public class RmResourceRegistration extends BaseEntity
     private String registrationStatus;
 
     /** 在线状态 0-离线，1-在线 */
-    @Excel(name = "在线状态")
+    @Excel(name = "在线状态", readConverterExp = "0=离线,1=在线")
     private String onlineStatus;
 
     private String switchOnlineStatus;