部署中心后端修改

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

@@ -21,9 +21,8 @@ import jxl.write.biff.RowsExceededException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.List;
@@ -45,8 +44,8 @@ public class AppUpgradeStatusController  extends BaseController{
     /**
      * 升级状态查询-列表
      */
-    @PostMapping("/list")
-    public TableDataInfo list(Page<UpgradeBatchInfo> page, UpgradeBatchInfo info){
+    @GetMapping("/list")
+    public TableDataInfo list(Page<UpgradeBatchInfo> page,UpgradeBatchInfo info){
         IPage<UpgradeBatchInfo> result = upgradeBatchInfoService.selectPage(page,info);
         return getDataTable(result);
     }
@@ -54,7 +53,7 @@ public class AppUpgradeStatusController  extends BaseController{
     /**
      * 升级状态查询-详情
      */
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     public AjaxResult detail(String id, String orgName, Integer status){
         List<BatchHostInfo> batchHosts = upgradeBatchInfoService.getBatchHosts(id,orgName,status);
         return AjaxResult.success(batchHosts);
@@ -62,7 +61,7 @@ public class AppUpgradeStatusController  extends BaseController{
     /**
      * 升级状态查询-详情下的二级详情
      */
-    @PostMapping("/appsDetail")
+    @GetMapping("/appsDetail")
     public AjaxResult appsDetail(String hostId, String batchNumber){
         List<UpgradeTask> upgradeTasks = upgradeTaskService.batchTask(hostId, batchNumber);
         for (UpgradeTask upgradeTask : upgradeTasks) {

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/BatchHostInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -64,10 +65,10 @@ public class BatchHostInfo implements Serializable{
      */
     private Integer status;
 
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
     /**

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/OperationLog.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -59,7 +60,7 @@ public class OperationLog implements Serializable {
     private String remark;
 
     @ApiModelProperty(value = "操作时间")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date operaTime;
 
     @ApiModelProperty(value = "操作结果")

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/PackageInfo.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
@@ -46,7 +47,7 @@ public class PackageInfo implements Serializable {
     /**
      * 上传时间
      */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
 
 

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/UpgradeBatchInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -57,7 +58,7 @@ public class UpgradeBatchInfo implements Serializable{
     /**
      * 创建日期
      */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @TableField(exist = false)
@@ -69,7 +70,7 @@ public class UpgradeBatchInfo implements Serializable{
     /**
      * 完成日期
      */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
     /**