Forráskód Böngészése

********************WX************************
数据中心改版

zhangweixin 4 éve
szülő
commit
cf1948b185
36 módosított fájl, 4345 hozzáadás és 3342 törlés
  1. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Building.kt
  2. 78 73
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  3. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt
  4. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/GeneralSystem.kt
  5. 8 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt
  6. 5 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt
  7. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  8. 2 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/SpaceSQueryResponse.kt
  9. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt
  10. 2 2
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt
  11. 2 2
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt
  12. 9 9
      datacenter/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt
  13. 3 3
      datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt
  14. 3 8
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt
  15. 8 8
      datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt
  16. 9 9
      datacenter/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt
  17. 10 10
      datacenter/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt
  18. 1 1
      datasyn/build.gradle
  19. 13 13
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectFromToControllers.kt
  20. 387 265
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/BuildingUtil.kt
  21. 2385 2260
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/EquipUtil.kt
  22. 149 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/FloorUtil.kt
  23. 126 0
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/ProjectUtil.kt
  24. 135 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/ShaftUtil.kt
  25. 174 0
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/SpaceUtil.kt
  26. 127 0
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/SystemUtil.kt
  27. 3 3
      datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt
  28. 16 0
      equip-componnet/src/main/kotlin/com/persagy/server/models/SpaceSQueryResponse.kt
  29. 2 2
      equip-componnet/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt
  30. 584 588
      equip-componnet/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt
  31. 1 1
      equip-componnet/src/main/kotlin/com/persagy/server/service/objects/ISpaceService.kt
  32. 2 2
      equip-componnet/src/main/kotlin/com/persagy/server/utils/DataVerification.kt
  33. 2 2
      message-center/src/main/kotlin/com/persagy/server/messagecenter/WebMvcConfg.kt
  34. 65 68
      scanbuilding/src/main/kotlin/com/persagy/server/controller/task/EquipScanTaskController.kt
  35. 4 4
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt
  36. 4 4
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Building.kt

