Browse Source

********************WX************************
调整发布草稿图形函数

zhangweixin 4 years ago
parent
commit
4ae5e9cea6
100 changed files with 1331 additions and 587 deletions
  1. 10 9
      data-center/src/main/kotlin/com/persagy/server/Swagger2Config.kt
  2. 58 5
      data-center/src/main/kotlin/com/persagy/server/controllers/dict/DictControllers.kt
  3. 5 5
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt
  4. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt
  5. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt
  6. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt
  7. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt
  8. 1 1
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt
  9. 1 1
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt
  10. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt
  11. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt
  12. 2 2
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt
  13. 6 6
      data-center/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt
  14. 1 1
      data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt
  15. 1 1
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt
  16. 23 23
      data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt
  17. 45 0
      data-center/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt
  18. 3 0
      data-center/src/main/kotlin/com/persagy/server/mappers/MepSystemMapper.kt
  19. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt
  20. 9 9
      data-center/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt
  21. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/assistant/UpDataFloorAndBuildingServuce.kt
  22. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/base/Service.kt
  23. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt
  24. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt
  25. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt
  26. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt
  27. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt
  28. 293 43
      data-center/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt
  29. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt
  30. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockSourceService.kt
  31. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt
  32. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeService.kt
  33. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt
  34. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/objects/BuildingService.kt
  35. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt
  36. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt
  37. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt
  38. 11 11
      data-center/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt
  39. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt
  40. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/objects/PropertyService.kt
  41. 13 13
      data-center/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt
  42. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/objects/SpaceService.kt
  43. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/objects/TenantService.kt
  44. 9 9
      data-center/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt
  45. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/rel/REq2SpService.kt
  46. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt
  47. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForFlService.kt
  48. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForShService.kt
  49. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt
  50. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqInShService.kt
  51. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/rel/REqInSpBaseService.kt
  52. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RFlThroughFlService.kt
  53. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/rel/RIspaceAdjacentIspaceService.kt
  54. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/rel/RShContainSpBaseService.kt
  55. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RShaftThroughShaftService.kt
  56. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSp2SiService.kt
  57. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInBdService.kt
  58. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInFlService.kt
  59. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInSiBaseService.kt
  60. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSpatialConnectionService.kt
  61. 7 7
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyEqService.kt
  62. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForBdService.kt
  63. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForFlService.kt
  64. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForShService.kt
  65. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForSpBaseService.kt
  66. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInBdService.kt
  67. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt
  68. 8 8
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.kt
  69. 6 6
      data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInSpBaseService.kt
  70. 4 4
      data-center/src/main/kotlin/com/persagy/server/services/rel/RTnInSpBaseService.kt
  71. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/relation_calc/CalcSpecialService.kt
  72. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt
  73. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskQueryService.kt
  74. 3 3
      data-center/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt
  75. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt
  76. 5 5
      data-center/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt
  77. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt
  78. 1 1
      data-center/src/main/kotlin/com/persagy/server/services/task/RecordProblemsService.kt
  79. 2 2
      data-center/src/main/kotlin/com/persagy/server/services/task/ScanTaskBaseService.kt
  80. 4 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBatchProcessing.kt
  81. 1 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefClass.kt
  82. 12 2
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt
  83. 14 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdProject.kt
  84. 24 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdScheme.kt
  85. 11 13
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictMajor.kt
  86. 18 6
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictProject.kt
  87. 27 5
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/Group.kt
  88. 2 1
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/CategoryRequest.kt
  89. 2 2
      datasyn/src/main/kotlin/com/persagy/server/syn/Swagger2Config.kt
  90. 1 1
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/DictControllers.kt
  91. 44 0
      datasyn/src/main/kotlin/com/persagy/server/syn/controllers/DictSchemeControllers.kt
  92. 6 0
      datasyn/src/main/kotlin/com/persagy/server/syn/models/DictPlatformInfo.kt
  93. 8 2
      datasyn/src/main/kotlin/com/persagy/server/syn/models/DictProject.kt
  94. 20 4
      datasyn/src/main/kotlin/com/persagy/server/syn/models/Group.kt
  95. 31 15
      datasyn/src/main/kotlin/com/persagy/server/syn/models/api/DictTypeApi.kt
  96. 5 3
      datasyn/src/main/kotlin/com/persagy/server/syn/models/response/DictMajorResponse.kt
  97. 198 174
      datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DClassDefService.kt
  98. 198 0
      datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DictSchemeService.kt
  99. 1 1
      equip-componnet/src/main/kotlin/com/persagy/server/controllers/PropertyController.kt
  100. 0 0
      equip-componnet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt

+ 10 - 9
data-center/src/main/kotlin/com/persagy/server/Swagger2Config.kt

