Преглед на файлове

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

zhangweixin преди 4 години
родител
ревизия
bbb4d59436

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

@@ -8,6 +8,7 @@ import javax.persistence.Id
 import javax.persistence.Table
 
 /**
+ * 平台字典对象类型
  *
  * @author  wx
  * @date  2020/9/19 16:37
@@ -17,10 +18,10 @@ import javax.persistence.Table
 class DefClass : SBaseEntity(){
 
     /** 全局id */
-    @ApiModelProperty(value = "全局id")
+    @ApiModelProperty(value = "全局 id")
     @Id
     @Column(name = "id")
-    var  id: Int? = null
+    var  id: String? = null
 
     /** 编码 */
     @ApiModelProperty(value = "编码")
@@ -44,8 +45,8 @@ class DefClass : SBaseEntity(){
     var type: String? = null
 
     @ApiModelProperty(value = "集团id, 默认为 '0' ")
-    @Column(name = "group_id")
-    var groupId: String? = ""
+    @Column(name = "group_code")
+    var groupCode: String? = ""
 
     @ApiModelProperty(value = "项目id, 默认为 '0' ")
     @Column(name = "project_id")
@@ -67,6 +68,10 @@ class DefClass : SBaseEntity(){
     @Column(name = "equipment_code")
     var equipmentCode: String? = null
 
+    @ApiModelProperty(value = "对象类型")
+    @Column(name = "obj_type")
+    var objType: String? = null
+
     @ApiModelProperty(value = "子列表")
     var children:ArrayList<DefClass>? = null
 

+ 16 - 34
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.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
@@ -22,180 +21,163 @@ class DefFuncId: Serializable {
     @ApiModelProperty(value = "全局id")
     @Id
     @Column(name = "id")
-    @JSONField(name = "Id")
-    var id: Int? = null
+    var id: String? = null
 
     /** 类型编码 */
     @ApiModelProperty(value = "类型编码")
+    @Id
     @Column(name = "class_code")
-    @JSONField(name = "ClassCode")
     var classCode: String? = null
 
     /** 动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL */
     @ApiModelProperty(value = "动静分类:静态STATIC,脉冲PULSE,阶段GRADATION,时序SEQUENTIAL")
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: 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
 
     /** 分类:commo平台级, group集团级, project项目级 */
     @ApiModelProperty(value = "分类:commo平台级, group集团级, project项目级")
+    @Id
     @Column(name = "type")
-    @JSONField(name = "Type")
     var type: String? = null
 
     /** 集团id, 默认为"0" */
     @ApiModelProperty(value = "集团id, 默认为'0'")
-    @Column(name = "group_id")
-    @JSONField(name = "GroupId")
-    var groupId: String? = null
+    @Column(name = "group_code")
+    var groupCode: String? = null
 
     /** 项目id, 默认为"0" */
     @ApiModelProperty(value = "项目id, 默认为'0'")
     @Column(name = "project_id")
-    @JSONField(name = "ProjectId")
     var projectId: String? = null
 
     /** 数据类型 */
     @ApiModelProperty(value = "数据类型")
     @Column(name = "data_type")
-    @JSONField(name = "DataType")
     var dataType: String? = null
 
     /** 数据格式 */
     @ApiModelProperty(value = "数据格式")
     @Column(name = "formater")
-    @JSONField(name = "Formater")
     var formater: String? = null
 
     /** 数据格式 */
     @ApiModelProperty(value = "数据格式")
     @Column(name = "data_source")
-    @JSONField(name = "DataSource")
     var dataSource: ArrayList<Any?>? = null
 
     /** 输入方式 */
     @ApiModelProperty(value = "输入方式")
     @Column(name = "input_mode")
-    @JSONField(name = "InputMode")
     var inputMode: String? = null
 
     /** 一级标签 */
     @ApiModelProperty(value = "一级标签")
     @Column(name = "first_tag")
-    @JSONField(name = "FirstTag")
     var firstTag: String? = null
 
     /** 一级名称 */
     @ApiModelProperty(value = "一级名称")
     @Column(name = "first_name")
-    @JSONField(name = "FirstName")
     var firstName: String? = null
 
     /** 二级标签 */
     @ApiModelProperty(value = "二级标签")
     @Column(name = "second_tag")
-    @JSONField(name = "SecondTag")
     var secondTag: String? = null
 
     /** 二级名称 */
     @ApiModelProperty(value = "二级名称")
     @Column(name = "second_name")
-    @JSONField(name = "SecondName")
     var secondName: String? = null
 
     /** 序列 */
     @ApiModelProperty(value = "序列")
     @Column(name = "idx")
-    @JSONField(name = "idx")
     var idx: Int? = null
 
     /** 优先级,重要程度 */
     @ApiModelProperty(value = "优先级,重要程度")
     @Column(name = "priority")
-    @JSONField(name = "Priority")
     var priority: String? = null
 
     /** 单位 */
     @ApiModelProperty(value = "单位")
     @Column(name = "unit")
-    @JSONField(name = "Unit")
     var unit: String? = null
 
     /** 备注 */
     @ApiModelProperty(value = "备注")
     @Column(name = "note")
-    @JSONField(name = "Note")
     var note: String? = null
 
+    /** 输入类型 */
+    @ApiModelProperty(value = "输入类型")
+    @Column(name = "orig_data_type")
+    var origDataType: String? = null
+
+    /** 旧信息点编码 */
+    @ApiModelProperty(value = "旧信息点编码")
+    @Column(name = "orig_code")
+    var origCode: String? = null
+
     /** 是否分类标签 */
     @ApiModelProperty(value = "是否分类标签")
     @Column(name = "can_sub")
-    @JSONField(name = "CanSub")
     var canSub: Boolean? = null
 
     /** 是否复数 */
     @ApiModelProperty(value = "是否复数")
     @Column(name = "is_multiple")
-    @JSONField(name = "IsMultiple")
     var isMultiple: Boolean? = null
 
     /** 是否区间 */
     @ApiModelProperty(value = "是否区间")
     @Column(name = "is_region")
-    @JSONField(name = "IsRegion")
     var isRegion: Boolean? = null
 
     /** 子分类标记 */
     @ApiModelProperty(value = "子分类标记")
     @Column(name = "sub_flag")
-    @JSONField(name = "SubFlag")
     var subFlag: Boolean? = null
 
     /** 是否只读, 如果是则不允许对该信息点做变更 */
     @ApiModelProperty(value = "是否只读, 如果是则不允许对该信息点做变更")
     @Column(name = "readonly")
-    @JSONField(name = "Readonly")
     var readonly: Boolean? = null
 
     /** 排序 */
     @ApiModelProperty(value = "排序")
     @Column(name = "sort")
-    @JSONField(name = "Sort")
     var sort: Int? = null
 
     /** 是否显示 */
     @ApiModelProperty(value = "是否显示")
     @Column(name = "visible")
-    @JSONField(name = "Visible")
     var visible: Boolean? = null
 
     /** 是否编辑 */
     @ApiModelProperty(value = "是否编辑")
     @Column(name = "editable")
-    @JSONField(name = "Editable")
     var editable: Boolean? = null
 
     /** 禁止操作 */
     @ApiModelProperty(value = "禁止操作")
     @Column(name = "un_disabled")
-    @JSONField(name = "UnDisabled")
     var unDisabled: Boolean? = null
 
     /** 路径 */
     @ApiModelProperty(value = "路径")
-    @JSONField(name = "Path")
     var path: String? = null
         get() {
             return if (firstName == "基本信息"|| firstName.isNullOrEmpty()){

+ 9 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/DictPlatformInfo.kt

@@ -1,12 +1,15 @@
 package com.persagy.server.syn.models
 
 /**
+ * 中台信息点类
  *
  * @author  wx
  * @date  2020/9/20 9:39
  */
 class DictPlatformInfo {
 
+    /** id */
+    var id: String? = null
 
     /** 类型编码 */
     var classCode: String? = null
@@ -24,7 +27,7 @@ class DictPlatformInfo {
     var type: String? = null
 
     /** 集团id, 默认为"0" */
-    var groupId: String? = null
+    var groupCode: String? = null
 
     /** 项目id, 默认为"0" */
     var projectId: String? = null
@@ -74,5 +77,10 @@ class DictPlatformInfo {
     /** 是否只读, 如果是则不允许对该信息点做变更 */
     var readonly: Boolean? = null
 
+    /** 旧字典编码 */
+    var origCode: String? = null
+
+    /** 旧字典编码类型 */
+    var origDataType: String? = null
 
 } // Class DictPlatformInfo

+ 6 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/models/DictPlatformType.kt

@@ -4,11 +4,14 @@ import java.io.Serializable
 
 /**
  *  平台字典类型
+ *
  * @author  wx
  * @date  2020/9/19 16:25
  */
 class DictPlatformType: Serializable {
 
+    var id: String? = null
+
     var code: String? = null
 
     var name: String? = null
@@ -19,7 +22,7 @@ class DictPlatformType: Serializable {
 
     var type: String? = null
 
-    var groupId: String? = null
+    var groupCode: String? = null
 
     var projectId: String? = null
 
@@ -31,4 +34,6 @@ class DictPlatformType: Serializable {
 
     var equipmentCode: String? = null
 
+    var objType: String? = null
+
 } // DictPlatformType

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

@@ -83,7 +83,7 @@ object DictTypeApi {
      * 平台字典对象类型
      */
     fun dictPlatform(): ArrayList<DictPlatformType>{
-        val url = "${opts.dataPlatform}/dict/class/query"
+        val url = "${opts.dataPlatform}/def/class/"
         val jsonObject = JSONObject()
         val jsonObject2 = JSONObject()
         jsonObject2["type"] = "common"
@@ -107,7 +107,7 @@ object DictTypeApi {
      * @param   type        平台或集团
      */
     fun dictPlatformInfo(category: String,type: String): ArrayList<DictPlatformInfo>{
-        val url = "${opts.dataPlatform}/dict/funcid/query"
+        val url = "${opts.dataPlatform}/def/funcid"
         val jsonObject = JSONObject()
         val jsonObject2 = JSONObject()
         jsonObject2["type"] = type

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

@@ -120,16 +120,18 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
             defClassService.delete(SFilter.eq("type","common"))
             for (dictPlatform in dictPlatformList){
                 val defClass = DefClass()
+                defClass.id = dictPlatform.id
                 defClass.aliasCode = dictPlatform.aliasCode
                 defClass.aliasName = dictPlatform.aliasName
                 defClass.code = dictPlatform.code
                 defClass.equipmentCode = dictPlatform.equipmentCode
-                defClass.groupId = if (dictPlatform.groupId.isNullOrEmpty())  "0" else dictPlatform.groupId
+                defClass.groupCode = if (dictPlatform.groupCode.isNullOrEmpty())  "0" else dictPlatform.groupCode
                 defClass.majorCode = dictPlatform.majorCode
                 defClass.name = dictPlatform.name
                 defClass.parentCode = dictPlatform.parentCode
                 defClass.projectId = if (dictPlatform.projectId.isNullOrEmpty())  "0" else dictPlatform.projectId
                 defClass.systemCode = dictPlatform.systemCode
+                defClass.objType = dictPlatform.objType
                 defClass.type = "common"
                 defClassService.replace(defClass)
             }
@@ -150,87 +152,87 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
 //            defFuncIdService.delete(SFilter.eq("groupId", "0"))
             for (defClass in defClassList){
                 val dictPlatformInfoList = DictTypeApi.dictPlatformInfo(defClass.code!!, defClass.type!!)
-                defFuncIdService.delete(SFilter.eq("classCode", defClass.code!!),SFilter.eq("groupId", "0"))
+                defFuncIdService.delete(SFilter.eq("classCode", defClass.code!!),SFilter.eq("groupCode", "0"))
                 if (!dictPlatformInfoList.isNullOrEmpty()){
                     for (dictPlatformInfo in dictPlatformInfoList){
                         /** 开头字母大写转小写 */
-                        val str1: String = dictPlatformInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
-                        val str2: String = dictPlatformInfo.code!!.substring(1, dictPlatformInfo.code!!.length) //截取字符串第二个以后
-                        var str=str1+str2
+//                        val str1: String = dictPlatformInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
+//                        val str2: String = dictPlatformInfo.code!!.substring(1, dictPlatformInfo.code!!.length) //截取字符串第二个以后
+//                        var str=str1+str2
                         val defFuncId = DefFuncId()
                         defFuncId.canSub = dictPlatformInfo.canSub
                         defFuncId.category = dictPlatformInfo.category
                         defFuncId.classCode = defClass.code
-                        if (str == "equipLocalID"){
+                        if (dictPlatformInfo.code == "equipLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str == "equipLocalName"){
+                        }else if (dictPlatformInfo.code == "equipLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "sysLocalID"){
+                        }else if (dictPlatformInfo.code == "sysLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str == "sysLocalName"){
+                        }else if (dictPlatformInfo.code == "sysLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "tenantLocalID"){
+                        }else if (dictPlatformInfo.code == "tenantLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str =="tenantLocalName"){
+                        }else if (dictPlatformInfo.code =="tenantLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "roomLocalID"){
+                        }else if (dictPlatformInfo.code == "roomLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str == "roomLocalName"){
+                        }else if (dictPlatformInfo.code == "roomLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "shaftLocalID"){
+                        }else if (dictPlatformInfo.code == "shaftLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str == "shaftLocalName"){
+                        }else if (dictPlatformInfo.code == "shaftLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "shaftID"){
+                        }else if (dictPlatformInfo.code == "shaftID"){
                             defFuncId.code = "id"
-                        }else if (str == "shaftName"){
+                        }else if (dictPlatformInfo.code == "shaftName"){
                             defFuncId.code = "name"
-                        }else if (str == "equipID"){
+                        }else if (dictPlatformInfo.code == "equipID"){
                             defFuncId.code = "id"
-                        }else if (str == "equipName"){
+                        }else if (dictPlatformInfo.code == "equipName"){
                             defFuncId.code = "name"
-                        }else if (str == "sysID"){
+                        }else if (dictPlatformInfo.code == "sysID"){
                             defFuncId.code = "id"
-                        }else if (str == "sysName"){
+                        }else if (dictPlatformInfo.code == "sysName"){
                             defFuncId.code = "name"
-                        }else if (str == "tenantID"){
+                        }else if (dictPlatformInfo.code == "tenantID"){
                             defFuncId.code = "id"
-                        }else if (str == "tenantName"){
+                        }else if (dictPlatformInfo.code == "tenantName"){
                             defFuncId.code = "name"
-                        }else if (str == "roomID"){
+                        }else if (dictPlatformInfo.code == "roomID"){
                             defFuncId.code = "id"
-                        }else if (str == "roomName"){
+                        }else if (dictPlatformInfo.code == "roomName"){
                             defFuncId.code = "name"
-                        }else if (str == "projID"){
+                        }else if (dictPlatformInfo.code == "projID"){
                             defFuncId.code = "id"
-                        }else if (str == "projName"){
+                        }else if (dictPlatformInfo.code == "projName"){
                             defFuncId.code = "name"
-                        }else if (str == "projLocalName"){
+                        }else if (dictPlatformInfo.code == "projLocalName"){
                             defFuncId.code = "localId"
-                        }else if (str == "projLocalName"){
+                        }else if (dictPlatformInfo.code == "projLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "flootID"){
+                        }else if (dictPlatformInfo.code == "flootID"){
                             defFuncId.code = "id"
-                        }else if (str == "flootName"){
+                        }else if (dictPlatformInfo.code == "flootName"){
                             defFuncId.code = "name"
-                        }else if (str == "floorLocalName"){
+                        }else if (dictPlatformInfo.code == "floorLocalName"){
                             defFuncId.code = "localId"
-                        }else if (str == "floorLocalName"){
+                        }else if (dictPlatformInfo.code == "floorLocalName"){
                             defFuncId.code = "localName"
-                        }else if (str == "buildID"){
+                        }else if (dictPlatformInfo.code == "buildID"){
                             defFuncId.code = "id"
-                        }else if (str == "buildName"){
+                        }else if (dictPlatformInfo.code == "buildName"){
                             defFuncId.code = "name"
-                        }else if (str == "buildLocalID"){
+                        }else if (dictPlatformInfo.code == "buildLocalID"){
                             defFuncId.code = "localId"
-                        }else if (str == "buildLocalName"){
+                        }else if (dictPlatformInfo.code == "buildLocalName"){
                             defFuncId.code = "localName"
                         }else{
-                            defFuncId.code = str
+                            defFuncId.code = dictPlatformInfo.code
                         }
 
-
-
+                        defFuncId.id = dictPlatformInfo.id
+//                        defFuncId.code = dictPlatformInfo.code
                         defFuncId.dataSource = dictPlatformInfo.dataSource
                         defFuncId.dataType = dictPlatformInfo.dataType
                         defFuncId.firstName = dictPlatformInfo.firstTag
@@ -238,7 +240,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                             defFuncId.firstTag = ParamTools.TwoLevelCode(dictPlatformInfo.firstTag!!)
                         }
                         defFuncId.formater = dictPlatformInfo.formater
-                        defFuncId.groupId = if (dictPlatformInfo.groupId.isNullOrEmpty()) "0" else dictPlatformInfo.groupId
+                        defFuncId.groupCode = if (dictPlatformInfo.groupCode.isNullOrEmpty()) "0" else dictPlatformInfo.groupCode
                         defFuncId.idx = dictPlatformInfo.idx
                         defFuncId.inputMode = dictPlatformInfo.inputMode
                         defFuncId.isMultiple = dictPlatformInfo.isMultiple
@@ -255,6 +257,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                         defFuncId.subFlag = dictPlatformInfo.subFlag
                         defFuncId.type = dictPlatformInfo.dataType
                         defFuncId.unit = dictPlatformInfo.unit
+                        defFuncId.origCode = dictPlatformInfo.origCode
+                        defFuncId.origDataType = dictPlatformInfo.origDataType
 
                         if (!defFuncId.name.isNullOrEmpty()){
                             /** 排序 */
@@ -471,7 +475,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                         defClass.aliasName = dictGroup.aliasName
                         defClass.code = dictGroup.code
                         defClass.equipmentCode = dictGroup.equipmentCode
-                        defClass.groupId = group.id
+                        defClass.groupCode = group.id
                         defClass.majorCode = dictGroup.majorCode
                         defClass.name = dictGroup.name
                         defClass.parentCode = dictGroup.parentCode
@@ -497,8 +501,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
         val defClassList = defClassService.select(SFilter.eq("type", "group")).exec()
         if (defClassList.size>0){
             for (defClass in defClassList){
-                val dictGroupInfoList = DictTypeApi.dictGroupInfo(defClass.groupId!!, defClass.code!!)
-                defFuncIdService.delete(SFilter.eq("groupId",defClass.groupId!!),SFilter.eq("classCode",defClass.code!!))
+                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){
                         /** 开头字母大写转小写 */
@@ -587,7 +591,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
                         }
                         defFuncId.firstName = dictGroupInfo.firstTag
                         defFuncId.formater = dictGroupInfo.formater
-                        defFuncId.groupId = defClass.groupId
+                        defFuncId.groupCode = defClass.groupCode
                         defFuncId.idx = dictGroupInfo.idx
                         defFuncId.inputMode = dictGroupInfo.inputMode
                         defFuncId.isMultiple = dictGroupInfo.isMultiple

+ 6 - 3
datasyn/src/main/resources/application-dev.yml

@@ -3,9 +3,12 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://60.205.177.43:5432/datacenter
+#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenter
+#    username:                           postgres
+#    password:                           123qwe!@#
+    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
-    password:                           123qwe!@#
+    password:                           persagy_2020qwe!@#
 
   activemq:
     broker-url:                         tcp://172.16.42.210:61616
@@ -18,5 +21,5 @@ spring:
       group-id:                             datacenter-consumer-group
 
 saga:
-  dataPlatform:                        http://192.168.3.203:8081/paas
+  dataPlatform:                        http://39.102.54.110:9002
 

+ 6 - 2
labsl/src/main/kotlin/com/persagy/server/labsl/controller/GraphController.kt

@@ -1,10 +1,12 @@
 package com.persagy.server.labsl.controller
 
+import com.persagy.database.SFilter
 import com.persagy.server.labsl.models.entities.Graph
 import com.persagy.server.labsl.models.entities.pub.GraphPub
 import com.persagy.server.labsl.models.response.SCommonResponse
 import com.persagy.server.labsl.services.GraphService
 import com.persagy.server.labsl.services.pub.GraphPubService
+import com.persagy.service.SPageContext
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
 import com.persagy.service.models.requests.SUpdateRequest
@@ -101,7 +103,8 @@ class GraphController {
     @ApiOperation(value = "草稿箱-查询图形信息", notes = "state 1(草稿箱),state 4(回收站) ,Id 和 GraphId 必填")
     @PostMapping(value = ["/drafts/query"])
     fun query(@RequestBody request: SQueryRequest): SQueryResponse<Graph> {
-        return GraphService.pageQuery(request)
+        val projectId = SPageContext.getHeader("projectId")
+        return GraphService.pageQuery(request, arrayListOf(SFilter.eq("projectId",projectId!!)))
     } // Function query()
 
     /**
@@ -128,7 +131,8 @@ class GraphController {
     @ApiOperation(value = "已发布-查询图形信息", notes = "Id 和 GraphId 必填")
     @PostMapping(value = ["/pub/query"])
     fun querPub(@RequestBody request: SQueryRequest): SQueryResponse<GraphPub> {
-        return GraphPubService.pageQuery(request)
+        val projectId = SPageContext.getHeader("projectId")
+        return GraphPubService.pageQuery(request, arrayListOf(SFilter.eq("projectId",projectId!!)))
     } // Function querPub()
 
     /**

+ 5 - 0
labsl/src/main/kotlin/com/persagy/server/labsl/models/entities/pub/GraphPub.kt

@@ -103,4 +103,9 @@ class GraphPub : SBaseEntity(), Serializable {
     @Column(name = "page_size")
     var pageSize: HashMap<String, Any?>? = null
 
+    /** 标签 */
+    @ApiModelProperty(value = " 标签 ")
+    @Column(name = "label")
+    var label: ArrayList<String>? = null
+
 } // Class Graph

+ 11 - 11
labsl/src/main/kotlin/com/persagy/server/labsl/services/GraphService.kt

@@ -212,7 +212,7 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
             SFilter.eq("graphId", graphPub.graphId!!),
             SFilter.eq("state", 1)
         )
-        val graph = squeryBuilder.table("labsl.graph_pub").entity()
+        val graph = squeryBuilder.table("labsl.graph").entity()
         if (graph!=null){
             //开启事务
             openTransaction()
@@ -226,7 +226,7 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
             graph.isAvailable = true
             graph.isPub = true
             val insert = GraphPubService.insert(graph)
-            if (insert) {
+            if (!insert) {
                 // 回滚
                 backTransaction()
                 sCreateResponse.result = SResponseType.failure
@@ -234,7 +234,7 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
             }
             /** 子节点 */
             val nodebuilder = nodePubService.select(
-                SFilter.eq("projectId", projectId!!),
+//                SFilter.eq("projectId", projectId!!),
                 SFilter.eq("graphId", graph.graphId!!),
                 SFilter.eq("id", graphPub.id!!),
                 SFilter.eq("state", 1)
@@ -255,12 +255,12 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
                 }
             }
             val markersbuilder = markersPubService.select(
-                SFilter.eq("projectId", projectId!!),
+//                SFilter.eq("projectId", projectId!!),
                 SFilter.eq("graphId", graph.graphId!!),
                 SFilter.eq("id", graphPub.id!!),
                 SFilter.eq("state", 1)
             )
-            val markersPubList = markersbuilder.table("labsl.marker").exec()
+            val markersPubList = markersbuilder.table("labsl.marker_pub").exec()
             if (markersPubList.size>0){
                 for (markersPub in markersPubList){
                     markersPub.id = graph.id
@@ -276,12 +276,12 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
                 }
             }
             val relationBuilder = relationPubService.select(
-                SFilter.eq("projectId", projectId!!),
+//                SFilter.eq("projectId", projectId!!),
                 SFilter.eq("graphId", graph.graphId!!),
                 SFilter.eq("id", graphPub.id!!),
                 SFilter.eq("state", 1)
             )
-            val relationList = relationBuilder.table("labsl.relation").exec()
+            val relationList = relationBuilder.table("labsl.relation_pub").exec()
             if (relationList.size>0){
                 for (relation in relationList){
                     relation.id = graph.id
@@ -297,12 +297,12 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
                 }
             }
             val anchorBuilder = anchorPubService.select(
-                SFilter.eq("projectId", projectId!!),
+//                SFilter.eq("projectId", projectId!!),
                 SFilter.eq("graphId", graph.graphId!!),
                 SFilter.eq("id", graphPub.id!!),
                 SFilter.eq("state", 1)
             )
-            val anchorList = anchorBuilder.table("labsl.anchor").exec()
+            val anchorList = anchorBuilder.table("labsl.anchor_pub").exec()
             if (anchorList.size>0){
                 for (anchor in anchorList){
                     anchor.id = graph.id
@@ -319,12 +319,12 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
             }
 
             val attachObjectIdsBuilder = attachObjectIdsPubService.select(
-                SFilter.eq("projectId", projectId!!),
+//                SFilter.eq("projectId", projectId!!),
                 SFilter.eq("graphId", graph.graphId!!),
                 SFilter.eq("id", graphPub.id!!),
                 SFilter.eq("state", 1)
             )
-            val attachObjectIdsList = attachObjectIdsBuilder.table("labsl.attach_object_ids").exec()
+            val attachObjectIdsList = attachObjectIdsBuilder.table("labsl.attach_object_ids_pub").exec()
             if (attachObjectIdsList.size>0){
                 for (attachObjectIds in attachObjectIdsList){
                     attachObjectIds.id = graph.id

+ 1 - 0
labsl/src/main/kotlin/com/persagy/server/labsl/services/mappers/CustomMapper.kt

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository
 
 /**
  * 自定义SQL
+ *
  * @author  wx
  * @date  2020/9/17 12:01
  */