********************WX************************

          调整发布草稿图形函数

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

@@ -35,7 +35,7 @@ class DictControllers {
      * @return 查询结果
      */
     @ApiOperation(value = "类型-字典查询所有设备类型、部件所有类型、系统类型、专业类型", notes = "输入设备类型：equipment，输入部件类型：component,输入系统类型：system,输入专业类型：major," +
-            "专业和系统：majorSystem，业务空间类型 space ,专业下的设备类型 majorEquipment ,设备和部件equipmentAndComponent,设备类型要以及对应的部件equipmentComponent，专业下的系统，系统下的设备majorSystemEquip ")
+            "专业和系统：majorSystem，业务空间类型 space ,专业下的设备类型 majorEquipment ,设备和部件equipmentAndComponent,设备类型要以及对应的部件equipmentComponent，专业下的系统，系统下的设备majorSystemEquip ,资产 property ")
     @PostMapping(value = ["/category"])
     fun categoryQuery(@RequestBody categoryRequest: CategoryRequest): SQueryResponse<DefClass> {
         return DictDefClassService.equipQuery(categoryRequest)

data-center/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt

@@ -154,4 +154,8 @@ open class SchemeService {
         mapper.dictInfo(projectId,groupId,code)
     } // Fun
 
+    fun dictInfoProperty(projectId: String, groupId: String,  code:String,propertyCode: String){
+        mapper.dictInfoProperty(projectId,groupId,code,propertyCode)
+    }
+
 } // Class SchemeService

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

@@ -5,6 +5,8 @@ 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.dict.EquipFamily
+import com.persagy.server.datacenter.models.entities.dict.Family
 import com.persagy.server.datacenter.models.entities.dictnew.*
 import com.persagy.server.datacenter.models.requests.CategoryRequest
 import com.persagy.server.mappers.CustomMapper
@@ -49,7 +51,9 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
     private val dictDefFuncId = SObjectService(SMybatisDao(DefFuncId::class.java))
     /** 项目定制化服务 */
     private val defFuncIdProjectService = SObjectService(SMybatisDao(DefFuncIdProject::class.java))
-
+    /** 设备族和设备类型对应表服务 */
+    private val equipFamilyService = SObjectService(SMybatisDao(EquipFamily::class.java))
+    private val familyService = SObjectService(SMybatisDao(Family::class.java))
 
     /**
      * 查询设备、部件、系统、专业类型
@@ -245,6 +249,18 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                             }
                         }
                     }
+                    "property" -> {
+                        /** 资产 */
+                        val familyList = familyService.selectAll().exec()
+                        for (family in familyList){
+                            val defClass = DefClass()
+                            defClass.code = family.code
+                            defClass.name = family.name
+                            defClass.aliasName = family.code
+                            defClass.aliasCode = family.name
+                            dictSchemeCategoryList.add(defClass)
+                        }
+                    }
                 }
                 sQueryResponse.result = SResponseType.success
                 sQueryResponse.content = dictSchemeCategoryList
