瀏覽代碼

****************************************提交分类************************************

weixinVSjinlai 4 年之前
父節點
當前提交
f68990f9ad
共有 53 個文件被更改,包括 718 次插入904 次删除
  1. 2 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Component.kt
  2. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/GeneralSystem.kt
  3. 4 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Project.kt
  4. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt
  5. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Shaft.kt
  6. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/ZoneSpace.kt
  7. 1 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/response/EquipAssetComponentsReqponse.kt
  8. 12 85
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Equipment.kt
  9. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt
  10. 173 173
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt
  11. 158 158
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  12. 1 1
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt
  13. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt
  14. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt
  15. 7 220
      datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt
  16. 12 95
      datacenter/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt
  17. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt
  18. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt
  19. 1 0
      datacenter/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt
  20. 1 1
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/MepSystemCalcService.kt
  21. 4 0
      datacenter/src/main/kotlin/com/persagy/server/wanda/a.java
  22. 4 0
      datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/b.java
  23. 9 17
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt
  24. 116 0
      datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/obj/EquipController.kt
  25. 146 0
      datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/obj/FloorController.kt
  26. 30 30
      datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt
  27. 1 0
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectToFromController.kt
  28. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelFromToControllers.kt
  29. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelToFromController.kt
  30. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/TestControllers.kt
  31. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/models/tools/EquipUtil.kt
  32. 1 0
      datasyn/src/main/kotlin/com/persagy/server/syn/services/BaseDataService.kt
  33. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterComponent.kt
  34. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterEquipment.kt
  35. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdComponent.kt
  36. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdEquip.kt
  37. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdRelationAdd.kt
  38. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdRelationDel.kt
  39. 1 1
      equip-component/src/main/kotlin/com/persagy/server/controllers/EquipController.kt
  40. 1 1
      equip-component/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt
  41. 1 1
      equip-component/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt
  42. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt
  43. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt
  44. 1 1
      equip-component/src/main/kotlin/com/persagy/server/models/labsl/EquipTypeLabsl.kt
  45. 1 3
      equip-component/src/main/kotlin/com/persagy/server/service/EquipmentComService.kt
  46. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt
  47. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/base/BaseDataService.kt
  48. 0 90
      equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt
  49. 1 1
      equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt
  50. 3 3
      equip-component/src/main/kotlin/com/persagy/server/utils/MatchingProperty.kt
  51. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/services/EquipmentService.kt
  52. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt
  53. 1 1
      scanbuilding/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

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

@@ -26,6 +26,8 @@
 
 package com.persagy.server.datacenter.models.entities.objects
 
+import com.persagy.server.datacenter.wanda.obj.Equipment
+
 
 /**
  * 部件

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

@@ -30,6 +30,7 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
 import com.persagy.server.datacenter.models.entities.assistant.GeneralSystemCategory
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

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

@@ -85,4 +85,8 @@ open class Project : BaseInfo() {
     @Column(name = "infos")
     var infos: HashMap<String,Any?>? = null
 
+    /** 集团编码 */
+    @Schema(description = "集团编码")
+    @Column(name = "group_code")
+    var groupCode: String? = null
 }

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

@@ -32,6 +32,7 @@ import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
 import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

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

@@ -28,6 +28,7 @@ package com.persagy.server.datacenter.models.entities.objects
 
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column

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

@@ -30,6 +30,7 @@ import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.SBaseEntity
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -27,7 +27,7 @@
 package com.persagy.server.datacenter.models.response
 
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema

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

@@ -24,12 +24,13 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.datacenter.models.entities.objects
+package com.persagy.server.datacenter.wanda.obj
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.server.datacenter.models.entities.assistant.BIMLocation
 import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.dict.EquipCategory
