Przeglądaj źródła

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 lat temu
rodzic
commit
47bc809943

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/DigitalObjectType.java

@@ -20,8 +20,8 @@ public enum DigitalObjectType {
     COMPONENT("component", "部件"),
     VIRTUAL("virtual", "虚拟对象"),
     TOOL("tool", "工具"),
-    MATERIAL("material", "耗材");
-
+    MATERIAL("material", "耗材"),
+    PARTITION("partition", "主要功能区");
     private String index;
     private String name;
 

+ 2 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/DigitalObjectTypeShort.java

@@ -21,7 +21,8 @@ public enum DigitalObjectTypeShort {
     COMPONENT("Ec", "部件"),
     VIRTUAL("Vo", "虚拟对象"),
     TOOL("To", "工具"),
-    MATERIAL("Ma", "耗材");
+    MATERIAL("Ma", "耗材"),
+    PARTITION("Pt", "主要功能区");
 
     private String index;
     private String name;

+ 3 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/utils/DigitalCommonUtils.java

@@ -57,7 +57,9 @@ public class DigitalCommonUtils {
             return DigitalObjectTypeShort.COMPONENT.getIndex();
         } else if (DigitalObjectType.VIRTUAL.getIndex().equalsIgnoreCase(category)) {
             return DigitalObjectTypeShort.VIRTUAL.getIndex();
-        } else {
+        }else if (DigitalObjectType.PARTITION.getIndex().equalsIgnoreCase(category)) {
+            return DigitalObjectTypeShort.PARTITION.getIndex();
+        }else {
             return "";
         }
     }