Browse Source

优化历史记录顺序

mxd 3 years ago
parent
commit
54c8adea71

+ 5 - 4
magic-api/src/main/java/org/ssssssss/magicapi/controller/MagicAPIController.java

@@ -9,11 +9,9 @@ import org.ssssssss.magicapi.interceptor.Authorization;
 import org.ssssssss.magicapi.model.ApiInfo;
 import org.ssssssss.magicapi.model.Backup;
 import org.ssssssss.magicapi.model.JsonBean;
-import org.ssssssss.magicapi.provider.ApiServiceProvider;
-import org.ssssssss.magicapi.provider.MagicAPIService;
-import org.ssssssss.magicapi.provider.MagicBackupService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -74,7 +72,10 @@ public class MagicAPIController extends MagicController implements MagicExceptio
 	@ResponseBody
 	public JsonBean<List<Backup>> backupList(HttpServletRequest request, String id) {
 		isTrue(allowVisit(request, Authorization.VIEW, getApiInfo(id)), PERMISSION_INVALID);
-		return new JsonBean<>(magicBackupService.backupById(id));
+		return new JsonBean<>(magicBackupService.backupById(id)
+				.stream()
+				.sorted(Comparator.comparing(Backup::getCreateDate).reversed())
+				.collect(Collectors.toList()));
 	}
 
 	/**

+ 5 - 4
magic-api/src/main/java/org/ssssssss/magicapi/controller/MagicFunctionController.java

@@ -9,11 +9,9 @@ import org.ssssssss.magicapi.interceptor.Authorization;
 import org.ssssssss.magicapi.model.Backup;
 import org.ssssssss.magicapi.model.FunctionInfo;
 import org.ssssssss.magicapi.model.JsonBean;
-import org.ssssssss.magicapi.provider.FunctionServiceProvider;
-import org.ssssssss.magicapi.provider.MagicAPIService;
-import org.ssssssss.magicapi.provider.MagicBackupService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -52,7 +50,10 @@ public class MagicFunctionController extends MagicController implements MagicExc
 	@ResponseBody
 	public JsonBean<List<Backup>> backupList(HttpServletRequest request, String id) {
 		isTrue(allowVisit(request, Authorization.VIEW, getFunctionInfo(id)), PERMISSION_INVALID);
-		return new JsonBean<>(magicBackupService.backupById(id));
+		return new JsonBean<>(magicBackupService.backupById(id)
+				.stream()
+				.sorted(Comparator.comparing(Backup::getCreateDate).reversed())
+				.collect(Collectors.toList()));
 	}
 
 	@RequestMapping("/function/move")

+ 3 - 3
magic-api/src/main/java/org/ssssssss/magicapi/model/Backup.java

@@ -12,7 +12,7 @@ public class Backup {
 	/**
 	 * 备份时间
 	 */
-	private long createDate;
+	private Long createDate = 0L;
 
 	/**
 	 * 标签,只允许有一个
@@ -58,11 +58,11 @@ public class Backup {
 		this.type = type;
 	}
 
-	public long getCreateDate() {
+	public Long getCreateDate() {
 		return createDate;
 	}
 
-	public void setCreateDate(long createDate) {
+	public void setCreateDate(Long createDate) {
 		this.createDate = createDate;
 	}