知识库查询增加排序

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/RwdeditRefTypeInfos.java

@@ -49,6 +49,7 @@ public class RwdeditRefTypeInfos {
         entity.setParentCode(model.getParentCode());
         entity.setCodePath(model.getCodePath());
         entity.setDataSource(model.getDataSource());
+        entity.setSeq(model.getSeq());
         return entity;
     }
 
@@ -64,6 +65,7 @@ public class RwdeditRefTypeInfos {
         model.setCode(this.getCode());
         model.setParentCode(this.getParentCode());
         model.setDataSource(this.getDataSource());
+        model.setSeq(this.getSeq());
         return model;
     }
 

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditRefTypeInfosService.java

@@ -15,6 +15,7 @@ import com.persagy.dmp.rwd.edit.entity.RwdeditRefType;
 import com.persagy.dmp.rwd.edit.entity.RwdeditRefTypeInfos;
 import com.persagy.dmp.rwd.edit.model.RwdeditRefTypeModel;
 import com.persagy.dmp.rwd.edit.repository.RwdeditRefTypeInfosRepository;
+import com.persagy.dmp.rwd.model.ClassDefModel;
 import com.persagy.dmp.rwd.model.RwdeditRefTypeInfosModel;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import lombok.extern.slf4j.Slf4j;
@@ -68,6 +69,7 @@ public class RwdeditRefTypeInfosService {
             allCriteria.setCriteria(objectNode);
             allCriteria.setWithColumns(new HashSet<>(Arrays.asList("code","name","codePath")));
             allCriteria.setWithoutCount(true);
+
             PagedResponse<RwdeditRefTypeInfos> allRefTypeInfos = criteriaUtils.query(QRwdeditRefTypeInfos.rwdeditRefTypeInfos, this::parse, allCriteria);
             List<RwdeditRefTypeInfos> allRefTypeInfosData = allRefTypeInfos.getData();
             Map<String, String> nameMap = allRefTypeInfosData.stream()
@@ -88,6 +90,8 @@ public class RwdeditRefTypeInfosService {
                 model.setParentName(parentName);
                 return model;
             }).collect(Collectors.toList());
+            //增加默认排序
+            collect = collect.stream().sorted(Comparator.comparing(RwdeditRefTypeInfosModel::getSeq, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
             result.setData(collect);
         }
         result.setCount(destRefTypeInfos.getCount());

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditRefTypeService.java

@@ -10,16 +10,14 @@ import com.persagy.dmp.rwd.edit.entity.QRwdeditRefType;
 import com.persagy.dmp.rwd.edit.entity.RwdeditRefType;
 import com.persagy.dmp.rwd.edit.model.RwdeditRefTypeModel;
 import com.persagy.dmp.rwd.edit.repository.RwdeditRefTypeRepository;
+import com.persagy.dmp.rwd.model.RwdeditRefTypeInfosModel;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -55,6 +53,8 @@ public class RwdeditRefTypeService {
                 }
                 return model;
             }).collect(Collectors.toList());
+            //增加默认排序
+            collect = collect.stream().sorted(Comparator.comparing(RwdeditRefTypeModel::getSeq, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
             result.setData(collect);
         }
         return result;