瀏覽代碼

********************WX***********************
模型处理

zhangweixin 4 年之前
父節點
當前提交
5a78cf3707
共有 100 個文件被更改,包括 74 次插入161 次删除
  1. 4 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointPosition.kt
  2. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt
  3. 11 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForBd.kt
  4. 0 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/SchemeUtils.kt
  5. 1 2
      datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt
  6. 4 4
      datacenter/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt
  7. 2 2
      datacenter/src/main/resources/application-dev.yml
  8. 2 2
      datacenter/src/main/resources/application-prod.yml
  9. 8 8
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectFromToControllers.kt
  10. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/api/dict/DictTypeApi.kt
  11. 2 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/FloorUtil.kt
  12. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt
  13. 2 2
      datasyn/src/main/resources/application-dev.yml
  14. 1 1
      datasyn/src/main/resources/application-prod.yml
  15. 0 0
      equip-componet/build.gradle
  16. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/EquipComponentApp.kt
  17. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/Opt.kt
  18. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/ShiroConfig.kt
  19. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/Swagger2Config.kt
  20. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/Swagger3Config.kt
  21. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/WebMvcConfg.kt
  22. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt
  23. 1 1
      equip-componnet/src/main/kotlin/com/persagy/server/controllers/EquipController.kt
  24. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/FloorController.kt
  25. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/PointController.kt
  26. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt
  27. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt
  28. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt
  29. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt
  30. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt
  31. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/controllers/labsl/LabslController.kt
  32. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt
  33. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt
  34. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt
  35. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt
  36. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt
  37. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt
  38. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt
  39. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt
  40. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt
  41. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt
  42. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipComDel.kt
  43. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipCompon.kt
  44. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipDictStatistics.kt
  45. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipORComponCategory.kt
  46. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt
  47. 4 104
      equip-componnet/src/main/kotlin/com/persagy/server/models/EquipmentProSy.kt
  48. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/GatherInfoPoint.kt
  49. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/InfoPoint.kt
  50. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/PointPorperty.kt
  51. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/Project.kt
  52. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt
  53. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/PropertyFamily.kt
  54. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt
  55. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/SimilarityDegree.kt
  56. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/SpaceBdFl.kt
  57. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/SpaceSQueryResponse.kt
  58. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/SysEquip.kt
  59. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/TenantCascade.kt
  60. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/VEquipComponentCount.kt
  61. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/labsl/EquipClassCode.kt
  62. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/labsl/EquipTypeLabsl.kt
  63. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/mappers/CustomSqlLabsl.kt
  64. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/mappers/REquipComponMapper.kt
  65. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/objects/Building.kt
  66. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt
  67. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt
  68. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosure.kt
  69. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosureRequest.kt
  70. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/RSQueryResponse.kt
  71. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/ShaftSpaceVertical.kt
  72. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/SpatialRelationship.kt
  73. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserChangePasswordRequest.kt
  74. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserDeleteRequest.kt
  75. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserUpdateRequest.kt
  76. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/ZoneEquipQueryRequest.kt
  77. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/requests/ZoneISpaceQueryRequest.kt
  78. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/responses/BaseResponse.kt
  79. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/responses/TokenCheckResponse.kt
  80. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserCreateRequest.kt
  81. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserCreateResponse.kt
  82. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserInfoResponse.kt
  83. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/CustomSqlService.kt
  84. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipAssetComponentsReqponseService.kt
  85. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipDelService.kt
  86. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipFamilyService.kt
  87. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipORComponCategoryService.kt
  88. 28 28
      equip-componnet/src/main/kotlin/com/persagy/server/service/EquipmentComService.kt
  89. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt
  90. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt
  91. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentZoneService.kt
  92. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/PropertyEquipService.kt
  93. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/PropertyFamilyService.kt
  94. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/REqInShService.kt
  95. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/REquipComponService.kt
  96. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/RShaftThroughShaftService.kt
  97. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/RSyEqService.kt
  98. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/RSyInShService.kt
  99. 0 0
      equip-componet/src/main/kotlin/com/persagy/server/service/SysEquipService.kt
  100. 0 0
      equip-componnet/src/main/kotlin/com/persagy/server/service/TenantZoneService.kt

+ 4 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/PointPosition.kt

@@ -26,6 +26,7 @@
 
 package com.persagy.server.datacenter.models.entities.assistant
 
