xujie 1 год назад
Родитель
Сommit
0019abc836

+ 4 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/AgentPackageController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 白令海管理-白令海版本管理
  */
@@ -40,12 +42,13 @@ public class AgentPackageController   extends BaseController{
      * 白令海管理-白令海版本管理-上传升级包
      */
     @RequestMapping("/upload")
-    public AjaxResult upload(MultipartFile file){
+    public AjaxResult upload(MultipartFile file, HttpServletResponse response){
         try {
             packageInfoService.uploadZip(file);
             return AjaxResult.success("升级包上传成功");
         }catch (Exception e){
             logger.error("白令海管理-白令海版本管理:上传升级包出现异常{}",e);
+            response.setStatus(500);
             return AjaxResult.error(e.getMessage());
         }
     }

+ 7 - 0
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/HostInfoVo.java

@@ -16,11 +16,18 @@ public class HostInfoVo {
     private String agentVersion;
     private Integer hostStatus;
     private String orderByColumn;
+    private String uploadVersion;
     private String isAsc;
     //todo:
     private String showNoOrgNameFlag;
     private String hostOrgName;
     private String id;
     private String registerDateTime;
+
+    /**
+     * 是否需要升级 0否  1是
+     */
+    private String upgradeFlag;
+
 }