+import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
@@ -169,36 +170,6 @@ open class Equipment : BaseInfo() {
     @Column(name = "equip_serial")
     var equipSerial: Double? = null
 
-    /** 生产厂家ID */  //生产商的id
-    @Schema(description = "生产厂家id")
-    @Column(name = "dp_manufacturer_id")
-    var dpManufacturerId: String? = null
-
-    /** 供应商信息id */
-    @Schema(description = "供应商信息id")
-    @Column(name = "dp_supplier_id")
-    var dpSupplierId: String? = null
-
-    /** 维修商信息id */
-    @Schema(description = "维修商信息id")
-    @Column(name = "dp_maintainer_id")
-    var dpMaintainerId: String? = null
-
-    /** 保险公司信息id */
-    @Schema(description = "保险公司信息id")
-    @Column(name = "dp_insurer_id")
-    var dpInsurerId: String? = null
-
-    /** 设备型号id */
-    @Schema(description = "设备型号id")
-    @Column(name = "dp_specification_id")
-    var dpSpecificationId: String? = null
-
-    /** 品牌id */
-    @Schema(description = "品牌id")
-    @Column(name = "dp_brand_id")
-    var dpBrandId: String? = null
-
     /** 信息点 */
     @Schema(description = "信息点")
     @Column(name = "infos")
@@ -209,10 +180,6 @@ open class Equipment : BaseInfo() {
     @Column(name = "parent_id")
     var parentId: String? = null
 
-    /** 系统id集合 */
-    @Schema(description = "系统id集合")
-    var systemList: List<String>? = null
-
     /** 对象类型 */
     @Schema(description = "对象类型")
     @Column(name = "object_type")
@@ -243,6 +210,16 @@ open class Equipment : BaseInfo() {
     @Column(name = "note")
     var note: Int? = null
 
+    /** 系统分类 */
+    @Schema(description = "系统分类")
+    @Column(name = "system_category")
+    var systemCategory: String? = null
+
+    /** 系统分类 */
+    @Schema(description = "设备类型名称")
+    @Column(name = "code_name")
+    var codeName: String? = null
+
     /** 方案id */
     @Schema(description = "方案id")
 //    @Column(name = "scheme_id")
@@ -253,54 +230,4 @@ open class Equipment : BaseInfo() {
             }
             return null
         }
-
-    /** 资产 */
-    @Schema(description = "级联-资产")
-    @SCascade(table="property", idColumn="equip_id", childIdColumn="id")
-    var property: Property? = null
-
-    /** 建筑   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @Schema(description = "级联-建筑")
-    @SCascade(table="equipment", idColumn="id", childIdColumn="building_id")
-    var building: Building? = null
-
-    /** 级联-楼层   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @Schema(description = "级联-楼层")
-    @SCascade(table="equipment", idColumn="id", childIdColumn="floor_id")
-    var floor: Floor? = null
-
-    /** 级联-项目 */
-    @Schema(description = "级联-项目")
-    @SCascade(table="equipment", idColumn="id", childIdColumn="project_id")
-    var project: Project? = null
-
-    /** 级联-设备分类 */
-    @Schema(description = "级联-设备分类")
-    @SCascade(table="equipment", idColumn="id", childIdColumn="class_code")
-    var equipCategory: EquipCategory? = null
-
-    /** 级联-设备服务的空间的 */
-    @Schema(description = "级联-设备服务的空间的")
-    @SCascade(table="relationship.r_eq2sp", idColumn="eq_id", childIdColumn="sp_id",filter = "type = 'eq2sp_for'")
-    var zoneSpaceForBase: ArrayList<ZoneSpace>? = null
-
-    /** 级联-设备所在的空间的 */
-    @Schema(description = "级联-设备所在的空间的")
-    @SCascade(table="relationship.r_eq2sp", idColumn="eq_id", childIdColumn="sp_id",filter = "type = 'eq2sp_in'")
-    var zoneSpaceInBase: ArrayList<ZoneSpace>? = null
-
-    /** 级联-设备所在的竖井 */
-    @Schema(description = "级联-设备所在的竖井")
-    @SCascade(table="r_eq_in_sh", idColumn="equip_id", childIdColumn="shaft_id")
-    var shaftList: ArrayList<Shaft>? = null
-
-    /** 资产列表 */
-    @Schema(description = "资产列表")
-    var propertyList: ArrayList<Property>? = null
-
-    /** 级联-部件   table  对应关系表   idColumn 对应 本类的id    childIdColumn 级联对象的关系id */
-    @Schema(description = "级联-部件")
-    @SCascade(table="equipment", idColumn="parent_id", childIdColumn="id")
-    var component: ArrayList<Equipment>? = null
-
 }

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

@@ -28,7 +28,7 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.services.objects.ComponentService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest

+ 173 - 173
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt

@@ -1,173 +1,173 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.controllers.objects
-
-import com.persagy.database.SFilter
-import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
-import com.persagy.server.datacenter.models.entities.objects.Equipment
-import com.persagy.server.services.objects.EquipmentProSyService
-import com.persagy.server.services.objects.EquipmentService
-import com.persagy.service.SPageContext
-import com.persagy.service.models.requests.SCountRequest
-import com.persagy.service.models.requests.SCreateRequest
-import com.persagy.service.models.requests.SQueryRequest
-import com.persagy.service.models.requests.SUpdateRequest
-import com.persagy.service.models.responses.SBaseResponse
-import com.persagy.service.models.responses.SCountResponse
-import com.persagy.service.models.responses.SCreateResponse
-import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.v3.oas.annotations.Operation
-import io.swagger.v3.oas.annotations.tags.Tag
-import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.*
-
-/**
- * 设备接口
- *
- * @author 张维新
- */
-@Tag(name = "004、设备")
-@RestController
-@RequestMapping("/object/equip")
-open class EquipController {
-
-    companion object {
-        /** 日志 */
-        private val logger = LoggerFactory.getLogger(EquipController::class.java)
-    } // Companion object
-
-    /**
-     * 创建设备
-     *
-     * @param   request         设备对象
-     * @return                  创建结果信息
-     */
-    @Operation(summary = "创建设备信息", description = "")
-    @PostMapping(value = ["/create"])
-    fun create(@RequestBody request: SCreateRequest<Equipment>): SCreateResponse<Equipment> {
-        return EquipmentService.createList(request)
-    } // Function create()
-
-    /**
-     * 根据id删除设备
-     *
-     * @param   idList      id数组
-     * @return              删除的结果信息
-     */
-    @Operation(summary = "根据id删除设备信息", description = "")
-    @PostMapping(value = ["/delete"])
-    fun delete(@RequestBody idList: ArrayList<Equipment>): SBaseResponse {
-        return EquipmentService.deleteByKeysList(idList)
-    } // Function delete()
-
-    /**
-     * 更新设备信息
-     *
-     * @param   request        更新的内容对象
-     * @return                  更新的结果
-     */
-    @Operation(summary = "更新设备信息", description = "")
-    @PostMapping(value = ["/update"])
-    fun update(@RequestBody request: SUpdateRequest<Equipment>): SBaseResponse {
-        return EquipmentService.updateList(request)
-    } // Function update()
-
-    /**
-     * 查询设备信息
-     *
-     * @param   request     查询信息条件
-     * @return              查询结果
-     */
-    @Operation(summary = "查询设备信息", description = " 可以级联的对象:资产(property)、楼层(floor)、建筑(building)、项目(project)、设备类(equipCategory)、设备服务的业务空间(zoneSpaceForBase)、设备所在的业务空间(zoneSpaceInBase)、设备所在的竖井(shaftList)  级联查询时子对象过滤时必须指定id否则无法定位对象,级联查询例子:{\n" +
-            "  \"Cascade\": [\n" +
-            "    {\n" +
-            "      \"Name\": \"property\",\n" +
-            "      \"Projection\": [\n" +
-            "        \"Family\",\"EquipLocalName\",\"EquipLocalID\",\"EquipID\",\"CodeType\"\n" +
-            "      ]\n" +
-            "    },\n" +
-            "    {\n" +
-            "      \"Name\": \"building\",\n" +
-            "      \"Projection\": [\n" +
-            "        \"BuildLocalName\",\"BuildName\",\"BuildID\"\n" +
-            "      ]\n" +
-            "    },\n" +
-            " {\n" +
-            "      \"Name\": \"floor\",\n" +
-            "      \"Projection\": [\n" +
-            "        \"FloorLocalName\",\"FloorName\",\"FloorID\"\n" +
-            "      ]\n" +
-            "    }\n" +
-            "  ],\n" +
-            "  \"Filters\": \" not propertyId isnull \",\n" +
-            "  \"PageNumber\": 1,\n" +
-            "  \"PageSize\": 50,\n" +
-            "  \"Projection\": [\n" +
-            "    \"BuildingId\",\"FloorId\",\"Category\",\"EquipLocalName\",\"EquipLocalID\",\"EquipID\",\"BIMID\"\n" +
-            "  ]\n" +
-            "}")
-    @PostMapping(value = ["/query"])
-    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
-        val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
-        return EquipmentService.pageQuery(request, withFilterList)
-    } // Function query()
-
-    /**
-     * 根据条件查询统计数量
-     */
-    @Operation(summary = "根据条件查询统计数量", description = "例子: 根据设备类型查询(\"Filters\": \"category ='SISU'\")," +
-            "根据设备类型和建筑查询(\"Filters\": \"category ='FASE';buildingId = '建筑id'\")," +
-            "根据设备类型和建筑楼层查询(\"Filters\": \"category ='FASE';buildingId = '建筑id';floorId = '楼层id'\")")
-    @PostMapping(value = ["/count"])
-    fun count(@RequestBody request: SCountRequest): SCountResponse {
-        val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
-        return EquipmentService.count(request, withFilterList)
-    } // Function count()
-
-    /**
-     * 根据项目id查询所有的设备和部件
-     */
-    @Operation(summary = "根据项目id查询所有的设备和部件", description = "")
-    @GetMapping(value = ["/query-equip"])
-    fun queryEquipCom(): SQueryResponse<Equipment>  {
-        return EquipmentService.queryEquipCom()
-    } // Function count()
-
-    /**
-     * 批量创建设备同时创建资产、创建设备和系统的关系
-     *
-     */
-    @Operation(summary = "批量创建设备同时创建资产、创建设备和系统的关系", description = "")
-    @PostMapping(value = ["/creat-equip-pro"])
-    fun createEquipPro(@RequestBody request: SCreateRequest<EquipmentProSy>): SCreateResponse<EquipmentProSy>{
-        return EquipmentProSyService.createList(request)
-    } // Function pageQuery()
-
-
-} // Class EquipController
+///*
+//// * *********************************************************************************************************************
+//// *
+//// *          !!
+//// *        .F88X
+//// *        X8888Y
+//// *      .}888888N;
+//// *        i888888N;        .:!              .I$WI:
+//// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+//// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+//// *            +888888N;  .8888888Y                                  "&&8Y.}8,
+//// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+//// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+//// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+//// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+//// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+//// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+//// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+//// *      .:R888888I
+//// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+//// *        ~8888'
+//// *        .!88~                                                                     All rights reserved.
+//// *
+//// * *********************************************************************************************************************
+//// */
+////
+////package com.persagy.server.controllers.objects
+////
+////import com.persagy.database.SFilter
+////import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
+////import com.persagy.server.datacenter.wanda.obj.Equipment
+////import com.persagy.server.services.objects.EquipmentProSyService
+////import com.persagy.server.services.objects.EquipmentService
+////import com.persagy.service.SPageContext
+////import com.persagy.service.models.requests.SCountRequest
+////import com.persagy.service.models.requests.SCreateRequest
+////import com.persagy.service.models.requests.SQueryRequest
+////import com.persagy.service.models.requests.SUpdateRequest
+////import com.persagy.service.models.responses.SBaseResponse
+////import com.persagy.service.models.responses.SCountResponse
+////import com.persagy.service.models.responses.SCreateResponse
+////import com.persagy.service.models.responses.SQueryResponse
+////import io.swagger.v3.oas.annotations.Operation
+////import io.swagger.v3.oas.annotations.tags.Tag
+////import org.slf4j.LoggerFactory
+////import org.springframework.web.bind.annotation.*
+////
+/////**
+//// * 设备接口
+//// *
+//// * @author 张维新
+//// */
+////@Tag(name = "004、设备")
+////@RestController
+////@RequestMapping("/object/equip")
+////open class EquipController {
+////
+////    companion object {
+////        /** 日志 */
+////        private val logger = LoggerFactory.getLogger(EquipController::class.java)
+////    } // Companion object
+////
+////    /**
+////     * 创建设备
+////     *
+////     * @param   request         设备对象
+////     * @return                  创建结果信息
+////     */
+////    @Operation(summary = "创建设备信息", description = "")
+////    @PostMapping(value = ["/create"])
+////    fun create(@RequestBody request: SCreateRequest<Equipment>): SCreateResponse<Equipment> {
+////        return EquipmentService.createList(request)
+////    } // Function create()
+////
+////    /**
+////     * 根据id删除设备
+////     *
+////     * @param   idList      id数组
+////     * @return              删除的结果信息
+////     */
+////    @Operation(summary = "根据id删除设备信息", description = "")
+////    @PostMapping(value = ["/delete"])
+////    fun delete(@RequestBody idList: ArrayList<Equipment>): SBaseResponse {
+////        return EquipmentService.deleteByKeysList(idList)
+////    } // Function delete()
+////
+////    /**
+////     * 更新设备信息
+////     *
+////     * @param   request        更新的内容对象
+////     * @return                  更新的结果
+////     */
+////    @Operation(summary = "更新设备信息", description = "")
+////    @PostMapping(value = ["/update"])
+////    fun update(@RequestBody request: SUpdateRequest<Equipment>): SBaseResponse {
+////        return EquipmentService.updateList(request)
+////    } // Function update()
+////
+////    /**
+////     * 查询设备信息
+////     *
+////     * @param   request     查询信息条件
+////     * @return              查询结果
+////     */
+////    @Operation(summary = "查询设备信息", description = " 可以级联的对象:资产(property)、楼层(floor)、建筑(building)、项目(project)、设备类(equipCategory)、设备服务的业务空间(zoneSpaceForBase)、设备所在的业务空间(zoneSpaceInBase)、设备所在的竖井(shaftList)  级联查询时子对象过滤时必须指定id否则无法定位对象,级联查询例子:{\n" +
+////            "  \"Cascade\": [\n" +
+////            "    {\n" +
+////            "      \"Name\": \"property\",\n" +
+////            "      \"Projection\": [\n" +
+////            "        \"Family\",\"EquipLocalName\",\"EquipLocalID\",\"EquipID\",\"CodeType\"\n" +
+////            "      ]\n" +
+////            "    },\n" +
+////            "    {\n" +
+////            "      \"Name\": \"building\",\n" +
+////            "      \"Projection\": [\n" +
+////            "        \"BuildLocalName\",\"BuildName\",\"BuildID\"\n" +
+////            "      ]\n" +
+////            "    },\n" +
+////            " {\n" +
+////            "      \"Name\": \"floor\",\n" +
+////            "      \"Projection\": [\n" +
+////            "        \"FloorLocalName\",\"FloorName\",\"FloorID\"\n" +
+////            "      ]\n" +
+////            "    }\n" +
+////            "  ],\n" +
+////            "  \"Filters\": \" not propertyId isnull \",\n" +
+////            "  \"PageNumber\": 1,\n" +
+////            "  \"PageSize\": 50,\n" +
+////            "  \"Projection\": [\n" +
+////            "    \"BuildingId\",\"FloorId\",\"Category\",\"EquipLocalName\",\"EquipLocalID\",\"EquipID\",\"BIMID\"\n" +
+////            "  ]\n" +
+////            "}")
+////    @PostMapping(value = ["/query"])
+////    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
+////        val withFilterList = ArrayList<SFilter>()
+////        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
+////        return EquipmentService.pageQuery(request, withFilterList)
+////    } // Function query()
+////
+////    /**
+////     * 根据条件查询统计数量
+////     */
+////    @Operation(summary = "根据条件查询统计数量", description = "例子: 根据设备类型查询(\"Filters\": \"category ='SISU'\")," +
+////            "根据设备类型和建筑查询(\"Filters\": \"category ='FASE';buildingId = '建筑id'\")," +
+////            "根据设备类型和建筑楼层查询(\"Filters\": \"category ='FASE';buildingId = '建筑id';floorId = '楼层id'\")")
+////    @PostMapping(value = ["/count"])
+////    fun count(@RequestBody request: SCountRequest): SCountResponse {
+////        val withFilterList = ArrayList<SFilter>()
+////        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
+////        return EquipmentService.count(request, withFilterList)
+////    } // Function count()
+////
+////    /**
+////     * 根据项目id查询所有的设备和部件
+////     */
+////    @Operation(summary = "根据项目id查询所有的设备和部件", description = "")
+////    @GetMapping(value = ["/query-equip"])
+////    fun queryEquipCom(): SQueryResponse<Equipment>  {
+////        return EquipmentService.queryEquipCom()
+////    } // Function count()
+////
+////    /**
+////     * 批量创建设备同时创建资产、创建设备和系统的关系
+////     *
+////     */
+////    @Operation(summary = "批量创建设备同时创建资产、创建设备和系统的关系", description = "")
+////    @PostMapping(value = ["/creat-equip-pro"])
+////    fun createEquipPro(@RequestBody request: SCreateRequest<EquipmentProSy>): SCreateResponse<EquipmentProSy>{
+////        return EquipmentProSyService.createList(request)
+////    } // Function pageQuery()
+////
+////
+////} // Class EquipController

