Просмотр исходного кода

feat-[厦门馆二期]:新增排序字段

seeseele 7 месяцев назад
Родитель
Сommit
df65bff964
33 измененных файлов с 456 добавлено и 88 удалено
  1. 26 1
      src/main/java/com/ruoyi/project/VRdemo/domain/ArchivesUnbound.java
  2. 16 0
      src/main/java/com/ruoyi/project/VRdemo/domain/Consultation.java
  3. 29 15
      src/main/java/com/ruoyi/project/VRdemo/domain/Economy.java
  4. 26 1
      src/main/java/com/ruoyi/project/VRdemo/domain/Institution.java
  5. 23 1
      src/main/java/com/ruoyi/project/VRdemo/domain/Literature.java
  6. 49 13
      src/main/java/com/ruoyi/project/VRdemo/domain/Press.java
  7. 16 0
      src/main/java/com/ruoyi/project/VRdemo/domain/Publication.java
  8. 3 3
      src/main/java/com/ruoyi/project/VRdemo/domain/RegionDevelop.java
  9. 15 0
      src/main/java/com/ruoyi/project/VRdemo/domain/Research.java
  10. 15 0
      src/main/java/com/ruoyi/project/VRdemo/domain/SpecialCollection.java
  11. 24 9
      src/main/java/com/ruoyi/project/VRdemo/domain/Thesis.java
  12. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/ArchivesUnboundImData.java
  13. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/ConsultationImData.java
  14. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/EconomyImData.java
  15. 11 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/InstitutionImData.java
  16. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/LiteratureImData.java
  17. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/PressImData.java
  18. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/PublicationImData.java
  19. 3 18
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/RegionDevelopImData.java
  20. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/ResearchImData.java
  21. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/SpecialCollectionImData.java
  22. 12 0
      src/main/java/com/ruoyi/project/VRdemo/domain/imData/ThesisImData.java
  23. 9 3
      src/main/resources/mybatis/VRdemo/ArchivesUnboundMapper.xml
  24. 9 3
      src/main/resources/mybatis/VRdemo/ConsultationMapper.xml
  25. 9 3
      src/main/resources/mybatis/VRdemo/EconomyMapper.xml
  26. 9 3
      src/main/resources/mybatis/VRdemo/InstitutionMapper.xml
  27. 9 2
      src/main/resources/mybatis/VRdemo/LiteratureMapper.xml
  28. 9 2
      src/main/resources/mybatis/VRdemo/PressMapper.xml
  29. 9 2
      src/main/resources/mybatis/VRdemo/PublicationMapper.xml
  30. 1 0
      src/main/resources/mybatis/VRdemo/RegionDevelopMapper.xml
  31. 9 3
      src/main/resources/mybatis/VRdemo/ResearchMapper.xml
  32. 9 3
      src/main/resources/mybatis/VRdemo/SpecialCollectionMapper.xml
  33. 10 3
      src/main/resources/mybatis/VRdemo/ThesisMapper.xml

+ 26 - 1
src/main/java/com/ruoyi/project/VRdemo/domain/ArchivesUnbound.java

@@ -44,6 +44,12 @@ public class ArchivesUnbound extends BaseEntity {
     @Excel(name = "访问地址")
     private String link;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public String getTitle() {
         return StringUtils.isEmpty(chineseName) ? englishName : chineseName;
     }
@@ -88,8 +94,27 @@ public class ArchivesUnbound extends BaseEntity {
         return link;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("englishName", getEnglishName()).append("chineseName", getChineseName()).append("introduce", getIntroduce()).append("link", getLink()).append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateTime", getUpdateTime()).append("updateBy", getUpdateBy()).toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("englishName", getEnglishName())
+                .append("chineseName", getChineseName())
+                .append("introduce", getIntroduce())
+                .append("link", getLink())
+                .append("sort", getSort())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .toString();
     }
 }

+ 16 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/Consultation.java

