Browse Source

******************WX *********************
修改日志级别

zhangweixin 4 years ago
parent
commit
0d4af7f130

+ 13 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt

@@ -27,6 +27,7 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 
+import com.persagy.server.datacenter.models.tools.DictInfoTools
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -222,14 +223,21 @@ open class DefFuncId: Serializable {
     @Schema(description = "路径")
     var path: String? = null
         get() {
-            return if ( code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"||code == "rFID"||
-                code == "partAutoFireExtinguishArea"||code == "autoFireExtinguishSystem"||code == "maxPermitArea"){
-                "infos.$code"
-            } else if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
+            return  if (DictInfoTools.pathCode(code!!)) {
+                code
+            } else if (firstName == "基本信息"&&code == "pic"){
                 code
-            }  else {
+            } else {
                 "infos.$code"
             }
+//            return if ( code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"||code == "rFID"||
+//                code == "partAutoFireExtinguishArea"||code == "autoFireExtinguishSystem"||code == "maxPermitArea"){
+//                "infos.$code"
+//            } else if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
+//                code
+//            }  else {
+//                "infos.$code"
+//            }
         }
 
     /** 字典内容 */

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt

@@ -84,7 +84,7 @@ open class Project : BaseInfo() {
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    override var objectType: String? = "Project"
+    override var objectType: String? = "project"
 
     @Schema(description = "信息点")
     @Column(name = "infos")

+ 4 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
+import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.service.models.annotations.SCascade
@@ -70,8 +71,9 @@ class Shaft : BaseInfo() {
     var bimId: String? = null
 
     /** 设计图纸中编码 */
-   @Schema(description = "设计图纸中编码")
+    @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
+    @JSONField(name = "cADID")
     var cadId: String? = null
 
     /** 二维码图片 */
@@ -112,7 +114,7 @@ class Shaft : BaseInfo() {
     /** 对象类型 */
    @Schema(description = "对象类型")
     @Column(name = "object_type")
-    override var objectType: String? = "Shaft"
+    override var objectType: String? = "shaft"
 
     /** 级联-竖井内的设备 */
    @Schema(description = "级联-竖井内的设备")

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Tenant.kt

@@ -88,7 +88,7 @@ class Tenant : BaseInfo() {
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    override var objectType: String? = "Tenant"
+    override var objectType: String? = "tenant"
 
 
     /** 租户租赁的租户业务空间  self = true  同样的对象查询时 id可以互相调换查询   */

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneIspace.kt

@@ -148,7 +148,7 @@ open class ZoneIspace : BaseInfo() {
 
     @Schema(description = "对象类型")
     @Column(name = "object_type")
-    override var objectType: String? = "Ispace"
+    override var objectType: String? = "ispace"
 
     /** 模型文件id */
     @Schema(description = "模型文件id")

+ 64 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/tools/DictInfoTools.kt

@@ -0,0 +1,64 @@
+package com.persagy.server.datacenter.models.tools
+
+/**
+ * 字典工具
+ */
+object DictInfoTools {
+
+
+    fun pathCode (code: String):Boolean{
+        return when (code) {
+            "id" -> true
+            "name" -> true
+            "localId" -> true
+            "localName" -> true
+            "qRCodePic" -> true
+            "defaultQRCode" -> true
+            "rFID" -> true
+            "cADID" -> true
+            "bimId" -> true
+            "bimTypeId" -> true
+            "bimLocation" -> true
+            "bimFamilyName" -> true
+            "bimFamilySymbol" -> true
+            "equipSerial" -> true
+            "modelId" -> true
+            "note" -> true
+            "introduction" -> true
+            "businessFloorNum" -> true
+            "officeFloorNum" -> true
+            "shaftSequenceId" -> true
+            "outline" -> true
+            "buildQRCode" -> true
+            "bimIdPre" -> true
+            "floorSequenceId" -> true
+            "permanentPeopleNum" -> true
+            "floorIdentity" -> true
+            "depth" -> true
+            "width" -> true
+            "buildArea" -> true
+            "netArea" -> true
+            "height" -> true
+            "intro" -> true
+            "ratedCoolingP" -> true
+            "ratedHeatingP" -> true
+            "acType" -> true
+            "zoneOrientation" -> true
+            "roomFuncType" -> true
+            "roomSerial" -> true
+            "projRoomFuncType" -> true
+            "ratedLightP" -> true
+            "zoneType" -> true
+            "tenantType" -> true
+            "tenant" -> true
+            "elecCap" -> true
+            "pollutionDegree" -> true
+            else -> {
+                false
+            }
+        }
+    }
+
+
+
+}