@@ -103,6 +103,11 @@ open class Building : BaseInfo() {
     @Column(name = "building_doc")
     var buildingDoc: HashMap<String,Any?>? = null
 
+    @ApiModelProperty(value = "建筑文档")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
+
     /** 对象类型 */
     @ApiModelProperty(value = "对象类型")
     @Column(name = "object_type")

+ 78 - 73
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt

@@ -189,6 +189,11 @@ open class Equipment : BaseInfo() {
     @Column(name = "dp_brand_id")
     var dpBrandID: String? = null
 
+    /** 信息点 */
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
     /** 台账参数 */
     @ApiModelProperty(value = "台账参数")
     @Column(name = "ledger_param")
@@ -229,70 +234,70 @@ open class Equipment : BaseInfo() {
     @Column(name = "parent_id")
     var parentId: String? = null
 
-    /** 温度传感器 */
-    @ApiModelProperty(value = "温度传感器")
-    @Column(name = "temp_sensor")
-    var tempSensor: HashMap<String,Any?>? = null
-
-    /** 技术参数-通用 */
-    @ApiModelProperty(value = "技术参数-通用")
-    @Column(name = "tech_param_general")
-    var techParamGeneral: HashMap<String,Any?>? = null
-
-    /** 运行参数-通用 */
-    @ApiModelProperty(value = "运行参数-通用")
-    @Column(name = "run_param_general")
-    var runParamGeneral: HashMap<String,Any?>? = null
-
-    /** 速度传感器 */
-    @ApiModelProperty(value = "速度传感器")
-    @Column(name = "speed_sensor")
-    var speedSensor: HashMap<String,Any?>? = null
-
-    /** 声音传感器 */
-    @ApiModelProperty(value = "声音传感器")
-    @Column(name = "sound_sensor")
-    var soundSensor: HashMap<String,Any?>? = null
-
-    /** 湿度传感器 */
-    @ApiModelProperty(value = "湿度传感器")
-    @Column(name = "humidity_sensor")
-    var humiditySensor: HashMap<String,Any?>? = null
-
-    /** 压力传感器 */
-    @ApiModelProperty(value = "压力传感器")
-    @Column(name = "press_transd")
-    var pressTransd: HashMap<String,Any?>? = null
-
-    /** 热量传感器 */
-    @ApiModelProperty(value = "热量传感器")
-    @Column(name = "heat_sensor")
-    var heatSensor: HashMap<String,Any?>? = null
-
-    /** 流量传感器 */
-    @ApiModelProperty(value = "流量传感器")
-    @Column(name = "flow_sensor")
-    var flowSensor: HashMap<String,Any?>? = null
-
-    /** 电度传感器 */
-    @ApiModelProperty(value = "电度传感器")
-    @Column(name = "electricity_sensor")
-    var electricitySensor: HashMap<String,Any?>? = null
-
-    /** 位移传感器 */
-    @ApiModelProperty(value = "位移传感器")
-    @Column(name = "displ_sensor")
-    var displSensor: HashMap<String,Any?>? = null
-
-    /** 浓度传感器 */
-    @ApiModelProperty(value = "浓度传感器")
-    @Column(name = "concent_sensor")
-    var concentSensor: HashMap<String,Any?>? = null
-
-    /** 图像传感器 */
-    @ApiModelProperty(value = "图像传感器")
-    @Column(name = "image_sensor")
-    var imageSensor: HashMap<String,Any?>? = null
+//    /** 温度传感器 */
+//    @ApiModelProperty(value = "温度传感器")
+//    @Column(name = "temp_sensor")
+//    var tempSensor: HashMap<String,Any?>? = null
+//
+//    /** 技术参数-通用 */
+//    @ApiModelProperty(value = "技术参数-通用")
+//    @Column(name = "tech_param_general")
+//    var techParamGeneral: HashMap<String,Any?>? = null
+//
+//    /** 运行参数-通用 */
+//    @ApiModelProperty(value = "运行参数-通用")
+//    @Column(name = "run_param_general")
+//    var runParamGeneral: HashMap<String,Any?>? = null
+//
+//    /** 速度传感器 */
+//    @ApiModelProperty(value = "速度传感器")
+//    @Column(name = "speed_sensor")
+//    var speedSensor: HashMap<String,Any?>? = null
+//
+//    /** 声音传感器 */
+//    @ApiModelProperty(value = "声音传感器")
+//    @Column(name = "sound_sensor")
+//    var soundSensor: HashMap<String,Any?>? = null
+//
+//    /** 湿度传感器 */
+//    @ApiModelProperty(value = "湿度传感器")
+//    @Column(name = "humidity_sensor")
+//    var humiditySensor: HashMap<String,Any?>? = null
+//
+//    /** 压力传感器 */
+//    @ApiModelProperty(value = "压力传感器")
+//    @Column(name = "press_transd")
+//    var pressTransd: HashMap<String,Any?>? = null
+//
+//    /** 热量传感器 */
+//    @ApiModelProperty(value = "热量传感器")
+//    @Column(name = "heat_sensor")
+//    var heatSensor: HashMap<String,Any?>? = null
+//
+//    /** 流量传感器 */
+//    @ApiModelProperty(value = "流量传感器")
+//    @Column(name = "flow_sensor")
+//    var flowSensor: HashMap<String,Any?>? = null
+//
+//    /** 电度传感器 */
+//    @ApiModelProperty(value = "电度传感器")
+//    @Column(name = "electricity_sensor")
+//    var electricitySensor: HashMap<String,Any?>? = null
+//
+//    /** 位移传感器 */
+//    @ApiModelProperty(value = "位移传感器")
+//    @Column(name = "displ_sensor")
+//    var displSensor: HashMap<String,Any?>? = null
+//
+//    /** 浓度传感器 */
+//    @ApiModelProperty(value = "浓度传感器")
+//    @Column(name = "concent_sensor")
+//    var concentSensor: HashMap<String,Any?>? = null
+//
+//    /** 图像传感器 */
+//    @ApiModelProperty(value = "图像传感器")
+//    @Column(name = "image_sensor")
+//    var imageSensor: HashMap<String,Any?>? = null
 
     /** 系统id集合 */
     @ApiModelProperty(value = "系统id集合")
@@ -318,15 +323,15 @@ open class Equipment : BaseInfo() {
     @Column(name = "model_id")
     var modelId: String? = null
 
-    /** 反馈参数 */
-    @ApiModelProperty(value = "反馈参数")
-    @Column(name = "feedback_param")
-    var feedbackParam: HashMap<String,Any?>? = null
-
-    /** 人流量传感器 */
-    @ApiModelProperty(value = "人流量传感器")
-    @Column(name = "man_flow_sensor")
-    var manFlowSensor: HashMap<String,Any?>? = null
+//    /** 反馈参数 */
+//    @ApiModelProperty(value = "反馈参数")
+//    @Column(name = "feedback_param")
+//    var feedbackParam: HashMap<String,Any?>? = null
+//
+//    /** 人流量传感器 */
+//    @ApiModelProperty(value = "人流量传感器")
+//    @Column(name = "man_flow_sensor")
+//    var manFlowSensor: HashMap<String,Any?>? = null
 
     /** 撕码贴码状态 */
     @ApiModelProperty(value = "撕码贴码状态")

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Floor.kt

@@ -109,6 +109,11 @@ open class Floor : BaseInfo() {
     @Column(name = "floor_identity")
     var floorIdentity: String? = null
 
+    /** 信息点 */
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
     /** 结构信息 */
     @ApiModelProperty(value = "结构信息")
     @Column(name = "structure_info")

+ 5 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/GeneralSystem.kt

@@ -100,6 +100,11 @@ open class GeneralSystem : BaseInfo() {
     @Column(name = "default_qr_code")
     var defaultQRCode: String? = null
 
+    /** 信息点 */
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
     /** 设定参数 */
     @ApiModelProperty(value = "设定参数")
     @Column(name = "setting_param")

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

@@ -123,4 +123,12 @@ open class Project : BaseInfo() {
     @Column(name = "object_type")
     @JSONField(name = "ObjectType")
     override var objectType: String? = "Project"
+
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
+
+
+
 } // Class Project

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

@@ -63,6 +63,11 @@ class Shaft : BaseInfo() {
     @Column(name = "project_id")
     var projectId: String? = null
 
+    /** 信息点 */
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String, Any?>? = null
+
     /** 结构信息 */
     @ApiModelProperty(value = "结构信息")
     @Column(name = "structure_info")

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt

@@ -180,6 +180,11 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     @Column(name = "func_type")
     var roomFuncType: String? = null
 
+    /** 信息点  */
+    @ApiModelProperty(value = "信息点")
+    @JSONField(name = "infos")
+    var infos: HashMap<String,Any?>? =null
+
     /** 运行参数  */
     @ApiModelProperty(value = "运行参数 ")
     @JSONField(name = "RunParam")
@@ -322,4 +327,9 @@ open class ZoneSpace: Serializable, SBaseEntity() {
     @SCascade(table="r_sp_in_fl", idColumn="space_id", childIdColumn="floor_id")
     var floorlList: ArrayList<Floor>? = null
 
+    /** 对象类型 */
+    @ApiModelProperty(value = "对象类型")
+    @Column(name = "object_type")
+    var objectType: String? = null
+
 } // Class ZoneAirConditioning

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/SpaceSQueryResponse.kt

@@ -1,10 +1,10 @@
 package com.persagy.server.datacenter.models.response
 
-import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
+import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.ApiModelProperty
 
-class SpaceSQueryResponse: SQueryResponse<ZoneIspace>() {
+class SpaceSQueryResponse: SQueryResponse<ZoneSpace>() {
 
     /** 楼层id */
     @ApiModelProperty(value = "楼层id")

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt

@@ -20,6 +20,7 @@
 
 package com.persagy.server.controllers.objects
 
+import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.entities.dict.DictSpaceProject
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
@@ -30,7 +31,6 @@ import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
 import com.persagy.server.services.dict.DictSpaceProjectService
 import com.persagy.server.services.objects.ZoneSpaceBaseService
 import com.persagy.server.services.relation_calc.MepSystemCalcService
-import com.persagy.database.SFilter
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest
 import com.persagy.service.models.requests.SCreateRequest

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt

@@ -74,7 +74,7 @@ object UpDataFloorAndBuildingServuce : Service<Equipment>(SMybatisDao(Equipment:
 
                                 val rSpinBd = RSpinBd()
                                 rSpinBd.objectType = type
-                                rSpinBd.buildingId = floor.buildId
+                                rSpinBd.buildingId = floor.buildingId
                                 rSpinBd.spaceId = spaceId
                                 rSpinBd.sign = 1
                                 rSpinBd.projectId = projectId
@@ -116,7 +116,7 @@ object UpDataFloorAndBuildingServuce : Service<Equipment>(SMybatisDao(Equipment:
                         zonePowerSupply.floorId = id
                         val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("FloorID", id))
                             .entity()
-                        zonePowerSupply.buildingId = floor?.buildId
+                        zonePowerSupply.buildingId = floor?.buildingId
                         val list = ArrayList<String>()
                         list.add("FloorId")
                         list.add("BuildingId")

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt

@@ -125,7 +125,7 @@ object ComponentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     override fun onCreateSuccess(entityList: ArrayList<Equipment>) {
         super.onCreateSuccess(entityList)
         for (equipment in entityList) {
-            ObjInfoService.createInfo(equipment,true,"Ec",equipment.category!!)
+            ObjInfoService.createInfo(equipment,true,"Ec",equipment.classCode!!)
         }
     }
 
@@ -135,7 +135,7 @@ object ComponentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     override fun onUpdateSuccess(entityList: ArrayList<Equipment>) {
         super.onUpdateSuccess(entityList)
         for (equipment in entityList) {
-            ObjInfoService.createInfo(equipment,false,"Ec",equipment.category!!)
+            ObjInfoService.createInfo(equipment,false,"Ec",equipment.classCode!!)
         }
     }
 

+ 9 - 9
datacenter/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt

@@ -63,11 +63,11 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
         if (floor.name.isNullOrEmpty()){
             floor.name = ShaftNameUtil.shaftName("楼层-")
         }
-        if (!floor.buildId.isNullOrEmpty()){
-            val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildId", floor.buildId!!)).exec()
+        if (!floor.buildingId.isNullOrEmpty()){
+            val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildingId", floor.buildingId!!)).exec()
             if (floorList.size>0){
                 for (floor001 in floorList){
-                    if (floor001.sequenceId == floor.sequenceId){
+                    if (floor001.floorSequenceId == floor.floorSequenceId){
                         return false
                     }
                 }
@@ -98,11 +98,11 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                       if (floor.name.isNullOrEmpty()){
                           floor.name = ShaftNameUtil.shaftName("楼层-")
                       }
-                      if (!floor.buildId.isNullOrEmpty()){
-                          val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildId", floor.buildId!!)).exec()
+                      if (!floor.buildingId.isNullOrEmpty()){
+                          val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildId", floor.buildingId!!)).exec()
                           if (floorList.size>0){
                               for (floor001 in floorList){
-                                  if (floor001.sequenceId == floor.sequenceId){
+                                  if (floor001.floorSequenceId == floor.floorSequenceId){
                                       val sCreateResponse = SCreateResponse<Floor>(SResponseType.failure)
                                       sCreateResponse.message = "楼层顺序号不可以重复"
                                       return sCreateResponse
@@ -176,13 +176,13 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                 jsonObject.put("obj_type", "Floor")
                 val jsonArray = JSONArray()
                 for (floor in request.content!!){
-                    if (!floor.buildId.isNullOrEmpty()){
+                    if (!floor.buildingId.isNullOrEmpty()){
 
-                        val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildId", floor.buildId!!), SFilter.not(SFilter.eq("id",floor.id!!))).exec()
+                        val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildingId", floor.buildingId!!), SFilter.not(SFilter.eq("id",floor.id!!))).exec()
                         if (floorList.size>0){
                             for (floor001 in floorList){
                                 try {
-                                    if (floor001.sequenceId == floor.sequenceId){
+                                    if (floor001.floorSequenceId == floor.floorSequenceId){
                                         if (listId.size>0){
                                             for (id in listId){
                                                 val jsonInfos = JSONObject()

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt

@@ -94,7 +94,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
                     generalSystem.projectId = projectId
                     if (generalSystem.name.isNullOrEmpty()) {
                         /** TODO:待修改 */
-                        val dClassDef = defService.select(SFilter.eq("id", generalSystem.category!!)).entity()
+                        val dClassDef = defService.select(SFilter.eq("id", generalSystem.classCode!!)).entity()
                         if (dClassDef!=null){
                             generalSystem.name = ShaftNameUtil.shaftName(dClassDef.name+"系统-")
                         }else{
@@ -463,7 +463,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
     override fun onCreateSuccess(entityList: ArrayList<GeneralSystem>) {
         super.onCreateSuccess(entityList)
         for (generalSystem in entityList) {
-            ObjInfoService.createInfo(generalSystem,true,"Sy",generalSystem.category!!)
+            ObjInfoService.createInfo(generalSystem,true,"Sy",generalSystem.classCode!!)
         }
     }
 
@@ -473,7 +473,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
     override fun onUpdateSuccess(entityList: ArrayList<GeneralSystem>) {
         super.onUpdateSuccess(entityList)
         for (generalSystem in entityList) {
-            ObjInfoService.createInfo(generalSystem,false,"Sy",generalSystem.category!!)
+            ObjInfoService.createInfo(generalSystem,false,"Sy",generalSystem.classCode!!)
         }
     }
 

+ 3 - 8
datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -83,11 +83,6 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
 //                }
 //            }
 
-
-
-
-
-
             val projectId = SPageContext.getHeader("projectId")
 
 //            if(request.zoneType.isNullOrEmpty()&&request.zoneTypeList.isNullOrEmpty()){
@@ -722,7 +717,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
 
                                 val rSpinBd = RSpinBd()
                                 rSpinBd.objectType = type
-                                rSpinBd.buildingId = floor.buildId
+                                rSpinBd.buildingId = floor.buildingId
                                 rSpinBd.spaceId = spaceId
                                 rSpinBd.sign = 1
                                 rSpinBd.projectId = projectId
@@ -754,8 +749,8 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
                 if (!id.isNullOrEmpty()) {
                     if (id.startsWith("Fl")) {
                         zoneSpace.floorId = id
-                        val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("FloorID", id)).entity()
-                        zoneSpace.buildingId = floor?.buildId
+                        val floor = FloorService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("FloorId", id)).entity()
+                        zoneSpace.buildingId = floor?.buildingId
                         val list = ArrayList<String>()
                         list.add("FloorId")
                         list.add("BuildingId")

+ 8 - 8
datacenter/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt

@@ -1,13 +1,13 @@
 package com.persagy.server.services.rel
 
-import com.persagy.server.services.base.RService
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.rel.RFlInSyList
 import com.persagy.server.datacenter.models.entities.rel.RSyInFl
 import com.persagy.server.datacenter.models.entities.rel.RSyInFlList
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.services.base.RService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -33,7 +33,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             val floorObj = floorService.select(SFilter.eq("id", rSyInFl.floorId!!)).entity()
             if(floorObj != null){
-                rSyInFl.buildingId = floorObj.buildId
+                rSyInFl.buildingId = floorObj.buildingId
             }
             val isInsert = insert(rSyInFl)
             if (isInsert){
@@ -93,7 +93,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                     val floorObj = floorService.select(SFilter.eq("id", rSyInFl.floorId!!)).entity()
                     if(floorObj != null){
-                        rSyInFl.buildingId = floorObj.buildId
+                        rSyInFl.buildingId = floorObj.buildingId
                     }
 
                     val replace = replace(rSyInFl)
@@ -145,7 +145,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                 val floorObj = floorService.select(SFilter.eq("id", rSyInFl.floorId!!)).entity()
                 if(floorObj != null){
-                    rSyInFl.buildingId = floorObj.buildId
+                    rSyInFl.buildingId = floorObj.buildingId
                 }
 
                 val replace = replace(rSyInFl)
@@ -193,7 +193,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
 
                 val floorObj = floorService.select(SFilter.eq("id", rFlInSyList.floorId!!)).entity()
                 if(floorObj != null){
-                    rSyInBd.buildingId = floorObj.buildId
+                    rSyInBd.buildingId = floorObj.buildingId
                 }
 
                 val replace = replace(rSyInBd)

+ 9 - 9
datacenter/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt

@@ -1,20 +1,20 @@
 package com.persagy.server.services.task
 
-import com.persagy.server.services.base.RService
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.SchemeUtils
 import cn.sagacloud.server.scanbuilding.User
-import com.persagy.server.scanbuilding.UserLog
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.task.EquipScanTask
+import com.persagy.server.scanbuilding.UserLog
+import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
@@ -83,7 +83,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
                 val equipment = equipmentService.select("id" to equipScanTask.equipId!!).entity()
                 if (equipScanTask.schemeId.isNullOrEmpty()){
-                    equipScanTask.schemeId = SchemeUtils.setScheme(equipment!!.category!!)
+                    equipScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                 }
 //                equipment.ledgerParam.PhotoDoc.Pic
                 if(equipment!!.ledgerParam != null){//设备图片信息
@@ -142,7 +142,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                     equipScanTask.localId = equipment!!.localId
                     equipScanTask.localName = equipment!!.localName
                     equipScanTask.bimId = equipment!!.bimId
-                    equipScanTask.category = equipment!!.category
+                    equipScanTask.category = equipment!!.classCode
                     equipScanTask.buildingId = equipment!!.buildingId
                     equipScanTask.floorId = equipment!!.floorId
                     equipScanTask.cadId = equipment!!.cadId
@@ -173,7 +173,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                         equipScanTask.bimId = equipment!!.bimId
                     }
                     if (equipScanTask.category.isNullOrEmpty()) {
-                        equipScanTask.category = equipment!!.category
+                        equipScanTask.category = equipment!!.classCode
                     }
                     if (equipScanTask.buildingId.isNullOrEmpty()) {
                         equipScanTask.buildingId = equipment!!.buildingId
@@ -239,7 +239,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 equipScanTask.localId = equipment!!.localId
                 equipScanTask.localName = equipment!!.localName
                 equipScanTask.bimId = equipment!!.bimId
-                equipScanTask.category = equipment!!.category
+                equipScanTask.category = equipment!!.classCode
                 equipScanTask.buildingId = equipment!!.buildingId
                 equipScanTask.floorId = equipment!!.floorId
                 equipScanTask.cadId = equipment!!.cadId

+ 10 - 10
datacenter/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -1,24 +1,24 @@
 package com.persagy.server.services.task
 
-import com.persagy.server.services.base.RService
 import cn.sagacloud.server.datacenter.utils.IdUtils
 import cn.sagacloud.server.datacenter.utils.SchemeUtils
 import cn.sagacloud.server.scanbuilding.User
-import com.persagy.server.scanbuilding.UserLog
 import com.alibaba.fastjson.JSONObject
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.database.SPageQueryInfo
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.datacenter.models.requests.ModelScanSQueryRequest
 import com.persagy.server.mappers.StatisticsCountMapper
+import com.persagy.server.scanbuilding.UserLog
+import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.database.SPageQueryInfo
-import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
@@ -101,7 +101,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                     val equipment = equipmentService.select("id" to modelScanTask.equipId!!).entity()
 
                     if (modelScanTask.schemeId.isNullOrEmpty()){
-                        modelScanTask.schemeId = SchemeUtils.setScheme(equipment!!.category!!)
+                        modelScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                     }
 
 //                equipment.ledgerParam.PhotoDoc.Pic
@@ -160,7 +160,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                         modelScanTask.localId = equipment!!.localId
                         modelScanTask.localName = equipment!!.localName
                         modelScanTask.bimId = equipment!!.bimId
-                        modelScanTask.category = equipment!!.category
+                        modelScanTask.category = equipment!!.classCode
                         modelScanTask.buildingId = equipment!!.buildingId
                         modelScanTask.floorId = equipment!!.floorId
                         modelScanTask.cadId = equipment!!.cadId
@@ -186,7 +186,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                             modelScanTask.bimId = equipment!!.bimId
                         }
                         if (modelScanTask.category.isNullOrEmpty()) {
-                            modelScanTask.category = equipment!!.category
+                            modelScanTask.category = equipment!!.classCode
                         }
                         if (modelScanTask.buildingId.isNullOrEmpty()) {
                             modelScanTask.buildingId = equipment!!.buildingId
@@ -243,7 +243,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                 modelScanTask.localId = equipment!!.localId
                 modelScanTask.localName = equipment!!.localName
                 modelScanTask.bimId = equipment!!.bimId
-                modelScanTask.category = equipment!!.category
+                modelScanTask.category = equipment!!.classCode
                 modelScanTask.buildingId = equipment!!.buildingId
                 modelScanTask.floorId = equipment!!.floorId
                 modelScanTask.cadId = equipment!!.cadId

+ 1 - 1
datasyn/build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // spring cloud 依赖
-//    compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka', version: SPRING_CLOUD_VERSION
+    compile group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka', version: SPRING_CLOUD_VERSION
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // MySQL

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

@@ -78,7 +78,7 @@ class ObjectFromToControllers {
 
                 if (projectQueryList.size > 0) {
                     for (projectQuery in projectQueryList) {
-                        val projectDataConversion = ProjectUtil.projectDataConversion(group.groupCode!!, projectQuery)
+                        val projectDataConversion = ProjectUtil.projectDataConversions(group.groupCode!!, projectQuery)
                         logger.debug("项目:  ${projectDataConversion.toJson()} ")
                         projectService.replace(projectDataConversion)
                     }
@@ -106,7 +106,7 @@ class ObjectFromToControllers {
                 if (buildingSynList.size > 0) {
                     for (buildingSyn in buildingSynList) {
                         val buildingDataConversion =
-                            BuildingUtil.buildingDataConversion(projectId, dictProject!!.groupCode!!, buildingSyn)
+                            BuildingUtil.buildingDataConversions(projectId, dictProject!!.groupCode!!, buildingSyn)
                         logger.debug("建筑:  ${buildingDataConversion.toJson()} ")
                         buildingService.replace(buildingDataConversion)
 
@@ -122,7 +122,7 @@ class ObjectFromToControllers {
                     if (buildingSynList.size > 0) {
                         for (buildingSyn in buildingSynList) {
                             val buildingDataConversion =
-                                BuildingUtil.buildingDataConversion(project.id!!, dictProject!!.groupCode!!, buildingSyn)
+                                BuildingUtil.buildingDataConversions(project.id!!, dictProject!!.groupCode!!, buildingSyn)
                             logger.debug("建筑:  ${buildingDataConversion.toJson()} ")
                             buildingService.replace(buildingDataConversion)
                         }
@@ -150,7 +150,7 @@ class ObjectFromToControllers {
                 val floorSynList = BuildingApi.buildingSyn(projectId, "floor")
                 if (floorSynList.size>0) {
                     for (floorSyn in floorSynList){
-                        val floor = FloorUtil.floorSyn(projectId, dictProject!!.groupCode!!, floorSyn)
+                        val floor = FloorUtil.floorSyns(projectId, dictProject!!.groupCode!!, floorSyn)
                         val floorInBuildingList = FloorApi.floorInBuilding(projectId, floor.id!!)
                         if (floorInBuildingList.size>0){
                             for (floorInBuilding in floorInBuildingList){
@@ -172,7 +172,7 @@ class ObjectFromToControllers {
                     val floorSynList = BuildingApi.buildingSyn(projectId, "floor")
                     if (floorSynList.size>0) {
                         for (floorSyn in floorSynList){
-                            val floor = FloorUtil.floorSyn(project.id!!, dictProject!!.groupCode!!, floorSyn)
+                            val floor = FloorUtil.floorSyns(project.id!!, dictProject!!.groupCode!!, floorSyn)
                             val floorInBuildingList = FloorApi.floorInBuilding(projectId, floor.id!!)
                             if (floorInBuildingList.size>0){
                                 for (floorInBuilding in floorInBuildingList){
@@ -215,7 +215,7 @@ class ObjectFromToControllers {
                 val equipSynApi = EquipApi.equipSynApi(projectId, page)
                 val equipDataList = equipSynApi.data
                 for (equipData in equipDataList!!){
-                    val equipSyn = EquipUtil.equipSyn(projectId, dictProject!!.groupCode!!, equipData)
+                    val equipSyn = EquipUtil.equipSyns(projectId, dictProject!!.groupCode!!, equipData)
                     if (isBuildingFloor){
                         /** 查询建筑 */
                         val equipInBuildingList = EquipApi.equipInBuilding(projectId, equipSyn.id!!)
@@ -257,7 +257,7 @@ class ObjectFromToControllers {
                     val equipSynApi = EquipApi.equipSynApi(project.id!!, page)
                     val equipDataList = equipSynApi.data
                     for (equipData in equipDataList!!){
-                        val equipSyn = EquipUtil.equipSyn(projectId, dictProject!!.groupCode!!, equipData)
+                        val equipSyn = EquipUtil.equipSyns(projectId, dictProject!!.groupCode!!, equipData)
                         if (isBuildingFloor){
                             /** 查询建筑 */
                             val equipInBuildingList = EquipApi.equipInBuilding(projectId, equipSyn.id!!)
@@ -317,7 +317,7 @@ class ObjectFromToControllers {
                 if (spaceSynApiList.size>0){
                     for (spaceSyn in spaceSynApiList){
                         val spaceDataConversion =
-                            SpaceUtil.spaceDataConversion(projectId, dictProject!!.groupCode!!, spaceSyn)
+                            SpaceUtil.spaceDataConversions(projectId, dictProject!!.groupCode!!, spaceSyn)
 
                         zoneSpaceService.replace(spaceDataConversion)
                         if (isBuildingFloor){
@@ -366,7 +366,7 @@ class ObjectFromToControllers {
                     if (spaceSynApiList.size>0){
                         for (spaceSyn in spaceSynApiList){
                             val spaceDataConversion =
-                                SpaceUtil.spaceDataConversion(projectId, dictProject!!.groupCode!!, spaceSyn)
+                                SpaceUtil.spaceDataConversions(projectId, dictProject!!.groupCode!!, spaceSyn)
 
                             zoneSpaceService.replace(spaceDataConversion)
                             if (isBuildingFloor){
@@ -431,7 +431,7 @@ class ObjectFromToControllers {
                 if (systemQueryList.size>0){
                     for (systemQuery in systemQueryList){
                         val spaceDataConversion =
-                            SystemUtil.systemDataConversion(projectId, dictProject!!.groupCode!!, systemQuery)
+                            SystemUtil.systemDataConversions(projectId, dictProject!!.groupCode!!, systemQuery)
                         generalSystemService.replace(spaceDataConversion)
                     }
                 }
@@ -444,7 +444,7 @@ class ObjectFromToControllers {
                     if (systemQueryList.size>0){
                         for (systemQuery in systemQueryList){
                             val spaceDataConversion =
-                                SystemUtil.systemDataConversion(project.id!!, dictProject!!.groupCode!!, systemQuery)
+                                SystemUtil.systemDataConversions(project.id!!, dictProject!!.groupCode!!, systemQuery)
                             generalSystemService.replace(spaceDataConversion)
                         }
                     }
@@ -475,7 +475,7 @@ class ObjectFromToControllers {
                 if (!shaftQueryList.isNullOrEmpty()) {
                     for (shaftQuery in shaftQueryList) {
                         val shaftDataConversion =
-                            ShaftUtil.shaftDataConversion(projectId, dictProject?.groupCode!!, shaftQuery)
+                            ShaftUtil.shaftDataConversions(projectId, dictProject?.groupCode!!, shaftQuery)
                         shaftService.replace(shaftDataConversion)
                     }
                 }
@@ -488,7 +488,7 @@ class ObjectFromToControllers {
                     if (!shaftQueryList.isNullOrEmpty()) {
                         for (shaftQuery in shaftQueryList) {
                             val shaftDataConversion =
-                                ShaftUtil.shaftDataConversion(project.id!!, dictProject?.groupCode!!, shaftQuery)
+                                ShaftUtil.shaftDataConversions(project.id!!, dictProject?.groupCode!!, shaftQuery)
                             shaftService.replace(shaftDataConversion)
                         }
                     }

+ 387 - 265
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/BuildingUtil.kt

@@ -1,11 +1,9 @@
 package com.persagy.server.syn.models.tools
 
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
+import com.persagy.base.extensions.toDouble
+import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.assistant.AttPic
-import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.syn.Opts
@@ -26,293 +24,416 @@ object BuildingUtil {
         SSpringContextUtil.getBean(Opts::class.java) as Opts
     }
 
+//    /**
+//     * 中台建筑转数据中心
+//     */
+//    fun buildingDataConversion(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Building {
+//        /** 查建筑类型字典 */
+//        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "building")).exec()
+//        val mapEx = HashMap<String, Any?>()
+//        val mapCode = HashMap<String, Any?>()
+//
+//        for (explainProject in dictDefFuncIdList) {
+//            mapEx[explainProject.code!!] = explainProject.firstName
+//            if (!explainProject.secondName.isNullOrEmpty()) {
+//                mapCode[explainProject.code!!] = explainProject.secondName
+//            }
+//        }
+//
+//        /** 建筑信息 */
+//        val buildingInfo = HashMap<String, Any?>()
+//        /** 工作历 */
+//        val schedule = HashMap<String, Any?>()
+//        /** 人员信息 */
+//        val peopleInfo = HashMap<String, Any?>()
+//        /** 能耗信息 */
+//        val consumptionInfo = HashMap<String, Any?>()
+//        /** 自定义 */
+//        val customParam = HashMap<String, Any?>()
+//        /** 建筑文档 */
+//        val buildingDoc = HashMap<String, Any?>()
+//
+//        /** 建筑类型 */
+//        var buildingType = HashMap<String, Any?>()
+//        /** 设计指标 */
+//        var designIndex = HashMap<String, Any?>()
+//        /** 结构参数 */
+//        var structureParam = HashMap<String, Any?>()
+//        /** 面积信息 */
+//        var areaInfo = HashMap<String, Any?>()
+//        /** 人员信息 */
+//        val peopleInfoTwo = HashMap<String, Any?>()
+//
+//        /** 工作作息 */
+//        var workRest = HashMap<String, Any?>()
+//        /** 季节 */
+//        var season = HashMap<String, Any?>()
+//        /** 工作历信息 */
+//        var workCalendar = HashMap<String, Any?>()
+//
+//        /** 逐时 */
+//        var hourly = HashMap<String, Any?>()
+//        /** 累计 */
+//        var cumulative = HashMap<String, Any?>()
+//
+//        /** 建筑对象 */
+//        val building = Building()
+//        building.projectId = projectId
+//        /** id 是否存在 */
+//        val containsKeyId = mapObj.containsKey("id")
+//        if(containsKeyId){
+//            building.id = mapObj["id"].toString()
+//        }
+//        /** name 是否存在 */
+//        val containsKeyName = mapObj.containsKey("name")
+//        if(containsKeyName){
+//            building.name = mapObj["name"].toString()
+//        }
+//
+//        for (key in mapObj!!.keys) {
+//            val containsKey = mapEx.containsKey(key)
+//            if (containsKey) {
+//                val value = mapEx[key]
+//                if (value == opts.BuildingInfo) {
+//                    /** 建筑信息 */
+//                    val contains = mapCode.containsKey(key)
+//                    if (contains) {
+//                        val any = mapCode[key].toString()
+//                        if (any == "建筑类型") {
+//
+//                            /** 安装图纸 安装照片 安装质检报告 */
+//                            if (key == "Pic" ){
+//                                try {
+//                                    val gson = Gson()
+//                                    val type = object : TypeToken<ArrayList<AttPic>>() {
+//                                    }.type
+//                                    val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
+//                                    if (attPicList.isNotEmpty()){
+//                                        val listPic =ArrayList<TaskPic>()
+//                                        for (attPic in attPicList){
+//                                            val taskPic = TaskPic()
+//                                            taskPic.key = attPic.key
+//                                            taskPic.name = attPic.name
+//                                            taskPic.systemId = attPic.systemId
+//                                            taskPic.type = attPic.type
+//                                            listPic.add(taskPic)
+//                                        }
+//                                        buildingType[key] = listPic
+//                                    }
+//                                } catch (e: Exception) {
+//                                    e.printStackTrace()
+//                                }
+//                            }else{
+//                                buildingType[key] = mapObj[key]
+//                            }
+//                        } else if (any == "设计指标") {
+//                            designIndex[key] = mapObj[key]
+//                        } else if (any == "结构参数") {
+//                            structureParam[key] = mapObj[key]
+//                        } else if (any == "面积信息") {
+//                            areaInfo[key] = mapObj[key]
+//                        } else if(any == "人员信息"){
+//                            peopleInfo[key]= mapObj[key]
+//                        }else {
+//                            buildingInfo[key] = mapObj[key]
+//                        }
+//                    } else {
+//                        buildingInfo[key] = mapObj[key]
+//                    }
+//                } else if (value == opts.Schedule) {
+//                    /** 工作历 */
+//                    val contains = mapCode.containsKey(key)
+//                    if (contains) {
+//                        val any = mapCode[key].toString()
+//                        if (any == "工作作息") {
+//                            workRest[key] = mapObj[key]
+//                        } else if (any == "季节") {
+//                            season[key] = mapObj[key]
+//                        } else if (any == "工作历信息") {
+//                            workCalendar[key] = mapObj[key]
+//                        } else {
+//                            schedule[key] = mapObj[key]
+//                        }
+//                    } else {
+//                        schedule[key] = mapObj[key]
+//                    }
+////
+//                } else if (value == opts.PeopleInfo) {
+//                    /** 人员信息 */
+//                    peopleInfo[key] = mapObj[key]
+//                } else if (value == opts.ConsumptionInfo) {
+//                    /** 能耗信息 */
+//                    val contains = mapCode.containsKey(key)
+//                    if (contains) {
+//                        val any = mapCode[key].toString()
+//                        if (any == "逐时") {
+//                            hourly[key] = mapObj[key]
+//                        } else if (any == "累计") {
+//                            cumulative[key] = mapObj[key]
+//                        } else {
+//                            consumptionInfo[key] = mapObj[key]
+//                        }
+//                    } else {
+//                        consumptionInfo[key] = mapObj[key]
+//                    }
+//                } else if (value == "建筑文档") {
+//
+//                    if (key == "drawing" ){
+//                        try {
+//                            val gson = Gson()
+//                            val type = object : TypeToken<ArrayList<AttPic>>() {
+//                            }.type
+//                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
+//                            if (attPicList.isNotEmpty()){
+//                                val listPic =ArrayList<TaskPic>()
+//                                for (attPic in attPicList){
+//                                    val taskPic = TaskPic()
+//                                    taskPic.key = attPic.key
+//                                    taskPic.name = attPic.name
+//                                    taskPic.systemId = attPic.systemId
+//                                    taskPic.type = attPic.type
+//                                    listPic.add(taskPic)
+//                                }
+//                                buildingType[key] = listPic
+//                            }
+//                        } catch (e: Exception) {
+//                            e.printStackTrace()
+//                        }
+//                    }else if (key == "archive"){
+//                        try {
+//                            val gson = Gson()
+//                            val type = object : TypeToken<ArrayList<AttPic>>() {
+//                            }.type
+//                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
+//                            if (attPicList.isNotEmpty()){
+//                                val listPic =ArrayList<TaskPic>()
+//                                for (attPic in attPicList){
+//                                    val taskPic = TaskPic()
+//                                    taskPic.key = attPic.key
+//                                    taskPic.name = attPic.name
+//                                    taskPic.systemId = attPic.systemId
+//                                    taskPic.type = attPic.type
+//                                    listPic.add(taskPic)
+//                                }
+//                                buildingType[key] = listPic
+//                            }
+//                        } catch (e: Exception) {
+//                            e.printStackTrace()
+//                        }
+//                    }else if (key == "simulationModel"){
+//                        try {
+//                            val gson = Gson()
+//                            val type = object : TypeToken<ArrayList<AttPic>>() {
+//                            }.type
+//                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
+//                            if (attPicList.isNotEmpty()){
+//                                val listPic =ArrayList<TaskPic>()
+//                                for (attPic in attPicList){
+//                                    val taskPic = TaskPic()
+//                                    taskPic.key = attPic.key
+//                                    taskPic.name = attPic.name
+//                                    taskPic.systemId = attPic.systemId
+//                                    taskPic.type = attPic.type
+//                                    listPic.add(taskPic)
+//                                }
+//                                buildingType[key] = listPic
+//                            }
+//                        } catch (e: Exception) {
+//                            e.printStackTrace()
+//                        }
+//                    }else{
+//                        buildingDoc[key] = mapObj[key]
+//                    }
+//
+//                } else {
+//                    when (key) {
+//                        "localID" -> building.localId = mapObj[key].toString()
+//                        "localName" -> building.localName = mapObj[key].toString()
+//                        "defaultQRCode" -> building.defaultQRCode.toString()
+//                        "buildQRCode" -> building.buildQRCode.toString()
+//                    }
+//                }
+//            }
+//        }
+//
+//        if (buildingType.size > 0) {
+//            buildingInfo.put("BuildingType", buildingType)
+//        }
+//        if (designIndex.size > 0) {
+//            buildingInfo.put("DesignIndex", designIndex)
+//        }
+//        if (structureParam.size > 0) {
+//            buildingInfo.put("StructureParam", structureParam)
+//        }
+//        if (areaInfo.size > 0) {
+//            buildingInfo.put("AreaInfo", areaInfo)
+//        }
+//        if (peopleInfoTwo.size>0){
+//            buildingInfo.put("PeopleInfo", peopleInfoTwo)
+//        }
+//
+//        if (workRest.size > 0) {
+//            schedule.put("WorkRest", workRest)
+//        }
+//        if (season.size > 0) {
+//            schedule.put("Season", season)
+//        }
+//
+//        if (hourly.size > 0) {
+//            consumptionInfo.put("Hourly", hourly)
+//        }
+//        if (cumulative.size > 0) {
+//            consumptionInfo.put("Cumulative", cumulative)
+//        }
+//
+//        if (workCalendar.size > 0) {
+//            schedule.put("WorkCalendar", workCalendar)
+//        }
+//
+//        if (buildingDoc.size > 0) {
+//            building.buildingDoc = buildingDoc
+//        }
+//
+//        if (buildingInfo.size > 0) {
+//            building.buildingInfo = buildingInfo
+//        }
+//
+//        if (schedule.size > 0) {
+//            building.schedule = schedule
+//        }
+//
+//        if (peopleInfo.size > 0) {
+//            building.peopleInfo = peopleInfo
+//        }
+//        if (consumptionInfo.size > 0) {
+//            building.consumptionInfo = consumptionInfo
+//        }
+//
+//        if (customParam.size > 0) {
+//            building.customParam = customParam
+//        }
+//
+//        return building
+//    }
+
     /**
-     * 中台建筑转数据中心
+     * 建筑
+     *
+     * @param projectId     项目 id
+     * @param groupCode     集团编码
+     * @param mapObj        对象信息
+     * @return  建筑对象
      */
-    fun buildingDataConversion(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Building {
+    fun buildingDataConversions(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Building {
         /** 查建筑类型字典 */
         val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "building")).exec()
         val mapEx = HashMap<String, Any?>()
         val mapCode = HashMap<String, Any?>()
-
+        /** 遍历项目类型字典 */
         for (explainProject in dictDefFuncIdList) {
-            mapEx[explainProject.code!!] = explainProject.firstName
-            if (!explainProject.secondName.isNullOrEmpty()) {
-                mapCode[explainProject.code!!] = explainProject.secondName
-            }
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
         }
 
-        /** 建筑信息 */
-        val buildingInfo = HashMap<String, Any?>()
-        /** 工作历 */
-        val schedule = HashMap<String, Any?>()
-        /** 人员信息 */
-        val peopleInfo = HashMap<String, Any?>()
-        /** 能耗信息 */
-        val consumptionInfo = HashMap<String, Any?>()
-        /** 自定义 */
-        val customParam = HashMap<String, Any?>()
-        /** 建筑文档 */
-        val buildingDoc = HashMap<String, Any?>()
-
-        /** 建筑类型 */
-        var buildingType = HashMap<String, Any?>()
-        /** 设计指标 */
-        var designIndex = HashMap<String, Any?>()
-        /** 结构参数 */
-        var structureParam = HashMap<String, Any?>()
-        /** 面积信息 */
-        var areaInfo = HashMap<String, Any?>()
-        /** 人员信息 */
-        val peopleInfoTwo = HashMap<String, Any?>()
-
-        /** 工作作息 */
-        var workRest = HashMap<String, Any?>()
-        /** 季节 */
-        var season = HashMap<String, Any?>()
-        /** 工作历信息 */
-        var workCalendar = HashMap<String, Any?>()
-
-        /** 逐时 */
-        var hourly = HashMap<String, Any?>()
-        /** 累计 */
-        var cumulative = HashMap<String, Any?>()
-
-        /** 建筑对象 */
         val building = Building()
         building.projectId = projectId
-        /** id 是否存在 */
-        val containsKeyId = mapObj.containsKey("id")
-        if(containsKeyId){
-            building.id = mapObj["id"].toString()
-        }
-        /** name 是否存在 */
-        val containsKeyName = mapObj.containsKey("name")
-        if(containsKeyName){
-            building.name = mapObj["name"].toString()
-        }
-
-        for (key in mapObj!!.keys) {
+        for (key in mapObj.keys) {
             val containsKey = mapEx.containsKey(key)
-            if (containsKey) {
-                val value = mapEx[key]
-                if (value == opts.BuildingInfo) {
-                    /** 建筑信息 */
-                    val contains = mapCode.containsKey(key)
-                    if (contains) {
+            if (containsKey){
+                if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="defaultQRCode"
+                    &&key!="buildQRCode"){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
                         val any = mapCode[key].toString()
-                        if (any == "建筑类型") {
-
-                            /** 安装图纸 安装照片 安装质检报告 */
-                            if (key == "Pic" ){
-                                try {
-                                    val gson = Gson()
-                                    val type = object : TypeToken<ArrayList<AttPic>>() {
-                                    }.type
-                                    val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
-                                    if (attPicList.isNotEmpty()){
-                                        val listPic =ArrayList<TaskPic>()
-                                        for (attPic in attPicList){
-                                            val taskPic = TaskPic()
-                                            taskPic.key = attPic.key
-                                            taskPic.name = attPic.name
-                                            taskPic.systemId = attPic.systemId
-                                            taskPic.type = attPic.type
-                                            listPic.add(taskPic)
-                                        }
-                                        buildingType[key] = listPic
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
                                     }
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
+                                    building.infos!![key] = mapObj[key]!!.toInt()
                                 }
-                            }else{
-                                buildingType[key] = mapObj[key]
-                            }
-                        } else if (any == "设计指标") {
-                            designIndex[key] = mapObj[key]
-                        } else if (any == "结构参数") {
-                            structureParam[key] = mapObj[key]
-                        } else if (any == "面积信息") {
-                            areaInfo[key] = mapObj[key]
-                        } else if(any == "人员信息"){
-                            peopleInfo[key]= mapObj[key]
-                        }else {
-                            buildingInfo[key] = mapObj[key]
-                        }
-                    } else {
-                        buildingInfo[key] = mapObj[key]
-                    }
-                } else if (value == opts.Schedule) {
-                    /** 工作历 */
-                    val contains = mapCode.containsKey(key)
-                    if (contains) {
-                        val any = mapCode[key].toString()
-                        if (any == "工作作息") {
-                            workRest[key] = mapObj[key]
-                        } else if (any == "季节") {
-                            season[key] = mapObj[key]
-                        } else if (any == "工作历信息") {
-                            workCalendar[key] = mapObj[key]
-                        } else {
-                            schedule[key] = mapObj[key]
-                        }
-                    } else {
-                        schedule[key] = mapObj[key]
-                    }
-//
-                } else if (value == opts.PeopleInfo) {
-                    /** 人员信息 */
-                    peopleInfo[key] = mapObj[key]
-                } else if (value == opts.ConsumptionInfo) {
-                    /** 能耗信息 */
-                    val contains = mapCode.containsKey(key)
-                    if (contains) {
-                        val any = mapCode[key].toString()
-                        if (any == "逐时") {
-                            hourly[key] = mapObj[key]
-                        } else if (any == "累计") {
-                            cumulative[key] = mapObj[key]
-                        } else {
-                            consumptionInfo[key] = mapObj[key]
-                        }
-                    } else {
-                        consumptionInfo[key] = mapObj[key]
-                    }
-                } else if (value == "建筑文档") {
-
-                    if (key == "drawing" ){
-                        try {
-                            val gson = Gson()
-                            val type = object : TypeToken<ArrayList<AttPic>>() {
-                            }.type
-                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
-                            if (attPicList.isNotEmpty()){
-                                val listPic =ArrayList<TaskPic>()
-                                for (attPic in attPicList){
-                                    val taskPic = TaskPic()
-                                    taskPic.key = attPic.key
-                                    taskPic.name = attPic.name
-                                    taskPic.systemId = attPic.systemId
-                                    taskPic.type = attPic.type
-                                    listPic.add(taskPic)
+                                "DOUBLE" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString().toDouble()
                                 }
-                                buildingType[key] = listPic
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }else if (key == "archive"){
-                        try {
-                            val gson = Gson()
-                            val type = object : TypeToken<ArrayList<AttPic>>() {
-                            }.type
-                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
-                            if (attPicList.isNotEmpty()){
-                                val listPic =ArrayList<TaskPic>()
-                                for (attPic in attPicList){
-                                    val taskPic = TaskPic()
-                                    taskPic.key = attPic.key
-                                    taskPic.name = attPic.name
-                                    taskPic.systemId = attPic.systemId
-                                    taskPic.type = attPic.type
-                                    listPic.add(taskPic)
+                                "BOOLEAN" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString().toBoolean()
                                 }
-                                buildingType[key] = listPic
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }else if (key == "simulationModel"){
-                        try {
-                            val gson = Gson()
-                            val type = object : TypeToken<ArrayList<AttPic>>() {
-                            }.type
-                            val attPicList = gson.fromJson<ArrayList<AttPic>>(mapObj[key].toString(),type)
-                            if (attPicList.isNotEmpty()){
-                                val listPic =ArrayList<TaskPic>()
-                                for (attPic in attPicList){
-                                    val taskPic = TaskPic()
-                                    taskPic.key = attPic.key
-                                    taskPic.name = attPic.name
-                                    taskPic.systemId = attPic.systemId
-                                    taskPic.type = attPic.type
-                                    listPic.add(taskPic)
+                                "STRING" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
                                 }
-                                buildingType[key] = listPic
+                                else -> {
+                                    if (building.infos.isNullOrEmpty()){
+                                        building.infos = HashMap<String,Any?>()
+                                    }
+                                    building.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (building.infos.isNullOrEmpty()){
+                                building.infos = HashMap<String,Any?>()
                             }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
+                            building.infos!![key] = mapObj[key]!!.toString()
                         }
-                    }else{
-                        buildingDoc[key] = mapObj[key]
                     }
 
                 } else {
-                    when (key) {
-                        "localID" -> building.localId = mapObj[key].toString()
-                        "localName" -> building.localName = mapObj[key].toString()
-                        "defaultQRCode" -> building.defaultQRCode.toString()
-                        "buildQRCode" -> building.buildQRCode.toString()
+                    when(key) {
+                        "id" -> building.id =  mapObj[key]!!.toString()
+                        "name" -> building.name =  mapObj[key]!!.toString()
+                        "localId" -> building.localId =  mapObj[key]!!.toString()
+                        "localName" -> building.localName =  mapObj[key]!!.toString()
+                        "defaultQRCode" -> building.defaultQRCode =  mapObj[key]!!.toString()
+                        "buildQRCode" -> building.buildQRCode =  mapObj[key]!!.toString()
                     }
                 }
-            }
-        }
-
-        if (buildingType.size > 0) {
-            buildingInfo.put("BuildingType", buildingType)
-        }
-        if (designIndex.size > 0) {
-            buildingInfo.put("DesignIndex", designIndex)
-        }
-        if (structureParam.size > 0) {
-            buildingInfo.put("StructureParam", structureParam)
-        }
-        if (areaInfo.size > 0) {
-            buildingInfo.put("AreaInfo", areaInfo)
-        }
-        if (peopleInfoTwo.size>0){
-            buildingInfo.put("PeopleInfo", peopleInfoTwo)
-        }
-
-        if (workRest.size > 0) {
-            schedule.put("WorkRest", workRest)
-        }
-        if (season.size > 0) {
-            schedule.put("Season", season)
-        }
-
-        if (hourly.size > 0) {
-            consumptionInfo.put("Hourly", hourly)
-        }
-        if (cumulative.size > 0) {
-            consumptionInfo.put("Cumulative", cumulative)
-        }
-
-        if (workCalendar.size > 0) {
-            schedule.put("WorkCalendar", workCalendar)
-        }
 
-        if (buildingDoc.size > 0) {
-            building.buildingDoc = buildingDoc
-        }
-
-        if (buildingInfo.size > 0) {
-            building.buildingInfo = buildingInfo
-        }
-
-        if (schedule.size > 0) {
-            building.schedule = schedule
-        }
-
-        if (peopleInfo.size > 0) {
-            building.peopleInfo = peopleInfo
-        }
-        if (consumptionInfo.size > 0) {
-            building.consumptionInfo = consumptionInfo
-        }
-
-        if (customParam.size > 0) {
-            building.customParam = customParam
+            } else {
+                //                if (zoneSpace.infos.isNullOrEmpty()){
+//                    zoneSpace.infos = HashMap<String,Any?>()
+//                }
+//                zoneSpace.infos!![key] =  mapObj[key]!!.toString()
+            }
         }
 
         return building
@@ -320,4 +441,5 @@ object BuildingUtil {
 
 
 
+
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2385 - 2260
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/EquipUtil.kt


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

@@ -2,6 +2,7 @@ package com.persagy.server.syn.models.tools
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.persagy.base.extensions.toDouble
 import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
@@ -27,7 +28,12 @@ object FloorUtil {
     }
 
     /**
-     * 楼层数据转换
+     * 楼层
+     *
+     * @param projectId     项目 id
+     * @param groupCode     集团编码
+     * @param mapObj        对象数据
+     * @return 楼层对象
      */
     fun floorSyn(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Floor {
         /** 查建楼层型字典 */
@@ -119,4 +125,146 @@ object FloorUtil {
         return floor
     }
 
+    /**
+     * 楼层
+     *
+     * @param projectId     项目 id
+     * @param groupCode     集团编码
+     * @param mapObj        对象数据
+     * @return 楼层对象
+     */
+    fun floorSyns(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Floor {
+        /** 查建楼层型字典 */
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "floor")).exec()
+        val mapEx = HashMap<String, Any?>()
+        val mapCode = HashMap<String, Any?>()
+        /** 遍历项目类型字典 */
+        for (explainProject in dictDefFuncIdList) {
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
+        }
+
+        val floor = Floor()
+        floor.projectId = projectId
+        for (key in mapObj.keys) {
+            val containsKey = mapEx.containsKey(key)
+            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"
+                ){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
+                        val any = mapCode[key].toString()
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toInt()
+                                }
+                                "DOUBLE" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString().toDouble()
+                                }
+                                "BOOLEAN" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString().toBoolean()
+                                }
+                                "STRING" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                else -> {
+                                    if (floor.infos.isNullOrEmpty()){
+                                        floor.infos = HashMap<String,Any?>()
+                                    }
+                                    floor.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (floor.infos.isNullOrEmpty()){
+                                floor.infos = HashMap<String,Any?>()
+                            }
+                            floor.infos!![key] = mapObj[key]!!.toString()
+                        }
+                    }
+
+                } else {
+                    when(key) {
+                        "id" -> floor.id =  mapObj[key]!!.toString()
+                        "name" -> floor.name =  mapObj[key]!!.toString()
+                        "localId" -> floor.localId =  mapObj[key]!!.toString()
+                        "localName" -> floor.localName =  mapObj[key]!!.toString()
+                        "defaultQRCode" -> floor.defaultQRCode =  mapObj[key]!!.toString()
+                        "qRCodePic" -> floor.qRCodePic =  mapObj[key]!!.toString()
+                        "bimIpPre" -> floor.bimIdPre =  mapObj[key]!!.toString()
+                        "bimId" -> floor.bimId =  mapObj[key]!!.toString()
+                        "modelId" -> floor.modelId =  mapObj[key]!!.toString()
+                        "bimLocation" -> floor.bimLocation =  mapObj[key]!!.toString()
+                        "floorSequenceId" -> floor.floorSequenceId =  mapObj[key]!!.toString().toInt()
+                        "permanentPeopleNum" -> floor.permanentPeopleNum =  mapObj[key]!!.toString().toInt()
+                        "floorIdentity" -> floor.floorIdentity =  mapObj[key]!!.toString()
+                        "outline" -> {
+                            val replace1 = mapObj[key].toString().replace("X", "x")
+                            val replace2 = replace1.replace("Y", "y")
+                            val replace3 = replace2.replace("Z", "z")
+//                                logger.debug("坐标= ${replace3}")
+                            val type = object : TypeToken<ArrayList<PointPosition>>() {
+                            }.getType()
+                            var outline=  Gson().fromJson<ArrayList<PointPosition>>(replace3,type)
+                            floor.outline = outline
+                        }
+                    }
+                }
+
+            } else {
+                //                if (zoneSpace.infos.isNullOrEmpty()){
+//                    zoneSpace.infos = HashMap<String,Any?>()
+//                }
+//                zoneSpace.infos!![key] =  mapObj[key]!!.toString()
+            }
+        }
+
+        return floor
+    }
+
 }

+ 126 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/ProjectUtil.kt

@@ -1,5 +1,6 @@
 package com.persagy.server.syn.models.tools
 
+import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
@@ -275,4 +276,129 @@ object ProjectUtil {
     }
 
 
+    /**
+     * 项目转换工具
+     *
+     * @param groupCode     集团编码
+     * @param mapObj        中台信息点
+     * @return 返回项目对象
+     */
+    fun projectDataConversions(groupCode: String, mapObj: HashMap<String, Any?>): Project{
+
+        /** 查询项目类型字典 */
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "project")).exec()
+        val mapEx = HashMap<String, Any?>()
+        val mapCode = HashMap<String, Any?>()
+        /** 遍历项目类型字典 */
+        for (explainProject in dictDefFuncIdList) {
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
+        }
+
+        val project = Project()
+        for (key in mapObj.keys) {
+            val containsKey = mapEx.containsKey(key)
+            if (containsKey){
+                if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="introduction"
+                    &&key!="businessFloorNum"&&key!="officeFloorNum"){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
+                        val any = mapCode[key].toString()
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toInt()
+                                }
+                                "DOUBLE" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString().toDouble()
+                                }
+                                "BOOLEAN" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString().toBoolean()
+                                }
+                                "STRING" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                else -> {
+                                    if (project.infos.isNullOrEmpty()){
+                                        project.infos = HashMap<String,Any?>()
+                                    }
+                                    project.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (project.infos.isNullOrEmpty()){
+                                project.infos = HashMap<String,Any?>()
+                            }
+                            project.infos!![key] = mapObj[key]!!.toString()
+                        }
+                    }
+                } else {
+                  when(key) {
+                      "id" -> project.id =  mapObj[key]!!.toString()
+                      "name" -> project.name =  mapObj[key]!!.toString()
+                      "localId" -> project.localId =  mapObj[key]!!.toString()
+                      "localName" -> project.localName =  mapObj[key]!!.toString()
+                      "introduction" -> project.introduction =  mapObj[key]!!.toString()
+                      "businessFloorNum" -> project.businessFloorNum =  mapObj[key]!!.toString()
+                      "officeFloorNum" -> project.officeFloorNum =  mapObj[key]!!.toString()
+                  }
+                }
+
+            } else {
+//                if (project.infos.isNullOrEmpty()){
+//                    project.infos = HashMap<String,Any?>()
+//                }
+//                project.infos!![key] =  mapObj[key]!!.toString()
+            }
+        }
+
+        return project
+    }
+
+
+
+
 }

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

@@ -1,5 +1,7 @@
 package com.persagy.server.syn.models.tools
 
+import com.persagy.base.extensions.toDouble
+import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
@@ -27,10 +29,18 @@ object ShaftUtil {
         SSpringContextUtil.getBean(Opts::class.java) as Opts
     }
 
+    /**
+     * 竖井
+     *
+     * @param projectId     项目id
+     * @param groupCode     集团编码
+     * @param mapObj        对象信息
+     * @return 竖井对象
+     */
     fun shaftDataConversion(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Shaft {
 
         /** 查建楼层型字典 */
-        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "floor")).exec()
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", "shaft")).exec()
         val mapEx = HashMap<String, Any?>()
         val mapCode = HashMap<String, Any?>()
 
@@ -93,5 +103,129 @@ object ShaftUtil {
         return shaft
     }
 
+    /**
+     * 竖井
+     *
+     * @param projectId     项目id
+     * @param groupCode     集团编码
+     * @param mapObj        对象信息
+     * @return 竖井对象
+     */
+    fun shaftDataConversions(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): Shaft {
+        /** 查建楼层型字典 */
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode","shaft")).exec()
+        val mapEx = HashMap<String, Any?>()
+        val mapCode = HashMap<String, Any?>()
+        /** 遍历项目类型字典 */
+        for (explainProject in dictDefFuncIdList) {
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
+        }
+
+        val shaft = Shaft()
+        shaft.projectId = projectId
+        for (key in mapObj.keys) {
+            val containsKey = mapEx.containsKey(key)
+            if (containsKey){
+                if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="defaultQRCode"
+                    &&key!="qRCodePic"&&key!="cadId"&&key!="bimId"){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
+                        val any = mapCode[key].toString()
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toInt()
+                                }
+                                "DOUBLE" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString().toDouble()
+                                }
+                                "BOOLEAN" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString().toBoolean()
+                                }
+                                "STRING" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                else -> {
+                                    if (shaft.infos.isNullOrEmpty()){
+                                        shaft.infos = HashMap<String,Any?>()
+                                    }
+                                    shaft.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (shaft.infos.isNullOrEmpty()){
+                                shaft.infos = HashMap<String,Any?>()
+                            }
+                            shaft.infos!![key] = mapObj[key]!!.toString()
+                        }
+                    }
+
+                } else {
+                    when(key) {
+                        "id" -> shaft.id =  mapObj[key]!!.toString()
+                        "name" -> shaft.name =  mapObj[key]!!.toString()
+                        "localId" -> shaft.localId =  mapObj[key]!!.toString()
+                        "localName" -> shaft.localName =  mapObj[key]!!.toString()
+                        "defaultQRCode" -> shaft.defaultQRCode =  mapObj[key]!!.toString()
+                        "qRCodePic" -> shaft.qRCodePic =  mapObj[key]!!.toString()
+                        "cadId" -> shaft.cadId =  mapObj[key]!!.toString()
+                        "bimId" -> shaft.bimId =  mapObj[key]!!.toString()
+                    }
+                }
+
+            } else {
+                //                if (zoneSpace.infos.isNullOrEmpty()){
+//                    zoneSpace.infos = HashMap<String,Any?>()
+//                }
+//                zoneSpace.infos!![key] =  mapObj[key]!!.toString()
+            }
+        }
+
+        return shaft
+    }
 
 }

+ 174 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/SpaceUtil.kt

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.toDouble
+import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.assistant.AttPic
@@ -340,4 +341,177 @@ object SpaceUtil {
         }
         return zoneSpace
     }
+
+    /**
+     * 空间转换工具
+     *
+     * @param projectId     项目 id
+     * @param groupCode     集团编码
+     * @param mapObj        中台数据对象
+     * @return 返回结果
+     */
+    fun spaceDataConversions(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): ZoneSpace {
+        /** 查建楼层型字典 */
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", mapObj["classCode"].toString())).exec()
+        val mapEx = HashMap<String, Any?>()
+        val mapCode = HashMap<String, Any?>()
+        /** 遍历项目类型字典 */
+        for (explainProject in dictDefFuncIdList) {
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
+        }
+
+        val zoneSpace = ZoneSpace()
+        zoneSpace.projectId = projectId
+        for (key in mapObj.keys) {
+            val containsKey = mapEx.containsKey(key)
+            if (containsKey){
+                if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="defaultQRCode"
+                    &&key!="qRCodePic"&&key!="outline"&&key!="roomSerial"&&key!="roomFuncType"&&key!="depth"
+                    &&key!="width"&&key!="bimId"&&key!="bimLocation"&&key!="buildArea"&&key!="netArea"&&key!="height"
+                    &&key!="zoneOrientation"&&key!="elecCap"&&key!="pollutionDegree"&&key!="permanentPeopleNum"&&key!="intro"
+                    &&key!="pic"&&key!="projRoomFuncType"){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
+                        val any = mapCode[key].toString()
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toInt()
+                                }
+                                "DOUBLE" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString().toDouble()
+                                }
+                                "BOOLEAN" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString().toBoolean()
+                                }
+                                "STRING" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                else -> {
+                                    if (zoneSpace.infos.isNullOrEmpty()){
+                                        zoneSpace.infos = HashMap<String,Any?>()
+                                    }
+                                    zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (zoneSpace.infos.isNullOrEmpty()){
+                                zoneSpace.infos = HashMap<String,Any?>()
+                            }
+                            zoneSpace.infos!![key] = mapObj[key]!!.toString()
+                        }
+                    }
+
+                } else {
+                    when(key) {
+                        "id" -> zoneSpace.id =  mapObj[key]!!.toString()
+                        "name" -> zoneSpace.name =  mapObj[key]!!.toString()
+                        "localId" -> zoneSpace.localId =  mapObj[key]!!.toString()
+                        "localName" -> zoneSpace.localName =  mapObj[key]!!.toString()
+                        "defaultQRCode" -> zoneSpace.defaultQRCode =  mapObj[key]!!.toString()
+                        "qRCodePic" -> zoneSpace.qRCodePic =  mapObj[key]!!.toString()
+                        "roomSerial" -> zoneSpace.roomSerial =  mapObj[key]!!.toString().toDouble()
+                        "roomFuncType" -> zoneSpace.roomFuncType =  mapObj[key]!!.toString()
+                        "depth" -> zoneSpace.depth =  mapObj[key]!!.toString().toDouble()
+                        "width" -> zoneSpace.width =  mapObj[key]!!.toString().toDouble()
+                        "buildArea" -> zoneSpace.buildArea =  mapObj[key]!!.toString().toDouble()
+                        "bimId" -> zoneSpace.bimId =  mapObj[key]!!.toString()
+                        "bimLocation" -> zoneSpace.bimLocation =  mapObj[key]!!.toString()
+                        "netArea" -> zoneSpace.netArea =  mapObj[key]!!.toString().toDouble()
+                        "height" -> zoneSpace.height =  mapObj[key]!!.toString().toDouble()
+                        "zoneOrientation" -> zoneSpace.zoneOrientation =  mapObj[key]!!.toString()
+                        "elecCap" -> zoneSpace.elecCap =  mapObj[key]!!.toString().toDouble()
+                        "pollutionDegree" -> zoneSpace.pollutionDegree =  mapObj[key]!!.toString()
+                        "permanentPeopleNum" -> zoneSpace.permanentPeopleNum =  mapObj[key]!!.toString().toInt()
+                        "intro" -> zoneSpace.intro =  mapObj[key]!!.toString()
+                        "projRoomFuncType" -> zoneSpace.projRoomFuncType =  mapObj[key]!!.toString()
+                        "pic" -> {
+                            try {
+                                val attPicList = JSON.parseArray(mapObj[key].toString(), AttPic::class.java) as ArrayList<AttPic>
+                                val listTaskPic = ArrayList<TaskPic>()
+                                for (attPic in attPicList){
+                                    val taskPic = TaskPic()
+                                    taskPic.type = attPic.type
+                                    taskPic.systemId = attPic.systemId
+                                    taskPic.name = attPic.name
+                                    taskPic.key = attPic.key
+                                    taskPic.createTime = attPic.createTime
+                                    listTaskPic.add(taskPic)
+                                }
+                                zoneSpace.pic = listTaskPic
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+                        }
+                        "outline" -> {
+                            try {
+                                val replace1 = mapObj[key].toString().replace("X", "x")
+                                val replace2 = replace1.replace("Y", "y")
+                                val replace3 = replace2.replace("Z", "z")
+//                                logger.debug("坐标= ${replace3}")
+                                val type = object : TypeToken<ArrayList<ArrayList<ArrayList<PointPosition>>>>() {
+                                }.getType()
+                                var outline=  Gson().fromJson<ArrayList<ArrayList<ArrayList<PointPosition>>>>(replace3,type)
+                                zoneSpace.outline = outline
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+                        }
+                    }
+                }
+
+            } else {
+//                if (zoneSpace.infos.isNullOrEmpty()){
+//                    zoneSpace.infos = HashMap<String,Any?>()
+//                }
+//                zoneSpace.infos!![key] =  mapObj[key]!!.toString()
+            }
+        }
+
+        return zoneSpace
+    }
 }

+ 127 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/SystemUtil.kt

@@ -1,5 +1,7 @@
 package com.persagy.server.syn.models.tools
 
+import com.persagy.base.extensions.toDouble
+import com.persagy.base.extensions.toInt
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
@@ -497,5 +499,130 @@ object SystemUtil {
         return  generalSystem
     }
 
+    /**
+     * 系统转换工具
+     *
+     * @param projectId     项目 id
+     * @param groupCode     集团编码
+     * @param mapObj        中台数据对象
+     * @return 返回结果
+     */
+    fun systemDataConversions(projectId: String,groupCode: String, mapObj: HashMap<String, Any?>): GeneralSystem {
+        /** 查建楼层型字典 */
+        val dictDefFuncIdList = dictDefFuncIdService.select(SFilter.eq("groupCode", groupCode), SFilter.eq("classCode", mapObj["classCode"].toString())).exec()
+        val mapEx = HashMap<String, Any?>()
+        val mapCode = HashMap<String, Any?>()
+        /** 遍历项目类型字典 */
+        for (explainProject in dictDefFuncIdList) {
+            /** 输入类型 */
+            mapEx[explainProject.code!!] = explainProject.dataType
+            mapCode[explainProject.code!!] = explainProject.category
+        }
+
+        val generalSystem = GeneralSystem()
+        generalSystem.projectId = projectId
+
+        for (key in mapObj.keys) {
+            val containsKey = mapEx.containsKey(key)
+            if (containsKey){
+                if (key != "id"&& key!="name"&&key!="localId"&&key!="localName"&&key!="defaultQRCode"
+                    &&key!="qRCodePic"&&key!="cadId"&&key!="bimId"){
+                    val containsKey1 = mapCode.containsKey(key)
+                    if (containsKey1){
+                        val any = mapCode[key].toString()
+                        if (any == "STATIC"){
+                            when(mapEx[key].toString()) {
+                                "INTEGER" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toInt()
+                                }
+                                "DOUBLE" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString().toDouble()
+                                }
+                                "BOOLEAN" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString().toBoolean()
+                                }
+                                "STRING" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "DATETIME" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ATTACHMENT" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "OBJECT" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "ENUM" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                "MENUM" -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                                else -> {
+                                    if (generalSystem.infos.isNullOrEmpty()){
+                                        generalSystem.infos = HashMap<String,Any?>()
+                                    }
+                                    generalSystem.infos!![key] = mapObj[key]!!.toString()
+                                }
+                            }
+                        }else{
+                            if (generalSystem.infos.isNullOrEmpty()){
+                                generalSystem.infos = HashMap<String,Any?>()
+                            }
+                            generalSystem.infos!![key] = mapObj[key]!!.toString()
+                        }
+                    }
+
+                } else {
+                    when(key) {
+                        "id" -> generalSystem.id =  mapObj[key]!!.toString()
+                        "name" -> generalSystem.name =  mapObj[key]!!.toString()
+                        "localId" -> generalSystem.localId =  mapObj[key]!!.toString()
+                        "localName" -> generalSystem.localName =  mapObj[key]!!.toString()
+                        "defaultQRCode" -> generalSystem.defaultQRCode =  mapObj[key]!!.toString()
+                        "qRCodePic" -> generalSystem.qRCodePic =  mapObj[key]!!.toString()
+                        "cadId" -> generalSystem.cadId =  mapObj[key]!!.toString()
+                        "bimId" -> generalSystem.bimId =  mapObj[key]!!.toString()
+                    }
+                }
+
+            } else {
+                //                if (zoneSpace.infos.isNullOrEmpty()){
+//                    zoneSpace.infos = HashMap<String,Any?>()
+//                }
+//                zoneSpace.infos!![key] =  mapObj[key]!!.toString()
+            }
+        }
+
+        return generalSystem
+    }
 
 }

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

@@ -265,7 +265,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                             defFuncId.secondTag = ParamTools.TwoLevelCode(dictPlatformInfo.secondTag!!)
                         }
                         defFuncId.subFlag = dictPlatformInfo.subFlag
-                        defFuncId.type = dictPlatformInfo.dataType
+                        defFuncId.type = dictPlatformInfo.type
                         defFuncId.unit = dictPlatformInfo.unit
                         defFuncId.origCode = dictPlatformInfo.origCode
                         defFuncId.origDataType = dictPlatformInfo.origDataType
@@ -625,7 +625,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                                 }
                                 defFuncId.secondName = dictGroupInfo.secondTag
                                 defFuncId.subFlag = dictGroupInfo.subFlag
-                                defFuncId.type = dictGroupInfo.dataType
+                                defFuncId.type = dictGroupInfo.type
                                 defFuncId.unit = dictGroupInfo.unit
                                 defFuncId.origCode = dictGroupInfo.origCode
                                 defFuncId.origDataType = dictGroupInfo.origDataType
@@ -848,7 +848,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                                 }
                                 defFuncId.secondName = dictGroupInfo.secondTag
                                 defFuncId.subFlag = dictGroupInfo.subFlag
-                                defFuncId.type = dictGroupInfo.dataType
+                                defFuncId.type = dictGroupInfo.type
                                 defFuncId.unit = dictGroupInfo.unit
                                 defFuncId.origCode = dictGroupInfo.origCode
                                 defFuncId.origDataType = dictGroupInfo.origDataType

+ 16 - 0
equip-componnet/src/main/kotlin/com/persagy/server/models/SpaceSQueryResponse.kt

@@ -0,0 +1,16 @@
+package com.persagy.server.models
+
+import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.annotations.ApiModelProperty
+
+class SpaceSQueryResponse: SQueryResponse<ZoneIspace>() {
+
+    /** 楼层id */
+    @ApiModelProperty(value = "楼层id")
+    var floorId: String? = null
+
+    @ApiModelProperty(value = "空间类型")
+    var zoneType: String? = null
+
+} // Class SpaceSQueryResponse

+ 2 - 2
equip-componnet/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt

@@ -237,7 +237,7 @@ class CustomSqlLabslService {
                 building.floor = floorList
                 /** 未明确楼层对象 */
                 val floor = Floor()
-                floor.id = "isnull"
+                floor.id = "fisnull"
                 floor.name = "未明确楼层"
                 floor.localName = "未明确楼层"
                 /** 添加到第一条 */
@@ -246,7 +246,7 @@ class CustomSqlLabslService {
 
             /** 未明确建筑对象 */
             val building = Building()
-            building.id = "isnull"
+            building.id = "bisnull"
             building.name = "未明确建筑"
             building.localName = "未明确建筑"
             /** 添加到第一条 */

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 584 - 588
equip-componnet/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt


+ 1 - 1
equip-componnet/src/main/kotlin/com/persagy/server/service/objects/ISpaceService.kt

@@ -22,7 +22,7 @@ package com.persagy.server.service.objects
 
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
-import com.persagy.server.datacenter.models.response.SpaceSQueryResponse
+import com.persagy.server.models.SpaceSQueryResponse
 import com.persagy.server.models.requests.ZoneISpaceQueryRequest
 import com.persagy.server.service.base.Service
 import com.persagy.service.SPageContext

+ 2 - 2
equip-componnet/src/main/kotlin/com/persagy/server/utils/DataVerification.kt

@@ -78,7 +78,7 @@ object DataVerification {
                                     generalSystem.id = system.id
                                     generalSystem.name = systemEntity.name
                                     generalSystem.localName = systemEntity.localName
-                                    generalSystem.category = system.category
+                                    generalSystem.classCode = system.category
                                     generalSystemList.add(generalSystem)
                                 }
                             }
@@ -160,7 +160,7 @@ object DataVerification {
                                     generalSystem.id = system.id
                                     generalSystem.name = systemEntity.name
                                     generalSystem.localName = systemEntity.localName
-                                    generalSystem.category = system.category
+                                    generalSystem.classCode = system.category
                                     generalSystemList.add(generalSystem)
                                 }
                             }

+ 2 - 2
message-center/src/main/kotlin/com/persagy/server/messagecenter/WebMvcConfg.kt

@@ -18,9 +18,9 @@
  * ********************************************************************************************************************
  */
 
-package cn.sagacloud.server.messagecenter
+package com.persagy.server.messagecenter
 
-import com.sybotan.service.interceptors.SPageInterceptor
+import com.persagy.service.interceptors.SPageInterceptor
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter

+ 65 - 68
scanbuilding/src/main/kotlin/com/persagy/server/controller/task/EquipScanTaskController.kt

@@ -20,11 +20,8 @@
 
 package com.persagy.server.controller.task
 
-import com.alibaba.fastjson.JSON
-import com.alibaba.fastjson.JSONObject
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
-import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.services.EquipmentService
 import com.persagy.server.services.task.EquipScanTaskQueryService
@@ -215,57 +212,26 @@ open class EquipScanTaskController {
                 val equipment = EquipmentService.select(SFilter.eq("id", equipScanTask.equipId!!)).entity()
                 if (equipment!=null){
                     if (!equipScanTask.taskPicList.isNullOrEmpty()&&equipScanTask.taskPicList!!.size>0){
-                        val photoDoc = HashMap<String,Any?>()
-                        if (equipment.ledgerParam.isNullOrEmpty()) {
-                            equipment.ledgerParam = HashMap<String,Any?>()
-
-                            val map = HashMap<String,Any?>()
-                            val picList = ArrayList<TaskPic>()
-                            for (taskPic in equipScanTask.taskPicList!!){
-                                if (!taskPic.name.isNullOrEmpty()&&taskPic.name == "铭牌照片"){
-                                    val taskPic1 = TaskPic()
-                                    taskPic1.key = taskPic.key
-                                    taskPic1.createTime = taskPic.createTime
-                                    taskPic1.name = taskPic.name
-                                    taskPic1.type = taskPic.type
-                                    val  nameplateList = ArrayList<TaskPic>()
-                                    nameplateList.add(taskPic1)
-                                    photoDoc["Nameplate"] = nameplateList
-                                }else{
-                                    picList.add(taskPic)
-                                }
-                            }
-                            if (!equipScanTask.installLocation.isNullOrEmpty()){
-                                val installLocationMap = HashMap<String,String?>()
-                                installLocationMap["InstallLocation"] = equipScanTask.installLocation
-                                val siteinstallMap = HashMap<String,Any?>()
-                                siteinstallMap["Siteinstall"] =installLocationMap
-                                map["Siteinstall"] = installLocationMap
-                            }
-                            photoDoc["Pic"] = picList
-                            map["PhotoDoc"] = photoDoc
-                            equipment.ledgerParam = map
-                            val list = ArrayList<String>()
-                            list.add("LedgerParam")
-                            EquipmentService.update(equipment,list)
-                        }else{
-
-                            val map = HashMap<String,Any?>()
-                            val picList = ArrayList<TaskPic>()
-                            for (taskPic in equipScanTask.taskPicList!!){
-                                if (!taskPic.name.isNullOrEmpty()&&taskPic.name == "铭牌照片"){
-                                    val taskPic1 = TaskPic()
-                                    taskPic1.key = taskPic.key
-                                    taskPic1.createTime = taskPic.createTime
-                                    taskPic1.name = taskPic.name
-                                    taskPic1.type = taskPic.type
-                                    val  nameplateList = ArrayList<TaskPic>()
-                                    nameplateList.add(taskPic1)
-                                    photoDoc["Nameplate"] = nameplateList
-                                }else{
-                                    picList.add(taskPic)
-                                }
-                            }
+//                        val photoDoc = HashMap<String,Any?>()
+//                        if (equipment.ledgerParam.isNullOrEmpty()) {
+//                            equipment.ledgerParam = HashMap<String,Any?>()
+//
+//                            val map = HashMap<String,Any?>()
+//                            val picList = ArrayList<TaskPic>()
+//                            for (taskPic in equipScanTask.taskPicList!!){
+//                                if (!taskPic.name.isNullOrEmpty()&&taskPic.name == "铭牌照片"){
+//                                    val taskPic1 = TaskPic()
+//                                    taskPic1.key = taskPic.key
+//                                    taskPic1.createTime = taskPic.createTime
+//                                    taskPic1.name = taskPic.name
+//                                    taskPic1.type = taskPic.type
+//                                    val  nameplateList = ArrayList<TaskPic>()
+//                                    nameplateList.add(taskPic1)
+//                                    photoDoc["Nameplate"] = nameplateList
+//                                }else{
+//                                    picList.add(taskPic)
+//                                }
+//                            }
 //                            if (!equipScanTask.installLocation.isNullOrEmpty()){
 //                                val installLocationMap = HashMap<String,String?>()
 //                                installLocationMap["InstallLocation"] = equipScanTask.installLocation
@@ -273,20 +239,51 @@ open class EquipScanTaskController {
 //                                siteinstallMap["Siteinstall"] =installLocationMap
 //                                map["Siteinstall"] = installLocationMap
 //                            }
-
-                            val containsKey = equipment.ledgerParam!!.containsKey("Siteinstall")
-                            if (containsKey){
-                                val siteinstallJson = JSONObject.parseObject(JSON.toJSONString(equipment.ledgerParam!!["Siteinstall"]))
-                                siteinstallJson.put("InstallLocation",equipScanTask.installLocation)
-                                equipment.ledgerParam!!["Siteinstall"] = siteinstallJson
-                            }
-                            photoDoc["Pic"] = picList
-                            equipment.ledgerParam!!["PhotoDoc"] = photoDoc
-                            val list = ArrayList<String>()
-                            list.add("LedgerParam")
-                            EquipmentService.update(equipment,list)
-
-                        }
+//                            photoDoc["Pic"] = picList
+//                            map["PhotoDoc"] = photoDoc
+//                            equipment.ledgerParam = map
+//                            val list = ArrayList<String>()
+//                            list.add("LedgerParam")
+//                            EquipmentService.update(equipment,list)
+//                        }else{
+//
+//                            val map = HashMap<String,Any?>()
+//                            val picList = ArrayList<TaskPic>()
+//                            for (taskPic in equipScanTask.taskPicList!!){
+//                                if (!taskPic.name.isNullOrEmpty()&&taskPic.name == "铭牌照片"){
+//                                    val taskPic1 = TaskPic()
+//                                    taskPic1.key = taskPic.key
+//                                    taskPic1.createTime = taskPic.createTime
+//                                    taskPic1.name = taskPic.name
+//                                    taskPic1.type = taskPic.type
+//                                    val  nameplateList = ArrayList<TaskPic>()
+//                                    nameplateList.add(taskPic1)
+//                                    photoDoc["Nameplate"] = nameplateList
+//                                }else{
+//                                    picList.add(taskPic)
+//                                }
+//                            }
+////                            if (!equipScanTask.installLocation.isNullOrEmpty()){
+////                                val installLocationMap = HashMap<String,String?>()
+////                                installLocationMap["InstallLocation"] = equipScanTask.installLocation
+////                                val siteinstallMap = HashMap<String,Any?>()
+////                                siteinstallMap["Siteinstall"] =installLocationMap
+////                                map["Siteinstall"] = installLocationMap
+////                            }
+//
+//                            val containsKey = equipment.ledgerParam!!.containsKey("Siteinstall")
+//                            if (containsKey){
+//                                val siteinstallJson = JSONObject.parseObject(JSON.toJSONString(equipment.ledgerParam!!["Siteinstall"]))
+//                                siteinstallJson.put("InstallLocation",equipScanTask.installLocation)
+//                                equipment.ledgerParam!!["Siteinstall"] = siteinstallJson
+//                            }
+//                            photoDoc["Pic"] = picList
+//                            equipment.ledgerParam!!["PhotoDoc"] = photoDoc
+//                            val list = ArrayList<String>()
+//                            list.add("LedgerParam")
+//                            EquipmentService.update(equipment,list)
+//
+//                        }
                     }
                 }
             }

+ 4 - 4
scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt

@@ -84,7 +84,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
                 val equipment = equipmentService.select("id" to equipScanTask.equipId!!).entity()
                 if (equipScanTask.schemeId.isNullOrEmpty()){
-                    equipScanTask.schemeId = SchemeUtils.setScheme(equipment!!.category!!)
+                    equipScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                 }
 //                equipment.ledgerParam.PhotoDoc.Pic
                 if(equipment!!.ledgerParam != null){//设备图片信息
@@ -143,7 +143,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                     equipScanTask.localId = equipment!!.localId
                     equipScanTask.localName = equipment!!.localName
                     equipScanTask.bimId = equipment!!.bimId
-                    equipScanTask.category = equipment!!.category
+                    equipScanTask.category = equipment!!.classCode
                     equipScanTask.buildingId = equipment!!.buildingId
                     equipScanTask.floorId = equipment!!.floorId
                     equipScanTask.cadId = equipment!!.cadId
@@ -174,7 +174,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                         equipScanTask.bimId = equipment!!.bimId
                     }
                     if (equipScanTask.category.isNullOrEmpty()) {
-                        equipScanTask.category = equipment!!.category
+                        equipScanTask.category = equipment!!.classCode
                     }
                     if (equipScanTask.buildingId.isNullOrEmpty()) {
                         equipScanTask.buildingId = equipment!!.buildingId
@@ -240,7 +240,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 equipScanTask.localId = equipment!!.localId
                 equipScanTask.localName = equipment!!.localName
                 equipScanTask.bimId = equipment!!.bimId
-                equipScanTask.category = equipment!!.category
+                equipScanTask.category = equipment!!.classCode
                 equipScanTask.buildingId = equipment!!.buildingId
                 equipScanTask.floorId = equipment!!.floorId
                 equipScanTask.cadId = equipment!!.cadId

+ 4 - 4
scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -103,7 +103,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                     val equipment = equipmentService.select("id" to modelScanTask.equipId!!).entity()
 
                     if (modelScanTask.schemeId.isNullOrEmpty()){
-                        modelScanTask.schemeId = SchemeUtils.setScheme(equipment!!.category!!)
+                        modelScanTask.schemeId = SchemeUtils.setScheme(equipment!!.classCode!!)
                     }
 
 //                equipment.ledgerParam.PhotoDoc.Pic
@@ -162,7 +162,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                         modelScanTask.localId = equipment!!.localId
                         modelScanTask.localName = equipment!!.localName
                         modelScanTask.bimId = equipment!!.bimId
-                        modelScanTask.category = equipment!!.category
+                        modelScanTask.category = equipment!!.classCode
                         modelScanTask.buildingId = equipment!!.buildingId
                         modelScanTask.floorId = equipment!!.floorId
                         modelScanTask.cadId = equipment!!.cadId
@@ -188,7 +188,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                             modelScanTask.bimId = equipment!!.bimId
                         }
                         if (modelScanTask.category.isNullOrEmpty()) {
-                            modelScanTask.category = equipment!!.category
+                            modelScanTask.category = equipment!!.classCode
                         }
                         if (modelScanTask.buildingId.isNullOrEmpty()) {
                             modelScanTask.buildingId = equipment!!.buildingId
@@ -245,7 +245,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                 modelScanTask.localId = equipment!!.localId
                 modelScanTask.localName = equipment!!.localName
                 modelScanTask.bimId = equipment!!.bimId
-                modelScanTask.category = equipment!!.category
+                modelScanTask.category = equipment!!.classCode
                 modelScanTask.buildingId = equipment!!.buildingId
                 modelScanTask.floorId = equipment!!.floorId
                 modelScanTask.cadId = equipment!!.cadId