From 4977b177c28e3dffb90b655a9d0c3e8e3ba8f10f Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Sun, 20 Dec 2020 20:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opsli/core/utils/DictUtil.java   | 28 +++++++++++++++++--
 .../opsli-core/src/main/resources/index.html  |  1 -
 .../service/impl/DictDetailServiceImpl.java   |  7 +++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 delete mode 100644 opsli-base-support/opsli-core/src/main/resources/index.html

diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
index b161f14e..89af8e3b 100644
--- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
+++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
@@ -15,6 +15,7 @@
  */
 package org.opsli.core.utils;
 
+import cn.hutool.core.collection.ListUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -130,6 +131,7 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
+                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         // 保存至缓存
                         DictUtil.put(dictWrapperModel);
@@ -217,6 +219,7 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
+                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         // 保存至缓存
                         DictUtil.put(dictWrapperModel);
@@ -270,10 +273,12 @@ public class DictUtil {
                 dictWrapperModel.setTypeCode(typeCode);
                 dictWrapperModel.setDictName(model.getDictName());
                 dictWrapperModel.setDictValue(model.getDictValue());
+                dictWrapperModel.setDictSort(model.getSortNo());
                 dictWrapperModels.add(dictWrapperModel);
             }
             if(!dictWrapperModels.isEmpty()){
-                return dictWrapperModels;
+                // 排序
+                return sortDictWrappers(dictWrapperModels);
             }
 
             // 防止缓存穿透判断
@@ -315,10 +320,12 @@ public class DictUtil {
                     dictWrapperModel.setTypeCode(typeCode);
                     dictWrapperModel.setDictName(model.getDictName());
                     dictWrapperModel.setDictValue(model.getDictValue());
+                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperModels.add(dictWrapperModel);
                 }
                 if(!dictWrapperModels.isEmpty()){
-                    return dictWrapperModels;
+                    // 排序
+                    return sortDictWrappers(dictWrapperModels);
                 }
 
 
@@ -331,6 +338,7 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
+                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         dictWrapperModels.add(dictWrapperModel);
                         // 保存至缓存
@@ -358,6 +366,22 @@ public class DictUtil {
             log.error(e.getMessage(),e);
             dictWrapperModels = Lists.newArrayList();
         }
+
+        // 排序
+        return sortDictWrappers(dictWrapperModels);
+    }
+
+    /**
+     * 字典排序
+     * @param dictWrapperModels
+     * @return
+     */
+    private static List<DictWrapper> sortDictWrappers(List<DictWrapper> dictWrapperModels) {
+        ListUtil.sort(dictWrapperModels, (o1, o2) -> {
+            int oInt1 = o1.getDictValue()==null?Integer.MAX_VALUE:o1.getDictSort();
+            int oInt2 = o2.getDictValue()==null?Integer.MAX_VALUE:o2.getDictSort();
+            return Integer.compare(oInt1, oInt2);
+        });
         return dictWrapperModels;
     }
 
diff --git a/opsli-base-support/opsli-core/src/main/resources/index.html b/opsli-base-support/opsli-core/src/main/resources/index.html
deleted file mode 100644
index 93a5f6ac..00000000
--- a/opsli-base-support/opsli-core/src/main/resources/index.html
+++ /dev/null
@@ -1 +0,0 @@
-123123
\ No newline at end of file
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
index 5bd443d9..6f8265e6 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
@@ -91,6 +91,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
+                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -135,6 +136,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
+                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -168,6 +170,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
+                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -199,6 +202,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
+                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -236,6 +240,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(sysDictDetail.getTypeCode());
                     dictWrapperModel.setDictName(sysDictDetail.getDictName());
                     dictWrapperModel.setDictValue(sysDictDetail.getDictValue());
+                    dictWrapperModel.setDictSort(sysDictDetail.getSortNo());
 
                     dictWrapperModels.add(dictWrapperModel);
 
@@ -288,6 +293,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(sysDictDetail.getTypeCode());
                     dictWrapperModel.setDictName(sysDictDetail.getDictName());
                     dictWrapperModel.setDictValue(sysDictDetail.getDictValue());
+                    dictWrapperModel.setDictSort(sysDictDetail.getSortNo());
 
                     dictWrapperModels.add(dictWrapperModel);
 
@@ -336,6 +342,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
+                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存