+ 158 - 158
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt

@@ -1,166 +1,166 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-package com.persagy.server.controllers.objects
-
-import com.persagy.base.extensions.toJson
-import com.persagy.database.SFilter
-import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.objects.Floor
-import com.persagy.server.services.objects.FloorService
-import com.persagy.service.SPageContext
-import com.persagy.service.models.requests.SCreateRequest
-import com.persagy.service.models.requests.SQueryRequest
-import com.persagy.service.models.requests.SUpdateRequest
-import com.persagy.service.models.responses.SBaseResponse
-import com.persagy.service.models.responses.SCreateResponse
-import com.persagy.service.models.responses.SQueryResponse
-import io.swagger.v3.oas.annotations.Operation
-import io.swagger.v3.oas.annotations.tags.Tag
-import org.slf4j.LoggerFactory
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-/**
- * 楼层接口
- *
- * @author 张维新
- */
-@Tag(name = "003、楼层")
-@RestController
-@RequestMapping("/object/floor")
-open class FloorController {
-    companion object {
-        /** 日志 */
-        private val logger = LoggerFactory.getLogger(FloorController::class.java)
-    }
-
-    /**
-     * 创建楼层
-     *
-     * @param request     楼层对象
-     * @return 创建结果信息
-     */
-    @Operation(summary = "创建楼层", description = "")
-    @PostMapping(value = ["/create"])
-    fun create(@RequestBody request: SCreateRequest<Floor>): SCreateResponse<Floor> {
-        return FloorService.create(request)
-    }
-
-    /**
-     * 根据id删除楼层
-     *
-     * @param idList  id 数组
-     * @return 删除的结果信息
-     */
-    @Operation(summary = "根据id删除楼层", description = "")
-    @PostMapping(value = ["/delete"])
-    fun delete(@RequestBody idList: ArrayList<Floor>): SBaseResponse {
-        return FloorService.deleteByKeysList( idList)
-    }
-
-    /**
-     * 更新楼层信息
-     *
-     *
-     * @param request     更新的内容对象
-     * @return 更新的结果
-     */
-    @Operation(summary = "更新楼层信息", description = "")
-    @PostMapping(value = ["/update"])
-    fun update(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
-        return FloorService.upDates(request)
-    }
-
+///*
+// * *********************************************************************************************************************
+// *
+// *          !!
+// *        .F88X
+// *        X8888Y
+// *      .}888888N;
+// *        i888888N;        .:!              .I$WI:
+// *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+// *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+// *            +888888N;  .8888888Y                                  "&&8Y.}8,
+// *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+// *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+// *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+// *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+// *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+// *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+// *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+// *      .:R888888I
+// *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+// *        ~8888'
+// *        .!88~                                                                     All rights reserved.
+// *
+// * *********************************************************************************************************************
+// */
+//
+//package com.persagy.server.controllers.objects
+//
+//import com.persagy.base.extensions.toJson
+//import com.persagy.database.SFilter
+//import com.persagy.server.Opt
+//import com.persagy.server.datacenter.models.entities.objects.Floor
+//import com.persagy.server.services.objects.FloorService
+//import com.persagy.service.SPageContext
+//import com.persagy.service.models.requests.SCreateRequest
+//import com.persagy.service.models.requests.SQueryRequest
+//import com.persagy.service.models.requests.SUpdateRequest
+//import com.persagy.service.models.responses.SBaseResponse
+//import com.persagy.service.models.responses.SCreateResponse
+//import com.persagy.service.models.responses.SQueryResponse
+//import io.swagger.v3.oas.annotations.Operation
+//import io.swagger.v3.oas.annotations.tags.Tag
+//import org.slf4j.LoggerFactory
+//import org.springframework.web.bind.annotation.PostMapping
+//import org.springframework.web.bind.annotation.RequestBody
+//import org.springframework.web.bind.annotation.RequestMapping
+//import org.springframework.web.bind.annotation.RestController
+//
+///**
+// * 楼层接口
+// *
+// * @author 张维新
+// */
+//@Tag(name = "003、楼层")
+//@RestController
+//@RequestMapping("/object/floor")
+//open class FloorController {
+//    companion object {
+//        /** 日志 */
+//        private val logger = LoggerFactory.getLogger(FloorController::class.java)
+//    }
+//
 //    /**
-//     * 更新楼层信息-Outline
+//     * 创建楼层
 //     *
+//     * @param request     楼层对象
+//     * @return 创建结果信息
+//     */
+//    @Operation(summary = "创建楼层", description = "")
+//    @PostMapping(value = ["/create"])
+//    fun create(@RequestBody request: SCreateRequest<Floor>): SCreateResponse<Floor> {
+//        return FloorService.create(request)
+//    }
+//
+//    /**
+//     * 根据id删除楼层
 //     *
-//     * @param request     更新楼层信息 Outline
+//     * @param idList  id 数组
+//     * @return 删除的结果信息
+//     */
+//    @Operation(summary = "根据id删除楼层", description = "")
+//    @PostMapping(value = ["/delete"])
+//    fun delete(@RequestBody idList: ArrayList<Floor>): SBaseResponse {
+//        return FloorService.deleteByKeysList( idList)
+//    }
+//
+//    /**
+//     * 更新楼层信息
+//     *
+//     *
+//     * @param request     更新的内容对象
 //     * @return 更新的结果
 //     */
+//    @Operation(summary = "更新楼层信息", description = "")
+//    @PostMapping(value = ["/update"])
+//    fun update(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
+//        return FloorService.upDates(request)
+//    }
+//
+////    /**
+////     * 更新楼层信息-Outline
+////     *
+////     *
+////     * @param request     更新楼层信息 Outline
+////     * @return 更新的结果
+////     */
+////    @Operation(summary = "更新楼层信息-Outline", description = "")
+////    @PostMapping(value = ["/outline/update"])
+////    fun updateOutlines(@RequestBody request: SUpdateRequest<FloorOutline>): SBaseResponse {
+////        return FloorService.updateOutline(request)
+////    }
+//
+//    /**
+//     * 更新楼层信息-Outline
+//     *
+//     *
+//     * @param   request     更新楼层信息-Outline
+//     * @return              更新的结果
+//     */
 //    @Operation(summary = "更新楼层信息-Outline", description = "")
-//    @PostMapping(value = ["/outline/update"])
-//    fun updateOutlines(@RequestBody request: SUpdateRequest<FloorOutline>): SBaseResponse {
+//    @PostMapping(value = ["/update-outline"])
+//    fun updateOutlines(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
+//        logger.debug("floorUpdate =${request.toJson()}")
 //        return FloorService.updateOutline(request)
+//    } // Function update()
+//
+//    /**
+//     * 查询楼层信息
+//     *
+//     * @param   request     查询信息条件
+//     * @return              查询结果
+//     */
+//    @Operation(summary = "查询楼层信息 - outline", description = "")
+//    @PostMapping(value = ["/query-outline"])
+//    fun queryOutline(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
+//        logger.debug("floorQuery =${request.toJson()}")
+//        if (!request.projection.isNullOrEmpty()){
+//            request.projection!!.clear()
+//        }
+//        val list = ArrayList<String>()
+//        list.add("id")
+//        list.add("name")
+//        list.add("localId")
+//        list.add("localName")
+//        list.add("outline")
+//        list.add("floorSequenceId")
+//        list.add("modelId")
+//        list.add("infos")
+//        list.add("properties")
+//        request.projection = list
+//        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
+//    } // Function query()
+//
+//    /**
+//     * 查询楼层信息
+//     *
+//     * @param request     查询信息条件
+//     * @return 查询结果
+//     */
+//    @Operation(summary = "查询楼层信息", description = "级联对象:建筑(building)、项目(project)、楼层贯通关系(floorThroughList)")
+//    @PostMapping(value = ["/query"])
+//    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
+//        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
 //    }
-
-    /**
-     * 更新楼层信息-Outline
-     *
-     *
-     * @param   request     更新楼层信息-Outline
-     * @return              更新的结果
-     */
-    @Operation(summary = "更新楼层信息-Outline", description = "")
-    @PostMapping(value = ["/update-outline"])
-    fun updateOutlines(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
-        logger.debug("floorUpdate =${request.toJson()}")
-        return FloorService.updateOutline(request)
-    } // Function update()
-
-    /**
-     * 查询楼层信息
-     *
-     * @param   request     查询信息条件
-     * @return              查询结果
-     */
-    @Operation(summary = "查询楼层信息 - outline", description = "")
-    @PostMapping(value = ["/query-outline"])
-    fun queryOutline(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
-        logger.debug("floorQuery =${request.toJson()}")
-        if (!request.projection.isNullOrEmpty()){
-            request.projection!!.clear()
-        }
-        val list = ArrayList<String>()
-        list.add("id")
-        list.add("name")
-        list.add("localId")
-        list.add("localName")
-        list.add("outline")
-        list.add("floorSequenceId")
-        list.add("modelId")
-        list.add("infos")
-        list.add("properties")
-        request.projection = list
-        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
-    } // Function query()
-
-    /**
-     * 查询楼层信息
-     *
-     * @param request     查询信息条件
-     * @return 查询结果
-     */
-    @Operation(summary = "查询楼层信息", description = "级联对象:建筑(building)、项目(project)、楼层贯通关系(floorThroughList)")
-    @PostMapping(value = ["/query"])
-    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
-        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
-    }
-
-}
+//
+//}

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

