部署中心修改

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/HostInfoController.java

@@ -15,6 +15,7 @@ import com.xunmei.deploy.domain.ZipPackInfo;
 import com.xunmei.deploy.service.*;
 import com.xunmei.deploy.util.CommonUtils;
 import com.xunmei.deploy.vo.HostInfoVo;
+import com.xunmei.deploy.vo.UpgradeHostVo;
 import jxl.Workbook;
 import jxl.WorkbookSettings;
 import jxl.write.*;
@@ -60,8 +61,8 @@ public class HostInfoController  extends BaseController{
      * @param hostInfoVo
      * @return
      */
-    @PostMapping("/list")
-    public TableDataInfo list(Page<HostInfo> page,@RequestBody HostInfoVo hostInfoVo){
+    @GetMapping("/list")
+    public TableDataInfo list(Page<HostInfo> page, HostInfoVo hostInfoVo){
         IPage<HostInfoVo> result = hostInfoService.selectHostInfoPage(page, hostInfoVo);
         return getDataTable(result);
     }
@@ -80,9 +81,9 @@ public class HostInfoController  extends BaseController{
      * 主机管理--批量升级
      */
     @PostMapping("/batchUpgrade")
-    public AjaxResult batchUpgrade(String zipId, @RequestParam("hostIds") String[] hostIds){
+    public AjaxResult batchUpgrade(@RequestBody UpgradeHostVo upgradeHostVo){
         try {
-            String msg = upgradeBatchInfoService.addHostUpgradeBatch(zipId, hostIds);
+            String msg = upgradeBatchInfoService.addHostUpgradeBatch(upgradeHostVo.getZipId(), upgradeHostVo.getHostIds());
             return AjaxResult.success(msg);
         } catch (Exception e) {
             log.error("主机管理：批量升级出现异常{}",e);
@@ -141,17 +142,21 @@ public class HostInfoController  extends BaseController{
      *  主机管理--批量升级-先根据页面勾选的主机筛选出可升级的主机hostIds，返回给页面操作升级
      */
     @PostMapping("/batchUpgradeValidate")
-    public AjaxResult batchUpgradeValidate(String upgradeZipId,@RequestParam("hostIds") String[] hostIds){
-        if(StringUtils.isEmpty(upgradeZipId)){
+    public AjaxResult batchUpgradeValidate(@RequestBody UpgradeHostVo upgradeHostVo){
+        if (null == upgradeHostVo){
+            log.error("主机管理--批量升级：前置验证，传入参数upgradeHostVo为空");
+            return AjaxResult.error("请选择升级包！");
+        }
+        if(StringUtils.isEmpty(upgradeHostVo.getZipId())){
             log.error("主机管理--批量升级：前置验证，传入参数upgradeZipId为空");
             return AjaxResult.error("请选择升级包！");
         }
-        if(hostIds == null || hostIds.length == 0){
+        if(upgradeHostVo.getHostIds() == null || upgradeHostVo.getHostIds().length == 0){
             log.error("主机管理--批量升级：前置验证，传入参数hostIds为空");
             return AjaxResult.error("请选择需要升级的主机！");
         }
         try {
-            Map<String, Object> data = upgradeBatchInfoService.validateHostBatch(upgradeZipId, hostIds);
+            Map<String, Object> data = upgradeBatchInfoService.validateHostBatch(upgradeHostVo.getZipId(), upgradeHostVo.getHostIds());
             return AjaxResult.success(data);
         } catch (Exception e) {
             log.error("主机管理--批量升级：前置验证，出现异常{}",e);

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/UpgradeHostVo.java

@@ -0,0 +1,10 @@
+package com.xunmei.deploy.vo;
+
+import lombok.Data;
+
+@Data
+public class UpgradeHostVo {
+    private String zipId;
+
+    private String[] hostIds;
+}