+import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 
@@ -38,14 +39,17 @@ class PointPosition : Serializable{
 
     /** 坐标x */
     @Schema(description = "坐标x",required = true)
+    @JSONField(name = "X")
     var x: Double? = null
 
     /** 坐标y */
     @Schema(description = "坐标y",required = true)
+    @JSONField(name = "Y")
     var y: Double? = null
 
     /** 坐标z */
     @Schema(description = "坐标z",required = true)
+    @JSONField(name = "Z")
     var z: Double? = null
 
 } // Class PointPosition

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

@@ -217,13 +217,13 @@ open class DefFuncId: Serializable {
     /** 关键信息点 */
     @Schema(description = "关键信息点")
     @Column(name = "key_word")
-    var keyWord: Boolean? = false
+    var keyWord: Boolean? = null
 
     /** 路径 */
     @Schema(description = "路径")
     var path: String? = null
         get() {
-            return if (firstName == "基本信息"|| firstName.isNullOrEmpty()){
+            return if (firstName == "基本信息"|| firstName.isNullOrEmpty()||firstName == "基本参数"){
                 code
             }else{
                 "infos.$code"

+ 11 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/REqForBd.kt

@@ -58,9 +58,19 @@ class REqForBd : RBaseInfo(){
     @Column(name = "project_id")
     var projectId: String? = null
 
+    /** 图类型 */
+    @Schema(description = "图类型")
+    @Column(name = "graph_code")
+    var graphCode: String? = null
+
+    /** 边类型 */
+    @Schema(description = "边类型")
+    @Column(name = "type")
+    var type: String? = null
+
     /** 计算标记 1 为手动 2为自动 */
     @Schema(description = "计算标记 1 为手动 2为自动 ")
     @Column(name = "sign")
     var sign: Int? = null
 
-} // Class REqForBd
+}

+ 0 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/SchemeUtils.kt

@@ -56,7 +56,6 @@ object SchemeUtils {
             "DVA" -> str ="1"
             "FSDV" -> str ="1"
             "DWA" -> str ="1"
-            "TDLS" -> str ="1"
             "HTA" -> str ="1"
             "FAHT" -> str ="1"
             "GAHT" -> str ="1"

+ 1 - 2
datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt

@@ -399,8 +399,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
                     try {
                         /** 插入字典信息数据 */
-                        defFuncIdProjectService.update(dictProject, arrayListOf("visible"),
-                            SFilter.eq("projectId",Opt.projectId!!),SFilter.eq("classCode",dictProject.classCode!!),SFilter.eq("code",dictProject.code!!))
+                        defFuncIdProjectService.update(dictProject)
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }

+ 4 - 4
datacenter/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt

@@ -155,8 +155,8 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
 
         try {
             val projectId = SPageContext.getHeader("projectId")
-            val comming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val comming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
                 try {
                     if (!comming.isNullOrEmpty()){
                         if (comming == "app"){
@@ -194,8 +194,8 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
             val  property = this.select(SFilter.eq("id", entity.id!!)).entity()
 
             val projectId = SPageContext.getHeader("projectId")
-            val coming = SPageContext.getHeader("Coming")
-            val account = SPageContext.getHeader("Account")
+            val coming = SPageContext.getHeader("coming")
+            val account = SPageContext.getHeader("account")
             try {
                 /** 日志 */
                 val dataCenterLogs = DataCenterLogs()

+ 2 - 2
datacenter/src/main/resources/application-dev.yml

@@ -33,8 +33,8 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-    url:                                jdbc:postgresql://60.205.177.43:5432/datacenter
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 2 - 2
datacenter/src/main/resources/application-prod.yml

@@ -31,8 +31,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
-#    url:                                jdbc:postgresql://172.17.11.228:5432/datacenter
+#    url:                                jdbc:postgresql://172.17.100.16:5432/datacenterlabsl
+    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 8 - 8
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectFromToControllers.kt

@@ -228,12 +228,12 @@ class ObjectFromToControllers {
                         val containsKeyOutline = floorSyn.containsKey("outline")
                         if (containsKeyOutline){
                             val id = floorSyn["id"].toString()
-                            val replace1 = floorSyn["outline"].toString().replace("X", "x")
-                            val replace2 = replace1.replace("Y", "y")
-                            val replace3 = replace2.replace("Z", "z")
+//                            val replace1 = floorSyn["outline"].toString().replace("X", "x")
+//                            val replace2 = replace1.replace("Y", "y")
+//                            val replace3 = replace2.replace("Z", "z")
                             val type = object : TypeToken<ArrayList<PointPosition>>() {
                             }.type
-                            var outline=  Gson().fromJson<ArrayList<PointPosition>>(replace3,type)
+                            var outline=  Gson().fromJson<ArrayList<PointPosition>>(floorSyn["outline"].toString(),type)
                             floorOutlineService.replace(FloorOutline(id,outline))
                         }
                     }
@@ -429,12 +429,12 @@ class ObjectFromToControllers {
                             val containsKey = spaceSyn.containsKey("outline")
                             if (containsKey){
                                 val id = spaceSyn["id"].toString()
-                                val replace1 = spaceSyn["outline"].toString().replace("X", "x")
-                                val replace2 = replace1.replace("Y", "y")
-                                val replace3 = replace2.replace("Z", "z")
+//                                val replace1 = spaceSyn["outline"].toString().replace("X", "x")
+//                                val replace2 = replace1.replace("Y", "y")
+//                                val replace3 = replace2.replace("Z", "z")
                                 val type = object : TypeToken<ArrayList<ArrayList<ArrayList<PointPosition>>>>() {
                                 }.type
-                                var outline=  Gson().fromJson<ArrayList<ArrayList<ArrayList<PointPosition>>>>(replace3,type)
+                                var outline=  Gson().fromJson<ArrayList<ArrayList<ArrayList<PointPosition>>>>(spaceSyn["outline"].toString(),type)
                                 spaceOutlineService.replace(SpaceOutline(id,outline))
                             }
                         }

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/api/dict/DictTypeApi.kt

@@ -161,7 +161,7 @@ object DictTypeApi {
      * @return 专业列表
      */
     fun dictMajor(type: String): ArrayList<DictMajorResponse.DataBean>{
-        val url = "${opts.dataPlatform}/dic/dt/data/query"
+        val url = "${opts.dataPlatform}/dic/dt/data/query?groupCode=WD&userId=123456"
         val jsonObject = JSONObject()
         val jsonObject2 = JSONObject()
         jsonObject2["type"] = type

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/FloorUtil.kt

@@ -82,7 +82,7 @@ object FloorUtil {
             if (containsKey){
                 if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="defaultQRCode"
                     &&key!="qRCodePic"&&key!="bimIdPre"&&key!="bimId"&&key!="modelId"&&key!="bimLocation"
-                    &&key!="outline"&&key!="floorSequenceId"&&key!="permanentPeopleNum"&&key!="floorIdentity"
+                    &&key!="outline"&&key!="floorSequenceId"&&key!="permanentPeopleNum"&&key!="floorIdentity"&&key!="floorSequenceID"
                 ){
                     val containsKey1 = mapCode.containsKey(key)
                     if (containsKey1){
@@ -171,6 +171,7 @@ object FloorUtil {
                         "modelId" -> floor.modelId =  mapObj[key]!!.toString()
                         "bimLocation" -> floor.bimLocation =  mapObj[key]!!.toString()
                         "floorSequenceId" -> floor.floorSequenceId =  mapObj[key]!!.toString().toInt()
+                        "floorSequenceID" -> floor.floorSequenceId =  mapObj[key]!!.toString().toInt()
                         "permanentPeopleNum" -> floor.permanentPeopleNum =  mapObj[key]!!.toString().toInt()
                         "floorIdentity" -> floor.floorIdentity =  mapObj[key]!!.toString()
                         "outline" -> {

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt

@@ -653,7 +653,7 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
                                 }
                                 defFuncId.secondName = dictGroupInfo.secondTag
                                 defFuncId.subFlag = dictGroupInfo.subFlag
-                                defFuncId.type = "group`"
+                                defFuncId.type = "group"
                                 defFuncId.unit = dictGroupInfo.unit
                                 defFuncId.origCode = dictGroupInfo.origCode
                                 defFuncId.origDataType = dictGroupInfo.origDataType

+ 2 - 2
datasyn/src/main/resources/application-dev.yml

@@ -3,10 +3,10 @@ server:
 
 spring:
   datasource:
-#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenter
+    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 1 - 1
datasyn/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://data-center:5432/datacenter
+    url:                                jdbc:postgresql://data-center:5432/datacenterlabsl
     username:                           postgres
     password:                           123qwe!@#
 

equip-componnet/build.gradle → equip-componet/build.gradle


equip-componnet/src/main/kotlin/com/persagy/server/EquipComponentApp.kt → equip-componet/src/main/kotlin/com/persagy/server/EquipComponentApp.kt


equip-componnet/src/main/kotlin/com/persagy/server/Opt.kt → equip-componet/src/main/kotlin/com/persagy/server/Opt.kt


equip-componnet/src/main/kotlin/com/persagy/server/ShiroConfig.kt → equip-componet/src/main/kotlin/com/persagy/server/ShiroConfig.kt


equip-componnet/src/main/kotlin/com/persagy/server/Swagger2Config.kt → equip-componet/src/main/kotlin/com/persagy/server/Swagger2Config.kt


equip-componnet/src/main/kotlin/com/persagy/server/Swagger3Config.kt → equip-componet/src/main/kotlin/com/persagy/server/Swagger3Config.kt


equip-componnet/src/main/kotlin/com/persagy/server/WebMvcConfg.kt → equip-componet/src/main/kotlin/com/persagy/server/WebMvcConfg.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/BuildingController.kt


+ 1 - 1
equip-componnet/src/main/kotlin/com/persagy/server/controllers/EquipController.kt

@@ -271,7 +271,7 @@ class EquipController {
     @Operation(summary = "查询项目下的设备或部件-根据项目、建筑、楼层、设备或部件分类、业务空间实例筛选设备 然后通过计算匹配资产",
         description = "查询条件中建筑id必须书写为buildingId,楼层id必须书写为floorId,spacrType物理世界定义的空间类型,spaceIdList业务空间实例id列表,category设备或部件类型")
     @PostMapping(value = ["/equip-category-property"])
-    fun equipProperty(category:String, @RequestBody request: SQueryRequest, spaceIdList: ArrayList<String>, spacrType: String?):SQueryResponse<Equipment>{
+    fun equipProperty(@RequestParam category:String, @RequestBody request: SQueryRequest, @RequestParam spaceIdList: ArrayList<String>?, @RequestParam spacrType: String?):SQueryResponse<Equipment>{
         return EquipmentComService.equipProperty(category, request, spaceIdList, spacrType)
     } // Function equipProperty()
 

equip-componnet/src/main/kotlin/com/persagy/server/controllers/FloorController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/FloorController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/PointController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/PointController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt


equip-componnet/src/main/kotlin/com/persagy/server/controllers/labsl/LabslController.kt → equip-componet/src/main/kotlin/com/persagy/server/controllers/labsl/LabslController.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneDao.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/EquipZoneTwoDao.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/TenantZoneDao.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/VerticalSpDao.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/EquipmentZoneMapper.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/TenantZoneMapper.kt


equip-componnet/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt → equip-componet/src/main/kotlin/com/persagy/server/dao/mappers/ZoneSpaceMapper.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt → equip-componet/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt → equip-componet/src/main/kotlin/com/persagy/server/models/ComponentProperty.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/EquipComDel.kt → equip-componet/src/main/kotlin/com/persagy/server/models/EquipComDel.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/EquipCompon.kt → equip-componet/src/main/kotlin/com/persagy/server/models/EquipCompon.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/EquipDictStatistics.kt → equip-componet/src/main/kotlin/com/persagy/server/models/EquipDictStatistics.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/EquipORComponCategory.kt → equip-componet/src/main/kotlin/com/persagy/server/models/EquipORComponCategory.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt → equip-componet/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt


+ 4 - 104
equip-componnet/src/main/kotlin/com/persagy/server/models/EquipmentProSy.kt

@@ -147,121 +147,21 @@ open class EquipmentProSy : BaseInfo() {
     @Column(name = "dp_brand_id")
     var dpBrandID: String? = null
 
-    /** 台账参数 */
-    @Schema(description = "台账参数")
-    @Column(name = "ledger_param")
-    var ledgerParam: HashMap<String,Any?>? = null
-
-    /** 通讯参数 */
-    @Schema(description = "通讯参数")
-    @Column(name = "comm_param")
-    var commParam: HashMap<String,Any?>? = null
-
-    /** 技术参数 */
-    @Schema(description = "技术参数")
-    @Column(name = "tech_param")
-    var techParam: HashMap<String,Any?>? = null
-
-    /** 运行参数 */
-    @Schema(description = "运行参数")
-    @Column(name = "run_param")
-    var runParam: HashMap<String,Any?>? = null
-
-    /** 设定参数 */
-    @Schema(description = "设定参数")
-    @Column(name = "setting_param")
-    var settingParam: HashMap<String,Any?>? = null
-
-    /** 报警信息 */
-    @Schema(description = "报警信息")
-    @Column(name = "alram")
-    var alram: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    var customParam: HashMap<String,Any?>? = null
+    /** 信息点 */
+    @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
 
     /** 部件关联设备id */
     @Schema(description = "部件关联设备id")
     @Column(name = "parent_id")
     var parentId: String? = null
 
-    /** 温度传感器 */
-    @Schema(description = "温度传感器")
-    @Column(name = "temp_sensor")
-    var tempSensor: HashMap<String,Any?>? = null
-
-    /** 技术参数-通用 */
-    @Schema(description = "技术参数-通用")
-    @Column(name = "tech_param_general")
-    var techParamGeneral: HashMap<String,Any?>? = null
-
-    /** 运行参数-通用 */
-    @Schema(description = "运行参数-通用")
-    @Column(name = "run_param_general")
-    var runParamGeneral: HashMap<String,Any?>? = null
-
-    /** 速度传感器 */
-    @Schema(description = "速度传感器")
-    @Column(name = "speed_sensor")
-    var speedSensor: HashMap<String,Any?>? = null
-
-    /** 声音传感器 */
-    @Schema(description = "声音传感器")
-    @Column(name = "sound_sensor")
-    var soundSensor: HashMap<String,Any?>? = null
-
-    /** 湿度传感器 */
-    @Schema(description = "湿度传感器")
-    @Column(name = "humidity_sensor")
-    var humiditySensor: HashMap<String,Any?>? = null
-
-    /** 压力传感器 */
-    @Schema(description = "压力传感器")
-    @Column(name = "press_transd")
-    var pressTransd: HashMap<String,Any?>? = null
-
-    /** 热量传感器 */
-    @Schema(description = "热量传感器")
-    @Column(name = "heat_sensor")
-    var heatSensor: HashMap<String,Any?>? = null
-
-    /** 流量传感器 */
-    @Schema(description = "流量传感器")
-    @Column(name = "flow_sensor")
-    var flowSensor: HashMap<String,Any?>? = null
-
-    /** 电度传感器 */
-    @Schema(description = "电度传感器")
-    @Column(name = "electricity_sensor")
-    var electricitySensor: HashMap<String,Any?>? = null
-
-    /** 位移传感器 */
-    @Schema(description = "位移传感器")
-    @Column(name = "displ_sensor")
-    var displSensor: HashMap<String,Any?>? = null
-
-    /** 浓度传感器 */
-    @Schema(description = "浓度传感器")
-    @Column(name = "concent_sensor")
-    var concentSensor: HashMap<String,Any?>? = null
-
-    /** 图像传感器 */
-    @Schema(description = "图像传感器")
-    @Column(name = "image_sensor")
-    var imageSensor: HashMap<String,Any?>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
     override var objectType: String? = "Equipment"
 
-    /** 反馈参数 */
-    @Schema(description = "反馈参数")
-    @Column(name = "feedback_param")
-    var feedbackParam: HashMap<String,Any?>? = null
-
     /** 系统id集合 */
     @Schema(description = "系统id集合")
     var systemList: List<String>? = null

equip-componnet/src/main/kotlin/com/persagy/server/models/GatherInfoPoint.kt → equip-componet/src/main/kotlin/com/persagy/server/models/GatherInfoPoint.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/InfoPoint.kt → equip-componet/src/main/kotlin/com/persagy/server/models/InfoPoint.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/PointPorperty.kt → equip-componet/src/main/kotlin/com/persagy/server/models/PointPorperty.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/Project.kt → equip-componet/src/main/kotlin/com/persagy/server/models/Project.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt → equip-componet/src/main/kotlin/com/persagy/server/models/PropertyEquip.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/PropertyFamily.kt → equip-componet/src/main/kotlin/com/persagy/server/models/PropertyFamily.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt → equip-componet/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/SimilarityDegree.kt → equip-componet/src/main/kotlin/com/persagy/server/models/SimilarityDegree.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/SpaceBdFl.kt → equip-componet/src/main/kotlin/com/persagy/server/models/SpaceBdFl.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/SpaceSQueryResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/SpaceSQueryResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/SysEquip.kt → equip-componet/src/main/kotlin/com/persagy/server/models/SysEquip.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/TenantCascade.kt → equip-componet/src/main/kotlin/com/persagy/server/models/TenantCascade.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/VEquipComponentCount.kt → equip-componet/src/main/kotlin/com/persagy/server/models/VEquipComponentCount.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/labsl/EquipClassCode.kt → equip-componet/src/main/kotlin/com/persagy/server/models/labsl/EquipClassCode.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/labsl/EquipTypeLabsl.kt → equip-componet/src/main/kotlin/com/persagy/server/models/labsl/EquipTypeLabsl.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/mappers/CustomSqlLabsl.kt → equip-componet/src/main/kotlin/com/persagy/server/models/mappers/CustomSqlLabsl.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/mappers/REquipComponMapper.kt → equip-componet/src/main/kotlin/com/persagy/server/models/mappers/REquipComponMapper.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/objects/Building.kt → equip-componet/src/main/kotlin/com/persagy/server/models/objects/Building.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt → equip-componet/src/main/kotlin/com/persagy/server/models/objects/FloorCompon.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt → equip-componet/src/main/kotlin/com/persagy/server/models/objects/ZoneSpace.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosure.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosure.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosureRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/EquipUpDateEnclosureRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/RSQueryResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/RSQueryResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/ShaftSpaceVertical.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/ShaftSpaceVertical.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/SpatialRelationship.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/SpatialRelationship.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/UserChangePasswordRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserChangePasswordRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/UserDeleteRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserDeleteRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/UserUpdateRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/UserUpdateRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/ZoneEquipQueryRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/ZoneEquipQueryRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/requests/ZoneISpaceQueryRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/requests/ZoneISpaceQueryRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/responses/BaseResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/responses/BaseResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/responses/TokenCheckResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/responses/TokenCheckResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/responses/UserCreateRequest.kt → equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserCreateRequest.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/responses/UserCreateResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserCreateResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/models/responses/UserInfoResponse.kt → equip-componet/src/main/kotlin/com/persagy/server/models/responses/UserInfoResponse.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/CustomSqlService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/CustomSqlService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipAssetComponentsReqponseService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipAssetComponentsReqponseService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipDelService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipDelService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipFamilyService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipFamilyService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipORComponCategoryService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipORComponCategoryService.kt


+ 28 - 28
equip-componnet/src/main/kotlin/com/persagy/server/service/EquipmentComService.kt

@@ -90,13 +90,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
      *  @param      spaceIdList     空间id列表
      *  @param      spacrType       空间类型
      *  */
-    fun equipProperty(category:String, request: SQueryRequest, spaceIdList: ArrayList<String>, spacrType: String?):SQueryResponse<Equipment> {
+    fun equipProperty(category:String, request: SQueryRequest, spaceIdList: ArrayList<String>?, spacrType: String?):SQueryResponse<Equipment> {
 
         return try {
             /** 设备类型或设备族类型 */
             val rEq2SpService = SBaseService(SMybatisDao(REq2Sp::class.java))
         val equipFamilyService = SBaseService(SMybatisDao(EquipFamily::class.java))
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (spaceIdList!=null&&spaceIdList.size>0){
             logger.debug("空间*************** ")
             /** 获取到空间关联的设备 */
@@ -108,7 +108,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                 }
                 val sQueryResponse = SQueryResponse<Equipment>()
 
-                val equipList = select(SFilter.inList("EquipID", setId.toList())).exec()
+                val equipList = select(SFilter.inList("id", setId.toList())).exec()
                 sQueryResponse.total = equipList.size.toLong()
                 val iterator = equipList.iterator()
                 while (iterator.hasNext()) {
@@ -129,7 +129,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
 //                        }else if (!equipment.buildingId.isNullOrEmpty()&&equipment.floorId.isNullOrEmpty()){
 //                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("buildingId", equipment.buildingId!!),SFilter.isNull("EquipmentId"), SFilter.eq("Family", equipFamily!!.family!!)).exec()
 //                        }else{
-                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("Family", equipFamily!!.family!!),SFilter.isNull("EquipmentId")).exec()
+                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("family", equipFamily!!.family!!),SFilter.isNull("equipId")).exec()
 //                        }
                         logger.debug("category = ${equipment.classCode}")
                         logger.debug("Family = ${equipFamily.family}")
@@ -178,8 +178,8 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                     setId.add(rEqInSpBase.id1!!)
                 }
 
-            val equipList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("category", category), SFilter.eq("buildingId", buildingId!!),
-                    SFilter.eq("floorId", floorId!!), SFilter.not(SFilter.inList("equipID", setId.toList()))).exec()
+            val equipList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("classCode", category), SFilter.eq("buildingId", buildingId!!),
+                    SFilter.eq("floorId", floorId!!), SFilter.not(SFilter.inList("id", setId.toList()))).exec()
             if (!equipList.isEmpty()){
                 val sQueryResponse = SQueryResponse<Equipment>()
 
@@ -190,11 +190,11 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                     val equipFamily = equipFamilyService.select(SFilter.eq("equipCode", equipment.classCode!!)).entity()
                     var propertyList = ArrayList<Property>()
 //                    if (!equipment.buildingId.isNullOrEmpty()&&!equipment.floorId.isNullOrEmpty()){
-                        propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("floorId", equipment.floorId!!), SFilter.isNull("EquipmentId"), SFilter.eq("Family", equipFamily!!.family!!)).exec()
+                        propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("floorId", equipment.floorId!!), SFilter.isNull("equipId"), SFilter.eq("family", equipFamily!!.family!!)).exec()
 //                    }else if (!equipment.buildingId.isNullOrEmpty()&&equipment.floorId.isNullOrEmpty()){
 //                        propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("buildingId", equipment.buildingId!!),SFilter.isNull("EquipmentId"), SFilter.eq("Family", equipFamily!!.family!!)).exec()
 //                    }else{
-                        propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("Family", equipFamily!!.family!!),SFilter.isNull("EquipmentId")).exec()
+                        propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("family", equipFamily!!.family!!),SFilter.isNull("equipId")).exec()
 //                    }
                     if (propertyList.size>0){
                         /** 计算匹配资产 */
@@ -216,13 +216,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                         if (!equip.buildingId.isNullOrEmpty()){
 
 
-                            val building = buildingService.select(SFilter.eq("BuildID", equip.buildingId!!)).entity()
+                            val building = buildingService.select(SFilter.eq("id", equip.buildingId!!)).entity()
                             if (building!=null){
                                 equip.building =  building
                             }
                         }
                         if (!equip.floorId.isNullOrEmpty()){
-                            val floor = floorService.select(SFilter.eq("FloorID", equip.floorId!!)).entity()
+                            val floor = floorService.select(SFilter.eq("id", equip.floorId!!)).entity()
                             if (floor!=null){
                                 equip.floor = floor
                             }
@@ -243,13 +243,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                                 if (!property.buildingId.isNullOrEmpty()){
 
 
-                                    val building = buildingService.select(SFilter.eq("BuildID", property.buildingId!!)).entity()
+                                    val building = buildingService.select(SFilter.eq("id", property.buildingId!!)).entity()
                                     if (building!=null){
                                         property.building =  building
                                     }
                                 }
                                 if (!property.floorId.isNullOrEmpty()){
-                                    val floor = floorService.select(SFilter.eq("FloorID", property.floorId!!)).entity()
+                                    val floor = floorService.select(SFilter.eq("id", property.floorId!!)).entity()
                                     if (floor!=null){
                                         property.floor = floor
                                     }
@@ -312,7 +312,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                     }
                     val sQueryResponse = SQueryResponse<Equipment>()
 
-                    val equipList = select(SFilter.inList("EquipID", setId.toList())).exec()
+                    val equipList = select(SFilter.inList("id", setId.toList())).exec()
                     sQueryResponse.total = equipList.size.toLong()
                     val iterator = equipList.iterator()
                     while (iterator.hasNext()) {
@@ -333,7 +333,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
 //                            }else if (!equipment.buildingId.isNullOrEmpty()&&equipment.floorId.isNullOrEmpty()){
 //                                propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("buildingId", equipment.buildingId!!),SFilter.isNull("EquipmentId"), SFilter.eq("Family", equipFamily!!.family!!)).exec()
 //                            }else{
-                                propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("Family", equipFamily!!.family!!),SFilter.isNull("EquipmentId")).exec()
+                                propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("family", equipFamily!!.family!!),SFilter.isNull("equipId")).exec()
 //                            }
                             if (propertyList.size>0){
                                 /** 计算匹配资产 */
@@ -357,13 +357,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                             if (!equip.buildingId.isNullOrEmpty()){
 
 
-                                val building = buildingService.select(SFilter.eq("BuildID", equip.buildingId!!)).entity()
+                                val building = buildingService.select(SFilter.eq("id", equip.buildingId!!)).entity()
                                 if (building!=null){
                                     equip.building =  building
                                 }
                             }
                             if (!equip.floorId.isNullOrEmpty()){
-                                val floor = floorService.select(SFilter.eq("FloorID", equip.floorId!!)).entity()
+                                val floor = floorService.select(SFilter.eq("id", equip.floorId!!)).entity()
                                 if (floor!=null){
                                     equip.floor = floor
                                 }
@@ -383,13 +383,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                                     if (!property.buildingId.isNullOrEmpty()){
 
 
-                                        val building = buildingService.select(SFilter.eq("BuildID", property.buildingId!!)).entity()
+                                        val building = buildingService.select(SFilter.eq("id", property.buildingId!!)).entity()
                                         if (building!=null){
                                             property.building =  building
                                         }
                                     }
                                     if (!property.floorId.isNullOrEmpty()){
-                                        val floor = floorService.select(SFilter.eq("FloorID", property.floorId!!)).entity()
+                                        val floor = floorService.select(SFilter.eq("id", property.floorId!!)).entity()
                                         if (floor!=null){
                                             property.floor = floor
                                         }
@@ -435,7 +435,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
             logger.debug("设备*************** ")
             request.pageSize = 100000
             SQueryRequest.maxRow = 100000
-            val pageQuery = pageQuery(request, arrayListOf(SFilter.eq("category", category),
+            val pageQuery = pageQuery(request, arrayListOf(SFilter.eq("classCode", category),
                     SFilter.isNull("propertyId"),SFilter.eq("projectId", projectId!!)))
             var contentList :ArrayList<Equipment>? = null
             logger.debug("设备***************${pageQuery.toJson()} ")
@@ -459,7 +459,7 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
 //                        }else if (!equipment.buildingId.isNullOrEmpty()&&equipment.floorId.isNullOrEmpty()){
 //                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!),SFilter.eq("buildingId", equipment.buildingId!!),SFilter.isNull("EquipmentId"), SFilter.eq("Family", equipFamily!!.family!!)).exec()
 //                        }else{
-                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("Family", equipFamily!!.family!!),SFilter.isNull("EquipmentId")).exec()
+                            propertyList = PropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("family", equipFamily!!.family!!),SFilter.isNull("equipId")).exec()
 //                        }
 //                        logger.debug("category = ${equipment.category}")
 //                        logger.debug("Family = ${equipFamily.family}")
@@ -524,14 +524,14 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                     if (!equip.buildingId.isNullOrEmpty()){
 
 
-                        val building = buildingService.select(SFilter.eq("BuildID", equip.buildingId!!)).entity()
+                        val building = buildingService.select(SFilter.eq("id", equip.buildingId!!)).entity()
                         if (building!=null){
                             equip.building =  building
                         }
                     }
                     if (!equip.floorId.isNullOrEmpty()){
                         try {
-                            val floor = floorService.select(SFilter.eq("FloorID", equip.floorId!!)).entity()
+                            val floor = floorService.select(SFilter.eq("id", equip.floorId!!)).entity()
                             if (floor!= null){
                                 equip.floor = floor
                             }
@@ -552,13 +552,13 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
                         for ( property in equip.propertyList!!){
                             if (!property.buildingId.isNullOrEmpty()){
 
-                                val building = buildingService.select(SFilter.eq("BuildID", property.buildingId!!)).entity()
+                                val building = buildingService.select(SFilter.eq("id", property.buildingId!!)).entity()
                                 if (building!=null){
                                     property.building =  building
                                 }
                             }
                             if (!property.floorId.isNullOrEmpty()){
-                                val floor = floorService.select(SFilter.eq("FloorID", property.floorId!!)).entity()
+                                val floor = floorService.select(SFilter.eq("id", property.floorId!!)).entity()
                                 if (floor!=null){
                                     property.floor = floor
                                 }
@@ -593,19 +593,19 @@ object EquipmentComService : Service<Equipment>(SMybatisDao(Equipment::class.jav
     fun equipPro(request: SUpdateRequest<Property>): SBaseResponse {
 
        return try {
-           val projectId = SPageContext.getHeader("ProjectId")
+           val projectId = SPageContext.getHeader("projectId")
             var projection = request.projection
 
             if (projection == null ){
                 projection = ArrayList()
-                projection.add("EquipmentId")
+                projection.add("equipId")
             }
             if (projection!=null&&projection!!.isEmpty()){
-                projection.add("EquipmentId")
+                projection.add("equipId")
             }
            if (projection!=null&&!projection.isEmpty()){
                projection.clear()
-               projection.add("EquipmentId")
+               projection.add("equipId")
            }
             val updateList = PropertyService.updateList(request)
 

equip-componnet/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentProSyService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/EquipmentZoneService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/EquipmentZoneService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/PropertyEquipService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/PropertyEquipService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/PropertyFamilyService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/PropertyFamilyService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/REqInShService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/REqInShService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/REquipComponService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/REquipComponService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/RShaftThroughShaftService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/RShaftThroughShaftService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/RSyEqService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/RSyEqService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/RSyInShService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/RSyInShService.kt


equip-componnet/src/main/kotlin/com/persagy/server/service/SysEquipService.kt → equip-componet/src/main/kotlin/com/persagy/server/service/SysEquipService.kt


+ 0 - 0
equip-componnet/src/main/kotlin/com/persagy/server/service/TenantZoneService.kt


部分文件因文件數量過多而無法顯示