Merge pull request halo-dev#301 from mrdong916/master

链接增加排序
q517544204 · Sep 18, 2019 · c097008 · c097008
2 parents b788dbe + 6c88aa4
commit c097008
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/run/halo/app/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/controller/admin/api/LinkController.java
@@ -35,7 +35,7 @@ public LinkController(LinkService linkService) {
      * @return List
      */
     @GetMapping
-    public List<LinkDTO> listLinks(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) {
+    public List<LinkDTO> listLinks(@SortDefault(sort = "priority", direction = Sort.Direction.ASC) Sort sort) {
         return linkService.listDtos(sort);
     }
 

diff --git a/src/main/java/run/halo/app/model/dto/LinkDTO.java b/src/main/java/run/halo/app/model/dto/LinkDTO.java
@@ -24,4 +24,6 @@ public class LinkDTO implements OutputConverter<LinkDTO, Link> {
     private String description;
 
     private String team;
+
+    private Integer priority;
 }
diff --git a/src/main/java/run/halo/app/model/entity/Link.java b/src/main/java/run/halo/app/model/entity/Link.java
@@ -54,13 +54,22 @@ public class Link extends BaseEntity {
     @Column(name = "team", columnDefinition = "varchar(255) default ''")
     private String team;
 
+    /**
+     * Sort.
+     */
+    @Column(name = "priority", columnDefinition = "int default 0")
+    private Integer priority;
 
     @Override
     public void prePersist() {
         super.prePersist();
 
         id = null;
 
+        if (priority == null) {
+            priority = 0;
+        }
+
         if (logo == null) {
             logo = "";
         }

diff --git a/src/main/java/run/halo/app/model/params/LinkParam.java b/src/main/java/run/halo/app/model/params/LinkParam.java
@@ -5,6 +5,7 @@
 import run.halo.app.model.dto.base.InputConverter;
 import run.halo.app.model.entity.Link;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
@@ -35,4 +36,6 @@ public class LinkParam implements InputConverter<Link> {
     @Size(max = 255, message = "友情链接分组的字符长度 {max}")
     private String team;
 
+    @Min(value = 0, message = "排序编号不能低于 {value}")
+    private Integer priority;
 }