Browse Source

信息点排序规则修改:所有通用放在非通用后面 & 附表15-抗震,二级编码修改

linhuili 3 years ago
parent
commit
2108352789

+ 7 - 7
dmp-rwd-datautils/src/test/java/com/persagy/dmp/rwd/dic/ImportKnowledgeForEdit.java

@@ -31,9 +31,9 @@ import java.util.*;
 @Slf4j
 public class ImportKnowledgeForEdit {
 
-    private String basepath = "D:\\资料\\工作资料\\原型图\\数据中台\\数据字典数据";
+    private String basepath = "D:\\users\\数据字典v3.1.11\\数据字典附表(20210701)";
 
-    private String outPath = "D:/资料/工作资料/原型图/数据中台/out/ref-infos-" + DateUtils.format(new Date()) + ".dml.sql";
+    private String outPath = "D:/users/20210701/edit/ref-infos-" + DateUtils.format(new Date()) + ".dml.sql";
 
     private final static Integer CREATE_USER_ID=0;
     private final static Integer UPDATE_USER_ID=0;
@@ -94,8 +94,8 @@ public class ImportKnowledgeForEdit {
 //        writeFuncSqlToFile(classes, "directionCode");
 //        classes.clear();
 //        // 抗震设防烈度
-//        initSeismicFortificationIntensity(classes,"seismicFortificationIntensity","抗震设防烈度");
-//        writeFuncSqlToFile(classes, "seismicFortificationIntensity");
+          initSeismicFortificationIntensity(classes,"seismicFortificationIntensity","抗震设防烈度");
+          writeFuncSqlToFile(classes, "seismicFortificationIntensity");
 //        classes.clear();
 //        // 防尘等级
 //        initDustproofLevel(classes,"dustproofLevel","防护等级");
@@ -134,7 +134,7 @@ public class ImportKnowledgeForEdit {
 //        writeFuncSqlToFile(classes, "commercialLeasingType");
 //        classes.clear();
         // 通用面积树
-        initThreeLevelData(classes,"universalAreaTree","A0");
+      /*  initThreeLevelData(classes,"universalAreaTree","A0");
         writeFuncSqlToFile(classes, "universalAreaTree");
         classes.clear();
         // 商业综合体面积树
@@ -183,7 +183,7 @@ public class ImportKnowledgeForEdit {
         classes.clear();
         // 医院分项树
         initFiveLevelData(classes,"hospitalItemizedTree","S4");
-        writeFuncSqlToFile(classes, "hospitalItemizedTree");
+        writeFuncSqlToFile(classes, "hospitalItemizedTree");*/
         classes.clear();
 //        // 对象间关系
 //        initObjectRelation(classes,"objectRelation","新版");
@@ -2121,7 +2121,7 @@ public class ImportKnowledgeForEdit {
                     && StringUtils.isNotBlank(target.systemName)) {
                 RwdeditRefTypeInfosModel model = new RwdeditRefTypeInfosModel();
                 model.setRefKey(refKey);
-                model.setCode(target.systemCode);
+                model.setCode(target.majorCode+target.systemCode);
                 model.setName(target.systemName);
                 model.setParentCode(target.majorCode);
                 model.setCodePath(refKey+"-"+target.majorCode+"-"+target.systemCode);

+ 8 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefService.java

@@ -74,7 +74,7 @@ public class FuncidDefService {
         // 二级按通用信息点、个性化信息点的excel表格进行排序展示;
         // 三级按照excel表格的逻辑进行排序展示
         list.sort((k1,k2)->{
-            if (StrUtil.isBlank(k1.getFirstTag()) && StrUtil.isBlank(k2.getFirstTag())){
+            /*if (StrUtil.isBlank(k1.getFirstTag()) && StrUtil.isBlank(k2.getFirstTag())){
                 int compareTo = StrUtil.blankToDefault(k1.getShareType(),"").compareTo(StrUtil.blankToDefault(k2.getShareType(),""));
                 if (0==compareTo) {
                     return k1.getOrderSeq().compareTo(k2.getOrderSeq());
@@ -95,7 +95,13 @@ public class FuncidDefService {
                 }
                 return compareTo;
             }
-            return firstTagSort;
+            return firstTagSort;*/
+            //2021.07.09需求修改:所有通用放在非通用后面
+            int compareTo = StrUtil.blankToDefault(k1.getShareType(),"").compareTo(StrUtil.blankToDefault(k2.getShareType(),""));
+            if (0==compareTo) {
+                return k1.getOrderSeq().compareTo(k2.getOrderSeq());
+            }
+            return -compareTo;
         });
     }