소스 검색

查询楼层下的设备bug修复

linhuili 3 년 전
부모
커밋
8b908a3b0f

+ 38 - 0
src/main/java/com/persagy/dmp/middleware/constant/enums/WdModeCodeEnum.java

@@ -0,0 +1,38 @@
+package com.persagy.dmp.middleware.constant.enums;
+/**
+ * @ClassName ClassCodeEnum
+ * @Description: 万达对象类型定义
+ * @Author linhuili
+ * @Date 2021/9/10 09:37
+ * @Version V1.0
+ **/
+public enum WdModeCodeEnum {
+
+    EQ("EQ", "设备设施模块"),
+    LC("LC", "楼层模块");
+
+
+    private String value;
+    private String desc;
+
+    WdModeCodeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

+ 1 - 1
src/main/java/com/persagy/dmp/middleware/service/impl/FloorServiceImpl.java

@@ -151,7 +151,7 @@ public class FloorServiceImpl implements IFloorService {
     public List<JSONObject>  queryFloorMateriaList(InstanceUrlParam context, CommonRequestDTO request){
         //查询广联达设备类型
         WdDefineTypeRel defineTypeRel = new WdDefineTypeRel();
-        defineTypeRel.setObjType(WdDefTypeEnum.EQUIPMENT.getValue());
+        defineTypeRel.setObjType(WdDefTypeEnum.MATERIAL.getValue());
         List<WdDefineTypeRel> defineTypeRels = iWdDefineTypeRelService.query(context,defineTypeRel);
 
         //根据广联达设备类型查询阀门信息

+ 5 - 21
src/main/java/com/persagy/dmp/middleware/utils/SortUtil.java

@@ -1,9 +1,9 @@
 package com.persagy.dmp.middleware.utils;
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import java.text.CollationKey;
 import java.text.Collator;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -58,31 +58,15 @@ public class SortUtil {
      */
     public static void sortByAlphabetical(List<JSONObject> list, String name) {
         Collections.sort(list, new Comparator<JSONObject>() {
+            Collator collator = Collator.getInstance(Locale.CHINA);
             @Override
             public int compare(JSONObject o1, JSONObject o2) {
-                return arrangeStringsAccordingToAscii(o1.getString(name), o2.getString(name));
+                CollationKey key1 = collator.getCollationKey(o1.getString(name));
+                CollationKey key2 = collator.getCollationKey(o2.getString(name));
+                return key1.compareTo(key2);
             }
         });
     }
 
-    /**
-     * ascii编码排序
-     * @param firstText
-     * @param lastText
-     * @return
-     */
-    private static int arrangeStringsAccordingToAscii(String firstText, String lastText) {
-        char[] firstChars = firstText.toCharArray();
-        char[] lastChars = lastText.toCharArray();
-        int min = Math.min(firstChars.length, lastChars.length);
-        for (int index = 0; index < min; index++) {
-            if (firstChars[index] > lastChars[index]) {
-                return 1;
-            } else if (firstChars[index] < lastChars[index]) {
-                return-1;
-            }
-        }
-        return firstChars.length - lastChars.length;
-    }
 
 }