@@ -129,9 +129,9 @@ open class Swagger2Config {
         val builderComming = ParameterBuilder()
         val builderPhone = ParameterBuilder()
         val pars = ArrayList<Parameter>()
-        builder.name("ProjectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderComming.name("Coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderPhone.name("Account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builder.name("projectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderComming.name("coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderPhone.name("account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
         pars.add(builder.build())
         pars.add(builderComming.build())
         pars.add(builderPhone.build())
@@ -155,9 +155,9 @@ open class Swagger2Config {
         val builderComming = ParameterBuilder()
         val builderPhone = ParameterBuilder()
         val pars = ArrayList<Parameter>()
-        builder.name("ProjectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderComming.name("Coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderPhone.name("Account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builder.name("projectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderComming.name("coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderPhone.name("account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
         pars.add(builder.build())
         pars.add(builderComming.build())
         pars.add(builderPhone.build())
@@ -183,9 +183,9 @@ open class Swagger2Config {
         val builderComming = ParameterBuilder()
         val builderPhone = ParameterBuilder()
         val pars = ArrayList<Parameter>()
-        builder.name("ProjectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderComming.name("Coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-        builderPhone.name("Account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builder.name("projectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderComming.name("coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+        builderPhone.name("account").description("账号信息").modelRef(ModelRef("string")).parameterType("header").required(false).build()
         pars.add(builder.build())
         pars.add(builderComming.build())
         pars.add(builderPhone.build())
@@ -233,4 +233,5 @@ open class Swagger2Config {
                 .version(version)
                 .build()
     } // Function apiInfo()
+
 } // Class Swagger2Config

+ 58 - 5
data-center/src/main/kotlin/com/persagy/server/controllers/dict/DictControllers.kt

@@ -1,9 +1,14 @@
 package com.persagy.server.controllers.dict
 
+import com.persagy.server.datacenter.models.entities.dict.DictBatchProcessing
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
+import com.persagy.server.datacenter.models.entities.dictnew.DefFuncIdProject
 import com.persagy.server.datacenter.models.requests.CategoryRequest
 import com.persagy.server.services.dict.dictnew.DictDefClassService
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
@@ -15,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController
 /**
  * 字典
  *
- * @author  wx
+ * @author wx  <zhangweixin@sagacloud.cn>
  * @date  2020/9/23 15:30
  */
 @Api(tags = ["040、字典"])
@@ -26,24 +31,72 @@ class DictControllers {
     /**
      * 字典查询所有设备类型、部件所有类型、系统类型、专业类型
      *
-     * @param   type        查询信息条件
-     * @return              查询结果
+     * @param  categoryRequest        查询信息条件
+     * @return 查询结果
      */
     @ApiOperation(value = "类型-字典查询所有设备类型、部件所有类型、系统类型、专业类型", notes = "输入设备类型:equipment,输入部件类型:component,输入系统类型:system,输入专业类型:major," +
             "专业和系统:majorSystem,业务空间类型 space ,专业下的设备类型 majorEquipment ,设备和部件equipmentAndComponent,设备类型要以及对应的部件equipmentComponent,专业下的系统,系统下的设备majorSystemEquip ")
     @PostMapping(value = ["/category"])
     fun categoryQuery(@RequestBody categoryRequest: CategoryRequest): SQueryResponse<DefClass> {
         return DictDefClassService.equipQuery(categoryRequest)
-    } // Function query()
+    } // Fun categoryQuery()
 
     /**
+     * 项目字典
      *
+     * @param categoryRequest   查询条件
+     * @return 查询结构
      */
     @ApiOperation(value ="查询项目下类型的信息点",notes = "")
     @PostMapping(value = ["/query"])
     fun categoryInfoQuery(@RequestBody categoryRequest: CategoryRequest): SQueryResponse<DefFuncId>{
         return DictDefClassService.categoryInfoQuery(categoryRequest)
-    } // Function query()
+    } // Fun query()
 
+    /**
+     * 项目定制化设置
+     *
+     * @param request   信息点对象列表
+     * @return 返回结果
+     */
+    @ApiOperation(value = "设置-项目定制化字典", notes = "")
+    @PostMapping(value = ["/setting-dic-project"])
+    fun settingDict(@RequestBody request: SCreateRequest<DefFuncIdProject>): SCreateResponse<DefFuncIdProject> {
+        return DictDefClassService.settingDict(request)
+    } // Fun settingDict()
+
+    /**
+     * 重置-根据类型项目id 具体对象类型重置
+     *
+     * @param categoryRequest 类型
+     * @return 返回结果
+     */
+    @ApiOperation(value = "重置-根据类型项目id 具体对象类型重置", notes = "重置项目下具体的类别")
+    @PostMapping(value = ["/reset-type"])
+    fun resetType(@RequestBody categoryRequest: CategoryRequest): SBaseResponse {
+        return DictDefClassService.resetType(categoryRequest)
+    } // Fun resetType()
+
+    /**
+     * 重置-根据项目id
+     */
+    @ApiOperation(value = "重置-根据项目id", notes = "重置项目下所有得定制信息点")
+    @PostMapping(value = ["/reset-dic"])
+    fun resetProjectId(): SBaseResponse{
+        return DictDefClassService.resetProjectId()
+    } // Fun reset()
+
+    /**
+     * 批量处理字典信息操作
+     *
+     * @param request   条件
+     * @return 返回结果
+     */
+    @ApiOperation(value = "批量处理字典信息操作", notes = "方案id :全新设定(schemeZero)、方案1(schemeOne)、方案2(schemeTwo)," +
+            "注意SchemeId为必填字段 ,优先级在列表中[R,S,M] ,一级标签[技术参数,基本参数] 列表为String类型")
+    @PostMapping(value = ["/dict-batch"])
+    fun createList(@RequestBody request: DictBatchProcessing): SCreateResponse<DictBatchProcessing>{
+        return DictDefClassService.setSchemeProject(request)
+    } // Function createList()
 
 } // Class DictControllers

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/controllers/objects/BuildingController.kt

@@ -20,12 +20,12 @@
 
 package com.persagy.server.controllers.objects
 
-import com.persagy.server.datacenter.models.entities.dictdatacenter.DictDatacenterProjectcustom
-import com.persagy.server.datacenter.models.entities.objects.Building
-import com.persagy.server.services.objects.BuildingService
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dictdatacenter.DictDatacenterProjectcustom
+import com.persagy.server.datacenter.models.entities.objects.Building
+import com.persagy.server.services.objects.BuildingService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCountRequest
@@ -108,7 +108,7 @@ open class BuildingController {
     @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())))
+        return BuildingService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
     /**
@@ -118,7 +118,7 @@ open class BuildingController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
 
         /** 服务 */
         val dictRentalservice = SObjectService(SMybatisDao(DictDatacenterProjectcustom::class.java))

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ComponentController.kt

@@ -104,7 +104,7 @@ open class ComponentController {
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
         logger.debug("equipQuery =${request.toJson()}")
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return ComponentService.pageQuery(request,withFilterList)
     } // Function query()
 
@@ -115,7 +115,7 @@ open class ComponentController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return ComponentService.count(request,withFilterList)
     } // Function count()
 

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/EquipController.kt

@@ -129,7 +129,7 @@ open class EquipController {
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
         logger.debug("equipQuery =${request.toJson()}")
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return EquipmentService.pageQuery(request, withFilterList)
     } // Function query()
 
@@ -142,7 +142,7 @@ open class EquipController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return EquipmentService.count(request, withFilterList)
     } // Function count()
 

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/FloorController.kt

@@ -128,7 +128,7 @@ open class FloorController {
         list.add("StructureInfo")
         list.add("ModelId")
         request.projection = list
-        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
 
@@ -142,6 +142,6 @@ open class FloorController {
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Floor> {
         logger.debug("floorQuery =${request.toJson()}")
-        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        return FloorService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 } // Class FloorController

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/GeneralSystemController.kt

@@ -117,7 +117,7 @@ open class GeneralSystemController {
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<GeneralSystem> {
         logger.debug("generalSystemQuery =${request.toJson()}")
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
        return GeneralSystemService.pageQuery(request,withFilterList)
     } // Function query()
 
@@ -145,7 +145,7 @@ open class GeneralSystemController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return GeneralSystemService.count(request,withFilterList)
     } // Function count()
 

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/controllers/objects/LocationPointController.kt

@@ -102,7 +102,7 @@ open class LocationPointController {
     @ApiOperation(value = "查询点位标签信息", notes = "级联查询:点位的图片imageList")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<LocationPoint> {
-        return LocationPointServices.pageQuery(request,arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        return LocationPointServices.pageQuery(request,arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
     /**

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt

@@ -99,7 +99,7 @@ private open class ProjectController {
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Project> {
 //        logger.debug("projectQuery =${request.toJson()}")
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (projectId.isNullOrEmpty()){
             return ProjectService.pageQuery(request)
         }else{

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/PropertyController.kt

@@ -100,7 +100,7 @@ open class PropertyController {
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Property> {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return PropertyService.pageQuery(request,withFilterList)
     } // Function query()
 
@@ -112,7 +112,7 @@ open class PropertyController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return PropertyService.count(request,withFilterList)
     } // Function count()
 

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt

@@ -91,7 +91,7 @@ class ShaftController {
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Shaft> {
         logger.debug("ShaftQuery =${request.toJson()}")
-        return ShaftService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        return ShaftService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
     /**
@@ -217,7 +217,7 @@ class ShaftController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return ShaftService.count(request,withFilterList)
     } // Function count()
 

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/controllers/objects/TenantController.kt

@@ -86,7 +86,7 @@ open class TenantController {
     @ApiOperation(value = "查询租户", notes = "级联-租赁租户分区(zoneTenantList)、租赁默认分区(zoneGeneraltList)")
     @PostMapping(value = ["/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Tenant> {
-        return TenantService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        return TenantService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
     /**
@@ -108,7 +108,7 @@ open class TenantController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return TenantService.count(request,withFilterList)
     } // Function count()
 

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/controllers/objects/ZoneSpaceController.kt

@@ -75,8 +75,8 @@ open class ZoneSpaceController {
 //    @PostMapping(value = ["/query"])
 //    fun query(@RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace> {
 //        logger.debug("metaSpaceQuery =${request.toJson()}")
-////        arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
-//        val projectId = SPageContext.getHeader("ProjectId")
+////        arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
+//        val projectId = SPageContext.getHeader("projectId")
 //        if (projectId.isNullOrEmpty()){
 //            return ZoneSpaceBaseService.pageQuery(request)
 //        }else{
@@ -91,7 +91,7 @@ open class ZoneSpaceController {
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return ZoneSpaceBaseService.count(request,withFilterList)
     } // Function count()
 
@@ -201,8 +201,8 @@ open class ZoneSpaceController {
     @PostMapping(value = ["/query-outline"])
     fun queryOutline(@RequestBody request: DCSQueryRequest): SpaceSQueryResponse {
 //        logger.debug("metaSpaceQuery =${request.toJson()}")
-//        arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
-        val projectId = SPageContext.getHeader("ProjectId")
+//        arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
+        val projectId = SPageContext.getHeader("projectId")
         if (!request.projection.isNullOrEmpty()){
             request.projection!!.clear()
         }
@@ -238,7 +238,7 @@ open class ZoneSpaceController {
     @ApiOperation(value = "获取项目下已有的空间类型", notes = "")
     @PostMapping(value = ["/space-type"])
     fun spaceType(): SQueryResponse<SpaceType>{
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         return mepSystemCalc.spaceTypes(projectId!!)
     } // Function
 

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/controllers/rel/RShContainSpBaseController.kt

@@ -138,7 +138,7 @@ class RShContainSpBaseController {
     @ApiOperation(value = "查询空间类型和名称",notes = "")
     @PostMapping(value = ["/space-type-query"])
     fun spaceTypeQuery(shaftId: String): SQueryResponse<SpaceInfoDic> {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return RShContainSpBaseService.spaceTypeQuery(projectId,shaftId)
     } // Function spaceTypeQuery()
 

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/MepSystemCalcController.kt

@@ -36,7 +36,7 @@ class MepSystemCalcController {
     @ApiOperation(value = "添加源设备", notes = "")
     @PostMapping(value = ["/source/add"])
     fun query(@RequestBody entity: SCreateRequest<MepSourceTypeEntity>): SCreateResponse<MepSourceTypeEntity> {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         var calcName : String? = null
         entity.content.forEach {
             if(it.projectId.isNullOrBlank())

+ 23 - 23
data-center/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt

@@ -36,7 +36,7 @@ class RelationCalcController {
     @PostMapping(value = ["/bd2sp"])
     fun calcBd2Sp(objectTypes: String?): SBaseResponse {
         logger.debug("calcBd2Sp --------------")
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.calcBd2Sp(objectTypes,projectId)
     } // Function calcBd2Sp()
 
@@ -47,7 +47,7 @@ class RelationCalcController {
     @PostMapping(value = ["/eq2bd"])
     fun calcEq2Bd(relationType: String?): SBaseResponse {
         logger.debug("calcEq2Bd --------------")
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.calcEq2Bd(projectId)
     } // Function calcEq2Bd()
 
@@ -58,7 +58,7 @@ class RelationCalcController {
     @PostMapping(value = ["/eq2fl"])
     fun calcEq2Fl(): SBaseResponse{
         logger.debug("calcEq2Fl --------------")
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.calcEq2Fl(projectId)
     } // Function calcEq2Fl()
 
@@ -70,7 +70,7 @@ class RelationCalcController {
     @PostMapping(value = ["/eq2sh"])
     fun calcEq2Sh(): SBaseResponse {
         logger.debug("calcEq2Sh --------------")
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.calcEq2Sh(projectId)
     } // Function calcEq2Sh()
 
@@ -84,7 +84,7 @@ class RelationCalcController {
             "sign 是否要删除手动维护的关系(不填默认为false), boolean型, 值为true或false (true表示删除自动和手动维护的关系, false表示只删除自动计算的的关系)")
     @PostMapping(value = ["/eq2sp_in"])
     fun calcEq2Sp(objectTypes: String?): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcEq2Sp --------------  $projectId")
         return service.calcEq2Sp(objectTypes,projectId, false)
     } // Function calcEq2Sp()
@@ -98,7 +98,7 @@ class RelationCalcController {
     @ApiOperation(value = "楼层贯通关系", notes = "")
     @PostMapping(value = ["/fl2fl"])
     fun calcFl2Fl(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcFl2Fl --------------$projectId")
         return service.calcFl2Fl(projectId)
     } // Function calcFl2Fl()
@@ -112,7 +112,7 @@ class RelationCalcController {
     @PostMapping(value = ["/fl2sp"])
     fun calcFl2Sp(objectTypes: String?): SBaseResponse {
         logger.debug("calcFl2Sp --------------")
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.calcFl2Sp(objectTypes,projectId)
     } // Function calcFl2Sp()
 
@@ -122,7 +122,7 @@ class RelationCalcController {
     @ApiOperation(value = "资产所在建筑", notes = "")
     @PostMapping(value = ["/pe2bd"])
     fun calcPe2Bd(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcPe2Bd --------------$projectId")
         return service.calcPe2Bd(projectId)
     } // Function calcPe2Bd()
@@ -133,7 +133,7 @@ class RelationCalcController {
     @ApiOperation(value = "资产所在楼层", notes = "")
     @PostMapping(value = ["/pe2fl"])
     fun calcPe2Fl(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcPe2Fl --------------$projectId")
         return service.calcPe2Fl(projectId)
     } // Function calcPe2Fl()
@@ -144,7 +144,7 @@ class RelationCalcController {
     @ApiOperation(value = "资产所在竖井", notes = "")
     @PostMapping(value = ["/pe2sh"])
     fun calcPe2Sh(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcPe2Sh --------------$projectId")
         return service.calcPe2Sh(projectId)
     } // Function property2Shaft()
@@ -155,7 +155,7 @@ class RelationCalcController {
     @ApiOperation(value = "资产所在业务空间", notes = "")
     @PostMapping(value = ["/pe2sp"])
     fun calcPe2Sp(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcPe2Sp --------------$projectId")
         return service.calcPe2Sp(projectId)
     } // Function calcPe2Sp()
@@ -166,7 +166,7 @@ class RelationCalcController {
     @ApiOperation(value = "建筑下的竖井", notes = "************************************************************")
     @PostMapping(value = ["/sh2bd"])
     fun calcSh2Bd(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSh2Bd --------------$projectId")
         return service.calcSh2Bd(projectId)
     } // Function calcSh2Bd()
@@ -177,7 +177,7 @@ class RelationCalcController {
     @ApiOperation(value = "竖井贯通", notes = "")
     @PostMapping(value = ["/sh2sh"])
     fun calcSh2Sh(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSh2Sh --------------$projectId")
         return service.calcSh2Sh(projectId)
     } // Function calcSh2Sh()
@@ -188,7 +188,7 @@ class RelationCalcController {
     @ApiOperation(value = "建筑下的系统设备部件", notes = "")
     @PostMapping(value = ["/syeq2bd"])
     fun calcSyEq2Bd(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSyEq2Bd --------------$projectId")
         return service.calcSyEq2Bd(projectId)
     } // Function calcSyEq2Bd()
@@ -199,7 +199,7 @@ class RelationCalcController {
     @ApiOperation(value = "系统所在建筑", notes = "")
     @PostMapping(value = ["/sy2bd"])
     fun calcSy2Bd(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Bd --------------$projectId")
         return service.calcSy2Bd(projectId)
     } // Function calcSy2Bd()
@@ -210,7 +210,7 @@ class RelationCalcController {
     @ApiOperation(value = "系统所在楼层", notes = "")
     @PostMapping(value = ["/sy2fl"])
     fun calcSy2Fl(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Fl --------------$projectId")
         return service.calcSy2Fl(projectId)
     } // Function calcSy2Fl()
@@ -221,7 +221,7 @@ class RelationCalcController {
     @ApiOperation(value = "系统所在竖井", notes = "")
     @PostMapping(value = ["/sy2sh"])
     fun calcSy2Sh(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Sh --------------$projectId")
         return service.calcSy2Sh(projectId)
     } // Function calcSy2Sh()
@@ -232,7 +232,7 @@ class RelationCalcController {
     @ApiOperation(value = "系统所在业务空间", notes = "")
     @PostMapping(value = ["/sy2sp"])
     fun calcSy2Sp(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Sp --------------$projectId")
         return service.calcSy2Sp(projectId)
     } // Function calcSy2Sp()
@@ -243,7 +243,7 @@ class RelationCalcController {
     @ApiOperation(value = "空间普通交通", notes = "")
     @PostMapping(value = ["/sp2sp_TrafficNetwork_1"])
     fun sp2sp_TrafficNetwork_1(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Sp --------------$projectId")
         return service.sp2spTransport(projectId)
     } // Function sp2sp_TrafficNetwork_1()
@@ -254,7 +254,7 @@ class RelationCalcController {
     @ApiOperation(value = "光照连通", notes = "")
     @PostMapping(value = ["/sp2sp_RadiationNetwork_1"])
     fun sp2spRadiationNetwork1(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Sp --------------$projectId")
         return service.sp2spLight(projectId)
     } // Function sp2spRadiationNetwork1()
@@ -265,7 +265,7 @@ class RelationCalcController {
     @ApiOperation(value = "空气自然对流", notes = "")
     @PostMapping(value = ["/sp2sp_ConvectionNetwork_1"])
     fun sp2spConvectionNetwork1(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.sp2spConvection(projectId)
     } // Fun
 
@@ -275,7 +275,7 @@ class RelationCalcController {
     @ApiOperation(value = "空间连通", notes = "")
     @PostMapping(value = ["/sp2sp_SpaceNeighborhood_5"])
     fun sp2spV2(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return service.sp2spV2(projectId)
     } // Fun
 
@@ -286,7 +286,7 @@ class RelationCalcController {
     @ApiOperation(value = "标记需要计算关系", notes = "")
     @PostMapping(value = ["/sign"])
     fun setMark(): SBaseResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcSy2Sp --------------$projectId")
         return service.setMarks(projectId)
     } // Function calcSy2Sp()

File diff suppressed because it is too large
+ 45 - 0
data-center/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt


+ 3 - 0
data-center/src/main/kotlin/com/persagy/server/mappers/MepSystemMapper.kt

@@ -9,6 +9,9 @@ import org.apache.ibatis.annotations.Select
 import org.apache.ibatis.annotations.SelectProvider
 import org.springframework.stereotype.Repository
 
+/**
+ *
+ */
 @Mapper
 @Repository
 interface MepSystemMapper {

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/assistant/RUpDateEquipAndSapceService.kt

@@ -35,7 +35,7 @@ object RUpDateEquipAndSapceService {
     fun rUpDateEquipAndSapces(rUpDateEquipAndSapceRequest: RUpDateEquipAndSapceRequest): SBaseResponse {
         return try {
             val sBaseResponse = SBaseResponse()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             /** 模型重新上传做标记 */
             try {

+ 9 - 9
data-center/src/main/kotlin/com/persagy/server/services/assistant/StatisticsService.kt

@@ -36,7 +36,7 @@ open class StatisticsService{
      * 不能同步到物理世界的关系数据
      */
     fun unSynchronizeRelation(): SCountResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val count1 = mapper.sh2bdCount(projectId)
         val count2 = mapper.sh2flCount(projectId)
         val count3 = mapper.sy2bdCount(projectId)
@@ -49,7 +49,7 @@ open class StatisticsService{
      * 岗位和关联的资产信息点值不一致
      */
     fun eq2peCount(): SCountResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val count = mapper.eq2peCount(projectId)
         return SCountResponse(count)
     }
@@ -59,7 +59,7 @@ open class StatisticsService{
      */
     fun eq2peDifferent(): SQueryResponse<ArrayList<EqpeDefferentReqponse>>{
         return try {
-            val projectId =  SPageContext.getHeader("ProjectId").toString()
+            val projectId =  SPageContext.getHeader("projectId").toString()
 
             var list=ArrayList<EqpeDefferentReqponse>()
             //岗位和关联的资产数据
@@ -519,7 +519,7 @@ open class StatisticsService{
      * 设备-未关联资产的设备
      */
     fun uneq2pe(): SCountResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val count = mapper.uneq2peCount(projectId)
         return SCountResponse(count)
     }
@@ -528,7 +528,7 @@ open class StatisticsService{
      * 业务空间-各分区占比
      */
     fun spObjectTypeCount(): ArrayList<StatisticsCountResponse> {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val list = mapper.spObjectTypeCount(projectId)
         val map = HashMap<String, Long>()
         for (obj in list) {
@@ -551,7 +551,7 @@ open class StatisticsService{
      * 业务空间-默认分区功能类型占比
      */
     fun generalSpFuncTypeCount(): ArrayList<StatisticsCountResponse> {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return mapper.generalSpFuncTypeCount(projectId)
     }
 
@@ -559,7 +559,7 @@ open class StatisticsService{
      * 租户-关联业务空间完成度
      */
     fun tenant2SpCount(): SCountResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val count = mapper.tenant2SpCount(projectId)
         return SCountResponse(count)
     }
@@ -568,7 +568,7 @@ open class StatisticsService{
      * 竖井-关联业务空间完成度
      */
     fun shaft2SpCount(): SCountResponse {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         val count = mapper.shaft2SpCount(projectId)
         return SCountResponse(count)
     }
@@ -577,7 +577,7 @@ open class StatisticsService{
      * 竖井-按功能类型占比
      */
     fun shaftFuncTypeCount(): ArrayList<StatisticsCountResponse> {
-        val projectId = SPageContext.getHeader("ProjectId").toString()
+        val projectId = SPageContext.getHeader("projectId").toString()
         return mapper.shaftFuncTypeCount(projectId)
     }
 } // Class StatisticsService

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

@@ -34,7 +34,7 @@ object UpDataFloorAndBuildingServuce : Service<Equipment>(SMybatisDao(Equipment:
      */
     fun upDataFloorORBuilding(upDataFloorAndBuildingRequestsList: ArrayList<UpDataFloorAndBuildingRequests>): SBaseResponse {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             if (upDataFloorAndBuildingRequestsList.isNullOrEmpty()) {
                 val sBaseResponse = SBaseResponse(SResponseType.failure)

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/base/Service.kt

@@ -56,7 +56,7 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
     override fun onCreateSuccess(entityList: ArrayList<ENTITY>) {
 
         entityList.forEach {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
 
@@ -110,7 +110,7 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
      * @param   entityList      删除成功对象列表
      */
     override fun onDeleteSuccess(entityList: ArrayList<ENTITY>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         entityList.forEach {
 
             try {
@@ -143,7 +143,7 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
     override fun onUpdateBefore(entity: ENTITY): Boolean {
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -174,7 +174,7 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>) : SObjectS
      */
     override fun onUpdateSuccess(entityList: ArrayList<ENTITY>) {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             val jsonObject = JSONObject()

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/base/ServiceSpace.kt

@@ -57,7 +57,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
     override fun onCreateSuccess(entityList: ArrayList<ENTITY>) {
 
         entityList.forEach {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
 
@@ -129,7 +129,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
      * @param   entityList      删除成功对象列表
      */
     override fun onDeleteSuccess(entityList: ArrayList<ENTITY>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         entityList.forEach {
 
             try {
@@ -162,7 +162,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
     override fun onUpdateBefore(entity: ENTITY): Boolean {
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
 
@@ -201,7 +201,7 @@ open class ServiceSpace<ENTITY : SBaseEntity>(daoClass: SAbstractDao<ENTITY>) :
      */
     override fun onUpdateSuccess(entityList: ArrayList<ENTITY>) {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             val jsonObject = JSONObject()

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/dict/DataDictionaryDescriptionProjectService.kt

@@ -36,7 +36,7 @@ object DataDictionaryDescriptionProjectService : Service<PropertyDefProjectInfo>
      * 创建之前操作
      */
     override fun onCreateBefore(dataDictionary: PropertyDefProjectInfo): Boolean {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (dataDictionary.type!!.length == 3) {
             val equipFamily = equipFamilyservice.select("family = '${dataDictionary.type}'").entity()
             dataDictionary.type = equipFamily!!.equipCode!!
@@ -54,7 +54,7 @@ object DataDictionaryDescriptionProjectService : Service<PropertyDefProjectInfo>
      */
     fun create(dataDictionaryList: ArrayList<PropertyDefProjectInfo>): SCreateResponse<PropertyDefProjectInfo> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (dataDictionary in dataDictionaryList) {
 
 //                if (dataDictionary.type!!.length == 3){
@@ -93,7 +93,7 @@ object DataDictionaryDescriptionProjectService : Service<PropertyDefProjectInfo>
      */
     fun deleteType(type: String): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(SFilter.eq("type", type), SFilter.eq("projectId", projectId!!))
             if (isDelete) {
                 val sCreateResponse = SBaseResponse()
@@ -119,7 +119,7 @@ object DataDictionaryDescriptionProjectService : Service<PropertyDefProjectInfo>
      */
     fun deleteId(): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(SFilter.eq("projectId", projectId!!))
             if (isDelete) {
                 val sCreateResponse = SBaseResponse()
@@ -145,7 +145,7 @@ object DataDictionaryDescriptionProjectService : Service<PropertyDefProjectInfo>
      */
     fun createListDict(request: DictBatchProcessing): SCreateResponse<DictBatchProcessing> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (request.schemeId.isNullOrEmpty()) {
                 val sCreateResponse = SCreateResponse<DictBatchProcessing>(SResponseType.failure)
                 sCreateResponse.message = "SchemeId:不能为空"

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/dict/DictSpaceProjectService.kt

@@ -21,7 +21,7 @@ object DictSpaceProjectService  : SObjectService<DictSpaceProject>(SMybatisDao(D
     fun zoneTypeCreate(request: SCreateRequest<DictSpaceProject>): SCreateResponse<DictSpaceProject> {
         try {
             /** 项目id */
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (request.content!=null&&request.content.size>0){
 
                 for (content in request.content){

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefProjectService.kt

@@ -64,7 +64,7 @@ object PropertyDefProjectService : Service<PropertyDefProjectInfo>(SMybatisDao(P
         return try {
 
             var dictProjectList : ArrayList<PropertyDefProjectInfo>? = null
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val queryBuilder = select(request.filters)
             var code: String?
             code = type
@@ -91,13 +91,13 @@ object PropertyDefProjectService : Service<PropertyDefProjectInfo>(SMybatisDao(P
 //                           if (type.length == 3){
 //                               queryBuilder.tableName = "\"dict\".\"f_project_def_property\"('$code')"
 //                           }else{
-                               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("ProjectId")}', 'OtherZone')"
+                               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("projectId")}', 'OtherZone')"
 //                           }
                        }else {
                            if (type.length == 3){
                                queryBuilder.tableName = "\"dict\".\"f_project_def_property\"('$code')"
                            }else{
-                               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("ProjectId")}', '$code')"
+                               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("projectId")}', '$code')"
                            }
                        }
 
@@ -105,14 +105,14 @@ object PropertyDefProjectService : Service<PropertyDefProjectInfo>(SMybatisDao(P
                        if (type.length == 3){
                            queryBuilder.tableName = "\"dict\".\"f_project_def_property\"('$code')"
                        }else{
-                           queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("ProjectId")}', '$code')"
+                           queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("projectId")}', '$code')"
                        }
                    }
                }
            }else{
-               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("ProjectId")}', '')"
+               queryBuilder.tableName = "\"dict\".\"f_project_def\"('${SPageContext.getHeader("projectId")}', '')"
            }
-//            queryBuilder.tableName = "\"dict\".\"f_property_def\"('${SPageContext.getHeader("ProjectId")}', '$code')"
+//            queryBuilder.tableName = "\"dict\".\"f_property_def\"('${SPageContext.getHeader("projectId")}', '$code')"
 
             /** 过滤 */
             if (null != request.projection) {
@@ -384,7 +384,7 @@ object PropertyDefProjectService : Service<PropertyDefProjectInfo>(SMybatisDao(P
      * 查询之前操作
      */
     override fun onQueryBefore(queryBuilder: SQueryBuilder<PropertyDefProjectInfo>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         queryBuilder.tableName = "dict.f_filter_labels('$projectId')"
 
         super.onQueryBefore(queryBuilder)

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/dict/PropertyDefService.kt

@@ -130,7 +130,7 @@ object PropertyDefService : Service<DPropertyDefML>(SMybatisDao(DPropertyDefML::
     fun pageQueryAllDict(dictTypeList: ArrayList<String>): AllDictCategory {
 
         val allDictCategory = AllDictCategory()
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val projectScheme = projectSchemeService.select(SFilter.eq("projectId", projectId!!)).entity()
 
         try {

+ 293 - 43
data-center/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt

@@ -4,51 +4,63 @@ import com.persagy.database.SFilter
 import com.persagy.database.SPageQueryInfo
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dict.DictBatchProcessing
 import com.persagy.server.datacenter.models.entities.dictnew.*
 import com.persagy.server.datacenter.models.requests.CategoryRequest
+import com.persagy.server.mappers.CustomMapper
 import com.persagy.server.services.assistant.SchemeService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil
 
 /**
  * 字典类型
- * @author  wx
+ *
+ * @author wx <zhangweixin@sagacloud.cn>
  * @date  2020/9/23 15:43
  */
 object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::class.java)){
-
     /** 自定义SQL 对象 */
-    val schemeService by lazy {
+    private val schemeService by lazy {
         SSpringContextUtil.getBean(SchemeService::class.java) as SchemeService
     }
 
-        /** 方案和项目的关系 */
-        private val dictSchemeAndProjectService = SObjectService(SMybatisDao(DictSchemeAndProject::class.java))
-        /** 方案下的类型 */
-        private val dictSchemeCategotyService = SObjectService(SMybatisDao(DictSchemeCategoty::class.java))
-        /** 项目所属的集团 */
-        private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
-        /** 平台集团对象类型 */
-        private val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
-        /** 专业 */
-        private val dictMajorService = SObjectService(SMybatisDao(DictMajor::class.java))
-        /** 信息点 */
-        private val dictDefFuncId = SObjectService(SMybatisDao(DefFuncId::class.java))
+    /** 自定义 sql */
+    private val customMapper by lazy {
+        SSpringContextUtil.getBean(CustomMapper::class.java) as CustomMapper
+    }
 
+    /** 方案和项目的关系 */
+    private val dictSchemeAndProjectService = SObjectService(SMybatisDao(DictSchemeAndProject::class.java))
+    /** 方案下的类型 */
+    private val dictSchemeCategotyService = SObjectService(SMybatisDao(DictSchemeCategoty::class.java))
+    /** 项目所属的集团 */
+    private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
+    /** 平台集团对象类型 */
+    private val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
+    /** 专业 */
+    private val dictMajorService = SObjectService(SMybatisDao(DictMajor::class.java))
+    /** 信息点 */
+    private val dictDefFuncId = SObjectService(SMybatisDao(DefFuncId::class.java))
+    /** 项目定制化服务 */
+    private val defFuncIdProjectService = SObjectService(SMybatisDao(DefFuncIdProject::class.java))
 
 
     /**
      * 查询设备、部件、系统、专业类型
      *
-     * @param   categoryRequest     类型查询对象
+     * @param categoryRequest   类型查询对象
+     * @return 返回结果
      */
     fun equipQuery(categoryRequest: CategoryRequest): SQueryResponse<DefClass> {
         val sQueryResponse = SQueryResponse<DefClass>()
         if (!categoryRequest.type.isNullOrEmpty()){
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             var dictSchemeCategoryList = ArrayList<DefClass>()
             // 查询项目所在的集团 然后取集团字典
 //        val dictSchemeAndProject = dictSchemeAndProjectService.select(SFilter.eq("projectId", projectId!!)).entity()
@@ -63,7 +75,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","equipment"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
 
                     }
@@ -74,7 +86,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                    pageInfo = queryBuilder.pageQuery(1, 1000)
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","component"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                     }
                     "system" -> {
@@ -82,7 +94,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                    pageInfo = queryBuilder.pageQuery(1, 1000)
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","system"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                     }
                     "major" -> {
@@ -117,8 +129,10 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 defClass.aliasName = dictMajor.aliasName
                                 defClass.aliasCode = dictMajor.aliasCode
                                 val defClassList = defClassService.select(
-                                    SFilter.eq("parentCode", "system"), SFilter.eq("type", "group"),
-                                    SFilter.eq("groupId", dictProject.groupId!!), SFilter.eq("majorCode", defClass.code!!)
+                                    SFilter.eq("parentCode", "system"),
+                                    SFilter.eq("type", "group"),
+                                    SFilter.eq("groupCode", dictProject.groupCode!!),
+                                    SFilter.eq("majorCode", defClass.code!!)
                                 ).exec()
                                 defClass.children = defClassList
                                 dictSchemeCategoryList.add(defClass)
@@ -129,7 +143,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         /** 业务空间类型 */
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","space"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                     }
                     "majorEquipment" -> {
@@ -143,8 +157,10 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 defClass.aliasName = dictMajor.aliasName
                                 defClass.aliasCode = dictMajor.aliasCode
                                 val defClassList = defClassService.select(
-                                    SFilter.eq("parentCode", "equipment"), SFilter.eq("type", "group"),
-                                    SFilter.eq("groupId", dictProject.groupId!!),SFilter.eq("majorCode", defClass.code!!)
+                                    SFilter.eq("parentCode", "equipment"),
+                                    SFilter.eq("type", "group"),
+                                    SFilter.eq("groupCode", dictProject.groupCode!!),
+                                    SFilter.eq("majorCode", defClass.code!!)
                                 ).exec()
                                 defClass.children = defClassList
                                 dictSchemeCategoryList.add(defClass)
@@ -155,19 +171,19 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         /** 设备和部件 */
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.or(SFilter.eq("parentCode","component"),SFilter.eq("parentCode","equipment")), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                     }
                     "equipmentComponent" ->{
                         /** 设备下的部件 */
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","equipment"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                         val defClassList = defClassService.select(
                             SFilter.eq("parentCode", "component"),
                             SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                         if (dictSchemeCategoryList.size > 0){
                             for (dictSchemeCategory in dictSchemeCategoryList){
@@ -199,12 +215,12 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         /** 系统 */
                         val systemList = defClassService.select(
                             SFilter.eq("parentCode", "system"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                         /** 设备 */
-                       val equipmentList = defClassService.select(
+                        val equipmentList = defClassService.select(
                             SFilter.eq("parentCode","equipment"), SFilter.eq("type", "group"),
-                            SFilter.eq("groupId", dictProject.groupId!!)
+                            SFilter.eq("groupCode", dictProject.groupCode!!)
                         ).exec()
                         /** 系统下的设备 */
                         for (system in systemList){
@@ -243,43 +259,277 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
     /**
      * 查询项目下对象类型对应的信息点
+     *
+     * @param categoryRequest   查询条件
+     * @return 返回结果
      */
     fun categoryInfoQuery(categoryRequest: CategoryRequest): SQueryResponse<DefFuncId> {
-        val projectId = SPageContext.getHeader("ProjectId")
+        /** 项目id */
+        val projectId = SPageContext.getHeader("projectId")
+        /** 返回对象 */
         val sQueryResponse = SQueryResponse<DefFuncId>()
-        if (!categoryRequest.type.isNullOrEmpty()){
+        sQueryResponse.result = SResponseType.failure
+        /** 类型不能为空 */
+        if (!categoryRequest.type.isNullOrEmpty()) {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId!!)).entity()
-            if (dictProject!=null){
+            /** 项目对应的集团对象不为空 */
+            if (dictProject!=null) {
                 val dictDefFuncBuilder = dictDefFuncId.select(
                     SFilter.eq("projectId", projectId),
-                    SFilter.eq("groupId", dictProject.groupId!!),
+                    SFilter.eq("groupCode", dictProject.groupCode!!),
                     SFilter.eq("classCode", categoryRequest.type!!)
                 )
                 val dictDefFuncList = dictDefFuncBuilder.table("dict.def_funcid_project").order("sort").exec()
-                if (dictDefFuncList.size>0){
+                /** 项目定制已存在直接返回 */
+                if (dictDefFuncList.size>0) {
                     sQueryResponse.content = dictDefFuncList
                     sQueryResponse.total = dictDefFuncList.size.toLong()
-                }else{
-                    schemeService.dictInfo(projectId,dictProject.groupId!!,categoryRequest.type!!)
+                } else {
+                    schemeService.dictInfo(projectId, dictProject.groupCode!!, categoryRequest.type!!)
                     val dictDefFuncBuilder = dictDefFuncId.select(
                         SFilter.eq("projectId", projectId),
-                        SFilter.eq("groupId", dictProject.groupId!!),
+                        SFilter.eq("groupCode", dictProject.groupCode!!),
                         SFilter.eq("classCode", categoryRequest.type!!)
                     )
                     val dictDefFuncList = dictDefFuncBuilder.table("dict.def_funcid_project").order("sort").exec()
                     sQueryResponse.content = dictDefFuncList
                     sQueryResponse.total = dictDefFuncList.size.toLong()
                 }
+
                 sQueryResponse.result = SResponseType.success
-            }else{
-                sQueryResponse.result = SResponseType.failure
             }
-        }else {
-            sQueryResponse.result = SResponseType.failure
         }
         return sQueryResponse
     } // Fun categoryInfoQuery()
 
+    /**
+     * 项目定制化设置
+     *
+     * @param request   字典信息列表
+     * @return 返回结果
+     */
+    fun settingDict(request: SCreateRequest<DefFuncIdProject>): SCreateResponse<DefFuncIdProject> {
+        /** 返回对象实例 */
+        val sCreateResponse = SCreateResponse<DefFuncIdProject>()
+        sCreateResponse.result = SResponseType.failure
+       return try {
+            /** 项目id */
+            val projectId = SPageContext.getHeader("projectId")
+            /** 数组不为空 */
+            if (!request.content.isNullOrEmpty()) {
+                /** 遍历字典信息列表 */
+                for (dictProject in request.content) {
+                    /** 项目id为空重新赋值 */
+                    if (dictProject.projectId.isNullOrEmpty()) {
+                        dictProject.projectId = projectId
+                    }
+
+                    try {
+                        /** 插入字典信息数据 */
+                        defFuncIdProjectService.replace(dictProject)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+
+                sCreateResponse.result = SResponseType.success
+                sCreateResponse.entityList = request.content
+                sCreateResponse
+            } else {
+                sCreateResponse
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+           sCreateResponse.message = e.message!!
+           sCreateResponse
+        }
+    } // Fun settingDict()
+
+    /**
+     * 根据项目下的对象类型重置
+     *
+     * @param categoryRequest  类型对象
+     * @return 返回结果
+     */
+    fun resetType(categoryRequest: CategoryRequest): SBaseResponse {
+        return try {
+            /** 项目id */
+            val projectId = SPageContext.getHeader("projectId")
+            /** 返回结果 */
+            val sCreateResponse = SBaseResponse()
+            /** 成功状态 */
+            sCreateResponse.result = SResponseType.success
+            /** 类型不为空 */
+            if (!categoryRequest.type.isNullOrEmpty()){
+                /** 删除项目下当前类型的信息点 */
+                val delete = defFuncIdProjectService.delete(SFilter.eq("classCode", categoryRequest.type!!), SFilter.eq("projectId", projectId!!))
+                /** 删除是否失败 */
+                if (!delete){
+                    /** 失败状态 */
+                    sCreateResponse.result = SResponseType.failure
+                }
+            }else{
+                /** 失败状态 */
+                sCreateResponse.result = SResponseType.failure
+            }
+
+            /** 返回对象 */
+            sCreateResponse
+        } catch (e: Exception) {
+            e.printStackTrace()
+            /** 返回对象以及状态,报错信息 */
+            SBaseResponse(SResponseType.failure,e.message!!)
+        }
+    } // Fun resetType()
+
+    /**
+     * 根据项目重置信息点
+     */
+    fun resetProjectId(): SBaseResponse {
+        return try {
+            /** 返回结果对象 */
+            val sCreateResponse = SBaseResponse()
+            /** 项目 id */
+            val projectId = SPageContext.getHeader("projectId")
+            /** 根据项目 id 删除 */
+            val isDelete = defFuncIdProjectService.delete(SFilter.eq("projectId", projectId!!))
+            /** 判断删除是否成功 */
+            if (isDelete) {
+                sCreateResponse.result = SResponseType.success
+                sCreateResponse.message = projectId
+                sCreateResponse
+            } else {
+                val sCreateResponse = SBaseResponse()
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message = projectId
+                sCreateResponse
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            SBaseResponse(SResponseType.failure, e.message!!)
+        }
+
+    } // Fun reset()
+
+    /**
+     * 方案设定
+     */
+    fun setSchemeProject(request: DictBatchProcessing): SCreateResponse<DictBatchProcessing>{
+        val projectId = SPageContext.getHeader("projectId")
+        return try {
+            if (request.schemeId.isNullOrEmpty()) {
+                val sCreateResponse = SCreateResponse<DictBatchProcessing>(SResponseType.failure)
+                sCreateResponse.message = "schemeId:不能为空"
+                sCreateResponse
+            } else {
+                val dictProject = dictProjectService.select(SFilter.eq("projectId", projectId!!)).entity()
+                when(request.schemeId){
+                    "schemeZero" -> {
+                        if (!request.priorityList.isNullOrEmpty() && !request.firstNameList.isNullOrEmpty()) {
+                            defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                            customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                            val defFuncIdProject = DefFuncIdProject()
+                            defFuncIdProject.visible = false
+                            defFuncIdProject.projectId = projectId
+                            defFuncIdProjectService.update(defFuncIdProject, arrayListOf("visible"),
+                                arrayListOf(SFilter.eq("projectId",projectId),SFilter.not(SFilter.eq("unDisabled",false))))
+                            /** 一级标签 */
+                            for (firstName in request.firstNameList!!) {
+                                val propertyDefProjectInfo = DefFuncIdProject()
+                                propertyDefProjectInfo.visible = true
+                                propertyDefProjectInfo.projectId = projectId
+                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("firstName",firstName)))
+                            }
+                            /** 匹配优先级 */
+                            for (priority in request.priorityList!!) {
+                                val propertyDefProjectInfo = DefFuncIdProject()
+                                propertyDefProjectInfo.visible = true
+                                propertyDefProjectInfo.projectId = projectId
+                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("priority",priority)))
+                            }
+                        }else if (!request.firstNameList.isNullOrEmpty() && request.firstNameList!!.size > 0) {
+                            try {
+                                /** 清除项目下的字典信息 */
+                                defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                                /** 导入原始字典数据 */
+                                customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                                val propertyDefProjectInfo = DefFuncIdProject()
+                                propertyDefProjectInfo.visible = false
+                                propertyDefProjectInfo.projectId = projectId
+                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
+
+                                /** 一级标签 */
+                                for (firstName in request.firstNameList!!) {
+                                    val propertyDefProjectInfo = DefFuncIdProject()
+                                    propertyDefProjectInfo.visible = true
+                                    propertyDefProjectInfo.projectId = projectId
+                                    defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                        arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("firstName",firstName)))
+                                }
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+                        } else if (!request.priorityList.isNullOrEmpty() && request.priorityList!!.size > 0) {
+                            /** 设置优先级 */
+                            try {
+                                /** 清除项目下的字典信息 */
+                                defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                                /** 导入原始字典数据 */
+                                customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                                val propertyDefProjectInfo = DefFuncIdProject()
+                                propertyDefProjectInfo.visible = false
+                                propertyDefProjectInfo.projectId = projectId
+                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
+
+                                /** 匹配优先级 */
+                                for (priority in request.priorityList!!) {
+                                    val propertyDefProjectInfo = DefFuncIdProject()
+                                    propertyDefProjectInfo.visible = true
+                                    propertyDefProjectInfo.projectId = projectId
+                                    defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                        arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("priority",priority)))
+                                }
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+                        } else {
+                            /** 清除项目下的字典信息 */
+                            defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                            /** 导入原始字典数据 */
+                            customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                            val propertyDefProjectInfo = DefFuncIdProject()
+                            propertyDefProjectInfo.visible = false
+                            propertyDefProjectInfo.projectId = projectId
+                            defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
+                        }
+                    }
+                    "schemeOne" ->{
+                        /** 清除项目下的字典信息 */
+                        defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                        /** 导入方案1 */
+                        customMapper.dictSchemeDataTwo(projectId,dictProject!!.groupCode!!)
+                    }
+                    "schemeTwo" ->{
+                        /** 清除项目下的字典信息 */
+                        defFuncIdProjectService.delete(SFilter.eq("projectId",projectId!!))
+                        /** 导入方案1 */
+                        customMapper.dictSchemeDataWanDa(projectId,dictProject!!.groupCode!!)
+                    }
+                }
+                SCreateResponse(SResponseType.success)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            SCreateResponse(SResponseType.failure,e.message!!)
+        }
+    } // Fun setSchemeProject()
+
+
 
 
 

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockService.kt

@@ -24,7 +24,7 @@ object ConnectedBlockService : RService<ConnectedBlockFamilyItem>(SMybatisDao(Co
 
 
     fun getConnectedBlock( request: SQueryRequest): SQueryResponse<ConnectedBlockResponse> {
-        var projectId = SPageContext.getHeader("ProjectId")
+        var projectId = SPageContext.getHeader("projectId")
         val responseList = ArrayList<ConnectedBlockResponse>()
         val result = SQueryResponse<ConnectedBlockResponse>()
         val list1 = ConnectedBlockService.select(request.filters).filter(SFilter.eq("projectId",projectId!!)).projection("blockId").distinct().exec()

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/graphtype/ConnectedBlockSourceService.kt

@@ -25,7 +25,7 @@ object ConnectedBlockSourceService : RService<ConnectedBlockSource>(SMybatisDao(
      */
     fun replaceConnectedBlockSource(request: ConnectedBlockSourceRequest): SCreateResponse<ConnectedBlockSource> {
        return try {
-            var projectId = SPageContext.getHeader("ProjectId")
+            var projectId = SPageContext.getHeader("projectId")
             if(projectId.isNullOrEmpty()){
                projectId = request.projectId
             }

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt

@@ -39,7 +39,7 @@ open class GraphicTypeMapperService {
     fun queryCount(): SQueryResponse<GraphicType> {
         return try {
             val queryResponse = SQueryResponse<GraphicType>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val graphicTypeService = RService(SMybatisDao(GraphicType::class.java))
             val relationTypeProjectService = RService(SMybatisDao(RelationTypeProject::class.java))
             val graphicTypeList = graphicTypeService.select(SFilter.not(SFilter.isNull("parentId"))).exec()
@@ -88,7 +88,7 @@ open class GraphicTypeMapperService {
             val rEq2SpService = RService(SMybatisDao(REq2Sp::class.java))
             val rSp2SpService = RService(SMybatisDao(RSp2Sp::class.java))
             val queryResponse = SQueryResponse<GraphicType>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val graphicTypeService = RService(SMybatisDao(GraphicType::class.java))
             val relationTypeProjectService = RService(SMybatisDao(RelationTypeProject::class.java))
             val graphicTypeList = graphicTypeService.select(SFilter.not(SFilter.isNull("parentId"))).exec()

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeService.kt

@@ -30,7 +30,7 @@ object GraphicTypeService : RService<GraphicType>(SMybatisDao(GraphicType::class
      */
     fun overview(): SQueryResponse<GraphicType> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val request = SQueryRequest()
             request.pageSize = 1000
             request.orders = "sort"

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -1,12 +1,12 @@
 package com.persagy.server.services.graphtype
 
-import com.persagy.server.services.base.RService
 import cn.sagacloud.server.datacenter.utils.IdUtils
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
 import com.persagy.server.mappers.IRelationExcelExportMapper
 import com.persagy.server.mappers.IRelationExcelImportMapper
-import com.persagy.database.SFilter
-import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.services.base.RService
 import com.persagy.service.SObjectService
 import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
@@ -105,7 +105,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
         } else {
             ""
         }
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val file = File("/tmp/relation-$projectId-${relType}${zone}.xlsx")
         val workbook = if (file.exists()) {
             XSSFWorkbook(file)
@@ -134,7 +134,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
 
         val sheet = workbook.getSheet("关系维护")
 
-//        val projectId = SPageContext.getHeader("ProjectId")
+//        val projectId = SPageContext.getHeader("projectId")
 
         try {
             writeExcelRelation(sheet, projectId!!, relType, code, zoneType)
@@ -226,7 +226,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
             } else {
                 ""
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             try {
 
                 val relationTypeProjectService = SObjectService(SMybatisDao(RelationTypeProject::class.java))

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/objects/BuildingService.kt

@@ -44,7 +44,7 @@ object BuildingService : Service<Building>(SMybatisDao(Building::class.java)) {
      * @return  返回true,可以创建对象
      */
     override fun onCreateBefore(building: Building): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         building.projectId = projectId
         if (!building.id.isNullOrEmpty()) {
             val isWith = building.id!!.startsWith("Bd")
@@ -68,7 +68,7 @@ object BuildingService : Service<Building>(SMybatisDao(Building::class.java)) {
      */
     override fun onDeleteBefore(entity: Building): Boolean {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             entity.projectId = projectId
 
             val exec = FloorService.select(SFilter.eq("buildId", entity.id!!)).exec()
@@ -207,7 +207,7 @@ object BuildingService : Service<Building>(SMybatisDao(Building::class.java)) {
     override fun onDeleteSuccess(entityList: ArrayList<Building>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (building in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",building.id!!), SFilter.eq("objType","Bd"))
             }

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/objects/ComponentService.kt

@@ -44,7 +44,7 @@ object ComponentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      * @param   component      创建前的回调函数
      */
     override fun onCreateBefore(component: Equipment): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         component.projectId = projectId
         if (!component.id.isNullOrEmpty()) {
             val isStartsWith = component.id.toString().startsWith("Ec")
@@ -91,7 +91,7 @@ object ComponentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
             cquipment.objectType = "Component"
             val  entity = this.select(SFilter.eq("id", cquipment.id!!)).entity()
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -145,7 +145,7 @@ object ComponentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     override fun onDeleteSuccess(entityList: ArrayList<Equipment>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (entity in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",entity.id!!), SFilter.eq("objType","Ec"))
             }

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -63,7 +63,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      */
     override fun onCreateBefore(equip: Equipment): Boolean {
         /** 查询准备类型 */
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (!equip.id.isNullOrEmpty()) {
             val isStartsWith = equip.id.toString().startsWith("Eq")
             if (!isStartsWith) {
@@ -132,7 +132,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      */
     override fun onUpdateBefore(entity: Equipment): Boolean {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (entity.propertyId.isNullOrEmpty()) {
 //                val property = PropertyService.select(SFilter.eq("equipmentId", entity.id!!)).entity()
 //                logger.debug("设备初次关联*********************************")
@@ -231,7 +231,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
             }
 
             try {
-                val projectId = SPageContext.getHeader("ProjectId")
+                val projectId = SPageContext.getHeader("projectId")
                 val comming = SPageContext.getHeader("Coming")
                 val account = SPageContext.getHeader("Account")
                 /** 日志 */
@@ -267,7 +267,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         try {
             val equipment = this.select(SFilter.eq("id", entity.id!!)).entity()
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             try {
@@ -323,7 +323,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      */
     fun queryEquipCom(): SQueryResponse<Equipment> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val equipList = select(SFilter.eq("projectId", projectId!!)).exec()
             val sQueryResponse = SQueryResponse<Equipment>(SResponseType.success)
             sQueryResponse.content = equipList
@@ -336,7 +336,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
 
     override fun onCreateSuccess(entityList: ArrayList<Equipment>) {
         entityList.forEach {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
 
@@ -386,7 +386,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      * @param   entityList      更新成功对象列表
      */
     override fun onUpdateSuccess(entityList: ArrayList<Equipment>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val comming = SPageContext.getHeader("Coming")
         val account = SPageContext.getHeader("Account")
         try {
@@ -477,7 +477,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
     override fun onDeleteSuccess(entityList: ArrayList<Equipment>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val oService = SBaseService(SMybatisDao(ObjInfos::class.java))
             for (entity in entityList) {
                 //更新信息点 表号功能号

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt

@@ -48,7 +48,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
      * 创建之前操作
      */
     override fun onCreateBefore(floor: Floor): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         floor.projectId = projectId
         /** 楼层id */
         if (!floor.id.isNullOrEmpty()) {
@@ -78,7 +78,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
 
   fun create(request: SCreateRequest<Floor>): SCreateResponse<Floor> {
       return try {
-          val projectId = SPageContext.getHeader("ProjectId")
+          val projectId = SPageContext.getHeader("projectId")
           val comming = SPageContext.getHeader("Coming")
           val account = SPageContext.getHeader("Account")
           if (!request.content.isNullOrEmpty()){
@@ -165,7 +165,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
 
     fun upDates(request: SUpdateRequest<Floor>): SBaseResponse{
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             val listId = ArrayList<String>()
@@ -290,7 +290,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
     override fun onDeleteBefore(entity: Floor): Boolean {
         val  floor = this.select(SFilter.eq("id", entity.id!!)).entity()
 
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val coming = SPageContext.getHeader("Coming")
         val account = SPageContext.getHeader("Account")
         /** 日志 */
@@ -315,7 +315,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
      */
     fun updateOutline(request: SUpdateRequest<Floor>): SBaseResponse{
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             val listId = ArrayList<String>()
@@ -410,7 +410,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
         super.onDeleteSuccess(entityList)
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (floor in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",floor.id!!), SFilter.eq("objType","Fl"))
             }
@@ -462,7 +462,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
     override fun onUpdateSuccess(entityList: ArrayList<Floor>) {
         super.onUpdateSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (floor in entityList) {
                 ObjInfoService.createInfo(floor,false,"Fl","Floor")
 //                ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",floor.id!!), SFilter.eq("objType","Fl"))

+ 11 - 11
data-center/src/main/kotlin/com/persagy/server/services/objects/GeneralSystemService.kt

@@ -65,7 +65,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      * 创建之前的操作
      */
     override fun onCreateBefore(generalSystem: GeneralSystem): Boolean {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         return true
     } // Function onCreateBefore()
@@ -75,7 +75,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      * 创建系统
      */
     fun createBdFl(request: SCreateRequest<GeneralSystem>): SCreateResponse<GeneralSystem>{
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         val contentList = request.content
         if (contentList.isNotEmpty()){
@@ -177,7 +177,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
     override fun onDeleteBefore(entity: GeneralSystem): Boolean {
         try {
             val generalSystem = this.select(SFilter.eq("id", entity.id!!)).entity()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -209,7 +209,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      */
     fun unSpaceSys(type: String, spaceId: String, request: SQueryRequest): SQueryResponse<GeneralSystem> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val queryBuilder = select(request.filters)
             queryBuilder.tableName="f_unsys_in_space('$projectId','$type','$spaceId')"
             if (null != request.projection) {
@@ -235,7 +235,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
 //     */
 //    fun unSysEquip(sysId: String, request: SQueryRequest): SQueryResponse<Equipment>{
 //        return  try {
-//            val projectId = SPageContext.getHeader("ProjectId")
+//            val projectId = SPageContext.getHeader("projectId")
 //             val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
 //            val queryBuilder = equipmentService.select(request.filters)
 //            queryBuilder.tableName="f_uneq_in_sy_equip('$projectId','$sysId')"
@@ -262,7 +262,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      */
     fun unSysEquip(sysId: String, request: SQueryRequest): SQueryResponse<Equipment>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
             val rSyEqService = SObjectService(SMybatisDao(RSyEq::class.java))
             val rSyEqList = rSyEqService.select(SFilter.eq("sysId", sysId), SFilter.eq("projectId", projectId!!)).exec()
@@ -294,7 +294,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      */
     fun unSysShaft(sysId: String, request: SQueryRequest): SQueryResponse<Shaft>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val shaftservice = SObjectService(SMybatisDao(Shaft::class.java))
             val queryBuilder = shaftservice.select(request.filters)
             queryBuilder.tableName="f_uneq_in_sy_shaft('$projectId','$sysId')"
@@ -320,7 +320,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      */
     fun unSysZoneSpaceBaseTable(sysId: String, request: SQueryRequest): SQueryResponse<ZoneSpace>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val zoneSpaceBaseTableservice = SObjectService(SMybatisDao(ZoneSpace::class.java))
             val queryBuilder = zoneSpaceBaseTableservice.select(request.filters)
             queryBuilder.tableName="f_uneq_in_sy_space('$projectId','$sysId')"
@@ -344,7 +344,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      */
     fun createLinkEquip(rSyEqList: RSyEqList): SCreateResponse<RSyEq> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val sysId = rSyEqList.sysId
             val service = SObjectService(SMybatisDao(RSyEq::class.java))
 
@@ -386,7 +386,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
      * 查询系统信息
      */
     fun pageQuerys(buildingId: String?, floorId: String?,request: SQueryRequest): SQueryResponse<GeneralSystem> {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val syinFlService = SObjectService(SMybatisDao(RSyInFl::class.java))
         val syinBdService = SObjectService(SMybatisDao(RSyInBd::class.java))
         val buildingFloorInfoService = SObjectService(SMybatisDao(BuildingFloorInfo::class.java))
@@ -483,7 +483,7 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
     override fun onDeleteSuccess(entityList: ArrayList<GeneralSystem>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (entity in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",entity.id!!), SFilter.eq("objType","Sy"))
             }

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/objects/LocationPointServices.kt

@@ -34,7 +34,7 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
      */
     override fun onCreateBefore(entity: LocationPoint): Boolean {
         logger.debug("创建的点位=${entity.toJson()}")
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (entity.id.isNullOrEmpty()) {
             return false
         }
@@ -61,7 +61,7 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
         super.onCreateSuccess(entityList)
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             for (entity in entityList){
@@ -120,7 +120,7 @@ object LocationPointServices : RService<LocationPoint>(SMybatisDao(LocationPoint
     override fun onUpdateSuccess(entityList: ArrayList<LocationPoint>) {
         super.onUpdateSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             for (entity in entityList){

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

@@ -52,7 +52,7 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
      * 创建之前操作
      */
     override fun onCreateBefore(property: Property): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val coming = SPageContext.getHeader("Coming")
         if (!property.id.isNullOrEmpty()) {
             val isStartsWith = property.id.toString().startsWith("Pe")
@@ -92,7 +92,7 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
     override fun onCreateSuccess(entityList: ArrayList<Property>) {
         super.onCreateSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             for (entity in entityList){
@@ -148,7 +148,7 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
     override fun onUpdateBefore(entity: Property): Boolean {
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
                 try {
@@ -187,7 +187,7 @@ object PropertyService : Service<Property>(SMybatisDao(Property::class.java)) {
         try {
             val  property = this.select(SFilter.eq("id", entity.id!!)).entity()
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             try {

+ 13 - 13
data-center/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -51,7 +51,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
      * @param   shaft   竖井对象
      */
     override fun onCreateBefore(shaft: Shaft): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         /** 竖井id */
         if (!shaft.id.isNullOrEmpty()) {
             val isWith = shaft.id!!.startsWith("Sh")
@@ -77,8 +77,8 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
     fun queryWithCount(@RequestBody request: SQueryRequest): SQueryResponse<ShaftWithCount> {
         val service = SBaseService(SMybatisDao(ShaftWithCount::class.java))
         return try {
-//            val queryBuilder = service.select(request.filters).filter(SFilter.notNull("id")).filter(SFilter.eq("ProjectId", SPageContext.getHeader("ProjectId")!!))
-            val queryBuilder = service.select(request.filters).filter(SFilter.eq("ProjectId", SPageContext.getHeader("ProjectId")!!))
+//            val queryBuilder = service.select(request.filters).filter(SFilter.notNull("id")).filter(SFilter.eq("ProjectId", SPageContext.getHeader("projectId")!!))
+            val queryBuilder = service.select(request.filters).filter(SFilter.eq("ProjectId", SPageContext.getHeader("projectId")!!))
             if (null != request.projection) {
                 queryBuilder.projection(request.projection!!)
             }
@@ -110,7 +110,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         val result = SQueryResponse<ShaftFuncType>()
         result.content = ArrayList()
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val entity = service.select(SFilter.eq("type", "Shaft"), SFilter.eq("InfoPointCode", "ShaftFuncType")).entity()
             val listType = ArrayList<ShaftFuncType>()
             // val dataDictionaryMap = SJsonUtil.fromJson<ArrayList<HashMap<String, Any?>>>(entity!!.dataSource!!)
@@ -182,7 +182,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         // 先取消后重新建立
         service.delete("shaftId" to request.shaftId!!)
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (space in request.spaceId!!.split(Regex(","))) {
                 val relationSpaceShaft = RelationSpaceShaft()
                 relationSpaceShaft.id = UUID.randomUUID().toString()
@@ -232,7 +232,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         try {
             val  shaft = this.select(SFilter.eq("id", entity.id!!)).entity()
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -281,7 +281,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
 //        return try {
 //            val listf = ArrayList<SFilter>()
 //            val list = ArrayList<String>()
-//            val projectId = SPageContext.getHeader("ProjectId")
+//            val projectId = SPageContext.getHeader("projectId")
 //            try {
 //                val execList = RShaftThroughShaftService.select(SFilter.eq("shaftId", shaftId), SFilter.eq("projectId", projectId!!)).exec()
 //                val execOtherList = RShaftThroughShaftService.select(SFilter.eq("shaftOtherId", shaftId), SFilter.eq("projectId", projectId!!)).exec()
@@ -320,7 +320,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         return try {
             val list = ArrayList<String>()
             val listf = ArrayList<SFilter>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val zoneSpaceBaseTableService = SObjectService(SMybatisDao(ZoneSpace::class.java))
             val rShContainSpBaseervice = SObjectService(SMybatisDao(RShContainSpBase::class.java))
             val rShContainSpBaseList = rSh2SpService.select(SFilter.eq("Id1", shaftId), SFilter.eq("projectId", projectId!!)).exec()
@@ -349,7 +349,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         return try {
             val list = ArrayList<String>()
             val listf = ArrayList<SFilter>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val zoneSpaceBaseTableService = SObjectService(SMybatisDao(ZoneSpace::class.java))
 
             val rShContainSpBaseList = rSh2SpService.select(SFilter.eq("Id1", shaftId), SFilter.eq("projectId", projectId!!)).exec()
@@ -376,7 +376,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
         val pageQuery: SPageQueryInfo<BuildingDic>
         val gson = Gson()
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             var request = SQueryRequest()
             val service = SBaseService(SMybatisDao(BuildingDic::class.java))
             val queryBuilder = service.select(request.filters)
@@ -424,7 +424,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
      */
     fun unShaftEquip(shaftId: String, request: SQueryRequest): SQueryResponse<Equipment>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
             val rEqInShService = SObjectService(SMybatisDao(REqInSh::class.java))
             val rSyEqList = rEqInShService.select(SFilter.eq("shaftId", shaftId), SFilter.eq("projectId", projectId!!)).exec()
@@ -456,7 +456,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
      */
     fun unShaftOtherShaft(shaftId: String, request: SQueryRequest): SQueryResponse<Shaft>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val rShaftThroughShaftService = SObjectService(SMybatisDao(RShaftThroughShaft::class.java))
             val rShaftThroughShaftList = rShaftThroughShaftService.select(SFilter.eq("shaftId", shaftId), SFilter.eq("projectId", projectId!!)).exec()
 
@@ -487,7 +487,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
      */
     fun unShaftSys(shaftId: String, request: SQueryRequest): SQueryResponse<GeneralSystem>{
         return  try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val generalSystemService = SObjectService(SMybatisDao(GeneralSystem::class.java))
             val rSyInShService = SObjectService(SMybatisDao(RSyInSh::class.java))
             val rSyInShList = rSyInShService.select(SFilter.eq("shaftId", shaftId), SFilter.eq("projectId", projectId!!)).exec()

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/objects/SpaceService.kt

@@ -45,7 +45,7 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
      * @param   space   创建的对象
      */
     override fun onCreateBefore(space: ZoneIspace): Boolean {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         /** 元空间id */
         if (!space.id.isNullOrEmpty()) {
             val isWith = space.id!!.startsWith("Si")
@@ -68,7 +68,7 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
         try {
             val zoneIspace = this.select(SFilter.eq("id", entity.id!!)).entity()
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -99,7 +99,7 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
         return try {
             if (!request.floorId.isNullOrEmpty()) {
 
-                val projectId = SPageContext.getHeader("ProjectId")
+                val projectId = SPageContext.getHeader("projectId")
 
                 val queryBuilder = select(request.filters)
                 val entity = FloorService.select(SFilter.eq("id", request.floorId!!)).entity()
@@ -122,7 +122,7 @@ object SpaceService : Service<ZoneIspace>(SMybatisDao(ZoneIspace::class.java)) {
                 sQueryResponse
 
             } else {
-                pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+                pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
             }
         } catch (e: Exception) {
             e.printStackTrace()

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/objects/TenantService.kt

@@ -32,7 +32,7 @@ object TenantService : Service<Tenant>(SMybatisDao(Tenant::class.java)) {
      * @param   tenant  租户对象
      */
     override fun onCreateBefore(tenant: Tenant): Boolean  {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         tenant.projectId = projectId
         if (tenant.id.isNullOrEmpty()){
             tenant.id = tenantIdCreate(projectId!!)
@@ -54,7 +54,7 @@ object TenantService : Service<Tenant>(SMybatisDao(Tenant::class.java)) {
         val service = SBaseService(SMybatisDao(TenantWithCount::class.java))
         return try {
             val queryBuilder = service.select(request.filters)
-                    .filter(SFilter.eq("ProjectId", SPageContext.getHeader("ProjectId")!!))
+                    .filter(SFilter.eq("ProjectId", SPageContext.getHeader("projectId")!!))
             if (null != request.projection) {
                 queryBuilder.projection(request.projection!!)
             }
@@ -90,7 +90,7 @@ object TenantService : Service<Tenant>(SMybatisDao(Tenant::class.java)) {
     override fun onDeleteBefore(entity: Tenant): Boolean {
         try {
             val  tenant = this.select(SFilter.eq("id", entity.id!!)).entity()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val coming = SPageContext.getHeader("Coming")
             val account = SPageContext.getHeader("Account")
             /** 日志 */
@@ -143,7 +143,7 @@ object TenantService : Service<Tenant>(SMybatisDao(Tenant::class.java)) {
         super.onDeleteSuccess(entityList)
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (entity in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",entity.id!!), SFilter.eq("objType","VOTn"))
             }

+ 9 - 9
data-center/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -88,7 +88,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
 
 
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
 //            if(request.zoneType.isNullOrEmpty()&&request.zoneTypeList.isNullOrEmpty()){
 //                val sQueryResponse = SQueryResponse<ZoneSpace>(SResponseType.failure)
@@ -400,7 +400,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     fun spBuildingFloor(): SQueryResponse<Building>{
        return try {
             /** 项目id */
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             val buildingList = BuildingService.select(SFilter.eq("projectId", projectId!!)).order("localName").exec()
             if (buildingList.size>0){
@@ -447,7 +447,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     fun zoneTypequery(request: DCSQueryRequest):SQueryResponse<DictSpaceProject> {
         try {
             /** 项目id */
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             val dictSpaceType = dictSpaceProjectService.select(SFilter.eq("projectId", projectId!!)).exec()
             if (dictSpaceType.size < 1) {
@@ -526,7 +526,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             return false
         }
 
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         /** id */
         if (!entity.id.isNullOrEmpty()) {
             val isWith = entity.id!!.startsWith("Sp")
@@ -566,7 +566,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
         for (zoneSpace in entityList) {
             ObjInfoService.createInfo(zoneSpace,true,"Sp",zoneSpace.objectType!!)
         }
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         try {
             for (space in entityList){
                 if (!space.buildingId.isNullOrEmpty()&&!space.floorId.isNullOrEmpty()){
@@ -651,7 +651,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
         }
 
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val comming = SPageContext.getHeader("comming")
             val account = SPageContext.getHeader("Account")
             for (entity in entityList){
@@ -690,7 +690,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
      */
     fun upDataFloorORBuilding(upDataFloorAndBuildingRequestsList :ArrayList<UpDataFloorAndBuildingRequests>): SBaseResponse {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             if (upDataFloorAndBuildingRequestsList.isNullOrEmpty()) {
                 val sBaseResponse = SBaseResponse(SResponseType.failure)
@@ -815,7 +815,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     } // Function sendMessages
 
     fun upDateOutline(request: SUpdateRequest<ZoneSpace>): SBaseResponse{
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         if (!request.projection.isNullOrEmpty()){
             request.projection!!.clear()
         }
@@ -865,7 +865,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
     override fun onDeleteSuccess(entityList: ArrayList<ZoneSpace>) {
         super.onDeleteSuccess(entityList)
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (entity in entityList) {
                 ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",entity.id!!), SFilter.eq("objType","Sp"))
             }

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/rel/REq2SpService.kt

@@ -16,7 +16,7 @@ object REq2SpService: SObjectService<REq2Sp>(SMybatisDao(REq2Sp::class.java)) {
     }
 
     override fun onDeleteSuccess(rEqInSpZoneLightingList: ArrayList<REq2Sp>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for(rEqInSpZoneLighting in rEqInSpZoneLightingList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "12")

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForBdService.kt

@@ -27,7 +27,7 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
      */
     fun create(req2Bd: REq2Bd): SCreateResponse<REq2Bd> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             req2Bd.projectId = projectId
             req2Bd.type = "eq2bd_for"
             val isInsert = insert(req2Bd)
@@ -60,7 +60,7 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
      */
     fun deletes(req2Bd: REq2Bd): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(req2Bd)
             /** 删除成功 */
             if (isDelete) {
@@ -98,7 +98,7 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipID = '${rEqForBdList.equipId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (buildingId in rEqForBdList.buildingIdList!!){
                 val rEqForBd = REq2Bd()
                 rEqForBd.id1 = rEqForBdList.equipId
@@ -148,7 +148,7 @@ object REqForBdService: RService<REq2Bd>(SMybatisDao(REq2Bd::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("buildingID = '${rEqForBdList.buildingId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rEqForBdList.equipIdList!!){
                 val rEqForBd = REq2Bd()
                 rEqForBd.id2 = rEqForBdList.buildingId

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForFlService.kt

@@ -26,7 +26,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
      */
     fun create(rEqForFl: REqForFl): SCreateResponse<REqForFl> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rEqForFl.projectId = projectId
             val isInsert = insert(rEqForFl)
             if (isInsert){
@@ -57,7 +57,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
      */
     fun deletes(rEqForFl: REqForFl): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rEqForFl)
             /** 删除成功 */
             if (isDelete) {
@@ -95,7 +95,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipId = '${rEqForFlList.equipId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (floorId in rEqForFlList.floorIdList!!){
                 val rEqForFl = REqForFl()
                 rEqForFl.equipId = rEqForFlList.equipId
@@ -144,7 +144,7 @@ object REqForFlService: RService<REqForFl>(SMybatisDao(REqForFl::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("floorID = '${rEqForFlList.floorId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rEqForFlList.equipIdList!!){
                 val rEqForFl = REqForFl()
                 rEqForFl.floorId = rEqForFlList.floorId

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForShService.kt

@@ -26,7 +26,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
      */
     fun create(rEqForSh: REqForSh): SCreateResponse<REqForSh> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rEqForSh.projectId = projectId
             val isInsert = insert(rEqForSh)
             if (isInsert){
@@ -57,7 +57,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
      */
     fun deletes(rEqForSh: REqForSh): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rEqForSh)
             /** 删除成功 */
             if (isDelete) {
@@ -95,7 +95,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipId = '${rEqForShList.equipId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rEqForShList.shaftIdList!!){
                 val rEqForSh = REqForSh()
                 rEqForSh.equipId = rEqForShList.equipId
@@ -144,7 +144,7 @@ object REqForShService: RService<REqForSh>(SMybatisDao(REqForSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("shaftID = '${rEqForShList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rEqForShList.equipIdList!!){
                 val rEqForSh = REqForSh()
                 rEqForSh.shaftId = rEqForShList.shaftId

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt

@@ -32,7 +32,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
      */
     fun create(type: String, rEqForSpBase: SCreateRequest<REqForSpBase>): SCreateResponse<REqForSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             for (rEqForSp in rEqForSpBase.content){
 
@@ -217,7 +217,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
     fun deletes(type: String, rEqForSpBaseList: ArrayList<REqForSpBase>): SBaseResponse {
         return try {
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rEqForSpBase in rEqForSpBaseList){
                 try {
                     /** 删除成功 */
@@ -402,7 +402,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
 //            /** 失败集合 */
 //            val failureList = ArrayList<Any>()
 //            delete("equipId = '${rEqForSpBaseList.equipId}'")
-//            val projectId = SPageContext.getHeader("ProjectId")
+//            val projectId = SPageContext.getHeader("projectId")
 //            for (spaceId in rEqForSpBaseList.spaceIdList!!){
 //                val rEqForSpBase = REqForSpBase()
 //                rEqForSpBase.equipId = rEqForSpBaseList.equipId
@@ -442,7 +442,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
 //            /** 失败集合 */
 //            val failureList = ArrayList<Any>()
 //            delete("spaceID = '${rEqForSpBaseList.spaceId}'")
-//            val projectId = SPageContext.getHeader("ProjectId")
+//            val projectId = SPageContext.getHeader("projectId")
 //            for (equipId in rEqForSpBaseList.equipIdList!!){
 //                val rEqForSpBase = REqForSpBase()
 //                rEqForSpBase.spaceId = rEqForSpBaseList.spaceId
@@ -485,7 +485,7 @@ object REqForSpBaseService: SBaseService<REqForSpBase>(SMybatisDao(REqForSpBase:
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rEqForSpBaseList.equipIdList!!){
                 val rEq2Sp = REq2Sp()
                 rEq2Sp.id2 = rEqForSpBaseList.spaceId

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/rel/REqInShService.kt

@@ -26,7 +26,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
      */
     fun create(rEqInSh: REqInSh): SCreateResponse<REqInSh>{
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rEqInSh.projectId = projectId
             val isInsert = insert(rEqInSh)
             if (isInsert){
@@ -61,7 +61,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
      */
     fun deletes(rEqInSh: REqInSh): SBaseResponse{
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rEqInSh)
             /** 删除成功 */
             if (isDelete) {
@@ -101,7 +101,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipID = '${rEqInShList.equipId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rEqInShList.shaftIdList!!){
                 val rEqInSh = REqInSh()
                 rEqInSh.equipId = rEqInShList.equipId
@@ -150,7 +150,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("shaftID = '${rShInEqList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rShInEqList.equipIdList!!){
                 val rEqInSh = REqInSh()
                 rEqInSh.shaftId = rShInEqList.shaftId
@@ -202,7 +202,7 @@ object REqInShService: RService<REqInSh>(SMybatisDao(REqInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
 //            delete("shaftID = '${rShInEqList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rShInEqList.equipIdList!!){
                 val rEqInSh = REqInSh()
                 rEqInSh.shaftId = rShInEqList.shaftId

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/rel/REqInSpBaseService.kt

@@ -34,7 +34,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
      */
     fun create(type: String, rEqInSpBaseList: SCreateRequest<REqInSpBase>): SCreateResponse<REqInSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rEqInSpBase in rEqInSpBaseList.content){
                 try {
                     val rEq2Sp = REq2Sp()
@@ -182,7 +182,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
      */
     fun deletes(type: String, rEqInSpBaseList: ArrayList<REqInSpBase>): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val list= ArrayList<REq2Sp>()
             for (rEqInSpBase in rEqInSpBaseList){
                 val rEq2Sp = REq2Sp()
@@ -327,7 +327,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("equipId = '${rEqInSpBaseList.equipId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rEqInSpBaseList.spaceIdList!!){
                 val rEqInSpBase = REqInSpBase()
                 rEqInSpBase.equipId = rEqInSpBaseList.equipId
@@ -377,7 +377,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("spaceID = '${rEqInSpBaseList.spaceId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (equipId in rEqInSpBaseList.equipIdList!!){
                 val rEqInSpBase = REqInSpBase()
                 rEqInSpBase.spaceId = rEqInSpBaseList.spaceId
@@ -425,7 +425,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
      */
     fun createsSpEq(type: String,rEqInSpBaseList: RSpInEqBaseList): SCreateResponse<RSpInEqBaseList> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             /** 业务空间类型服务 */
 
             if (!type.isNullOrEmpty()){

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RFlThroughFlService.kt

@@ -27,7 +27,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
      */
     fun create(rFlThroughFl: RFlThroughFl): SCreateResponse<RFlThroughFl> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rFlThroughFl.projectId = projectId
             val isInsert = insert(rFlThroughFl)
             if (isInsert){
@@ -58,7 +58,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
      */
     fun deletes(rFlThroughFl: RFlThroughFl): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rFlThroughFl)
             /** 删除成功 */
             if (isDelete) {
@@ -102,7 +102,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (rFloorThroughFloorOtherList.floorOtherIdList!=null&&rFloorThroughFloorOtherList.floorOtherIdList!!.isNotEmpty()){
                 for (floorOtherId in rFloorThroughFloorOtherList.floorOtherIdList!!){
                     val rFlThroughFl = RFlThroughFl()
@@ -162,7 +162,7 @@ object RFlThroughFlService : RService<RFlThroughFl>(SMybatisDao(RFlThroughFl::cl
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (rFollrOtherThroughFloorList.floorIdList!=null&&rFollrOtherThroughFloorList.floorIdList!!.isNotEmpty()){
                 for (floorId in rFollrOtherThroughFloorList.floorIdList!!){
                     val rFlThroughFl = RFlThroughFl()

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/rel/RIspaceAdjacentIspaceService.kt

@@ -25,7 +25,7 @@ object RIspaceAdjacentIspaceService : RService<RIspaceAdjacentIspace>(SMybatisDa
      */
     fun createLists(rIspaceAdjacentIspace: SCreateRequest<RIspaceAdjacentIspace>): SCreateResponse<RIspaceAdjacentIspace> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rIspaceAdjacentIspace.content
             for (rIspaceIspace in rIspaceAdjacentIspace.content) {
                 rIspaceIspace.projectId = projectId
@@ -55,7 +55,7 @@ object RIspaceAdjacentIspaceService : RService<RIspaceAdjacentIspace>(SMybatisDa
     fun delectId(floorId: String): SBaseResponse {
 
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val ispaceList = SpaceService.select(SFilter.eq("floorId", floorId)).exec()
 
             val list = ArrayList<String>()

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/rel/RShContainSpBaseService.kt

@@ -36,7 +36,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
     fun create(rShContainSpBaseList: SCreateRequest<RShContainSpBase>): SCreateResponse<RShContainSpBase> {
         return try {
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rShContainSpBase in rShContainSpBaseList.content){
                 val rSh2Sp = RSh2Sp()
                 rSh2Sp.id2 = rShContainSpBase.spaceId
@@ -101,7 +101,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
     fun deletes(type: String, rShContainSpBaseList: ArrayList<RShContainSpBase>): SBaseResponse {
         return try {
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rShContainSpBase in rShContainSpBaseList){
                 val rSh2Sp = RSh2Sp()
                 rSh2Sp.id2 = rShContainSpBase.spaceId
@@ -167,7 +167,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rSh2SpService.delete("Id1 = '${rShContainSpBaseList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rShContainSpBaseList.spaceIdList!!){
                 val rSh2Sp = RSh2Sp()
                 rSh2Sp.id1 = rShContainSpBaseList.shaftId
@@ -210,7 +210,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rSh2SpService.delete("id2 = '${rShContainSpBaseList.spaceId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rShContainSpBaseList.shaftIdList!!){
                 val rSh2Sp = RSh2Sp()
                 rSh2Sp.id2 = rShContainSpBaseList.spaceId
@@ -256,7 +256,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!rShContainSpBaseList.spaceIdList.isNullOrEmpty()&&!type.isNullOrEmpty()){
                 for (spaceId in rShContainSpBaseList.spaceIdList!!){
                     val rSh2Sp = RSh2Sp()
@@ -351,7 +351,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             if (!rSpContainShBaseList.shaftIdList.isNullOrEmpty()){
                 for (shaftId in rSpContainShBaseList.shaftIdList!!){
@@ -427,7 +427,7 @@ object RShContainSpBaseService: SBaseService<RShContainSpBase>(SMybatisDao(RShCo
      */
     fun createShSpsReplace(type: String,buildingId: String,floorId: String,rShContainSpBaseList: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val allSpaceIdList = ArrayList<String>()//和竖井关联的并且为当前空间类型的业务空间id列表
             val spaceIdList = ArrayList<String>()//和竖井关联且为当前空间类型、所在建筑楼层为当前建筑楼层的的业务空间id列表
             val allSpaceIdFilterList = ArrayList<SFilter>()

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RShaftThroughShaftService.kt

@@ -27,7 +27,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
      */
     fun create(rFlThroughFl: RShaftThroughShaft): SCreateResponse<RShaftThroughShaft> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rFlThroughFl.projectId = projectId
             val isInsert = insert(rFlThroughFl)
             if (isInsert){
@@ -59,7 +59,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
      */
     fun deletes(rFlThroughFl: RShaftThroughShaft): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rFlThroughFl)
 
             val rShaftThroughShaft = RShaftThroughShaft()
@@ -124,7 +124,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (rFloorThroughFloorOtherList.shaftOtherIdList!=null&&rFloorThroughFloorOtherList.shaftOtherIdList!!.isNotEmpty()){
                 for (floorOtherId in rFloorThroughFloorOtherList.shaftOtherIdList!!){
                     val rFlThroughFl = RShaftThroughShaft()
@@ -185,7 +185,7 @@ object RShaftThroughShaftService : RService<RShaftThroughShaft>(SMybatisDao(RSha
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (rFloorThroughFloorOtherList.shaftOtherIdList!=null&&rFloorThroughFloorOtherList.shaftOtherIdList!!.isNotEmpty()){
                 for (floorOtherId in rFloorThroughFloorOtherList.shaftOtherIdList!!){
                     val rFlThroughFl = RShaftThroughShaft()

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/rel/RSp2SiService.kt

@@ -19,7 +19,7 @@ object RSp2SiService: SObjectService<RSp2Si>(SMybatisDao(RSp2Si::class.java)) {
     }
 
     override fun onDeleteSuccess(rEqInSpZoneLightingList: ArrayList<RSp2Si>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for(rEqInSpZoneLighting in rEqInSpZoneLightingList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "12")

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInBdService.kt

@@ -23,7 +23,7 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
      */
     fun  spInBdCreates(rSiInSpBase: SCreateRequest<RSpinBd>): SCreateResponse<RSpinBd> {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val contentList = rSiInSpBase.content
             if (contentList.isNotEmpty()){
                 for (rSpinBd in contentList){
@@ -62,7 +62,7 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
      */
     fun spInBdDeLs(rSpinBdList: ArrayList<RSpinBd>): SBaseResponse {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!rSpinBdList.isNullOrEmpty()){
                 for (rSpinBd in rSpinBdList){
                     if (!rSpinBd.spaceId.isNullOrEmpty()&&!rSpinBd.buildingId.isNullOrEmpty()){
@@ -94,7 +94,7 @@ object RSpInBdService: SObjectService<RSpinBd>(SMybatisDao(RSpinBd::class.java))
      */
     fun spInBdUpdates(request: SUpdateRequest<RSpinBd>): SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val contentList = request.content
             if (!contentList.isNullOrEmpty()){
 

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInFlService.kt

@@ -26,7 +26,7 @@ object RSpInFlService: SObjectService<RSpinFl>(SMybatisDao(RSpinFl::class.java))
      */
     fun  spInBdOrFlCreates(rSiInSpBase: SCreateRequest<RSpinFl>): SCreateResponse<RSpinFl> {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val contentList = rSiInSpBase.content
             if (contentList.isNotEmpty()){
                 for (rSpinFl in contentList){
@@ -80,7 +80,7 @@ object RSpInFlService: SObjectService<RSpinFl>(SMybatisDao(RSpinFl::class.java))
      */
     fun spInBdDeLs(rSpinBdList: ArrayList<RSpinFl>): SBaseResponse {
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!rSpinBdList.isNullOrEmpty()){
                 for (rSpinBd in rSpinBdList){
                     if (!rSpinBd.spaceId.isNullOrEmpty()&&!rSpinBd.floorId.isNullOrEmpty()){
@@ -112,7 +112,7 @@ object RSpInFlService: SObjectService<RSpinFl>(SMybatisDao(RSpinFl::class.java))
      */
     fun spInBdUpdates(request: SUpdateRequest<RSpinFl>): SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val contentList = request.content
             if (!contentList.isNullOrEmpty()){
 

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/rel/RSpInSiBaseService.kt

@@ -36,7 +36,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
      */
     fun createLists(type: String, rSiInSpBaseList: SCreateRequest<RSiInSpBase>): SCreateResponse<RSiInSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             for (rSpInSiBase in rSiInSpBaseList.content){
                 val rSp2Si = RSp2Si()
@@ -117,7 +117,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
      */
     fun deletes(type: String, rSiInSpBaseList: ArrayList<RSiInSpBase>): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rSpInSiBase in rSiInSpBaseList){
                 val rSp2Si = RSp2Si()
                 rSp2Si.id1 = rSpInSiBase.spaceId
@@ -191,7 +191,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
             val failureList = ArrayList<Any>()
 //            delete("ispaceId = '${rSpInSiBaseList.ispaceId}'")
             RSp2SiService.delete("id2 ='${rSpInSiBaseList.ispaceId} ")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if(!rSpInSiBaseList.spaceIdList.isNullOrEmpty()) {
                 for (spaceId in rSpInSiBaseList.spaceIdList!!) {
                     val rSp2Si = RSp2Si()
@@ -250,7 +250,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
 //            delete("spaceID = '${rSiInSpBaseList.spaceId}'")
             RSp2SiService.delete("Id1 = '${rSiInSpBaseList.spaceId}'")
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if(!rSiInSpBaseList.ispaceIdList.isNullOrEmpty()) {
                 for (ispaceId in rSiInSpBaseList.ispaceIdList!!) {
                     val rSp2Si = RSp2Si()
@@ -308,7 +308,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if(!rSiInSpBaseList.ispaceIdList.isNullOrEmpty()) {
                 for (ispaceId in rSiInSpBaseList.ispaceIdList!!) {
                     val rSp2Si = RSp2Si()
@@ -393,7 +393,7 @@ object RSpInSiBaseService: SObjectService<RSiInSpBase>(SMybatisDao(RSiInSpBase::
      */
     fun createsSp(type: String,rSiInSpBaseList: RSiInSpBaseList): SCreateResponse<RSiInSpBaseList> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RSpatialConnectionService.kt

@@ -28,7 +28,7 @@ object RSpatialConnectionService : SObjectService<RSpatialConnection>(SMybatisDa
      */
     fun create(rSiInSpBase: SCreateRequest<RSpatialConnection>): SCreateResponse<RSpatialConnection> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val contentList = rSiInSpBase.content
             if (contentList.size > 0) {
                 for (content in contentList) {
@@ -69,7 +69,7 @@ object RSpatialConnectionService : SObjectService<RSpatialConnection>(SMybatisDa
      */
     fun pageQuerys(request: SQueryRequest): SQueryResponse<RSpatialConnection> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val filter = select(request.filters).filter(SFilter.eq("projectId", projectId!!)).exec()
             val sQueryResponse = SQueryResponse<RSpatialConnection>(SResponseType.success)
             sQueryResponse.total = filter.size.toLong()
@@ -87,7 +87,7 @@ object RSpatialConnectionService : SObjectService<RSpatialConnection>(SMybatisDa
     fun  delete(idList: ArrayList<RSpatialConnection>): SBaseResponse {
         return try {
             if (idList.size>0){
-                val projectId = SPageContext.getHeader("ProjectId")
+                val projectId = SPageContext.getHeader("projectId")
                 for (rSpatialConnection in idList){
                     try {
                         delete(SFilter.eq("zoneType",rSpatialConnection.zoneType!!),SFilter.eq("graphType",rSpatialConnection.graphType!!),SFilter.eq("projectId",projectId!!),SFilter.eq("spaceIdOne",rSpatialConnection.spaceIdOne!!),SFilter.eq("spaceIdTwo",rSpatialConnection.spaceIdTwo!!))
@@ -118,7 +118,7 @@ object RSpatialConnectionService : SObjectService<RSpatialConnection>(SMybatisDa
      */
     fun  deleteFloor(rSpatialConnection: RSpatialConnection): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             delete(SFilter.eq("graphType",rSpatialConnection.graphType!!),SFilter.eq("projectId",projectId!!),SFilter.eq("floorId",rSpatialConnection.floorId!!),SFilter.eq("zoneType",rSpatialConnection.zoneType!!))
 
             SBaseResponse(SResponseType.success)

+ 7 - 7
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyEqService.kt

@@ -31,7 +31,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
      */
     fun create(rSyEq: RSyEq): SCreateResponse<RSyEq> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 //            rSyEq.id = IdUtils.uuidCreate()
             rSyEq.projectId = projectId
             val isInsert = replace(rSyEq)
@@ -64,7 +64,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
      */
      fun deletes(rSyEq: RSyEq): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
                 val isDelete = delete(rSyEq)
                 /** 删除成功 */
                 if (isDelete) {
@@ -116,7 +116,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
      */
     fun createSy(rSyEqList: RSyEqList): SCreateResponse<RSyEq> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */
@@ -175,7 +175,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
     */
     fun createsEq(rSyEqList: REqSyList): SCreateResponse<RSyEq> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             /** 成功集合 */
             val successList = ArrayList<Any>()
             /** 失败集合 */
@@ -242,7 +242,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
     fun createSyEq(rSyEqList: RSyEqList): SCreateResponse<RSyEq> {
         return try {
             logger.debug("设备和系统00001=${rSyEqList.toJson()}")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 
             /** 失败集合 */
             val failureList = ArrayList<RSyEq>()
@@ -340,7 +340,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
      */
     override fun onCreateSuccess(entityList: ArrayList<RSyEq>) {
         super.onCreateSuccess(entityList)
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for (rSyEq in entityList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "11")
@@ -361,7 +361,7 @@ object RSyEqService : RService<RSyEq>(SMybatisDao(RSyEq::class.java)) {
      */
     override fun onDeleteSuccess(entityList: ArrayList<RSyEq>) {
         super.onDeleteSuccess(entityList)
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for (rSyEq in entityList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "12")

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForBdService.kt

@@ -25,7 +25,7 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
      */
     fun create(rSyForBd: RSyForBd): SCreateResponse<RSyForBd> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyForBd.projectId = projectId
             val isInsert = insert(rSyForBd)
             if (isInsert){
@@ -74,7 +74,7 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyForBdList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (buildingId in rSyForBdList.buildingIdList!!){
                 val rSyForBd = RSyForBd()
                 rSyForBd.sysId = rSyForBdList.sysId
@@ -114,7 +114,7 @@ object RSyForBdService: RService<RSyForBd>(SMybatisDao(RSyForBd::class.java)){
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("buildingID = '${rBdForSyList.buildingId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rBdForSyList.sysIdList!!){
                 val rSyForBd = RSyForBd()
                 rSyForBd.buildingId = rBdForSyList.buildingId

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForFlService.kt

@@ -25,7 +25,7 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
      */
     fun create(rSyForFl: RSyForFl):SCreateResponse<RSyForFl> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyForFl.projectId = projectId
             val isInsert = insert(rSyForFl)
             if(isInsert){
@@ -74,7 +74,7 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyForFlList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (floorId in rSyForFlList.floorIdList!!){
                 val rSyForFl = RSyForFl()
                 rSyForFl.sysId = rSyForFlList.sysId
@@ -114,7 +114,7 @@ object RSyForFlService: RService<RSyForFl>(SMybatisDao(RSyForFl::class.java)){
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("floorID = '${rSyForFlList.floorId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rSyForFlList.sysIdList!!){
                 val rSyForFl = RSyForFl()
                 rSyForFl.floorId = rSyForFlList.floorId

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForShService.kt

@@ -24,7 +24,7 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
      */
     fun create(rSyForSh: RSyForSh): SCreateResponse<RSyForSh> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyForSh.projectId = projectId
             val isInsert = insert(rSyForSh)
             if(isInsert){
@@ -73,7 +73,7 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyForShList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rSyForShList.shaftIdList!!){
                 val rSyForSh = RSyForSh()
                 rSyForSh.sysId = rSyForShList.sysId
@@ -113,7 +113,7 @@ object RSyForShService: RService<RSyForSh>(SMybatisDao(RSyForSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("shaftID = '${rSyForShList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rSyForShList.sysIdList!!){
                 val rSyForSh = RSyForSh()
                 rSyForSh.shaftId = rSyForShList.shaftId

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyForSpBaseService.kt

@@ -30,7 +30,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
      */
     fun create(rSyForSpBase: RSyForSpBase): SCreateResponse<RSyForSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyForSpBase.projectId = projectId
             val rSy2Sp = RSy2Sp()
             rSy2Sp.id1 = rSyForSpBase.sysId
@@ -59,7 +59,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
      */
     fun deletes(rSyForSpBase: RSyForSpBase): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val entity = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", rSyForSpBase.spaceId!!)).entity()
             val rSy2Sp = RSy2Sp()
             rSy2Sp.id1 = rSyForSpBase.sysId
@@ -94,7 +94,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rSy2SpService.delete("id1 = '${rSyForSpBaseList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rSyForSpBaseList.spaceIdList!!){
                 val entity = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", spaceId!!)).entity()
                 val rSy2Sp = RSy2Sp()
@@ -137,7 +137,7 @@ object RSyForSpBaseService: SBaseService<RSyForSpBase>(SMybatisDao(RSyForSpBase:
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSy2SpService.delete("id2 = '${rSyForSpBaseList.spaceId}'")
             val entity = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", rSyForSpBaseList.spaceId!!)).entity()
 

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInBdService.kt

@@ -25,7 +25,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
      */
     fun create(rSyInBd: RSyInBd): SCreateResponse<RSyInBd> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyInBd.projectId = projectId
             val isInsert = insert(rSyInBd)
             if (isInsert){
@@ -75,7 +75,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyInBdList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (rSyInBdList.buildingIdList!=null&&rSyInBdList.buildingIdList!!.size>0){
                 for (buildingId in rSyInBdList.buildingIdList!!){
                     val rSyInBd = RSyInBd()
@@ -120,7 +120,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
 //            delete("sysID = '${rSyInBdList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (buildingId in rSyInBdList.buildingIdList!!){
                 val rSyInBd = RSyInBd()
                 rSyInBd.sysId = rSyInBdList.sysId
@@ -160,7 +160,7 @@ object RSyInBdService: RService<RSyInBd>(SMybatisDao(RSyInBd::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("buildingID = '${rBdInSyList.buildingId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rBdInSyList.sysIdList!!){
                 val rSyInBd = RSyInBd()
                 rSyInBd.buildingId = rBdInSyList.buildingId

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInFlService.kt

@@ -28,7 +28,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
      */
     fun create(rSyInFl: RSyInFl): SCreateResponse<RSyInFl> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyInFl.projectId = projectId
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             val floorObj = floorService.select(SFilter.eq("id", rSyInFl.floorId!!)).entity()
@@ -82,7 +82,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyInFlList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             if (!rSyInFlList.floorIdList.isNullOrEmpty()){
                 for (floorId in rSyInFlList.floorIdList!!){
@@ -135,7 +135,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
 //            delete("sysID = '${rSyInFlList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             for (floorId in rSyInFlList.floorIdList!!){
                 val rSyInFl = RSyInFl()
@@ -183,7 +183,7 @@ object RSyInFlService: RService<RSyInFl>(SMybatisDao(RSyInFl::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("floorID = '${rFlInSyList.floorId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val floorService = SObjectService(SMybatisDao(Floor::class.java))
             for (sysId in rFlInSyList.sysIdList!!){
                 val rSyInBd = RSyInFl()

+ 8 - 8
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInShService.kt

@@ -26,7 +26,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     fun create(rSyInSh: RSyInSh): SCreateResponse<RSyInSh> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             rSyInSh.projectId = projectId
             val isInsert = insert(rSyInSh)
             if (isInsert){
@@ -58,7 +58,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     fun deletes(rSyInSh: RSyInSh): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val isDelete = delete(rSyInSh)
             /** 删除成功 */
             if (isDelete) {
@@ -95,7 +95,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("sysID = '${rSyInShList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rSyInShList.shaftIdList!!){
                 val rSyInSh = RSyInSh()
                 rSyInSh.sysId = rSyInShList.sysId
@@ -145,7 +145,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             delete("shaftID = '${rShInSyList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rShInSyList.sysIdList!!){
                 val rSyInSh = RSyInSh()
                 rSyInSh.shaftId = rShInSyList.shaftId
@@ -199,7 +199,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             /** 失败集合 */
             val failureList = ArrayList<Any>()
 //            delete("shaftID = '${rShInSyList.shaftId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rShInSyList.sysIdList!!){
                 val rSyInSh = RSyInSh()
                 rSyInSh.shaftId = rShInSyList.shaftId
@@ -251,7 +251,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (shaftId in rSyInShList.shaftIdList!!){
                 val rSyInSh = RSyInSh()
                 rSyInSh.sysId = rSyInShList.sysId
@@ -293,7 +293,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     override fun onCreateSuccess(entityList: ArrayList<RSyInSh>) {
         super.onCreateSuccess(entityList)
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for (rSyInSh in entityList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "11")
@@ -313,7 +313,7 @@ object RSyInShService: RService<RSyInSh>(SMybatisDao(RSyInSh::class.java)) {
      */
     override fun onDeleteSuccess(entityList: ArrayList<RSyInSh>) {
         super.onDeleteSuccess(entityList)
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         for (rSyInSh in entityList){
             val jsonObject = JSONObject()
             jsonObject.put("type", "12")

+ 6 - 6
data-center/src/main/kotlin/com/persagy/server/services/rel/RSyInSpBaseService.kt

@@ -33,7 +33,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
      */
     fun create(rSyInSpBaseList: SCreateRequest<RSyInSpBase>): SCreateResponse<RSyInSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rSyInSpBase in rSyInSpBaseList.content){
                 val rSy2Sp = RSy2Sp()
                 rSy2Sp.id1 = rSyInSpBase.sysId
@@ -115,7 +115,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
     fun deletes(type: String, rSyInSpBaseList: ArrayList<RSyInSpBase>): SBaseResponse {
         return try {
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rSyInSpBase in rSyInSpBaseList){
                 val rSy2Sp = RSy2Sp()
                 rSy2Sp.id2 = rSyInSpBase.spaceId
@@ -200,7 +200,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rSy2SpService.delete("id1 = '${rSyInSpBaseList.sysId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rSyInSpBaseList.spaceIdList!!){
                 val entity = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", spaceId!!)).entity()
                 val rSy2Sp = RSy2Sp()
@@ -252,7 +252,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             delete("id2 = '${rSyInSpBaseList.spaceId}'")
             val entity = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId!!), SFilter.eq("id", rSyInSpBaseList.spaceId!!)).entity()
 
@@ -311,7 +311,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (sysId in rSyInSpBase.sysIdList!!){
                 val rSy2Sp = RSy2Sp()
                 rSy2Sp.id2 = rSyInSpBase.spaceId
@@ -399,7 +399,7 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
             val successList = ArrayList<Any>()
             /** 失败集合 */
             val failureList = ArrayList<Any>()
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rSyInSpBase.spaceIdList!!){
                 val rSy2Sp = RSy2Sp()
                 rSy2Sp.id1 = rSyInSpBase.sysId

+ 4 - 4
data-center/src/main/kotlin/com/persagy/server/services/rel/RTnInSpBaseService.kt

@@ -40,7 +40,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
      */
     fun create(type: String,rTnInSpBaseList: SCreateRequest<RTnInSpBase>): SCreateResponse<RTnInSpBase> {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!rTnInSpBaseList.content.isNullOrEmpty()){
                 for (rTnInSpBase in rTnInSpBaseList.content){
                     val rTn2Sp = RTn2Sp()
@@ -156,7 +156,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
      */
     fun deletes(type: String,rTnInSpBaseList: ArrayList<RTnInSpBase>): SBaseResponse {
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (rTnInSpBase in rTnInSpBaseList) {
                 val rTn2Sp = RTn2Sp()
                 rTn2Sp.id1 = rTnInSpBase.tenantId
@@ -258,7 +258,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rTn2SpService.delete("Id1 = '${rTnInSpBaseList.tenantId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (spaceId in rTnInSpBaseList.spaceIdList!!){
                 val rTn2Sp = RTn2Sp()
                 rTn2Sp.id1 = rTnInSpBaseList.tenantId
@@ -333,7 +333,7 @@ object RTnInSpBaseService: SBaseService<RTnInSpBase>(SMybatisDao(RTnInSpBase::cl
             /** 失败集合 */
             val failureList = ArrayList<Any>()
             rTn2SpService.delete("Id2 = '${rTnInSpBaseList.spaceId}'")
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             for (tenantId in rTnInSpBaseList.tenantIdList!!){
                 val rTn2Sp = RTn2Sp()
                 rTn2Sp.id2 = rTnInSpBaseList.spaceId

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/relation_calc/CalcSpecialService.kt

@@ -69,7 +69,7 @@ open class CalcSpecialService {
     fun sysBolck(relationType: String): SBaseResponse {
         try {
             val buildingId: String? = null
-            val projectId = SPageContext.getHeader("ProjectId").toString()
+            val projectId = SPageContext.getHeader("projectId").toString()
             upDateBiaoji(projectId,relationType ,3)
             val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", relationType)).entity()
             if (entity != null) {
@@ -169,7 +169,7 @@ open class CalcSpecialService {
      */
     fun sysDirection(buildingId: String?, blockId: String, systemName: String, domain: String, isSource: Boolean): SBaseResponse {
         try {
-            val projectId = SPageContext.getHeader("ProjectId").toString()
+            val projectId = SPageContext.getHeader("projectId").toString()
             val result = mapper.sysDirection(projectId, buildingId, blockId, systemName, domain, isSource)
             if (result) {
                 return SBaseResponse(SResponseType.success)

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -99,7 +99,7 @@ open class ManualRelationCalcService {
      */
     fun delPe2Space(manualRelationCalcDel: ManualRelationCalcDel):SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!manualRelationCalcDel.fromId.isNullOrEmpty()&&!manualRelationCalcDel.toId.isNullOrEmpty()){
 
                 val delete = rPeInSpBaseService.delete(SFilter.eq("projectId", projectId!!),
@@ -134,7 +134,7 @@ open class ManualRelationCalcService {
      */
     fun delPe2Shs(manualRelationCalcDel: ManualRelationCalcDel):SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!manualRelationCalcDel.fromId.isNullOrEmpty()&&!manualRelationCalcDel.toId.isNullOrEmpty()){
 
                 val delete = rPeInShService.delete(SFilter.eq("projectId", projectId!!),
@@ -171,7 +171,7 @@ open class ManualRelationCalcService {
 
         try {
             /** 项目id */
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val list = ArrayList<SFilter>()
             list.add(SFilter.eq("projectId",projectId!!))
             /** 模糊查询 */
@@ -291,7 +291,7 @@ open class ManualRelationCalcService {
      */
     fun addRel(relationAddRequest: RelationAddRequest): ManualRelationCalcSCreateResponse {
         /** 项目id */
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         val sCreateResponse = ManualRelationCalcSCreateResponse()
 
@@ -2087,7 +2087,7 @@ open class ManualRelationCalcService {
      */
     fun delRel(manualRelationCalcDel: ManualRelationCalcDel):SBaseResponse{
         try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             if (!manualRelationCalcDel.fromId.isNullOrEmpty()&&!manualRelationCalcDel.toId.isNullOrEmpty()){
 
                 try {

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskQueryService.kt

@@ -24,7 +24,7 @@ object EquipScanTaskQueryService : SObjectService<EquipScanTaskQuery>(SMybatisDa
     fun pageQuerys(request: SQueryRequest): SQueryResponse<EquipScanTaskQuery> {
 
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         withFilterList.add(SFilter.lt(SLength("category"), 6))
         val pageQuery = pageQuery(request, withFilterList)
         if (!pageQuery.content.isNullOrEmpty()&&pageQuery.content!!.size>0){

+ 3 - 3
data-center/src/main/kotlin/com/persagy/server/services/task/EquipScanTaskService.kt

@@ -68,7 +68,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
                 resetTaskStatus(equipScanTask)
             }
 
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 //            if (equipScanTask.id.isNullOrEmpty()) {
                 equipScanTask.id = IdUtils.uuidCreate()
 //            }
@@ -217,7 +217,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
      * 设备级联部件,所有部件也增加任务
      */
     override fun onCreateSuccess(equipScanTaskList: ArrayList<EquipScanTask>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         for(task in equipScanTaskList){
             val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
@@ -265,7 +265,7 @@ object EquipScanTaskService : RService<EquipScanTask>(SMybatisDao(EquipScanTask:
      * 状态修改完成之后,若修改为  已完成状态  则级联部件任务状态全部修改为  已完成
      */
     override fun onUpdateSuccess(list: ArrayList<EquipScanTask>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val comming = SPageContext.getHeader("Coming")
         val account = SPageContext.getHeader("Account")
         for (task in list) {

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskQueryService.kt

@@ -18,7 +18,7 @@ object ModelScanTaskQueryService : RService<ModelScanTaskQuery>(SMybatisDao(Mode
 
     fun pageQuerys(request: SQueryRequest): SQueryResponse<ModelScanTaskQuery> {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         withFilterList.add(SFilter.lt(SLength("category"), 6))
         val pageQuery = pageQuery(request, withFilterList)
         if (!pageQuery.content.isNullOrEmpty()&&pageQuery.content!!.size>0){

+ 5 - 5
data-center/src/main/kotlin/com/persagy/server/services/task/ModelScanTaskService.kt

@@ -85,7 +85,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
                     flag = true
                     resetTaskStatus(modelScanTask)
                 }
-                val projectId = SPageContext.getHeader("ProjectId")
+                val projectId = SPageContext.getHeader("projectId")
 //                if (modelScanTask.id.isNullOrEmpty()) {
                     modelScanTask.id = UUID.randomUUID().toString()
 //                }
@@ -221,7 +221,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      * 创建设备台账任务成功之后,设备级联部件,所有部件也增加任务
      */
     override fun onCreateSuccess(modelScanTaskList: ArrayList<ModelScanTask>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         for(task in modelScanTaskList){
             val equipmentService = SBaseService(SMybatisDao(Equipment::class.java))
@@ -265,7 +265,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      */
     override fun onUpdateSuccess(list: ArrayList<ModelScanTask>) {
 
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val comming = SPageContext.getHeader("Coming")
         val account = SPageContext.getHeader("Account")
 
@@ -405,7 +405,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
         val pageQuery: SPageQueryInfo<ModelFolder>
         val gson = Gson()
         return try {
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             var request = SQueryRequest()
             val modelFolderService = SBaseService(SMybatisDao(ModelFolder::class.java))
             val modelFolderQueryBuilder = modelFolderService.select(request.filters)
@@ -435,7 +435,7 @@ object ModelScanTaskService : RService<ModelScanTask>(SMybatisDao(ModelScanTask:
      */
     fun  equipQuery(request: ModelScanSQueryRequest): SQueryResponse<EquipmentTaskTwo>{
         return  try{
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
             val modelScanTaskService = SBaseService(SMybatisDao(EquipmentTaskTwo::class.java))
             if (!request.modelId.isNullOrEmpty()&&!request.idList.isNullOrEmpty()&&request.idList!!.size>0){
                 val list = ArrayList<EquipmentTaskTwo>()

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/task/PropertyScanTaskService.kt

@@ -73,7 +73,7 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
                     propertyScanTaskService.update(resetTask)
                 }
             }
-            val projectId = SPageContext.getHeader("ProjectId")
+            val projectId = SPageContext.getHeader("projectId")
 //            if (propertyScanTask.id.isNullOrEmpty()) {
                 propertyScanTask.id = UUID.randomUUID().toString()
 //            }
@@ -244,7 +244,7 @@ object PropertyScanTaskService : RService<PropertyScanTask>(SMybatisDao(Property
      * 状态修改完成之后
      */
     override fun onUpdateSuccess(list: ArrayList<PropertyScanTask>) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val comming = SPageContext.getHeader("Coming")
         val account = SPageContext.getHeader("Account")
         for (task in list) {

+ 1 - 1
data-center/src/main/kotlin/com/persagy/server/services/task/RecordProblemsService.kt

@@ -12,7 +12,7 @@ import com.persagy.service.SPageContext
 object RecordProblemsService : RService<RecordProblems>(SMybatisDao(RecordProblems::class.java)){
 
     override fun onCreateBefore(entity: RecordProblems): Boolean {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
 
         if (entity.id.isNullOrEmpty()){
             entity.id = IdUtils.uuidCreate()

+ 2 - 2
data-center/src/main/kotlin/com/persagy/server/services/task/ScanTaskBaseService.kt

@@ -39,7 +39,7 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
             var request = SQueryRequest()
             val queryBuilder = equipCategoryDicService.select(request.filters)
 
-            val projectId = SPageContext.getHeader("ProjectId").toString()
+            val projectId = SPageContext.getHeader("projectId").toString()
             queryBuilder.tableName = "scantask.f_get_category('$type','$projectId')"
             pageQuery = queryBuilder.pageQuery(1, 1000)
             SQueryResponse(pageQuery)
@@ -57,7 +57,7 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
         val pageQuery: SPageQueryInfo<BuildingDic>
         val gson = Gson()
         return try {
-            val projectId = SPageContext.getHeader("ProjectId").toString()
+            val projectId = SPageContext.getHeader("projectId").toString()
             var request = SQueryRequest()
             val service = SBaseService(SMybatisDao(BuildingDic::class.java))
             val queryBuilder = service.select(request.filters)

+ 4 - 6
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/DictBatchProcessing.kt

@@ -1,27 +1,25 @@
 package com.persagy.server.datacenter.models.entities.dict
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModelProperty
 
 /**
  * 字典 批量处理
+ *
+ * @author wx  <zhangweixin@sagacloud.cn>
  */
 class DictBatchProcessing : SBaseEntity(){
 
-    /** 方案id */
-    @ApiModelProperty(value = "方案id")
-    @JSONField(name = "SchemeId")
+    /** 方案 id */
+    @ApiModelProperty(value = "方案 id")
     var schemeId:String? = null
 
     /** 优先级列表 */
     @ApiModelProperty(value = "优先级列表")
-    @JSONField(name = "PriorityList")
     var priorityList:ArrayList<String>? = null
 
     /** 一级标签名称列表 */
     @ApiModelProperty(value = "一级标签名称列表")
-    @JSONField(name = "FirstNameList")
     var firstNameList:ArrayList<String>? = null
 
 } // Class DictBatchProcessing

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

@@ -45,6 +45,7 @@ class DefClass : SBaseEntity(){
     var type: String? = null
 
     @ApiModelProperty(value = "集团id, 默认为 '0' ")
+    @Id
     @Column(name = "group_code")
     var groupCode: String? = ""
 

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

@@ -10,12 +10,12 @@ import javax.persistence.Table
 /**
  * 平台对象信息点
  *
- * @author  wx
+ * @author wx <zhangweixin@sagacloud.cn>
  * @date  2020/9/19 17:41
  */
 @ApiModel(description = "平台对象信息点")
 @Table(name = "dict.def_funcid")
-class DefFuncId: Serializable {
+open class DefFuncId: Serializable {
 
     /** 全局id */
     @ApiModelProperty(value = "全局id")
@@ -131,6 +131,16 @@ class DefFuncId: Serializable {
     @Column(name = "orig_code")
     var origCode: String? = null
 
+    /** 别编码 */
+    @ApiModelProperty(value = "别编码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    @ApiModelProperty(value = "别名称")
+    @Column(name = "alias_name")
+    var aliasName: String? = null
+
     /** 是否分类标签 */
     @ApiModelProperty(value = "是否分类标签")
     @Column(name = "can_sub")

+ 14 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdProject.kt

@@ -0,0 +1,14 @@
+package com.persagy.server.datacenter.models.entities.dictnew
+
+import io.swagger.annotations.ApiModel
+import javax.persistence.Table
+
+/**
+ * 项目定制化实体类
+ *
+ * @author wx <zhangweixin@sagacloud.com>
+ * @date  2020/10/14 22:19
+ */
+@ApiModel(description = "平台对象信息点")
+@Table(name = "dict.def_funcid_project")
+class DefFuncIdProject : DefFuncId()

+ 24 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncIdScheme.kt

@@ -0,0 +1,24 @@
+package com.persagy.server.datacenter.models.entities.dictnew
+
+import io.swagger.annotations.ApiModel
+import io.swagger.annotations.ApiModelProperty
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 项目定制化实体类
+ *
+ * @author wx <zhangweixin@sagacloud.com>
+ * @date  2020/10/14 22:19
+ */
+@ApiModel(description = "平台对象信息点")
+@Table(name = "dict.def_funcid_scheme")
+class DefFuncIdScheme : DefFuncId(){
+
+    @ApiModelProperty(value = "方案 id")
+    @Id
+    @Column(name = "scheme_id")
+    var schemeId: Int? = null
+
+} // Class DefFuncIdScheme

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

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
 import java.io.Serializable
@@ -11,7 +10,7 @@ import javax.persistence.Table
 /**
  * 专业
  *
- * @author  wx
+ * @author wx  <zhangweixin@sagacloud.com>
  * @date  2020/9/20 16:03
  */
 @ApiModel(description = "专业")
@@ -21,43 +20,42 @@ class DictMajor: Serializable {
     /** 全局id */
     @ApiModelProperty(value = "全局id")
     @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: Int? = null
+    var id: String? = null
 
+    /** 编码 */
     @ApiModelProperty(value = "编码")
     @Id
     @Column(name = "code")
-    @JSONField(name = "Code")
     var code: String? = null
 
+    /** 名称 */
     @ApiModelProperty(value = "名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
+    /** 说明 */
     @ApiModelProperty(value = "说明")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: String? = null
 
+    /** 别编码 */
     @ApiModelProperty(value = "别编码")
     @Column(name = "alias_code")
-    @JSONField(name = "AliasCode")
     var aliasCode: String? = null
 
+    /** 别名称 */
     @ApiModelProperty(value = "别名称")
     @Column(name = "alias_name")
-    @JSONField(name = "AliasName")
     var aliasName: String? = null
 
+    /** 平台类型 */
     @ApiModelProperty(value = "平台类型")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
+    /** 集团id */
     @ApiModelProperty(value = "集团id")
-    @Column(name = "group_id")
-    @JSONField(name = "GroupId")
-    var groupId: String? = null
+    @Column(name = "group_code")
+    var groupCode: String? = null
 
 } // class DictMajor

+ 18 - 6
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DictProject.kt

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
 import javax.persistence.Column
@@ -21,19 +20,32 @@ class DictProject {
     @ApiModelProperty(value = "项目id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var  id: String? = null
 
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
     /** 集团id */
     @ApiModelProperty(value = "集团id")
-    @Column(name = "group_id")
-    @JSONField(name = "GroupId")
-    var groupId: String? = null
+    @Column(name = "group_code")
+    var groupCode: String? = null
+
+    /** 标记 */
+    @ApiModelProperty(value = "标记")
+    @Column(name = "status")
+    var status: Int? = null
+
+    /** 创建者 */
+    @ApiModelProperty(value = "创建者")
+    @Column(name = "create_user")
+    var createUser: String? = null
+
+    /** 更新者 */
+    @ApiModelProperty(value = "更新者")
+    @Column(name = "update_user")
+    var updateUser: String? = null
+
 
 } // Class DictProject

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

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
-import com.alibaba.fastjson.annotation.JSONField
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
 import java.io.Serializable
@@ -11,24 +10,47 @@ import javax.persistence.Table
 /**
  * 集团实体类
  *
- * @author  wx
+ * @author  wx <zhangweixin@sagacloud.com>
  * @date  2020/9/16 22:13
  */
 @ApiModel(description = "集团实体类")
 @Table(name = "dict.group")
 class Group : Serializable {
 
+    /** id */
+    @ApiModelProperty(value = "id")
+    @Column(name = "id")
+    var id: String? = null
+
     /** 编码 */
     @ApiModelProperty(value = "编码")
     @Id
     @Column(name = "code")
-    @JSONField(name = "Code")
-    var  id: String? = null
+    var  code: String? = null
 
     /** 集团名称 */
     @ApiModelProperty(value = "集团名称")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name: String? = null
 
+    /** 标记 */
+    @ApiModelProperty(value = "标记")
+    @Column(name = "status")
+    var status: Int? = null
+
+    /** 创建者 */
+    @ApiModelProperty(value = "创建者")
+    @Column(name = "create_user")
+    var createUser: String? = null
+
+    /** 更新者 */
+    @ApiModelProperty(value = "更新者")
+    @Column(name = "update_user")
+    var updateUser: String? = null
+
+    /** 说明 */
+    @ApiModelProperty(value = "说明")
+    @Column(name = "remark")
+    var remark: String? = null
+
 } // Class Group

+ 2 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/requests/CategoryRequest.kt

@@ -4,7 +4,8 @@ import java.io.Serializable
 
 /**
  * 字典类型请求体
- * @author  wx
+ *
+ * @author wx  <zhangweixin@sagacloud.cn>
  * @date  2020/9/23 19:53
  */
 class CategoryRequest: Serializable {

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/Swagger2Config.kt

@@ -58,8 +58,8 @@ open class Swagger2Config {
         val builder = ParameterBuilder()
         val builderComming = ParameterBuilder()
         val pars = ArrayList<Parameter>()
-//        builder.name("ProjectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
-//        builderComming.name("Coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+//        builder.name("projectId").description("项目ID").modelRef(ModelRef("string")).parameterType("header").required(false).build()
+//        builderComming.name("coming").description("来源").modelRef(ModelRef("string")).parameterType("header").required(false).build()
         pars.add(builder.build())
         pars.add(builderComming.build())
         return Docket(DocumentationType.SWAGGER_2)

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController
  * @author  wx
  * @date  2020/9/10 10:00
  */
-@Api(tags = ["字典-手动导入字典"])
+@Api(tags = ["0001、字典-手动导入字典"])
 @RestController
 @RequestMapping("/dict")
 class DictControllers {

+ 44 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/DictSchemeControllers.kt

@@ -0,0 +1,44 @@
+package com.persagy.server.syn.controllers
+
+import com.persagy.server.datacenter.models.entities.dictnew.DefFuncIdScheme
+import com.persagy.server.syn.services.dict.DictSchemeService
+import com.persagy.service.models.responses.SCreateResponse
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 设置方案
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/10/15 17:08
+ */
+@Api(tags = ["0002、设置方案字典方案"])
+@RestController
+@RequestMapping("/set-scheme")
+class DictSchemeControllers {
+
+    /**
+     * 预置方案1生成
+     */
+    @ApiOperation(value = " 预置方案1生成", notes = "")
+    @PostMapping(value = ["/create"])
+    fun setSchemeOne(): SCreateResponse<DefFuncIdScheme> {
+        return DictSchemeService.setSchemeOne()
+    } // Fun setSchemeOne()
+
+    /**
+     * 万达预制方案
+     */
+    @ApiOperation(value = " 预置方案1生成", notes = "")
+    @PostMapping(value = ["/create-wanda"])
+    fun wanDaScheme(): SCreateResponse<DefFuncIdScheme> {
+        return DictSchemeService.wanDaScheme()
+    } // Fun wanDaScheme()
+
+
+
+
+} // Class DictSchemeControllers

+ 6 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/models/DictPlatformInfo.kt

@@ -83,4 +83,10 @@ class DictPlatformInfo {
     /** 旧字典编码类型 */
     var origDataType: String? = null
 
+    /** 别编码 */
+    var aliasCode: String? = null
+
+    /** 别名称 */
+    var aliasName: String? = null
+
 } // Class DictPlatformInfo

+ 8 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/models/DictProject.kt

@@ -12,7 +12,13 @@ class DictProject {
     var id: String? = null
     /** 项目名称 */
     var name: String? = null
-    /** 集团信息 */
-    var groupCompany: Group? = null
+    /** 集团编码 */
+    var groupCode: String? = null
+    /** 标记 */
+    var status: Int? = null
+    /** 创建者 */
+    var createUser: String? = null
+    /** 更新者 */
+    var updateUser: String? = null
 
 } // Class DictProject

+ 20 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/models/Group.kt

@@ -5,14 +5,30 @@ import java.io.Serializable
 /**
  * 集团实体类
  *
- * @author  wx
+ * @author wx <zhangweixin@sagacloid.com>
  * @date  2020/9/16 22:13
  */
 class Group : Serializable {
 
-    /** 集团id */
-    var  code: String? = null
+    /** id */
+    var id: String? = null
+
+    /** 编码 */
+    var code: String? = null
+
     /** 集团名称 */
     var name: String? = null
 
-} //
+    /** 标记 */
+    var status: Int? = null
+
+    /** 创建者 */
+    var createUser: String? = null
+
+    /** 更新者 */
+    var updateUser: String? = null
+
+    /** 说明 */
+    var remark: String? = null
+
+} // Class Group

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

@@ -20,8 +20,8 @@ import com.persagy.service.utils.SSpringContextUtil
  * @date  2020/9/11 15:04
  */
 object DictTypeApi {
-
-    val opts: Opts by lazy {
+    /** 配置实例 */
+    private val opts: Opts by lazy {
         SSpringContextUtil.getBean(Opts::class.java) as Opts
     } // opts
 
@@ -34,8 +34,7 @@ object DictTypeApi {
 
         val request = SHttpUtil.getRequest(url)
 
-
-    } //
+    } // Fun dictTypeHttp()
 
 
     /**
@@ -44,8 +43,10 @@ object DictTypeApi {
     fun groupQuery():ArrayList<Group> {
         var data = ArrayList<Group>()
         try {
-            val url = "${opts.dataPlatform}/usercenter/groupCompany/query"
+            val url = "${opts.dataPlatform}/group/query"
             val jsonObject = JSONObject()
+            val jsonObject2 = JSONObject()
+            jsonObject["criteria"] = jsonObject2
             val postObject = SHttpUtil.postObject<GroupResponse>(url, jsonObject)
             DClassDefService.logger.debug("集团结果:${postObject.toJson()}")
             if (postObject.result == "success"){
@@ -61,12 +62,15 @@ object DictTypeApi {
 
     /**
      * 查询字典项目
+     *
+     * @param code  集团编码
+     * @return 项目对象列表
      */
     fun dictProjectQuery(code: String): ArrayList<DictProject>{
-        val url = "${opts.dataPlatform}/usercenter/project/query"
+        val url = "${opts.dataPlatform}/project/query"
         val jsonObject = JSONObject()
         val jsonObject2 = JSONObject()
-        jsonObject2.put("groupCompanyCode",code)
+        jsonObject2["groupCode"] = code
         jsonObject["criteria"] = jsonObject2
         DClassDefService.logger.debug("url:${url}")
         DClassDefService.logger.debug("项目请求体:${jsonObject.toJson()}")
@@ -98,7 +102,7 @@ object DictTypeApi {
     } // Fun dictPlatform()
 
 
-    val a = "http://192.168.3.203:8081/paas/dict/funcid/query"
+
 
     /**
      * 对象详细信息点
@@ -125,9 +129,12 @@ object DictTypeApi {
 
     /**
      * 获取专业
+     *
+     * @param type  类型
+     * @return 专业列表
      */
     fun dictMajor(type: String): ArrayList<DictMajorResponse.DataBean>{
-        val url = "${opts.dataPlatform}/dict/major/query"
+        val url = "${opts.dataPlatform}/dt/data/query"
         val jsonObject = JSONObject()
         val jsonObject2 = JSONObject()
         jsonObject2["type"] = type
@@ -218,25 +225,34 @@ object DictTypeApi {
 
     /**
      * 集团字典类型
+     *
+     * @param groupId   集团id
      */
     fun dictGroup(groupId: String): ArrayList<DictPlatformType>{
-        val url = "${opts.dataPlatform}/dict/class/query?groupId=$groupId"
-
-        val dictGroupCategoryResponse = SHttpUtil.getObject<DictPlatformTypeResponse>(url)
+        //type=group&groupCode=wd
+        val url = "${opts.dataPlatform}/def/class?groupCode=$groupId"
+        val jsonObject = JSONObject()
+        val jsonObject2 = JSONObject()
+        jsonObject["criteria"] = jsonObject2
+        val dictGroupCategoryResponse = SHttpUtil.postObject<DictPlatformTypeResponse>(url,jsonObject)
         if (dictGroupCategoryResponse.result == opts.SUCCESS_CODE) {
             if (!dictGroupCategoryResponse.data.isNullOrEmpty()){
                 return dictGroupCategoryResponse.data!!
             }
         }
         return ArrayList()
-    } // dictGroup()
+    } // Fun dictGroup()
 
     /**
      * 集团下对象信息点
      */
     fun dictGroupInfo(groupId: String,code: String): ArrayList<DictPlatformInfo>{
-        val url = "${opts.dataPlatform}/dict/funcid?groupId=$groupId&classCode=$code"
-        val dictPlatformInfoResponse = SHttpUtil.getObject<DictPlatformInfoResponse>(url)
+        val url = "${opts.dataPlatform}/def/funcid?groupCode=$groupId"
+        val jsonObject = JSONObject()
+        val jsonObject2 = JSONObject()
+        jsonObject2["classCode"] = code
+        jsonObject["criteria"] = jsonObject2
+        val dictPlatformInfoResponse = SHttpUtil.postObject<DictPlatformInfoResponse>(url,jsonObject)
         if (dictPlatformInfoResponse.result == opts.SUCCESS_CODE) {
             if (!dictPlatformInfoResponse.data.isNullOrEmpty()){
                 return dictPlatformInfoResponse.data!!

+ 5 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/models/response/DictMajorResponse.kt

@@ -29,15 +29,17 @@ class DictMajorResponse: Serializable {
          * type : common
          * groupId : 0
          */
-        var id = 0
+        var id: String? =  null
+        var dictTypeId: String? = null
         var code: String? = null
-        var name: String? = null
+        var label: String? = null
         var aliasCode: String? = null
         var aliasName: String? = null
         var type: String? = null
         var groupId: String? = null
         var note: String? = null
-
+        var status: String? = null
+        var createUser: String? = null
     } // class DataBean
 
 } // class DictMajorResponse

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

@@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory
 /**
  * 字典类型
  *
- * @author 张维新
+ * @author 张维新  <zhangweixin@sagacloud.cn>
  */
 object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class.java)) {
 
@@ -60,8 +60,13 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
             groupService.deleteAll()
             for (groupQuery in groupQueryList) {
                 val group = Group()
-                group.id = groupQuery.code
+                group.id = groupQuery.id
                 group.name = groupQuery.name
+                group.code = groupQuery.code
+                group.createUser = groupQuery.createUser
+                group.updateUser = groupQuery.updateUser
+                group.remark = groupQuery.remark
+                group.status = groupQuery.status
                 groupService.insert(group)
             }
         } else {
@@ -83,15 +88,20 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
             if (!selectAllList.isNullOrEmpty()) {
                 for (group in selectAllList) {
 
-                    val dictProjectQueryList = DictTypeApi.dictProjectQuery(group.id!!)
+                    val dictProjectQueryList = DictTypeApi.dictProjectQuery(group.code!!)
                     if (dictProjectQueryList.size > 0) {
+                        dictProjectService.deleteAll()
                         logger.debug("项目结果:${dictProjectQueryList.toJson()}")
-                        dictProjectService.delete(SFilter.eq("groupId",group.id!!))
+//                        dictProjectService.delete(SFilter.eq("groupCode",group.id!!))
                         for (dictProjectQuery in dictProjectQueryList) {
                             val dictProject = DictProject()
                             dictProject.id = dictProjectQuery.id
                             dictProject.name = dictProjectQuery.name
-                            dictProject.groupId = group.id
+                            dictProject.groupCode = dictProjectQuery.groupCode
+                            dictProject.createUser = dictProjectQuery.createUser
+                            dictProject.updateUser = dictProjectQuery.updateUser
+                            dictProject.status = dictProjectQuery.status
+
                             dictProjectService.insert(dictProject)
                         }
                     }
@@ -259,7 +269,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                         defFuncId.unit = dictPlatformInfo.unit
                         defFuncId.origCode = dictPlatformInfo.origCode
                         defFuncId.origDataType = dictPlatformInfo.origDataType
-
+                        defFuncId.aliasCode = dictPlatformInfo.aliasCode
+                        defFuncId.aliasName = dictPlatformInfo.aliasName
                         if (!defFuncId.name.isNullOrEmpty()){
                             /** 排序 */
                             if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
@@ -306,7 +317,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                             }
                         }
 
-                        defFuncIdService.insert(defFuncId)
+                        defFuncIdService.replace(defFuncId)
                     }
                 }
             }
@@ -322,18 +333,18 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
      */
     fun dictMajor(): SBaseResponse{
         val sBaseResponse = SBaseResponse()
-        val dictMajorList = DictTypeApi.dictMajor("common")
-        dictMajorService.delete(SFilter.eq("type","common"))
+        val dictMajorList = DictTypeApi.dictMajor("major")
+        dictMajorService.delete(SFilter.eq("type","major"))
         if (dictMajorList.size>0){
             for (dictMajor in dictMajorList){
 
                 val dictMajor1 = DictMajor()
-                dictMajor1.aliasCode = dictMajor.aliasCode
-                dictMajor1.aliasName = dictMajor.aliasName
+                dictMajor1.aliasCode = dictMajor.code
+                dictMajor1.aliasName = dictMajor.label
                 dictMajor1.code = dictMajor.code
-                dictMajor1.groupId = dictMajor.groupId
+                dictMajor1.groupCode = dictMajor.groupId
                 dictMajor1.id = dictMajor.id
-                dictMajor1.name = dictMajor.name
+                dictMajor1.name = dictMajor.label
                 dictMajor1.note = dictMajor.note
                 dictMajor1.type = dictMajor.type
                 dictMajorService.insert(dictMajor1)
@@ -343,7 +354,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
             sBaseResponse.result = SResponseType.failure
         }
         return  sBaseResponse
-    } // dictMajor()
+    } // Fun dictMajor()
 
     /**
      * 集团下的方案
@@ -354,7 +365,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
         if (groupList.size>0){
 
             for (group in groupList){
-                dictSchemeService.delete(SFilter.eq("groupId",group.id!!))
+                dictSchemeService.delete(SFilter.eq("groupCode",group.id!!))
                 val dictGroupSchemeList = DictTypeApi.dictGroupScheme(group.id!!)
                 if (dictGroupSchemeList.size>0){
                     for (dictGroupScheme in dictGroupSchemeList){
@@ -466,16 +477,17 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
         val groupList = groupService.selectAll().exec()
         if (groupList.size>0){
             for (group in groupList){
-                val dictGroupList = DictTypeApi.dictGroup(group.id!!)
+                val dictGroupList = DictTypeApi.dictGroup(group.code!!)
                 if (dictGroupList.size>0){
-                    defClassService.delete(SFilter.eq("type","group"),SFilter.eq("groupId",group.id!!))
+                    defClassService.delete(SFilter.eq("type","group"),SFilter.eq("groupCode",group.code!!))
                     for (dictGroup in dictGroupList){
                         val defClass = DefClass()
+                        defClass.id = dictGroup.id
                         defClass.aliasCode = dictGroup.aliasCode
                         defClass.aliasName = dictGroup.aliasName
                         defClass.code = dictGroup.code
                         defClass.equipmentCode = dictGroup.equipmentCode
-                        defClass.groupCode = group.id
+                        defClass.groupCode = group.code
                         defClass.majorCode = dictGroup.majorCode
                         defClass.name = dictGroup.name
                         defClass.parentCode = dictGroup.parentCode
@@ -486,9 +498,9 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                     }
                 }
             }
-            sBaseResponse.result = SResponseType.failure
-        }else{
             sBaseResponse.result = SResponseType.success
+        }else{
+            sBaseResponse.result = SResponseType.failure
         }
         return sBaseResponse
     } // Fun
@@ -500,169 +512,181 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
         val sBaseResponse = SBaseResponse()
         val defClassList = defClassService.select(SFilter.eq("type", "group")).exec()
         if (defClassList.size>0){
-            for (defClass in defClassList){
-                val dictGroupInfoList = DictTypeApi.dictGroupInfo(defClass.groupCode!!, defClass.code!!)
-                defFuncIdService.delete(SFilter.eq("groupId",defClass.groupCode!!),SFilter.eq("classCode",defClass.code!!))
-                if (dictGroupInfoList.size>0){
-                    for (dictGroupInfo in dictGroupInfoList){
-                        /** 开头字母大写转小写 */
-                        val str1: String = dictGroupInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
-                        val str2: String = dictGroupInfo.code!!.substring(1, dictGroupInfo.code!!.length) //截取字符串第二个以后
-                        var str=str1+str2;
-                        val defFuncId = DefFuncId()
 
-                        if (str == "equipLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str == "equipLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "sysLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str == "sysLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "tenantLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str =="tenantLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "roomLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str == "roomLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "shaftLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str == "shaftLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "shaftID"){
-                            defFuncId.code = "id"
-                        }else if (str == "shaftName"){
-                            defFuncId.code = "name"
-                        }else if (str == "equipID"){
-                            defFuncId.code = "id"
-                        }else if (str == "equipName"){
-                            defFuncId.code = "name"
-                        }else if (str == "sysID"){
-                            defFuncId.code = "id"
-                        }else if (str == "sysName"){
-                            defFuncId.code = "name"
-                        }else if (str == "tenantID"){
-                            defFuncId.code = "id"
-                        }else if (str == "tenantName"){
-                            defFuncId.code = "name"
-                        }else if (str == "roomID"){
-                            defFuncId.code = "id"
-                        }else if (str == "roomName"){
-                            defFuncId.code = "name"
-                        }else if (str == "projID"){
-                            defFuncId.code = "id"
-                        }else if (str == "projName"){
-                            defFuncId.code = "name"
-                        }else if (str == "projLocalName"){
-                            defFuncId.code = "localId"
-                        }else if (str == "projLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "flootID"){
-                            defFuncId.code = "id"
-                        }else if (str == "flootName"){
-                            defFuncId.code = "name"
-                        }else if (str == "floorLocalName"){
-                            defFuncId.code = "localId"
-                        }else if (str == "floorLocalName"){
-                            defFuncId.code = "localName"
-                        }else if (str == "buildID"){
-                            defFuncId.code = "id"
-                        }else if (str == "buildName"){
-                            defFuncId.code = "name"
-                        }else if (str == "buildLocalID"){
-                            defFuncId.code = "localId"
-                        }else if (str == "buildLocalName"){
-                            defFuncId.code = "localName"
-                        }else{
-                            defFuncId.code = str
-                        }
 
-
-                        defFuncId.canSub = dictGroupInfo.canSub
-                        defFuncId.category = dictGroupInfo.category
-                        defFuncId.classCode = defClass.code
+            val groupList = groupService.selectAll().exec()
+            if (groupList.size>0){
+                for (group in groupList){
+                    for (defClass in defClassList){
+                        val dictGroupInfoList = DictTypeApi.dictGroupInfo(group.code!!, defClass.code!!)
+                        defFuncIdService.delete(SFilter.eq("groupCode",group.code!!),SFilter.eq("classCode",defClass.code!!))
+                        if (dictGroupInfoList.size>0){
+                            for (dictGroupInfo in dictGroupInfoList){
+                                /** 开头字母大写转小写 */
+                                val str1: String = dictGroupInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
+                                val str2: String = dictGroupInfo.code!!.substring(1, dictGroupInfo.code!!.length) //截取字符串第二个以后
+                                var str=str1+str2;
+                                val defFuncId = DefFuncId()
+
+                                if (str == "equipLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "equipLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "sysLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "sysLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "tenantLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str =="tenantLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "roomLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "roomLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "shaftLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "shaftLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "shaftID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "shaftName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "equipID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "equipName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "sysID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "sysName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "tenantID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "tenantName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "roomID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "roomName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "projID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "projName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "projLocalName"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "projLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "flootID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "flootName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "floorLocalName"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "floorLocalName"){
+                                    defFuncId.code = "localName"
+                                }else if (str == "buildID"){
+                                    defFuncId.code = "id"
+                                }else if (str == "buildName"){
+                                    defFuncId.code = "name"
+                                }else if (str == "buildLocalID"){
+                                    defFuncId.code = "localId"
+                                }else if (str == "buildLocalName"){
+                                    defFuncId.code = "localName"
+                                }else{
+                                    defFuncId.code = str
+                                }
+                                defFuncId.code = dictGroupInfo.code
+                                defFuncId.id = dictGroupInfo.id
+                                defFuncId.canSub = dictGroupInfo.canSub
+                                defFuncId.category = dictGroupInfo.category
+                                defFuncId.classCode = defClass.code
 //                        defFuncId.code = str
-                        defFuncId.dataSource = dictGroupInfo.dataSource
-                        defFuncId.dataType = dictGroupInfo.dataType
-                        if (!dictGroupInfo.firstTag.isNullOrEmpty()){
-                            defFuncId.firstTag = ParamTools.TwoLevelCode(dictGroupInfo.firstTag!!)
-                        }
-                        defFuncId.firstName = dictGroupInfo.firstTag
-                        defFuncId.formater = dictGroupInfo.formater
-                        defFuncId.groupCode = defClass.groupCode
-                        defFuncId.idx = dictGroupInfo.idx
-                        defFuncId.inputMode = dictGroupInfo.inputMode
-                        defFuncId.isMultiple = dictGroupInfo.isMultiple
-                        defFuncId.isRegion = dictGroupInfo.isRegion
-                        defFuncId.name = dictGroupInfo.name
-                        logger.debug("name: ${ dictGroupInfo.name} *******************************************************")
-                        defFuncId.note = dictGroupInfo.note
-                        defFuncId.priority = dictGroupInfo.priority
-                        defFuncId.projectId = if (dictGroupInfo.projectId.isNullOrEmpty()) "0" else dictGroupInfo.projectId
-                        defFuncId.readonly = dictGroupInfo.readonly
-                        if (!dictGroupInfo.secondTag.isNullOrEmpty()){
-                            defFuncId.secondTag = ParamTools.TwoLevelCode(dictGroupInfo.secondTag!!)
-                        }
-                        defFuncId.secondName = dictGroupInfo.secondTag
-                        defFuncId.subFlag = dictGroupInfo.subFlag
-                        defFuncId.type = dictGroupInfo.dataType
-                        defFuncId.unit = dictGroupInfo.unit
-
-
-                        if (!defFuncId.name.isNullOrEmpty()){
-                            /** 排序 */
-                            if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
-                                defFuncId.sort = 1
-                            }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
-                                defFuncId.sort = 2
-                            }else if (defFuncId.name!! == "设备二维码图片"){
-                                defFuncId.sort = 3
-                            }else if (defFuncId.name!! == "设计图纸中编码"){
-                                defFuncId.sort = 4
-                            }else if (defFuncId.name!! == "设备ID"){
-                                defFuncId.sort = 101
-                            }else if (defFuncId.name!! == "设备名称"){
-                                defFuncId.sort = 102
-                            }else if (defFuncId.name!! == "BIM模型中编码"){
-                                defFuncId.sort = 103
-                            }else if (defFuncId.name!! == "BIM模型中坐标"){
-                                defFuncId.sort = 104
-                            }else if (defFuncId.firstName != null&& defFuncId.firstName == "台账参数"){
-                                defFuncId.sort = 10
-                            }else if(defFuncId.firstName != null&& defFuncId.firstName == "通讯参数"){
-                                defFuncId.sort = 20
-                            }else {
-                                defFuncId.sort = 60
+                                defFuncId.dataSource = dictGroupInfo.dataSource
+                                defFuncId.dataType = dictGroupInfo.dataType
+                                if (!dictGroupInfo.firstTag.isNullOrEmpty()){
+                                    defFuncId.firstTag = ParamTools.TwoLevelCode(dictGroupInfo.firstTag!!)
+                                }
+                                defFuncId.firstName = dictGroupInfo.firstTag
+                                defFuncId.formater = dictGroupInfo.formater
+                                defFuncId.groupCode = group.code
+                                defFuncId.idx = dictGroupInfo.idx
+                                defFuncId.inputMode = dictGroupInfo.inputMode
+                                defFuncId.isMultiple = dictGroupInfo.isMultiple
+                                defFuncId.isRegion = dictGroupInfo.isRegion
+                                defFuncId.name = dictGroupInfo.name
+                                logger.debug("name: ${ dictGroupInfo.name} *******************************************************")
+                                defFuncId.note = dictGroupInfo.note
+                                defFuncId.priority = dictGroupInfo.priority
+                                defFuncId.projectId = if (dictGroupInfo.projectId.isNullOrEmpty()) "0" else dictGroupInfo.projectId
+                                defFuncId.readonly = dictGroupInfo.readonly
+                                if (!dictGroupInfo.secondTag.isNullOrEmpty()){
+                                    defFuncId.secondTag = ParamTools.TwoLevelCode(dictGroupInfo.secondTag!!)
+                                }
+                                defFuncId.secondName = dictGroupInfo.secondTag
+                                defFuncId.subFlag = dictGroupInfo.subFlag
+                                defFuncId.type = dictGroupInfo.dataType
+                                defFuncId.unit = dictGroupInfo.unit
+                                defFuncId.origCode = dictGroupInfo.origCode
+                                defFuncId.origDataType = dictGroupInfo.origDataType
+                                defFuncId.aliasCode = dictGroupInfo.aliasCode
+                                defFuncId.aliasName = dictGroupInfo.aliasName
+
+                                if (!defFuncId.name.isNullOrEmpty()){
+                                    /** 排序 */
+                                    if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
+                                        defFuncId.sort = 1
+                                    }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
+                                        defFuncId.sort = 2
+                                    }else if (defFuncId.name!! == "设备二维码图片"){
+                                        defFuncId.sort = 3
+                                    }else if (defFuncId.name!! == "设计图纸中编码"){
+                                        defFuncId.sort = 4
+                                    }else if (defFuncId.name!! == "设备ID"){
+                                        defFuncId.sort = 101
+                                    }else if (defFuncId.name!! == "设备名称"){
+                                        defFuncId.sort = 102
+                                    }else if (defFuncId.name!! == "BIM模型中编码"){
+                                        defFuncId.sort = 103
+                                    }else if (defFuncId.name!! == "BIM模型中坐标"){
+                                        defFuncId.sort = 104
+                                    }else if (defFuncId.firstName != null&& defFuncId.firstName == "台账参数"){
+                                        defFuncId.sort = 10
+                                    }else if(defFuncId.firstName != null&& defFuncId.firstName == "通讯参数"){
+                                        defFuncId.sort = 20
+                                    }else {
+                                        defFuncId.sort = 60
+                                    }
+                                }
+
+                                val dicConfigureEditable = ParamTools.dicConfigureEditable()
+                                val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
+                                if (containsKey){
+                                    defFuncId.editable = false
+                                    defFuncId.unDisabled = false
+                                    defFuncId.visible = false
+                                }
+
+                                val dicConfigure = ParamTools.dicConfigure()
+                                if (defFuncId.code!=null){
+                                    val containsKey = dicConfigure.containsKey(defFuncId.code!!)
+                                    if (containsKey){
+                                        defFuncId.editable = true
+                                        defFuncId.unDisabled = false
+                                        defFuncId.visible = true
+                                    }
+                                }
+
+                                defFuncIdService.insert(defFuncId)
                             }
                         }
-
-                        val dicConfigureEditable = ParamTools.dicConfigureEditable()
-                        val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
-                        if (containsKey){
-                            defFuncId.editable = false
-                            defFuncId.unDisabled = false
-                            defFuncId.visible = false
-                        }
-
-                        val dicConfigure = ParamTools.dicConfigure()
-                        if (defFuncId.code!=null){
-                            val containsKey = dicConfigure.containsKey(defFuncId.code!!)
-                            if (containsKey){
-                                defFuncId.editable = true
-                                defFuncId.unDisabled = false
-                                defFuncId.visible = true
-                            }
-                        }
-
-                        defFuncIdService.insert(defFuncId)
                     }
                 }
+                sBaseResponse.result = SResponseType.success
+            }else{
+                sBaseResponse.result = SResponseType.failure
             }
-            sBaseResponse.result = SResponseType.failure
         }else{
-            sBaseResponse.result = SResponseType.success
+            sBaseResponse.result = SResponseType.failure
         }
         return sBaseResponse
     } // Fun dictGroupInfo()

+ 198 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DictSchemeService.kt

@@ -0,0 +1,198 @@
+package com.persagy.server.syn.services.dict
+
+import com.persagy.database.SFilter
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dictnew.DefClass
+import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
+import com.persagy.server.datacenter.models.entities.dictnew.DefFuncIdScheme
+import com.persagy.server.datacenter.models.entities.dictnew.Group
+import com.persagy.server.syn.utils.ParamTools
+import com.persagy.service.SBaseService
+import com.persagy.service.SObjectService
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.responses.SCreateResponse
+
+/**
+ * 设置方案服务
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/10/15 17:10
+ */
+object DictSchemeService : SObjectService<DefFuncIdScheme>(SMybatisDao(DefFuncIdScheme::class.java)) {
+    /** 集团服务 */
+    private val groupService = SBaseService(SMybatisDao(Group::class.java))
+    /** 详细信息点 */
+    private val defFuncIdService = SBaseService(SMybatisDao(DefFuncId::class.java))
+    /** 类型服务 */
+    private val defClassService = SObjectService(SMybatisDao(DefClass::class.java))
+
+    /**
+     * 预支方案1
+     */
+    fun setSchemeOne(): SCreateResponse<DefFuncIdScheme> {
+        return try {
+            /** 读取集团 */
+            val groupList = groupService.selectAll().exec()
+            for (group in groupList) {
+                val defClassList =
+                    defClassService.select(SFilter.eq("type", "group"), SFilter.eq("groupCode", group.code!!)).exec()
+                for (defClass in defClassList) {
+                    val defFuncIdBuilder = select(
+                        SFilter.eq("groupCode", group.code!!),
+                        SFilter.eq("classCode", defClass.code!!)
+                    )
+                    val defFuncIdList = defFuncIdBuilder.table("dict.def_funcid").exec()
+
+                    for (defFuncId in defFuncIdList){
+
+                        if (defFuncId.firstName.isNullOrEmpty() || defFuncId.firstName == "基本信息" || defFuncId.firstName == "技术参数" ||
+                            defFuncId.firstName == "运行参数" || defFuncId.firstName == "报警消息") {
+                            defFuncId.visible = true
+                        } else if (defFuncId.secondName == "设备厂家" || defFuncId.secondName == "供应购买" || defFuncId.secondName == "现场安装"
+                            || defFuncId.secondName == "运行维保" || defFuncId.secondName == "照片文档") {
+                            defFuncId.visible = true
+                        } else if (defFuncId.priority == "S") {
+                            defFuncId.visible = true
+                        } else {
+                            defFuncId.visible = false
+                        }
+                        val dicConfigureEditable = ParamTools.dicConfigureEditable()
+                        val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
+                        if (containsKey){
+                            defFuncId.editable = false
+                            defFuncId.unDisabled = false
+                            defFuncId.visible = false
+                        }
+
+                        val dicConfigure = ParamTools.dicConfigure()
+                        if (defFuncId.code!=null){
+                            val containsKey = dicConfigure.containsKey(defFuncId.code!!)
+                            if (containsKey){
+                                defFuncId.editable = true
+                                defFuncId.unDisabled = false
+                                defFuncId.visible = true
+                            }
+                        }
+
+                        defFuncId.schemeId = 1
+                        replace(defFuncId)
+                    }
+                }
+            }
+            SCreateResponse(SResponseType.success)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            SCreateResponse(SResponseType.failure,e.message!!)
+        }
+
+    } // Fun setSchemeOne
+
+    /**
+     * 万达方案
+     */
+    fun wanDaScheme(): SCreateResponse<DefFuncIdScheme>{
+        val defDictSchemeList = select(SFilter.eq("schemeId", 1)).exec()
+        for (defDictScheme in defDictSchemeList){
+            defDictScheme.schemeId = 2
+
+            if (defDictScheme.classCode == "ACCCCC"){
+                if (defDictScheme.name == "设备本地编码"||defDictScheme.name == "设备本地名称"||defDictScheme.name == "品牌"
+                    ||defDictScheme.name == "额定功率"||defDictScheme.name == "额定制冷量"||defDictScheme.name == "累计耗电量"
+                    ||defDictScheme.name == "冷凝器入口水温"||defDictScheme.name == "冷凝器出口水温"||defDictScheme.name == "耗电功率"
+                    ||defDictScheme.name == "蒸发器入口水温"||defDictScheme.name == "蒸发器出口水温"||defDictScheme.name == "运行状态"
+                    ||defDictScheme.name == "A相电流"||defDictScheme.name == "B相电流"||defDictScheme.name == "C相电流"
+                    ||defDictScheme.name == "电流负载率"||defDictScheme.name == "冷冻水出口温度设定值"||defDictScheme.name == "冷冻水出水温度设定值"){
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                }else{
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "ACCCSC"){
+                if (defDictScheme.name == "设备本地编码"||defDictScheme.name == "设备本地名称"||defDictScheme.name == "品牌"
+                    ||defDictScheme.name == "额定功率"||defDictScheme.name == "额定制冷量"||defDictScheme.name == "累计耗电量"
+                    ||defDictScheme.name == "冷凝器入口水温"||defDictScheme.name == "冷凝器出口水温"||defDictScheme.name == "耗电功率"
+                    ||defDictScheme.name == "蒸发器入口水温"||defDictScheme.name == "蒸发器出口水温"||defDictScheme.name == "运行状态"
+                    ||defDictScheme.name == "A相电流"||defDictScheme.name == "B相电流"||defDictScheme.name == "C相电流"
+                    ||defDictScheme.name == "电流负载率"||defDictScheme.name == "冷冻水出口温度设定值"||defDictScheme.name == "冷冻水出水温度设定值"){
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                }else{
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "ACCCCP"){
+                if (defDictScheme.name == "设备本地编码"||defDictScheme.name == "设备本地名称"||defDictScheme.name == "品牌"
+                    ||defDictScheme.name == "额定功率"||defDictScheme.name == "额定流量"||defDictScheme.name == "是否有变频功能"
+                    ||defDictScheme.name == "额定扬程"||defDictScheme.name == "累计耗电量"||defDictScheme.name == "耗电功率"
+                    ||defDictScheme.name == "运行频率"){
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                }else{
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "ACCCOP"){
+                if (defDictScheme.name == "设备本地编码" || defDictScheme.name == "设备本地名称" || defDictScheme.name == "品牌"
+                    || defDictScheme.name == "额定功率" || defDictScheme.name == "额定流量" || defDictScheme.name == "是否有变频功能"
+                    || defDictScheme.name == "额定扬程" || defDictScheme.name == "累计耗电量" || defDictScheme.name == "耗电功率"
+                    || defDictScheme.name == "运行频率") {
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                } else {
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "ACCCOT"){
+                if (defDictScheme.name == "设备本地编码" || defDictScheme.name == "设备本地名称" || defDictScheme.name == "品牌"
+                    || defDictScheme.name == "风机类型" || defDictScheme.name == "单台风机额定功率" || defDictScheme.name == "累计耗电量"
+                    || defDictScheme.name == "耗电功率" || defDictScheme.name == "风机运行频率") {
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                } else {
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "ACCC"){
+                if (defDictScheme.name == "系统本地编码" || defDictScheme.name == "系统本地名称" || defDictScheme.name == "冷冻水供水干管温度"
+                    || defDictScheme.name == "冷冻水总流量" || defDictScheme.name == "冷却水供水干管温度" || defDictScheme.name == "冷却水回水干管温度"
+                    || defDictScheme.name == "冷却水总流量" || defDictScheme.name == "冷冻水回水干管温度"|| defDictScheme.name == "逐时供冷量"
+                    || defDictScheme.name == "累计供冷量") {
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                } else {
+                    defDictScheme.visible = false
+                }
+            }
+
+            if (defDictScheme.classCode == "AirConditioningZone"){
+                if (defDictScheme.name == "空间本地编码" || defDictScheme.name == "空间本地名称" || defDictScheme.name == "空间功能区类型"
+                    || defDictScheme.name == "空气相对湿度" || defDictScheme.name == "空气(干球)温度" ) {
+                    defDictScheme.unDisabled = true
+                    defDictScheme.editable = true
+                    defDictScheme.visible = true
+                } else {
+                    defDictScheme.visible = false
+                }
+            }
+            replace(defDictScheme)
+        }
+       return SCreateResponse<DefFuncIdScheme>( SResponseType.success)
+    } // Fun wanDaScheme()
+
+
+
+
+
+} // Object DictSchemeService

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

@@ -32,7 +32,7 @@ class PropertyController {
     @PostMapping(value = ["/property-query"])
     fun pageQueryProperty(@RequestBody request: SQueryRequest): SQueryResponse<PropertyEquip> {
         val withFilterList = ArrayList<SFilter>()
-        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString()))
+        withFilterList.add(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString()))
         return PropertyEquipService.pageQuery(request, withFilterList)
     } // Function pageQueryProperty()
 

+ 0 - 0
equip-componnet/src/main/kotlin/com/persagy/server/controllers/TenantController.kt


Some files were not shown because too many files changed in this diff