@@ -28,7 +28,7 @@ package com.persagy.server.controllers.objects
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
 import com.persagy.server.datacenter.models.entities.objects.Shaft
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace

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

@@ -28,7 +28,7 @@ package com.persagy.server.services.assistant
 
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl

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

@@ -33,7 +33,7 @@ import com.persagy.database.SQueryBuilder
 import com.persagy.database.extensions.keyValue
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.services.assistant.ObjInfoService
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService

+ 7 - 220
datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -34,7 +34,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.assistant.ObjInfos
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.assistant.ObjInfoService
@@ -96,134 +96,12 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         }
         equip.codeType = 1
         return true
-    } // Function onCreateBefore()
-
-    override fun onCountSuccess(count: Long) {
-        super.onCountSuccess(count)
-
     }
 
-
-    /**
-     * 查询设备数量之前设置条件
-     *
-     * @param   queryBuilder    条件信息
-     */
-    override fun onCountBefore(queryBuilder: SQueryBuilder<Equipment>) {
-        queryBuilder.tableName = "v_equipment"
-        return
-    }  // Function onCreateBefore()
-
-    /**
-     * 查询设备之前添加条件方法
-     *
-     * @param   queryBuilder    条件信息
-     */
-    override fun onQueryBefore(queryBuilder: SQueryBuilder<Equipment>) {
-        queryBuilder.tableName = "v_equipment"
-        return
-    } // Function onCreateBefore()
-
     /**
      * 修改设备信息之前的操作
      */
     override fun onUpdateBefore(entity: Equipment): Boolean {
-        try {
-            if (entity.propertyId.isNullOrEmpty()) {
-
-//                val property = PropertyService.select(SFilter.eq("equipmentId", entity.id!!)).entity()
-//                logger.debug("设备初次关联*********************************")
-//                if (property!=null){
-//                    property.equipId = null
-//                    val list = ArrayList<Property>()
-//                    list.add(property)
-//                    val sUpdateRequest = SUpdateRequest<Property>()
-//                    sUpdateRequest.content = list
-//                    sUpdateRequest.projection = arrayListOf("EquipmentId")
-//                    PropertyService.updateList(sUpdateRequest)
-//                }
-            } else {
-                val property = PropertyService.select(SFilter.eq("equipId", entity.id!!)).entity()
-                if (property != null) {
-
-                    logger.debug("已经有关联的信息*********************************")
-                    /** 设备关联的资产如果更改了先取消以前的,在关联新的 */
-                    if (entity.propertyId != property.id) {
-                        property.equipId = null
-                        property.bimId = null
-                        val list = ArrayList<Property>()
-                        list.add(property)
-                        val sUpdateRequest = SUpdateRequest<Property>()
-                        sUpdateRequest.content = list
-                        sUpdateRequest.projection = arrayListOf("equipId", "bimId")
-
-                        val updateList = PropertyService.updateList(sUpdateRequest)
-                        val pr = PropertyService.select(SFilter.eq("id", entity.propertyId!!)).entity()
-                        val listp = ArrayList<Property>()
-                        pr!!.equipId = entity.id
-                        pr.bimId = entity.bimId
-                        listp.add(pr)
-                        val sUpdate = SUpdateRequest<Property>()
-                        sUpdate.content = listp
-                        sUpdate.projection = arrayListOf("equipId", "bimId")
-                        PropertyService.updateList(sUpdate)
-                        logger.debug("现在关联**${sUpdate.toJson()}*******************************")
-
-                        try {
-                            /** 处理关系标记 */
-                            val listtype = ArrayList<String>()
-                            listtype.add("pe2bd")
-                            listtype.add("pe2fl")
-                            listtype.add("pe2sh")
-                            listtype.add("pe2sp")
-                            for (type in listtype){
-                                val entity = relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
-                                if (entity!=null){
-                                    entity.computationalState = 2
-                                    relationTypeProjectservice.update(entity)
-                                }
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }
-                } else {
-                    val prop = PropertyService.select(SFilter.eq("id", entity.propertyId!!)).entity()
-                    logger.debug("第一次关联***${prop!!.toJson()}******************************")
-                    if (prop != null) {
-                        prop.equipId = entity.id
-                        prop.lastUpdate = null
-                        prop.createTime = null
-                        prop.name = "1236"
-                        val listp = ArrayList<Property>()
-                        listp.add(prop)
-                        val sUpdate = SUpdateRequest<Property>()
-                        sUpdate.content = listp
-                        sUpdate.projection = arrayListOf("equipId")
-                        val updateList = PropertyService.updateList(sUpdate)
-                        logger.debug("第一次更新信息***${sUpdate.toJson()}******************************")
-                        logger.debug("第一次更新***${updateList.toJson()}******************************")
-                        try {
-                            /** 处理关系标记 */
-                            val listtype = ArrayList<String>()
-                            listtype.add("pe2bd")
-                            listtype.add("pe2fl")
-                            listtype.add("pe2sh")
-                            listtype.add("pe2sp")
-                            for (type in listtype){
-                                val entity = relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
-                                if (entity!=null){
-                                    entity.computationalState = 2
-                                    relationTypeProjectservice.update(entity)
-                                }
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-            }
-
             try {
                 /** 日志 */
                 DataCenterLogsService.addLogs(Opt.projectId!!,"update-before",entity.objectType!!,
@@ -231,11 +109,8 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
         return true
-    } // Function onUpdateBefore()
+    }
 
 
 
@@ -244,59 +119,17 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      * 删除之前操作
      */
     override fun onDeleteBefore(entity: Equipment): Boolean {
-        try {
-            val equipment = this.select(SFilter.eq("id", entity.id!!)).entity()
             try {
+                val equipment = this.select(SFilter.eq("id", entity.id!!)).entity()
                 /** 日志 */
                 DataCenterLogsService.addLogs(Opt.projectId!!,"delete",entity.objectType!!,
-                    entity.id!!,entity,Opt.account,Opt.coming)
+                    entity.id!!,equipment!!,Opt.account,Opt.coming)
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            /** 清除对应关系 */
-            if (equipment != null) {
-                val property = PropertyService.select(SFilter.eq("EquipmentId", equipment.id!!)).entity()
-                if (property != null && equipment.taskState != null && equipment.taskState == -1 && property.taskState != null && property.taskState == -1) {
-                    val list = ArrayList<Property>()
-                    list.add(property)
-                    PropertyService.deleteByKeysList(list)
-                } else {
-                    if (property != null) {
-                        property.equipId = null
-                        property.bimId = null
-                        val list = ArrayList<Property>()
-                        list.add(property)
-                        val sUpdateRequest = SUpdateRequest<Property>()
-                        sUpdateRequest.content = list
-                        val listStr = ArrayList<String>()
-                        listStr.add("EquipmentId")
-                        listStr.add("BIMID")
-                        sUpdateRequest.projection = listStr
-                        PropertyService.updateList(sUpdateRequest)
-                    }
-                }
-            }
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
         return super.onDeleteBefore(entity)
-    } // Function onDeleteBefore()
+    }
 
-    /**
-     * 查询项目下的设备和部件
-     */
-    fun queryEquipCom(): SQueryResponse<Equipment> {
-        return try {
-            val equipList = select(SFilter.eq("projectId", Opt.projectId!!)).exec()
-            val sQueryResponse = SQueryResponse<Equipment>(SResponseType.success)
-            sQueryResponse.content = equipList
-            sQueryResponse
-        } catch (e: Exception) {
-            e.printStackTrace()
-            SQueryResponse(SResponseType.failure)
-        }
-    } // Function queryEquipCom()
 
     override fun onCreateSuccess(entityList: ArrayList<Equipment>) {
         entityList.forEach {
@@ -316,10 +149,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
-                    //添加信息点创建 表号功能号
-                    ObjInfoService.createInfo(entity,true,"Eq",entity.classCode!!)
                 }
-
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -340,8 +170,6 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                         /** 日志 */
                         DataCenterLogsService.addLogs(Opt.projectId!!,"update-after",entity.objectType!!,
                             entity.id!!,entity,Opt.account,Opt.coming)
-                        //更新信息点 表号功能号
-                        ObjInfoService.createInfo(entity,false,"Eq",entity.classCode!!)
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -356,35 +184,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         } catch (e: Exception) {
             e.printStackTrace()
         }
-
-        try {
-            for (entity in entityList){
-                try {
-                    if (!Opt.coming.isNullOrEmpty()){
-                        if (Opt.coming == "app"){
-                            val user = LocationPointServices.userService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("phone", Opt.account!!)).entity()
-                            val userLog = UserLog()
-                            userLog.comming = "app"
-                            userLog.action = "更新设备"
-                            userLog.id = IdUtils.uuidCreate()
-                            userLog.note = "项目ID: "+Opt.projectId+" 用户ID:"+user!!.id+" 手机号:"+ Opt.account+" 请求来源:"+Opt.coming+ " "+entity.toJson()
-                            userLog.phone = Opt.account
-                            userLog.projectId = Opt.projectId
-                            userLog.userId = user.id
-                            userLog.name = user.name
-                            userLog.objectId = entity.id
-                            LocationPointServices.userLogService.insert(userLog)
-                        }
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-
-    } // Function onUpdateSuccess()
+    }
 
     /**
      * @Description:删除成功之后
@@ -392,28 +192,15 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     override fun onDeleteSuccess(entityList: ArrayList<Equipment>) {
         super.onDeleteSuccess(entityList)
         try {
-
-            val oService = SBaseService(SMybatisDao(ObjInfos::class.java))
             for (entity in entityList) {
-
                 try {
                     rabbitMqService.sendObjects(Opt.projectId!!, Opt.DELETE,entity.id!!)
                 } catch (e: Exception) {
                     e.printStackTrace()
                 }
-
-                try {//更新信息点 表号功能号
-                    oService.delete(SFilter.eq("projectId",Opt.projectId!!), SFilter.eq("objId",entity.id!!), SFilter.eq("objType","Eq"))
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
             }
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
-
-
-
-
-} // Object EquipmentService
+}

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

@@ -60,23 +60,22 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
      * 创建之前操作
      */
     override fun onCreateBefore(floor: Floor): Boolean  {
-        val projectId = SPageContext.getHeader("projectId")
-        floor.projectId = projectId
-        /** 楼层id */
+        floor.projectId = Opt.projectId
+        /** 楼层 id */
         if (!floor.id.isNullOrEmpty()) {
             val isWith = floor.id!!.startsWith("Fl")
             if (!isWith) {
-                floor.id = IdUtils.floorIdCreate(projectId!!)
+                floor.id = IdUtils.floorIdCreate(Opt.projectId!!)
             }
         } else {
-            floor.id = IdUtils.floorIdCreate(projectId!!)
+            floor.id = IdUtils.floorIdCreate(Opt.projectId!!)
         }
 
         if (floor.name.isNullOrEmpty()){
             floor.name = ShaftNameUtil.shaftName("楼层-")
         }
         if (!floor.buildingId.isNullOrEmpty()){
-            val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildingId", floor.buildingId!!)).exec()
+            val floorList = select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("buildingId", floor.buildingId!!)).exec()
             if (floorList.size>0){
                 for (floor001 in floorList){
                     if (floor001.floorSequenceId == floor.floorSequenceId){
@@ -86,7 +85,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
             }
         }
         return true
-    } // Function onCreateBefore()
+    }
 
     /**
      * 创建楼层对象
@@ -106,8 +105,8 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
             if (!request.content.isNullOrEmpty()){
                 for (floor in request.content){
                     try {
-                        floor.projectId = projectId
-                        /** 楼层id */
+                        floor.projectId = Opt.projectId!!
+                        /** 楼层 id */
                         if (!floor.id.isNullOrEmpty()) {
                             val isWith = floor.id!!.startsWith("Fl")
                             if (!isWith) {
@@ -134,17 +133,6 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                         }
                         val insert = insert(floor)
                         if (insert){
-//                            try {
-//                                if (!floor.outline.isNullOrEmpty()) {
-//                                    val floorOutline = FloorOutline()
-//                                    floorOutline.id = floor.id
-//                                    floorOutline.outline = floor.outline
-//                                    floorOutlineService.replace(floorOutline)
-//                                }
-//                            } catch (e: Exception) {
-//                                e.printStackTrace()
-//                            }
-
                             try {
                                 rabbitMqService.sendObjects(Opt.projectId!!, Opt.CREATE,floor.id!!)
                             } catch (e: Exception) {
@@ -194,11 +182,6 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
             val listId = ArrayList<String>()
             /** 对象列表不可以为空 */
             if (!request.content.isNullOrEmpty()){
-//                val jsonObject = JSONObject()
-//                jsonObject.put("type", "7")
-//                jsonObject.put("projectId", projectId)
-//                jsonObject.put("obj_type", "Floor")
-//                val jsonArray = JSONArray()
                 /** 遍历楼层列表 */
                 for (floor in request.content!!){
                     if (!floor.buildingId.isNullOrEmpty()){
@@ -219,57 +202,10 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                         }
                     }
                     try {
-                        if (!request.projection.isNullOrEmpty()&&request.projection!!.size>0){
-
-                            val update = update(floor, request.projection)
-                            if (update){
-                                listId.add(floor.id!!)
-                                try {
-//                                    val hashMap = HashMap<String, Any?>()
-//                                    hashMap["Floor"] = floor
-//                                    /** 日志 */
-//                                    val dataCenterLogs = DataCenterLogs(IdUtils.uuidCreate(),projectId,
-//                                        "update-after",hashMap,"dataCenter",floor.id,comming,account)
-//                                    dataCenterLogs.id = IdUtils.uuidCreate()
-//                                    dataCenterLogs.author = "dataCenter"
-//                                    dataCenterLogs.projectId = projectId
-//                                    dataCenterLogs.objectType = "Floor"
-//                                    dataCenterLogs.type = "update-after"
-//                                    dataCenterLogs.account = account
-//                                    dataCenterLogs.coming = comming
-//                                    dataCenterLogs.objectId = floor.id
-//
-//                                    dataCenterLogs.dataSource = hashMap
-//                                    logService.insert(dataCenterLogs)
-
-                                    rabbitMqService.sendObjects(projectId!!, Opt.UPDATE,floor.id!!)
-                                    DataCenterLogsService.addLogs(projectId,"update-after","floor",
-                                        floor.id!!,floor,account,comming)
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }else{
                             val update = update(floor)
-
                             if (update){
                                 listId.add(floor.id!!)
                                 try {
-                                    /** 日志 */
-//                                    val dataCenterLogs = DataCenterLogs()
-//                                    dataCenterLogs.id = IdUtils.uuidCreate()
-//                                    dataCenterLogs.author = "dataCenter"
-//                                    dataCenterLogs.projectId = projectId
-//                                    dataCenterLogs.objectType = "Floor"
-//                                    dataCenterLogs.type = "update-after"
-//                                    dataCenterLogs.account = account
-//                                    dataCenterLogs.coming = comming
-//                                    dataCenterLogs.objectId = floor.id
-//                                    val hashMap = HashMap<String, Any?>()
-//                                    hashMap["Floor"] = floor
-//                                    dataCenterLogs.dataSource = hashMap
-//                                    logService.insert(dataCenterLogs)
-
                                     rabbitMqService.sendObjects(projectId!!, Opt.UPDATE,floor.id!!)
                                     logger.debug("更新标记= ***********************************************************************************")
                                     DataCenterLogsService.addLogs(projectId,"update","floor",
@@ -278,30 +214,19 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                                     e.printStackTrace()
                                 }
                             }
-                        }
+
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
                 }
-
                 if (listId.size>0){
                     for (id in listId){
-//                        val jsonInfos = JSONObject()
-//                        jsonInfos.put("id", id)
-//                        jsonInfos.put("obj_type", "Floor")
-//                        jsonArray.put(jsonInfos)
                         rabbitMqService.sendObjects(projectId!!, Opt.UPDATE,id)
                     }
-//                    jsonObject.put("infos", jsonArray)
-//                    /** 发送消息 */
-//                    messageHandler.sendMessage(jsonObject.toString())
-
                 }
-                val sBaseResponse = SBaseResponse(SResponseType.success)
-                return sBaseResponse
+                return SBaseResponse(SResponseType.success)
             }else{
-                val sBaseResponse = SBaseResponse(SResponseType.failure)
-                return sBaseResponse
+                return SBaseResponse(SResponseType.failure)
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -319,9 +244,8 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
             DataCenterLogsService.addLogs(Opt.projectId!!,"delete","floor",
                 floor!!.id!!,floor,Opt.account,Opt.coming)
         }
-
         return super.onDeleteBefore(entity)
-    } // Function onDeleteBefore()
+    }
 
     /**
      * 更新楼层 Outline
@@ -382,9 +306,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
     override fun onDeleteSuccess(entityList: ArrayList<Floor>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("projectId")
             for (floor in entityList) {
-                ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",floor.id!!), SFilter.eq("objType","Fl"))
                 rabbitMqService.sendObjects(Opt.projectId!!, Opt.DELETE,floor.id!!)
             }
         } catch (e: Exception) {
@@ -401,7 +323,6 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
         super.onCreateSuccess(entityList)
         try {
             for (floor in entityList) {
-                ObjInfoService.createInfo(floor,true,"Fl","Floor")
                 rabbitMqService.sendObjects(floor.projectId!!, Opt.CREATE,floor.id!!)
             }
         } catch (e: Exception) {
@@ -417,15 +338,11 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
     override fun onUpdateSuccess(entityList: ArrayList<Floor>) {
         super.onUpdateSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("projectId")
             for (floor in entityList) {
-                ObjInfoService.createInfo(floor,false,"Fl","Floor")
                 rabbitMqService.sendObjects(floor.projectId!!, Opt.UPDATE,floor.id!!)
             }
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
-
-
 }

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

@@ -32,7 +32,7 @@ import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.assistant.BuildingFloorInfo
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
 import com.persagy.server.datacenter.models.entities.objects.Shaft
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace

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

@@ -32,7 +32,7 @@ import com.persagy.database.SFilter
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.logs.DataCenterLogs
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.scanbuilding.UserLog
 import com.persagy.server.services.base.Service

+ 1 - 0
datacenter/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -41,6 +41,7 @@ import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
 import com.persagy.server.datacenter.models.entities.task.FloorDic
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.services.base.Service
 import com.persagy.server.services.log.DataCenterLogsService
 import com.persagy.server.synchronize.MessageHandler

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/MepSystemCalcService.kt

@@ -33,7 +33,7 @@ import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBl
 import com.persagy.server.datacenter.models.entities.graphtype.block.ConnectedBlockSource
 import com.persagy.server.datacenter.models.entities.graphtype.block.EquipIdUUIDMap
 import com.persagy.server.datacenter.models.entities.graphtype.block.MepSourceTypeEntity
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.rel.REq2Eq
 import com.persagy.server.datacenter.models.entities.task.SpaceType
 import com.persagy.server.mappers.MepSystemMapper

+ 4 - 0
datacenter/src/main/kotlin/com/persagy/server/wanda/a.java

@@ -0,0 +1,4 @@
+package com.persagy.server.wanda;
+
+public class a {
+}

+ 4 - 0
datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/b.java

@@ -0,0 +1,4 @@
+package com.persagy.server.wanda.controllers;
+
+public class b {
+}

+ 9 - 17
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt

@@ -24,10 +24,11 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.controllers.objects
+package com.persagy.server.wanda.controllers.obj
 
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
+import com.persagy.server.Opt
 import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.services.objects.BuildingService
 import com.persagy.service.SPageContext
@@ -56,10 +57,6 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/object/building")
 open class BuildingController {
-    companion object {
-        // 日志
-        private val logger = LoggerFactory.getLogger(BuildingController::class.java)
-    } // Companion object
 
     /**
      * 批量创建建筑
@@ -70,9 +67,8 @@ open class BuildingController {
     @Operation(summary = "创建建筑信息", description = "")
     @PostMapping(value = ["/create"])
     fun create(@RequestBody request: SCreateRequest<Building>): SCreateResponse<Building> {
-        logger.debug("building =${request.toJson()}")
         return BuildingService.createList(request)
-    } // Function create()
+    }
 
     /**
      * 根据id删除建筑
@@ -84,7 +80,7 @@ open class BuildingController {
     @PostMapping(value = ["/delete"])
     fun delete(@RequestBody idList: ArrayList<Building>): SBaseResponse {
         return BuildingService.deleteByKeysList(idList)
-    } // Function delete()
+    }
 
     /**
      * 更新建筑信息
@@ -95,7 +91,6 @@ open class BuildingController {
     @Operation(summary = "更新建筑信息", description = "")
     @PostMapping(value = ["/update"])
     fun update(@RequestBody request: SUpdateRequest<Building>): SBaseResponse {
-        logger.debug("buildingUpdate =${request.toJson()}")
         return BuildingService.updateList(request)
     } // Function update()
 
@@ -108,9 +103,8 @@ open class BuildingController {
     @Operation(summary = "查询建筑信息", description = "级联查询的对象:楼层(floor)、项目(project)")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Building> {
-        logger.debug("buildingQuery =${request.toJson()}")
-        return BuildingService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
-    } // Function query()
+        return BuildingService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
+    }
 
     /**
      * 根据条件查询统计数量
@@ -118,9 +112,7 @@ open class BuildingController {
     @Operation(summary = "根据条件查询统计数量", description = "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
-        val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
-        return BuildingService.count(request,withFilterList)
-    } // Function count()
+        return BuildingService.count(request,arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
+    }
 
-} // Class BuildingController
+}

+ 116 - 0
datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/obj/EquipController.kt

@@ -0,0 +1,116 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.wanda.controllers.obj
+
+import com.persagy.database.SFilter
+import com.persagy.server.Opt
+import com.persagy.server.datacenter.models.entities.assistant.EquipmentProSy
+import com.persagy.server.datacenter.wanda.obj.Equipment
+import com.persagy.server.services.objects.EquipmentProSyService
+import com.persagy.server.services.objects.EquipmentService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.*
+
+/**
+ * 设备接口
+ *
+ * @author 张维新
+ */
+@Tag(name = "004、设备")
+@RestController
+@RequestMapping("/object/equip")
+open class EquipController {
+
+    /**
+     * 创建设备
+     *
+     * @param   request         设备对象
+     * @return                  创建结果信息
+     */
+    @Operation(summary = "创建设备信息", description = "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody request: SCreateRequest<Equipment>): SCreateResponse<Equipment> {
+        return EquipmentService.createList(request)
+    }
+
+    /**
+     * 根据id删除设备
+     *
+     * @param   idList      id数组
+     * @return              删除的结果信息
+     */
+    @Operation(summary = "根据id删除设备信息", description = "")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<Equipment>): SBaseResponse {
+        return EquipmentService.deleteByKeysList(idList)
+    }
+
+    /**
+     * 更新设备信息
+     *
+     * @param   request        更新的内容对象
+     * @return                  更新的结果
+     */
+    @Operation(summary = "更新设备信息", description = "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<Equipment>): SBaseResponse {
+        return EquipmentService.updateList(request)
+    }
+
+    /**
+     * 查询设备信息
+     *
+     * @param   request     查询信息条件
+     * @return              查询结果
+     */
+    @Operation(summary = "查询设备信息", description = "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
+        return EquipmentService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
+    }
+
+    /**
+     * 根据条件查询统计数量
+     */
+    @Operation(summary = "根据条件查询统计数量", description = "")
+    @PostMapping(value = ["/count"])
+    fun count(@RequestBody request: SCountRequest): SCountResponse {
+        return EquipmentService.count(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
+    }
+
+}

+ 146 - 0
datacenter/src/main/kotlin/com/persagy/server/wanda/controllers/obj/FloorController.kt

@@ -0,0 +1,146 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.wanda.controllers.obj
+
+import com.persagy.base.extensions.toJson
+import com.persagy.database.SFilter
+import com.persagy.server.Opt
+import com.persagy.server.datacenter.models.entities.objects.Floor
+import com.persagy.server.services.objects.FloorService
+import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.slf4j.LoggerFactory
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 楼层接口
+ *
+ * @author 张维新
+ */
+@Tag(name = "003、楼层")
+@RestController
+@RequestMapping("/object/floor")
+open class FloorController {
+    /**
+     * 创建楼层
+     *
+     * @param request     楼层对象
+     * @return 创建结果信息
+     */
+    @Operation(summary = "创建楼层", description = "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody request: SCreateRequest<Floor>): SCreateResponse<Floor> {
+        return FloorService.create(request)
+    }
+
+    /**
+     * 根据id删除楼层
+     *
+     * @param idList  id 数组
+     * @return 删除的结果信息
+     */
+    @Operation(summary = "根据id删除楼层", description = "")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<Floor>): SBaseResponse {
+        return FloorService.deleteByKeysList( idList)
+    }
+
+    /**
+     * 更新楼层信息
+     *
+     *
+     * @param request     更新的内容对象
+     * @return 更新的结果
+     */
+    @Operation(summary = "更新楼层信息", description = "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
+        return FloorService.upDates(request)
+    }
+
+    /**
+     * 更新楼层信息-Outline
+     *
+     *
+     * @param   request     更新楼层信息-Outline
+     * @return              更新的结果
+     */
+//    @Operation(summary = "更新楼层信息-Outline", description = "")
+//    @PostMapping(value = ["/update-outline"])
+//    fun updateOutlines(@RequestBody request: SUpdateRequest<Floor>): SBaseResponse {
+//        return FloorService.updateOutline(request)
+//    }
+
+    /**
+     * 查询楼层信息
+     *
+     * @param   request     查询信息条件
+     * @return              查询结果
+     */
+//    @Operation(summary = "查询楼层信息 - outline", description = "")
+//    @PostMapping(value = ["/query-outline"])
+//    fun queryOutline(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
+//        if (!request.projection.isNullOrEmpty()){
+//            request.projection!!.clear()
+//        }
+//        val list = ArrayList<String>()
+//        list.add("id")
+//        list.add("name")
+//        list.add("localId")
+//        list.add("localName")
+//        list.add("outline")
+//        list.add("floorSequenceId")
+//        list.add("modelId")
+//        list.add("infos")
+//        list.add("properties")
+//        request.projection = list
+//        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
+//    } // Function query()
+
+    /**
+     * 查询楼层信息
+     *
+     * @param request     查询信息条件
+     * @return 查询结果
+     */
+    @Operation(summary = "查询楼层信息", description = "级联对象:建筑(building)、项目(project)")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
+        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opt.projectId!!)))
+    }
+
+}

+ 30 - 30
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt

@@ -24,13 +24,18 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.controllers.objects
+package com.persagy.server.wanda.controllers.obj
 
 import com.persagy.database.SFilter
+import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.services.objects.ProjectService
 import com.persagy.service.SPageContext
+import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -55,20 +60,17 @@ private open class ProjectController {
         private val logger = LoggerFactory.getLogger(ProjectController::class.java)
     } // Companion object
 
-//    /**
-//     * 创建项目
-//     *
-//     * @param   code        城市编码
-//     * @param   password    项目密码
-//     * @param   project     项目对象
-//     * @return              创建结果信息
-//     */
-//    @Operation(summary = "创建项目", description = "")
-//    @PostMapping(value = ["/create"])
-//    fun create(code: String?, password: String, @RequestBody project: Project): SCreateResponse {
-//        logger.debug("project =${project.toJson()}")
-//        return ProjectService.create(code, password, project,messageHandler)
-//    } // Function create()
+    /**
+     * 创建项目
+     *
+     * @param  request      对象列表
+     * @return              创建结果信息
+     */
+    @Operation(summary = "创建项目", description = "")
+    @PostMapping(value = ["/create"])
+    fun create(@RequestBody request: SCreateRequest<Project>): SCreateResponse<Project> {
+        return ProjectService.createList(request)
+    }
 
 //    /**
 //     * 根据id删除项目
@@ -82,18 +84,17 @@ private open class ProjectController {
 //        return ProjectService.delete(idList,messageHandler)
 //    } // Function delete()
 
-//    /**
-//     * 更新项目信息
-//     *
-//     * @param   request     更新的内容对象
-//     * @return              更新的结果
-//     */
-//    @Operation(summary = "更新项目信息", description = "")
-//    @PostMapping(value = ["/update"])
-//    fun update(@RequestBody request: SUpdateRequest<Project>): SUpdateResponse {
-//        logger.debug("ProjectUpdate =${request.toJson()}")
-//        return ProjectService.update(request, messageHandler)
-//    } // Function update()
+    /**
+     * 更新项目信息
+     *
+     * @param   request     更新的内容对象
+     * @return              更新的结果
+     */
+    @Operation(summary = "更新项目信息", description = "")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<Project>): SBaseResponse {
+        return ProjectService.updateList(request)
+    }
 
     /**
      * 查询项目信息
@@ -104,13 +105,12 @@ private open class ProjectController {
     @Operation(summary = "查询项目信息", description = "")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Project> {
-//        logger.debug("projectQuery =${request.toJson()}")
         val projectId = SPageContext.getHeader("projectId")
         if (projectId.isNullOrEmpty()){
             return ProjectService.pageQuery(request)
         }else{
             return ProjectService.pageQuery(request, arrayListOf(SFilter.eq("id",projectId)))
         }
-    } // Function query()
+    }
 
-} // Class ProjectController
+}

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectToFromController.kt

@@ -33,6 +33,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.objects.*
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelFromToControllers.kt

@@ -3,7 +3,7 @@ package com.persagy.server.syn.controllers.obj
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelToFromController.kt

@@ -31,7 +31,7 @@ import com.persagy.database.SFilter
 import com.persagy.database.functions.SLength
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.rel.*
 import com.persagy.server.syn.Configure

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/TestControllers.kt

@@ -30,7 +30,7 @@ import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.syn.models.api.obj.BuildingApi

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

@@ -31,7 +31,7 @@ import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Opts
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SSpringContextUtil

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/services/BaseDataService.kt

@@ -32,6 +32,7 @@ import com.persagy.server.datacenter.models.entities.dictnew.Group
 import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterComponent.kt

@@ -29,7 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/DataCenterEquipment.kt

@@ -29,7 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdComponent.kt

@@ -30,7 +30,7 @@ import com.alibaba.fastjson.JSONObject
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdEquip.kt

@@ -29,7 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdRelationAdd.kt

@@ -29,7 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdRelationDel.kt

@@ -29,7 +29,7 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.*

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

@@ -28,7 +28,7 @@ package com.persagy.server.controllers
 
 import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.response.EquipAssetComponentsReqponse
 import com.persagy.server.models.*

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/controllers/ShaftController.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.controllers
 
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
 import com.persagy.server.datacenter.models.entities.objects.Shaft
 import com.persagy.server.models.objects.FloorCompon

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/controllers/SpaceController.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.controllers
 
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.GeneralSystem
 import com.persagy.server.datacenter.models.entities.objects.ZoneIspace
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/ComponentCascade.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.models
 
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Table

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt

@@ -32,7 +32,7 @@ import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.models.entities.dict.EquipFamilyCategory
 import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.datacenter.models.entities.objects.Building
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.models.objects.FloorCompon
 import com.persagy.service.models.annotations.SCascade

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/models/labsl/EquipTypeLabsl.kt

@@ -26,7 +26,7 @@
 
 package com.persagy.server.models.labsl
 
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import io.swagger.v3.oas.annotations.media.Schema
 import javax.persistence.Column
 import javax.persistence.Table

+ 1 - 3
equip-component/src/main/kotlin/com/persagy/server/service/EquipmentComService.kt

@@ -39,8 +39,8 @@ import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.datacenter.models.entities.objects.*
 import com.persagy.server.datacenter.models.entities.rel.REq2Sp
-import com.persagy.server.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.models.planar.PlanarEquip
 import com.persagy.server.models.requests.PlanarEquipRequests
 import com.persagy.server.service.base.Service
@@ -58,9 +58,7 @@ import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
 import org.slf4j.LoggerFactory
-import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.collections.HashSet
 
 /**

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/EquipmentORComService.kt

@@ -28,7 +28,7 @@ package com.persagy.server.service
 
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.service.base.Service
 
 /**

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/base/BaseDataService.kt

@@ -28,7 +28,7 @@ package com.persagy.server.service.base
 
 
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.models.ComponentCascade
 import com.persagy.server.models.TenantCascade
 import com.persagy.service.SObjectService

+ 0 - 90
equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

@@ -151,106 +151,16 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
 //                    }
 //                }
                 dictStage.infos = funcIdList
-                logger.debug("阶段=${dictStage.code}*************************************************")
             }
-            logger.debug("结束*************************************************")
             dictInfoResponse.basicInfos = defFuncIdList
             dictInfoResponse.dictStages = dictStageList
             dictInfoResponse.result = SResponseType.success
             return dictInfoResponse
-            logger.debug("结束2*************************************************")
         } catch (e: Exception) {
             e.printStackTrace()
             dictInfoResponse.result = SResponseType.failure
             dictInfoResponse.message = "错误"
         }
         return dictInfoResponse
-
     }
-
-
-    /**
-     * 类型下信息点查询
-     *
-     * @param category    分类
-     */
-//    fun dictEquipInfoQuery(category: String): SQueryResponse<DictInfoResponse> {
-//        val sQueryResponse = SQueryResponse<DictInfoResponse>()
-//        val dictInfoResponse = DictInfoResponse()
-//        try {//        val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
-////                ,SFilter.eq("classCode", category)).exec()
-////        val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
-////                ,SFilter.eq("classCode", category)).exec()
-//            var defFuncIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),
-//                    SFilter.inList("code", arrayListOf("bimTypeId","name","localName","localId"))).exec()
-////            if (defFuncIdList.size == 0 ) {
-////                defFuncIdList = DefFuncIdService.select(SFilter.eq("type","group"),
-////                        SFilter.inList("code", arrayListOf("bimTypeId","name","localName","localId"))).exec()
-////                if (defFuncIdList.size == 0) {
-////                    defFuncIdList = DefFuncIdService.select(SFilter.eq("type","common"),
-////                            SFilter.inList("code", arrayListOf("bimTypeId","name","localName","localId"))).exec()
-////                }
-////            }
-//            for (defFuncId in defFuncIdList) {
-//                if (defFuncId.code == "name"){
-//                    defFuncId.code = "systemCategory"
-//                    defFuncId.name = "系统分类"
-//                    defFuncId.aliasCode = "systemCategory"
-//                    defFuncId.aliasName = "系统分类"
-//                } else if (defFuncId.code == "localName"){
-//                    defFuncId.code = "codeName"
-//                    defFuncId.name = "设备类型名称"
-//                    defFuncId.aliasCode = "codeName"
-//                    defFuncId.aliasName = "设备类型名称"
-//                }
-//            }
-//
-//            val dictStageList = dictStageService.selectAll().exec()
-//            for (dictStage in dictStageList) {
-//                val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
-//                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
-//                val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
-//                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
-//                if (dictInfosWanDaProjectList.size>0){
-//                    dictInfosWanDaGroupList.addAll(dictInfosWanDaProjectList)
-//                }
-//                var setCode = HashSet<String>()
-//                for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
-//                    setCode.add(dictInfosWanDaGroup.code!!)
-//                }
-//                var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
-//                        SFilter.inList("code", setCode.toList())).order("code").exec()
-////                if (funcIdList.size == 0 ) {
-////                    funcIdList = DefFuncIdService.select(SFilter.eq("type","group"),
-////                            SFilter.eq("groupCode",Opt.groupCode!!),SFilter.eq("classCode", category),
-////                            SFilter.inList("code", setCode.toList())).order("code").exec()
-////                    if (funcIdList.size == 0) {
-////                        funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),SFilter.eq("classCode", category),
-////                                SFilter.inList("code",  setCode.toList())).order("code").exec()
-////                    }
-////                }
-//                dictStage.infos = funcIdList
-//                logger.debug("阶段=${dictStage.code}*************************************************")
-//        }
-//            logger.debug("结束*************************************************")
-//            dictInfoResponse.basicInfos = defFuncIdList
-////            dictInfoResponse.dictStages = dictStageList
-//            dictInfoResponse.result = SResponseType.success
-//
-//            val list = ArrayList<DictInfoResponse>()
-//            list.add(dictInfoResponse)
-//            sQueryResponse.content = list
-//            return sQueryResponse
-//            logger.debug("结束2*************************************************")
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            dictInfoResponse.result = SResponseType.failure
-//            dictInfoResponse.message = "错误"
-//        }
-//        return sQueryResponse
-//
-//    }
-
-
-
 }

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -35,7 +35,7 @@ import com.persagy.server.Opt
 import com.persagy.server.dao.mappers.CustomSql
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.REq2Sp

+ 3 - 3
equip-component/src/main/kotlin/com/persagy/server/utils/MatchingProperty.kt

@@ -32,7 +32,7 @@ import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.eq
 import com.persagy.server.dao.mappers.EquipmentZoneMapper
 import com.persagy.server.datacenter.models.entities.assistant.PointD
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Property
 import com.persagy.server.models.SimilarityDegree
 import com.persagy.service.utils.SSpringContextUtil
@@ -334,7 +334,7 @@ object MatchingProperty {
     /**
      * 相似度方法
      */
-    fun similarity(equipment: Equipment, list: ArrayList<Property>,propertyList: ArrayList<Property> ): ArrayList<Property> {
+    fun similarity(equipment: Equipment, list: ArrayList<Property>, propertyList: ArrayList<Property> ): ArrayList<Property> {
         /** 相似度 */
         for (property in list) {
             if (!property.localName.isNullOrEmpty()&& similarityDegree(equipment.localName!!,property.localName!!)){
@@ -401,7 +401,7 @@ object MatchingProperty {
     /**
      * 根据坐标x,y
      */
-    fun  pointXY(equipment: Equipment, list: ArrayList<Property>,propertyList: ArrayList<Property> ): ArrayList<Property> {
+    fun  pointXY(equipment: Equipment, list: ArrayList<Property>, propertyList: ArrayList<Property> ): ArrayList<Property> {
         val distancePropertyList = ArrayList<Property>()
 
         for (property in list) {

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/services/EquipmentService.kt

@@ -29,7 +29,7 @@ package com.persagy.server.services
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.services.base.Service
 import com.persagy.service.SBaseService
 import org.slf4j.LoggerFactory

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

@@ -35,7 +35,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
 import com.persagy.server.datacenter.models.entities.assistant.TaskPic
-import com.persagy.server.datacenter.models.entities.objects.Equipment
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.task.EquipScanTask
 import com.persagy.server.datacenter.models.entities.task.SchemeUtils
 import com.persagy.server.scanbuilding.UserLog

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

@@ -37,7 +37,7 @@ import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opts
 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.wanda.obj.Equipment
 import com.persagy.server.datacenter.models.entities.task.*
 import com.persagy.server.datacenter.models.requests.ModelScanSQueryRequest
 import com.persagy.server.mappers.StatisticsCountMapper