@@ -13,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @date 2024-09-26
  */
 public class Consultation extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -56,6 +57,12 @@ public class Consultation extends BaseEntity {
     @Excel(name = "机构介绍")
     private String introduce;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public Consultation() {
     }
 
@@ -119,6 +126,14 @@ public class Consultation extends BaseEntity {
         return introduce;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -129,6 +144,7 @@ public class Consultation extends BaseEntity {
                 .append("englishName", getEnglishName())
                 .append("link", getLink())
                 .append("introduce", getIntroduce())
+                .append("sort", getSort())
                 .append("createTime", getCreateTime())
                 .append("createBy", getCreateBy())
                 .append("updateTime", getUpdateTime())

+ 29 - 15
src/main/java/com/ruoyi/project/VRdemo/domain/Economy.java

@@ -7,12 +7,11 @@ import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
  * 东南亚经济统计对象 vr_economy
- * 
+ *
  * @author ruoyi
  * @date 2024-10-06
  */
-public class Economy extends BaseEntity
-{
+public class Economy extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -50,6 +49,12 @@ public class Economy extends BaseEntity
     @Excel(name = "简介")
     private String introduce;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -98,19 +103,28 @@ public class Economy extends BaseEntity
         return introduce;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("affiliation", getAffiliation())
-            .append("location", getLocation())
-            .append("title", getTitle())
-            .append("link", getLink())
-            .append("introduce", getIntroduce())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("affiliation", getAffiliation())
+                .append("location", getLocation())
+                .append("title", getTitle())
+                .append("link", getLink())
+                .append("introduce", getIntroduce())
+                .append("sort", getSort())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

+ 26 - 1
src/main/java/com/ruoyi/project/VRdemo/domain/Institution.java

@@ -13,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @date 2024-09-26
  */
 public class Institution extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -56,6 +57,12 @@ public class Institution extends BaseEntity {
     @Excel(name = "机构介绍")
     private String introduce;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public Institution() {
     }
 
@@ -87,6 +94,14 @@ public class Institution extends BaseEntity {
         this.location = location;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     public void setChineseName(String chineseName) {
         this.chineseName = chineseName;
     }
@@ -121,6 +136,16 @@ public class Institution extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("affiliation", getAffiliation()).append("location", getLocation()).append("chineseName", getChineseName()).append("englishName", getEnglishName()).append("link", getLink()).append("introduce", getIntroduce()).append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateTime", getUpdateTime()).append("updateBy", getUpdateBy()).toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId()).append("affiliation", getAffiliation())
+                .append("location", getLocation())
+                .append("chineseName", getChineseName())
+                .append("englishName", getEnglishName())
+                .append("link", getLink()).append("introduce", getIntroduce())
+                .append("sort", getSort())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy()).toString();
     }
 }

+ 23 - 1
src/main/java/com/ruoyi/project/VRdemo/domain/Literature.java

@@ -12,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @date 2024-09-26
  */
 public class Literature extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -37,6 +38,12 @@ public class Literature extends BaseEntity {
     @Excel(name = "出版日期", width = 30, dateFormat = "yyyy-MM-dd")
     private String publicationTime;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public Literature() {
     }
 
@@ -72,8 +79,23 @@ public class Literature extends BaseEntity {
         return publicationTime;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("title", getTitle()).append("url", getUrl()).append("publicationTime", getPublicationTime()).append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateTime", getUpdateTime()).append("updateBy", getUpdateBy()).toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("title", getTitle())
+                .append("url", getUrl())
+                .append("publicationTime", getPublicationTime())
+                .append("sort", getSort())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy()).append("updateTime", getUpdateTime()).append("updateBy", getUpdateBy()).toString();
     }
 }

+ 49 - 13
src/main/java/com/ruoyi/project/VRdemo/domain/Press.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -15,53 +16,79 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-01-19
  */
-public class Press extends BaseEntity
-{
+public class Press extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
-    /** 自增id */
+    /**
+     * 自增id
+     */
     @ExcelIgnore
     private Long pressId;
 
-    /** 题目 */
+    /**
+     * 题目
+     */
     @ExcelProperty("题目")
     private String title;
 
-    /** 作者 */
+    /**
+     * 作者
+     */
     @ExcelProperty("作者")
     private String author;
 
-    /** 刊名 */
+    /**
+     * 刊名
+     */
     @ExcelProperty("刊名")
     private String pressTitle;
 
     private String press_title;
 
-    /** 年份 */
+    /**
+     * 年份
+     */
     @JsonFormat(pattern = "yyyy")
     @ExcelProperty("年份")
     private Date date;
 
-    /** 刊期 */
+    /**
+     * 刊期
+     */
     @ExcelProperty("刊期")
     private String issue;
 
-    /** 起止页 */
+    /**
+     * 起止页
+     */
     @ExcelProperty("起止页")
     private String pages;
 
-    /** 关键词 */
+    /**
+     * 关键词
+     */
     @ExcelProperty("关键词")
     private String keyword;
 
-    /** 分类 */
+    /**
+     * 分类
+     */
     @ExcelProperty("分类")
     private String classify;
 
-    /** 地区 */
+    /**
+     * 地区
+     */
     @ExcelProperty("地区")
     private String area;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public Long getPressId() {
         return pressId;
     }
@@ -150,9 +177,17 @@ public class Press extends BaseEntity
         this.area = area;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("pressId", getPressId())
                 .append("title", getTitle())
                 .append("author", getAuthor())
@@ -163,6 +198,7 @@ public class Press extends BaseEntity
                 .append("keyword", getKeyword())
                 .append("classify", getClassify())
                 .append("area", getArea())
+                .append("sort", getSort())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

+ 16 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/Publication.java

@@ -12,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @date 2024-10-06
  */
 public class Publication extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -49,6 +50,12 @@ public class Publication extends BaseEntity {
     @Excel(name = "简介")
     private String introduce;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -97,6 +104,14 @@ public class Publication extends BaseEntity {
         return introduce;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -106,6 +121,7 @@ public class Publication extends BaseEntity {
                 .append("title", getTitle())
                 .append("link", getLink())
                 .append("introduce", getIntroduce())
+                .append("sort", getSort())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

+ 3 - 3
src/main/java/com/ruoyi/project/VRdemo/domain/RegionDevelop.java

@@ -36,7 +36,7 @@ public class RegionDevelop extends BaseEntity {
      * 排序
      */
     @Excel(name = "排序")
-    private String sort;
+    private Integer sort;
 
     /**
      * 文件路径
@@ -74,11 +74,11 @@ public class RegionDevelop extends BaseEntity {
         return title;
     }
 
-    public void setSort(String sort) {
+    public void setSort(Integer sort) {
         this.sort = sort;
     }
 
-    public String getSort() {
+    public Integer getSort() {
         return sort;
     }
 

+ 15 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/Research.java

@@ -45,6 +45,12 @@ public class Research extends BaseEntity
     @Excel(name = "分类号")
     private String category;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -109,6 +115,14 @@ public class Research extends BaseEntity
         return category;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -119,6 +133,7 @@ public class Research extends BaseEntity
                 .append("topic", getTopic())
                 .append("publicationTime", getPublicationTime())
                 .append("category", getCategory())
+                .append("sort", getSort())
                 .toString();
     }
 }

+ 15 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/SpecialCollection.java

@@ -37,6 +37,12 @@ public class SpecialCollection extends BaseEntity {
     @Excel(name = "网址")
     private String link;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -69,6 +75,14 @@ public class SpecialCollection extends BaseEntity {
         return link;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -76,6 +90,7 @@ public class SpecialCollection extends BaseEntity {
                 .append("title", getTitle())
                 .append("content", getContent())
                 .append("link", getLink())
+                .append("sort", getSort())
                 .append("createTime", getCreateTime())
                 .append("createBy", getCreateBy())
                 .append("updateTime", getUpdateTime())

+ 24 - 9
src/main/java/com/ruoyi/project/VRdemo/domain/Thesis.java

@@ -51,6 +51,12 @@ public class Thesis extends BaseEntity
     @Excel(name = "学位")
     private String degree;
 
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -124,17 +130,26 @@ public class Thesis extends BaseEntity
         return degree;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("teacher", getTeacher())
-            .append("major", getMajor())
-            .append("title", getTitle())
-            .append("keyword", getKeyword())
-            .append("replyTime", getReplyTime())
-            .append("degree", getDegree())
-            .toString();
+                .append("id", getId())
+                .append("name", getName())
+                .append("teacher", getTeacher())
+                .append("major", getMajor())
+                .append("title", getTitle())
+                .append("keyword", getKeyword())
+                .append("replyTime", getReplyTime())
+                .append("degree", getDegree())
+                .append("sort", getSort())
+                .toString();
     }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/ArchivesUnboundImData.java

@@ -22,6 +22,9 @@ public class ArchivesUnboundImData implements BaseImData<ArchivesUnboundImData,
     @ExcelProperty("访问地址")
     private String link;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<ArchivesUnboundImData, ArchivesUnbound> converter = new DataConverter<ArchivesUnboundImData, ArchivesUnbound>() {
         @Override
@@ -32,6 +35,7 @@ public class ArchivesUnboundImData implements BaseImData<ArchivesUnboundImData,
             archivesUnbound.setEnglishName(archivesUnboundImData.getEnglishName());
             archivesUnbound.setLink(archivesUnboundImData.getLink());
             archivesUnbound.setIntroduce(archivesUnboundImData.getIntroduce());
+            archivesUnbound.setSort(archivesUnboundImData.getSort());
             return archivesUnbound;
         }
     };
@@ -80,4 +84,12 @@ public class ArchivesUnboundImData implements BaseImData<ArchivesUnboundImData,
     public void setEnglishName(String englishName) {
         this.englishName = englishName;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/ConsultationImData.java

@@ -28,6 +28,9 @@ public class ConsultationImData implements BaseImData<ConsultationImData, Consul
     @ExcelProperty("机构介绍")
     private String introduce;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<ConsultationImData, Consultation> converter = new DataConverter<ConsultationImData, Consultation>() {
         @Override
@@ -40,6 +43,7 @@ public class ConsultationImData implements BaseImData<ConsultationImData, Consul
             consultation.setEnglishName(consultationImData.getEnglishName());
             consultation.setLink(consultationImData.getLink());
             consultation.setIntroduce(consultationImData.getIntroduce());
+            consultation.setSort(consultationImData.getSort());
             return consultation;
         }
     };
@@ -104,4 +108,12 @@ public class ConsultationImData implements BaseImData<ConsultationImData, Consul
     public String getIntroduce() {
         return introduce;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/EconomyImData.java

@@ -25,6 +25,9 @@ public class EconomyImData implements BaseImData<EconomyImData, Economy> {
     @ExcelProperty("简介")
     private String introduce;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<EconomyImData, Economy> converter = new DataConverter<EconomyImData, Economy>() {
         @Override
@@ -36,6 +39,7 @@ public class EconomyImData implements BaseImData<EconomyImData, Economy> {
             economy.setTitle(economyImData.getTitle());
             economy.setLink(economyImData.getLink());
             economy.setIntroduce(economyImData.getIntroduce());
+            economy.setSort(economyImData.getSort());
             return economy;
         }
     };
@@ -92,4 +96,12 @@ public class EconomyImData implements BaseImData<EconomyImData, Economy> {
     public String getIntroduce() {
         return introduce;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 11 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/InstitutionImData.java

@@ -28,6 +28,9 @@ public class InstitutionImData implements BaseImData<InstitutionImData, Institut
     @ExcelProperty("机构介绍")
     private String introduce;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<InstitutionImData, Institution> converter = new DataConverter<InstitutionImData, Institution>() {
         @Override
@@ -40,6 +43,7 @@ public class InstitutionImData implements BaseImData<InstitutionImData, Institut
             institution.setIntroduce(institutionImData.getIntroduce());
             institution.setAffiliation(institutionImData.getAffiliation());
             institution.setLocation(institutionImData.getLocation());
+            institution.setSort(institutionImData.getSort());
             return institution;
         }
     };
@@ -105,4 +109,11 @@ public class InstitutionImData implements BaseImData<InstitutionImData, Institut
         return introduce;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/LiteratureImData.java

@@ -19,6 +19,9 @@ public class LiteratureImData implements BaseImData<LiteratureImData, Literature
     @ExcelProperty("出版日期")
     private String publicationTime;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<LiteratureImData, Literature> converter = new DataConverter<LiteratureImData, Literature>(){
         @Override
@@ -28,6 +31,7 @@ public class LiteratureImData implements BaseImData<LiteratureImData, Literature
             literature.setTitle(literatureImData.getTitle());
             literature.setUrl(literatureImData.getUrl());
             literature.setPublicationTime(literatureImData.getPublicationTime());
+            literature.setSort(literatureImData.getSort());
             return literature;
         }
     };
@@ -68,4 +72,12 @@ public class LiteratureImData implements BaseImData<LiteratureImData, Literature
     public String getPublicationTime() {
         return publicationTime;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/PressImData.java

@@ -38,6 +38,9 @@ public class PressImData implements BaseImData<PressImData, Press> {
     @ExcelProperty("地区")
     private String area;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<PressImData, Press> converter = new DataConverter<PressImData, Press>() {
         @Override
@@ -53,6 +56,7 @@ public class PressImData implements BaseImData<PressImData, Press> {
             press.setKeyword(pressImData.getKeyword());
             press.setClassify(pressImData.getClassify());
             press.setArea(pressImData.getArea());
+            press.setSort(pressImData.getSort());
             return press;
         }
     };
@@ -142,6 +146,14 @@ public class PressImData implements BaseImData<PressImData, Press> {
         this.pressTitle = pressTitle;
     }
 
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     @Override
     public String toString() {
         return "PressImData{" +

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/PublicationImData.java

@@ -25,6 +25,9 @@ public class PublicationImData implements BaseImData<PublicationImData, Publicat
     @ExcelProperty("简介")
     private String introduce;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<PublicationImData, Publication> converter = new DataConverter<PublicationImData, Publication>() {
         @Override
@@ -36,6 +39,7 @@ public class PublicationImData implements BaseImData<PublicationImData, Publicat
             publication.setTitle(publicationImData.getTitle());
             publication.setLink(publicationImData.getLink());
             publication.setIntroduce(publicationImData.getIntroduce());
+            publication.setSort(publicationImData.getSort());
             return publication;
         }
     };
@@ -92,4 +96,12 @@ public class PublicationImData implements BaseImData<PublicationImData, Publicat
     public String getIntroduce() {
         return introduce;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 3 - 18
src/main/java/com/ruoyi/project/VRdemo/domain/imData/RegionDevelopImData.java

@@ -10,33 +10,18 @@ public class RegionDevelopImData implements BaseImData<RegionDevelopImData, Regi
     @ExcelProperty("id")
     private Long id;
 
-    /**
-     * 类别
-     */
     @ExcelProperty("类别")
     private String type;
 
-    /**
-     * 题目
-     */
     @ExcelProperty("题目")
     private String title;
 
-    /**
-     * 排序
-     */
     @ExcelProperty("排序")
-    private String sort;
+    private Integer sort;
 
-    /**
-     * 文件路径
-     */
     @ExcelProperty("文件路径")
     private String path;
 
-    /**
-     * 页数
-     */
     @ExcelProperty("页数")
     private Long count;
 
@@ -84,11 +69,11 @@ public class RegionDevelopImData implements BaseImData<RegionDevelopImData, Regi
         return title;
     }
 
-    public void setSort(String sort) {
+    public void setSort(Integer sort) {
         this.sort = sort;
     }
 
-    public String getSort() {
+    public Integer getSort() {
         return sort;
     }
 

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/ResearchImData.java

@@ -28,6 +28,9 @@ public class ResearchImData implements BaseImData<ResearchImData, Research> {
     @ExcelProperty("分类号")
     private String category;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<ResearchImData, Research> converter = new DataConverter<ResearchImData, Research>() {
         @Override
@@ -40,6 +43,7 @@ public class ResearchImData implements BaseImData<ResearchImData, Research> {
             research.setTopic(researchImData.getTopic());
             research.setPublicationTime(researchImData.getPublicationTime());
             research.setCategory(researchImData.getCategory());
+            research.setSort(researchImData.getSort());
             return research;
         }
     };
@@ -104,4 +108,12 @@ public class ResearchImData implements BaseImData<ResearchImData, Research> {
     public void setCategory(String category) {
         this.category = category;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/SpecialCollectionImData.java

@@ -19,6 +19,9 @@ public class SpecialCollectionImData implements BaseImData<SpecialCollectionImDa
     @ExcelProperty("网址")
     private String link;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @ExcelIgnore
     DataConverter<SpecialCollectionImData, SpecialCollection> converter = new DataConverter<SpecialCollectionImData, SpecialCollection>() {
         @Override
@@ -28,6 +31,7 @@ public class SpecialCollectionImData implements BaseImData<SpecialCollectionImDa
             specialCollection.setTitle(collectionImData.getTitle());
             specialCollection.setContent(collectionImData.getContent());
             specialCollection.setLink(collectionImData.getLink());
+            specialCollection.setSort(collectionImData.getSort());
             return specialCollection;
         }
     };
@@ -68,4 +72,12 @@ public class SpecialCollectionImData implements BaseImData<SpecialCollectionImDa
     public String getLink() {
         return link;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 12 - 0
src/main/java/com/ruoyi/project/VRdemo/domain/imData/ThesisImData.java

@@ -38,6 +38,9 @@ public class ThesisImData implements BaseImData<ThesisImData, Thesis> {
     @ExcelProperty("学位")
     private String degree;
 
+    @ExcelProperty("排序")
+    private Integer sort;
+
     private static Date getDate(String replyTime) {
         Date finalDate;
         try {
@@ -84,6 +87,7 @@ public class ThesisImData implements BaseImData<ThesisImData, Thesis> {
             thesis.setKeyword(thesisImData.getKeyword());
             thesis.setReplyTime(finalDate);
             thesis.setDegree(thesisImData.getDegree());
+            thesis.setSort(thesisImData.getSort());
             return thesis;
         }
     };
@@ -156,4 +160,12 @@ public class ThesisImData implements BaseImData<ThesisImData, Thesis> {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

+ 9 - 3
src/main/resources/mybatis/VRdemo/ArchivesUnboundMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chineseName"    column="chinese_name"    />
         <result property="introduce"    column="introduce"    />
         <result property="link"    column="link"    />
+        <result property="sort"    column="sort"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectArchivesUnboundVo">
-        select id, english_name, chinese_name, introduce, link, create_time, create_by, update_time, update_by from vr_archives_unbound
+        select id, english_name, chinese_name, introduce, link, sort, create_time, create_by, update_time, update_by from vr_archives_unbound
     </sql>
 
     <select id="selectArchivesUnboundList" parameterType="ArchivesUnbound" resultMap="ArchivesUnboundResult">
@@ -27,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null  and chineseName != ''"> and chinese_name like concat('%', #{chineseName}, '%')</if>
             <if test="introduce != null  and introduce != ''"> and introduce like concat('%', #{introduce}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectArchivesUnboundById" parameterType="Long" resultMap="ArchivesUnboundResult">
@@ -47,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name,</if>
             <if test="introduce != null and introduce != ''">introduce,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -57,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">#{chineseName},</if>
             <if test="introduce != null and introduce != ''">#{introduce},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -65,10 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertArchivesUnboundDataList" parameterType="java.util.List">
-        insert into vr_archives_unbound(english_name, chinese_name, introduce, link, create_time, create_by)
+        insert into vr_archives_unbound(english_name, chinese_name, introduce, link, sort, create_time, create_by)
         values
         <foreach collection="list" item="item" separator=",">
-          (#{item.englishName}, #{item.chineseName}, #{item.introduce}, #{item.link}, #{item.createTime}, #{item.createBy})
+          (#{item.englishName}, #{item.chineseName}, #{item.introduce}, #{item.link}, #{item.sort}, #{item.createTime}, #{item.createBy})
         </foreach>
     </insert>
 
@@ -79,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name = #{chineseName},</if>
             <if test="introduce != null and introduce != ''">introduce = #{introduce},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 3
src/main/resources/mybatis/VRdemo/ConsultationMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="englishName"    column="english_name"    />
         <result property="link"    column="link"    />
         <result property="introduce"    column="introduce"    />
+        <result property="sort"    column="sort"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectConsultationVo">
-        select id, affiliation, location, chinese_name, english_name, link, introduce, create_time, create_by, update_time, update_by from vr_consultation
+        select id, affiliation, location, chinese_name, english_name, link, introduce, sort, create_time, create_by, update_time, update_by from vr_consultation
     </sql>
 
     <select id="selectConsultationList" parameterType="Consultation" resultMap="ConsultationResult">
@@ -31,7 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="englishName != null  and englishName != ''"> and english_name like concat('%', #{englishName}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="introduce != null  and introduce != ''"> and introduce like concat('%', #{introduce}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectConsultationById" parameterType="Long" resultMap="ConsultationResult">
@@ -53,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name,</if>
             <if test="introduce != null and introduce != ''">introduce,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -65,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">#{chineseName},</if>
             <if test="introduce != null and introduce != ''">#{introduce},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -73,11 +78,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertConsultationDataList" parameterType="java.util.List">
-        INSERT INTO vr_consultation (affiliation, location, chinese_name, english_name, link, introduce, create_by,create_time)
+        INSERT INTO vr_consultation (affiliation, location, chinese_name, english_name, link, introduce, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.affiliation}, #{item.location}, #{item.chineseName}, #{item.englishName}, #{item.link}, #{item.introduce},
-            #{item.createBy}, #{item.createTime})
+            #{item.sort},#{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -90,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name = #{chineseName},</if>
             <if test="introduce != null and introduce != ''">introduce = #{introduce},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 3
src/main/resources/mybatis/VRdemo/EconomyMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="link"    column="link"    />
         <result property="introduce"    column="introduce"    />
+        <result property="sort"    column="sort"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEconomyVo">
-        select id, affiliation, location, title, link, introduce, create_by, create_time, update_by, update_time from vr_economy
+        select id, affiliation, location, title, link, introduce, sort, create_by, create_time, update_by, update_time from vr_economy
     </sql>
 
     <select id="selectEconomyList" parameterType="Economy" resultMap="EconomyResult">
@@ -29,7 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="introduce != null  and introduce != ''"> and introduce like concat('%', #{introduce}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectEconomyById" parameterType="Long" resultMap="EconomyResult">
@@ -50,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title,</if>
             <if test="introduce != null and introduce != ''">introduce,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -61,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">#{title},</if>
             <if test="introduce != null and introduce != ''">#{introduce},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -69,11 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertEconomyDataList" parameterType="java.util.List">
-        INSERT INTO vr_economy (affiliation, location, title, link, introduce, create_by,create_time)
+        INSERT INTO vr_economy (affiliation, location, title, link, introduce, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.affiliation}, #{item.location}, #{item.title}, #{item.link}, #{item.introduce},
-            #{item.createBy}, #{item.createTime})
+            #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -85,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="introduce != null and introduce != ''">introduce = #{introduce},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 3
src/main/resources/mybatis/VRdemo/InstitutionMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="englishName"    column="english_name"    />
         <result property="link"    column="link"    />
         <result property="introduce"    column="introduce"    />
+        <result property="sort"    column="sort"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInstitutionVo">
-        select id, affiliation, location, chinese_name, english_name, link, introduce, create_time, create_by, update_time, update_by from vr_institution
+        select id, affiliation, location, chinese_name, english_name, link, introduce, sort, create_time, create_by, update_time, update_by from vr_institution
     </sql>
 
     <select id="selectInstitutionList" parameterType="Institution" resultMap="InstitutionResult">
@@ -31,7 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="englishName != null  and englishName != ''"> and english_name like concat('%', #{englishName}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="introduce != null  and introduce != ''"> and introduce like concat('%', #{introduce}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectInstitutionById" parameterType="Long" resultMap="InstitutionResult">
@@ -53,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name,</if>
             <if test="introduce != null and introduce != ''">introduce,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -65,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">#{chineseName},</if>
             <if test="introduce != null and introduce != ''">#{introduce},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -73,10 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertInstitutionDataList" parameterType="java.util.List">
-        INSERT INTO vr_institution (affiliation, location, chinese_name, english_name, link, introduce, create_by,create_time)
+        INSERT INTO vr_institution (affiliation, location, chinese_name, english_name, link, introduce,  sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.affiliation}, #{item.location}, #{item.chineseName}, #{item.englishName}, #{item.link}, #{item.introduce}, #{item.createBy}, #{item.createTime})
+            (#{item.affiliation}, #{item.location}, #{item.chineseName}, #{item.englishName}, #{item.link}, #{item.introduce}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -89,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chineseName != null and chineseName != ''">chinese_name = #{chineseName},</if>
             <if test="introduce != null and introduce != ''">introduce = #{introduce},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 2
src/main/resources/mybatis/VRdemo/LiteratureMapper.xml

@@ -9,6 +9,7 @@
         <result property="title" column="title"/>
         <result property="url" column="url"/>
         <result property="publicationTime" column="publication_time"/>
+        <result property="sort"    column="sort"    />
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
@@ -20,6 +21,7 @@
                title,
                url,
                publication_time,
+               sort,
                create_time,
                create_by,
                update_time,
@@ -33,7 +35,9 @@
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="url != null  and url != ''">and url like concat('%', #{url}, '%')</if>
             <if test="publicationTime != null and publicationTime != ''">and publication_time = #{publicationTime}</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="selectLiteratureById" parameterType="Long" resultMap="LiteratureResult">
@@ -52,6 +56,7 @@
             <if test="title != null and title != ''">title,</if>
             <if test="url != null and url != ''">url,</if>
             <if test="publicationTime != null and publicationTime != ''">publication_time,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -61,6 +66,7 @@
             <if test="title != null and title != ''">#{title},</if>
             <if test="url != null and url != ''">#{url},</if>
             <if test="publicationTime != null and publicationTime != ''">#{publicationTime},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -69,10 +75,10 @@
     </insert>
 
     <insert id="insertLiteratureDataList" parameterType="java.util.List">
-        INSERT INTO vr_literature (title, url, publication_time, create_by,create_time)
+        INSERT INTO vr_literature (title, url, publication_time, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.title}, #{item.url}, #{item.publicationTime}, #{item.createBy}, #{item.createTime})
+            (#{item.title}, #{item.url}, #{item.publicationTime}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -82,6 +88,7 @@
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="url != null and url != ''">url = #{url},</if>
             <if test="publicationTime != null and publicationTime != ''">publication_time = #{publicationTime},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 2
src/main/resources/mybatis/VRdemo/PressMapper.xml

@@ -14,6 +14,7 @@
         <result property="keyword" column="keyword"/>
         <result property="classify" column="classify"/>
         <result property="area" column="area"/>
+        <result property="sort"    column="sort"    />
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -30,6 +31,7 @@
                keyword,
                classify,
                area,
+               sort,
                create_by,
                create_time,
                update_by,
@@ -48,7 +50,9 @@
             <if test="keyword != null  and keyword != ''">and keyword like concat('%', #{keyword}, '%')</if>
             <if test="classify != null  and classify != ''">and classify like concat('%', #{classify}, '%')</if>
             <if test="area != null  and area != ''">and area like concat('%', #{area}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="selectPressByPressId" parameterType="Long" resultMap="PressResult">
@@ -73,6 +77,7 @@
             <if test="keyword != null and keyword != ''">keyword,</if>
             <if test="classify != null and classify != ''">classify,</if>
             <if test="area != null and area != ''">area,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -88,6 +93,7 @@
             <if test="keyword != null and keyword != ''">#{keyword},</if>
             <if test="classify != null and classify != ''">#{classify},</if>
             <if test="area != null and area != ''">#{area},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -97,11 +103,11 @@
 
     <insert id="insertPressDataList" parameterType="java.util.List">
         INSERT INTO vr_press (title, author, press_title, issue, date, pages, keyword,
-        classify,area,create_by,create_time)
+        classify,area, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.title}, #{item.author}, #{item.pressTitle}, #{item.issue}, #{item.date}, #{item.pages},
-            #{item.keyword}, #{item.classify}, #{item.area}, #{item.createBy}, #{item.createTime})
+            #{item.keyword}, #{item.classify}, #{item.area}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -117,6 +123,7 @@
             <if test="keyword != null and keyword != ''">keyword = #{keyword},</if>
             <if test="classify != null and classify != ''">classify = #{classify},</if>
             <if test="area != null and area != ''">area = #{area},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 2
src/main/resources/mybatis/VRdemo/PublicationMapper.xml

@@ -11,6 +11,7 @@
         <result property="title" column="title"/>
         <result property="link" column="link"/>
         <result property="introduce" column="introduce"/>
+        <result property="sort"    column="sort"    />
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -24,6 +25,7 @@
                title,
                link,
                introduce,
+               sort,
                create_by,
                create_time,
                update_by,
@@ -39,7 +41,9 @@
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="introduce != null  and introduce != ''"> and introduce like concat('%', #{introduce}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="selectPublicationById" parameterType="Long" resultMap="PublicationResult">
@@ -61,6 +65,7 @@
             <if test="title != null and title != ''">title,</if>
             <if test="introduce != null and introduce != ''">introduce,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -72,6 +77,7 @@
             <if test="title != null and title != ''">#{title},</if>
             <if test="introduce != null and introduce != ''">#{introduce},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -80,11 +86,11 @@
     </insert>
 
     <insert id="insertPublicationDataList" parameterType="java.util.List">
-        INSERT INTO vr_publication (affiliation, location, title, link, introduce, create_by,create_time)
+        INSERT INTO vr_publication (affiliation, location, title, link, introduce, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.affiliation}, #{item.location}, #{item.title}, #{item.link}, #{item.introduce},
-            #{item.createBy}, #{item.createTime})
+            #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -96,6 +102,7 @@
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="introduce != null and introduce != ''">introduce = #{introduce},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 1 - 0
src/main/resources/mybatis/VRdemo/RegionDevelopMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null  and path != ''"> and path like concat('%', #{path}, '%')</if>
             <if test="count != null and count != '' "> and count = #{count}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectRegionDevelopById" parameterType="Long" resultMap="RegionDevelopResult">

+ 9 - 3
src/main/resources/mybatis/VRdemo/ResearchMapper.xml

@@ -12,10 +12,11 @@
         <result property="topic" column="topic"/>
         <result property="publicationTime" column="publication_time"/>
         <result property="category" column="category"/>
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectResearchVo">
-        select id, title, author, institution, topic, publication_time, category
+        select id, title, author, institution, topic, publication_time, category, sort
         from vr_research
     </sql>
 
@@ -30,7 +31,9 @@
             <if test="topic != null  and topic != ''">and topic like concat('%', #{topic}, '%')</if>
             <if test="publicationTime != null ">and publication_time = #{publicationTime}</if>
             <if test="category != null  and category != ''">and category like concat('%', #{category}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="selectResearchById" parameterType="Long" resultMap="ResearchResult">
@@ -52,6 +55,7 @@
             <if test="topic != null and topic != ''">topic,</if>
             <if test="publicationTime != null ">publication_time,</if>
             <if test="category != null">category,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -64,6 +68,7 @@
             <if test="topic != null and topic != ''">#{topic},</if>
             <if test="publicationTime != null ">#{publicationTime},</if>
             <if test="category != null">#{category},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -72,11 +77,11 @@
     </insert>
 
     <insert id="insertResearchDataList" parameterType="java.util.List">
-        INSERT INTO vr_research (title, author, institution, topic, publication_time, category, create_by,create_time)
+        INSERT INTO vr_research (title, author, institution, topic, publication_time, category, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.title}, #{item.author}, #{item.institution}, #{item.topic}, #{item.publicationTime},
-            #{item.category}, #{item.createBy}, #{item.createTime})
+            #{item.category}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -89,6 +94,7 @@
             <if test="topic != null and topic != ''">topic = #{topic},</if>
             <if test="publicationTime != null ">publication_time = #{publicationTime},</if>
             <if test="category != null">category = #{category},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 9 - 3
src/main/resources/mybatis/VRdemo/SpecialCollectionMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="content"    column="content"    />
         <result property="link"    column="link"    />
+        <result property="sort"    column="sort"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCollectionVo">
-        select id, title, content, link, create_time, create_by, update_time, update_by from vr_special_collection
+        select id, title, content, link, sort, create_time, create_by, update_time, update_by from vr_special_collection
     </sql>
 
     <select id="selectCollectionList" parameterType="Collection" resultMap="SpecialCollectionResult">
@@ -25,7 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
             <if test="link != null  and link != ''"> and link like concat('%', #{link}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+        ORDER BY sort
     </select>
     
     <select id="selectCollectionById" parameterType="Long" resultMap="SpecialCollectionResult">
@@ -44,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title,</if>
             <if test="content != null and content != ''">content,</if>
             <if test="link != null and link != ''">link,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -53,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">#{title},</if>
             <if test="content != null and content != ''">#{content},</if>
             <if test="link != null and link != ''">#{link},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -61,10 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertCollectionDataList" parameterType="java.util.List">
-        INSERT INTO vr_special_collection (title, content, link, create_by,create_time)
+        INSERT INTO vr_special_collection (title, content, link, sort, create_by,create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.title}, #{item.content}, #{item.link}, #{item.createBy}, #{item.createTime})
+            (#{item.title}, #{item.content}, #{item.link}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -74,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="content != null and content != ''">content = #{content},</if>
             <if test="link != null and link != ''">link = #{link},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

+ 10 - 3
src/main/resources/mybatis/VRdemo/ThesisMapper.xml

@@ -13,6 +13,7 @@
         <result property="keyword" column="keyword"/>
         <result property="replyTime" column="reply_time"/>
         <result property="degree" column="degree"/>
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectThesisVo">
@@ -23,7 +24,8 @@
                title,
                keyword,
                reply_time,
-               degree
+               degree,
+               sort
         from vr_thesis
     </sql>
 
@@ -37,7 +39,9 @@
             <if test="keyword != null  and keyword != ''">and keyword like concat('%', #{keyword}, '%')</if>
             <if test="replyTime != null ">and reply_time = #{replyTime}</if>
             <if test="degree != null  and degree != ''">and degree like concat('%', #{degree}, '%')</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
         </where>
+            ORDER BY sort
     </select>
 
     <select id="selectThesisById" parameterType="Long" resultMap="ThesisResult">
@@ -60,6 +64,7 @@
             <if test="keyword != null and keyword != ''">keyword,</if>
             <if test="replyTime != null">reply_time,</if>
             <if test="degree != null and degree != ''">degree,</if>
+            <if test="sort != null and sort != ''">sort,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -73,6 +78,7 @@
             <if test="keyword != null and keyword != ''">#{keyword},</if>
             <if test="replyTime != null">#{replyTime},</if>
             <if test="degree != null and degree != ''">#{degree},</if>
+            <if test="sort != null and sort != ''">#{sort},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
@@ -81,11 +87,11 @@
     </insert>
 
     <insert id="insertThesisDataList" parameterType="java.util.List">
-        INSERT INTO vr_thesis (name, teacher, major, title, keyword, reply_time, degree, create_by,create_time)
+        INSERT INTO vr_thesis (name, teacher, major, title, keyword, reply_time, degree, sort, create_by, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.name}, #{item.teacher}, #{item.major}, #{item.title}, #{item.keyword}, #{item.replyTime},
-            #{item.degree}, #{item.createBy}, #{item.createTime})
+            #{item.degree}, #{item.sort}, #{item.createBy}, #{item.createTime})
         </foreach>
     </insert>
 
@@ -99,6 +105,7 @@
             <if test="keyword != null and keyword != ''">keyword = #{keyword},</if>
             <if test="replyTime != null">reply_time = #{replyTime},</if>
             <if test="degree != null and degree != ''">degree = #{degree},</if>
+            <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>