@@ -284,7 +300,22 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                 if (dictDefFuncList.size>0) {
                     sQueryResponse.content = dictDefFuncList
                     sQueryResponse.total = dictDefFuncList.size.toLong()
-                } else {
+                } else if(categoryRequest.type!!.length == 3){
+
+                    val familyList = equipFamilyService.select(SFilter.eq("family", categoryRequest.type!!)).exec()
+                    if (familyList.size>0){
+                        val equipFamily = familyList[0]
+                        schemeService.dictInfoProperty(projectId, dictProject.groupCode!!, equipFamily.equipCode!!,categoryRequest.type!!)
+                        val dictDefFuncBuilder = dictDefFuncId.select(
+                            SFilter.eq("projectId", projectId),
+                            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()
+                    }
+                }else{
                     schemeService.dictInfo(projectId, dictProject.groupCode!!, categoryRequest.type!!)
                     val dictDefFuncBuilder = dictDefFuncId.select(
                         SFilter.eq("projectId", projectId),
@@ -384,6 +415,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
     /**
      * 根据项目重置信息点
+     *
+     * @return 返回结果
      */
     fun resetProjectId(): SBaseResponse {
         return try {
@@ -413,6 +446,9 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
     /**
      * 方案设定
+     *
+     * @param request 条件
+     * @return 返回结果
      */
     fun setSchemeProject(request: DictBatchProcessing): SCreateResponse<DictBatchProcessing>{
         val projectId = SPageContext.getHeader("projectId")

data-center/src/main/kotlin/com/persagy/server/services/rel/RSpContainShBaseList.kt

@@ -1,6 +1,5 @@
 package com.persagy.server.services.rel
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
@@ -15,17 +14,14 @@ open class RSpContainShBaseList : SBaseEntity() {
 
     /** 业务空间id */
     @ApiModelProperty(value = "业务空间id")
-    @JSONField(name = "SpaceId")
     var spaceId: String? = null
 
     /** 竖井id列表 */
     @ApiModelProperty(value = "竖井id列表")
-    @JSONField(name = "ShaftIdList")
     var shaftIdList: ArrayList<String>? = null
 
     /** 业务空间类型 */
     @ApiModelProperty(value = "业务空间类型")
-    @JSONField(name = "ZoneType")
     var zoneType: String? = null
 
 } // Class RSpContainShBaseList

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

@@ -1,6 +1,5 @@
 package com.persagy.server.datacenter.models.entities.assistant
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.google.gson.annotations.SerializedName
 import io.swagger.annotations.ApiModelProperty
 import java.io.Serializable
@@ -14,19 +13,16 @@ class PointPosition : Serializable{
 
     /** 坐标x */
     @ApiModelProperty(value = "坐标x",required = true)
-    @JSONField(name = "X")
     @SerializedName("X")
     var x: Double? = null
 
     /** 坐标y */
     @ApiModelProperty(value = "坐标y",required = true)
-    @JSONField(name = "Y")
     @SerializedName("Y")
     var y: Double? = null
 
     /** 坐标z */
     @ApiModelProperty(value = "坐标z",required = true)
-    @JSONField(name = "Z")
     @SerializedName("Z")
     var z: Double? = null
 

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/assistant/ViewEquipSystem.kt

@@ -19,18 +19,17 @@ class ViewEquipSystem : Serializable {
     /** 系统id */
     @ApiModelProperty(value = "系统id")
     @Column(name = "id")
-    @JSONField(name = "SysID")
+    @JSONField(name = "sysID")
     var id: String? = null
 
     /** 系统分类 */
     @ApiModelProperty(value = "系统分类")
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 系统名称 */
     @ApiModelProperty(value = "系统名称")
-    @Column(name = "SysName")
+    @Column(name = "sys_name")
     @JSONField(name = "SysName")
     var name: String? = null
 
@@ -43,7 +42,6 @@ class ViewEquipSystem : Serializable {
     /** 设备id */
     @ApiModelProperty(value = "设备id")
     @Column(name = "equip_id")
-    @JSONField(name = "EquipId")
     var equipId: String? = null
 
 } // class ViewEquipSystem

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/EquipFamily.kt

@@ -14,20 +14,18 @@ import javax.persistence.Table
  * @author 张维新
  */
 @ApiModel(description = "设备信息实体类")
-@Table(name = "equip_family")
+@Table(name = "dict.equip_family")
 class EquipFamily : BaseInfo() {
 
     /** 族编码 */
     @ApiModelProperty(value = "族编码")
     @Id
     @Column(name = "family")
-    @JSONField(name = "Family")
     var family: String? = null
 
     /** 族名称 */
     @ApiModelProperty(value = "族名称")
     @Column(name = "family_name")
-    @JSONField(name = "FamilyName")
     var familyName: String? = null
 
     /** 设备分类编码 */

data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dict/Family.kt

@@ -14,7 +14,7 @@ import javax.persistence.Table
  * @author 张维新
  */
 @ApiModel(description = "设备族信息")
-@Table(name = "family")
+@Table(name = "dict.family")
 class Family : SBaseEntity() {
 
     /** 设备族code */

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

@@ -53,6 +53,7 @@ open class DefFuncId: Serializable {
 
     /** 集团id, 默认为"0" */
     @ApiModelProperty(value = "集团id, 默认为'0'")
+    @Id
     @Column(name = "group_code")
     var groupCode: String? = null
 

data-core/src/main/kotlin/com/persagy/server/scanbuilding/NoteTemplate.kt

@@ -21,25 +21,21 @@ class NoteTemplate : SBaseEntity() {
     @ApiModelProperty(value = "主键ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "TemplateId")
     var id: String? = null
 
     /** 名称 */
     @ApiModelProperty(value = "名称")
     @Column(name = "name")
-    @JSONField(name = "TemplateName")
     var name: String? = null
 
     /** 类型(0：设备；1：点位) */
     @ApiModelProperty(value = "类型(0：设备；1：点位)")
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: Int? = null
 
     /** 模板内容 */
     @ApiModelProperty(value = "模板内容")
     @Column(name = "template")
-    @JSONField(name = "Template")
     var template: String? = null
 
     /** 版本 */

data-core/src/main/kotlin/com/persagy/server/scanbuilding/Sound.kt

@@ -1,6 +1,5 @@
-package cn.sagacloud.server.scanbuilding
+package com.persagy.server.scanbuilding
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
@@ -21,31 +20,26 @@ class Sound : SBaseEntity() {
     @ApiModelProperty(value = "主键ID")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 项目ID */
     @ApiModelProperty(value = "项目ID")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 对象ID */
     @ApiModelProperty(value = "对象ID")
     @Column(name = "object_id")
-    @JSONField(name = "ObjectId")
     var objectId: String? = null
 
     /** 信息点ID */
     @ApiModelProperty(value = "信息点ID")
     @Column(name = "info_point_code")
-    @JSONField(name = "InfoPointCode")
     var infoPointCode: String? = null
 
     /** 声音文件key */
     @ApiModelProperty(value = "声音文件key")
     @Column(name = "sound_key")
-    @JSONField(name = "SoundKey")
     var soundKey: String? = null
 
 } // Class Sound

data-core/src/main/kotlin/com/persagy/server/scanbuilding/UserLog.kt

@@ -1,6 +1,5 @@
 package com.persagy.server.scanbuilding
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
@@ -21,54 +20,44 @@ class UserLog : SBaseEntity() {
     @ApiModelProperty(value = "主键id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id:String? = null
 
     /** 项目ID */
     @ApiModelProperty(value = "项目ID")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId:String? = null
 
     /** 扫楼用户ID */
     @ApiModelProperty(value = "扫楼用户ID")
     @Column(name = "user_id")
-    @JSONField(name = "UserId")
     var userId:String? = null
 
     /** 扫楼用户名字 */
     @ApiModelProperty(value = "扫楼用户名字")
     @Column(name = "name")
-    @JSONField(name = "Name")
     var name:String? = null
 
     /** 扫楼用户手机 */
     @ApiModelProperty(value = "扫楼用户手机")
     @Column(name = "phone")
-    @JSONField(name = "Phone")
     var phone:String? = null
 
     /** 用户操作 */
     @ApiModelProperty(value = "用户操作")
     @Column(name = "action")
-    @JSONField(name = "Action")
     var action:String? = null
 
     /** 操作对象id */
     @ApiModelProperty(value = "操作对象id")
     @Column(name = "object_id")
-    @JSONField(name = "ObjectId")
     var objectId:String? = null
 
     /** 备注 */
     @ApiModelProperty(value = "备注")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note:String? = null
 
     @ApiModelProperty(value = "")
-    @Column(name = "comming")
-    @JSONField(name = "Comming")
     var comming:String? = null
 
 } // Class UserLog

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

@@ -1,4 +1,4 @@
-package com.persagy.server.syn.controllers
+package com.persagy.server.syn.controllers.dict
 
 import com.persagy.server.syn.services.dict.DClassDefService
 import com.persagy.service.models.responses.SBaseResponse

datasyn/src/main/kotlin/com/persagy/server/syn/controllers/DictSchemeControllers.kt

@@ -1,4 +1,4 @@
-package com.persagy.server.syn.controllers
+package com.persagy.server.syn.controllers.dict
 
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncIdScheme
 import com.persagy.server.syn.services.dict.DictSchemeService

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

@@ -0,0 +1,19 @@
+package com.persagy.server.syn.controllers.obj
+
+/**
+ * 对象，中台到数据中心
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/10/18 10:06
+ */
+class ObjectFromToControllers {
+
+    /**
+     * 项目信息-数据中台存储到数据中心，根据集团获取集团写所有项目
+     */
+    fun projectGroupAll(){
+
+    }
+
+
+}

datasyn/src/main/kotlin/com/persagy/server/syn/models/api/DictTypeApi.kt

@@ -1,4 +1,4 @@
-package com.persagy.server.syn.models.api
+package com.persagy.server.syn.models.api.dict
 
 import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject

datasyn/src/main/kotlin/com/persagy/server/syn/models/api/obj/ProjectApi.kt

@@ -0,0 +1,38 @@
+package com.persagy.server.syn.models.api.obj
+
+import com.alibaba.fastjson.JSONObject
+import com.persagy.server.syn.Opts
+import com.persagy.service.utils.SSpringContextUtil
+
+/**
+ * 数据中台至数据中心
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/10/18 10:15
+ */
+object ProjectApi {
+
+    /** 配置实例 */
+    private val opts: Opts by lazy {
+        SSpringContextUtil.getBean(Opts::class.java) as Opts
+    } // opts
+
+    /**
+     *
+     */
+    fun projectQuery(groupCode: String){
+        val url = "${opts.dataPlatform}/instance/object/query?groupCode=${groupCode}"
+        val jsonObject = JSONObject()
+        val jsonObject2 = JSONObject()
+        jsonObject2["classCode"] = groupCode
+        jsonObject2["valid"] = 1
+        jsonObject["criteria"] = jsonObject2
+
+//        SHttpUtil.postObject<GroupResponse>(url, jsonObject)
+
+
+    }
+
+
+
+}

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

@@ -5,7 +5,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dict.DClassDef
 import com.persagy.server.datacenter.models.entities.dictnew.*
-import com.persagy.server.syn.models.api.DictTypeApi
+import com.persagy.server.syn.models.api.dict.DictTypeApi
 import com.persagy.server.syn.utils.ParamTools
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
@@ -676,7 +676,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                                     }
                                 }
 
-                                defFuncIdService.insert(defFuncId)
+                                defFuncIdService.replace(defFuncId)
                             }
                         }
                     }

datasyn/src/main/kotlin/com/persagy/server/syn/services/object/ProjectService.kt

@@ -0,0 +1,15 @@
+package com.persagy.server.syn.services.`object`
+
+/**
+ * 项目服务
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/10/18 10:12
+ */
+class ProjectService {
+
+
+
+
+
+}

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

@@ -1,6 +1,5 @@
 package com.persagy.server.models
 
-import com.alibaba.fastjson.annotation.JSONField
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
@@ -11,12 +10,9 @@ import java.io.Serializable
  */
 class SimilarityDegree : Serializable {
 
-    @JSONField(name = "key")
     @SerializedName("key")
     var key: String? = null
 
-    @JSONField(name = "value")
-    @SerializedName("value")
     var value: Double? = null
 
 } //