ソースを参照

********labsl VS meiku***********************************
蜡笔森林 添加注释
美库 添加注释

zhangweixin 4 年 前
コミット
1574577554
46 ファイル変更2021 行追加51 行削除
  1. 13 1
      labsl/src/main/kotlin/com/persagy/labsl/Swagger3Config.kt
  2. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/controller/GraphCategoryController.kt
  3. 2 3
      labsl/src/main/kotlin/com/persagy/labsl/controller/GraphController.kt
  4. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/controller/MarkersController.kt
  5. 1 4
      labsl/src/main/kotlin/com/persagy/labsl/controller/NodeController.kt
  6. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/controller/RelationController.kt
  7. 190 0
      labsl/src/main/kotlin/com/persagy/labsl/controller/planar/PlanarGraphController.kt
  8. 90 0
      labsl/src/main/kotlin/com/persagy/labsl/controller/planar/QbsFolderController.kt
  9. 114 0
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/PlanarGraph.kt
  10. 15 0
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/PlanarGraphPub.kt
  11. 38 0
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/QbsFolder.kt
  12. 2 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Anchor.kt
  13. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/AttachObjectIds.kt
  14. 2 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Elements.kt
  15. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Graph.kt
  16. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/GraphCategory.kt
  17. 3 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Markers.kt
  18. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Node.kt
  19. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Pos.kt
  20. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Relation.kt
  21. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/Size.kt
  22. 0 0
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/tpt/auxiliary/CategoryCode.kt
  23. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pic/Picture.kt
  24. 2 2
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/AnchorPub.kt
  25. 0 0
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/tpt/pub/AttachObjectIdsPub.kt
  26. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/ElementsPub.kt
  27. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/GraphPub.kt
  28. 2 2
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/MarkersPub.kt
  29. 3 3
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/NodePub.kt
  30. 2 2
      labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/RelationPub.kt
  31. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/services/AnchorService.kt
  32. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/services/AttachObjectIdsServices.kt
  33. 1 2
      labsl/src/main/kotlin/com/persagy/labsl/services/GraphCategoryService.kt
  34. 5 4
      labsl/src/main/kotlin/com/persagy/labsl/services/GraphService.kt
  35. 3 2
      labsl/src/main/kotlin/com/persagy/labsl/services/MarkersService.kt
  36. 3 2
      labsl/src/main/kotlin/com/persagy/labsl/services/NodeService.kt
  37. 3 2
      labsl/src/main/kotlin/com/persagy/labsl/services/RelationService.kt
  38. 46 0
      labsl/src/main/kotlin/com/persagy/labsl/services/planar/Building.kt
  39. 90 0
      labsl/src/main/kotlin/com/persagy/labsl/services/planar/Floor.kt
  40. 1234 0
      labsl/src/main/kotlin/com/persagy/labsl/services/planar/PlanarGraphService.kt
  41. 136 0
      labsl/src/main/kotlin/com/persagy/labsl/services/planar/QbsFolderService.kt
  42. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/services/pub/AnchorPubService.kt
  43. 1 1
      labsl/src/main/kotlin/com/persagy/labsl/services/pub/GraphPubService.kt
  44. 2 2
      labsl/src/main/resources/application-dev.yml
  45. 1 0
      labsl/src/main/resources/application-prod.yml
  46. 1 0
      meiku/src/main/resources/application-prod.yml

+ 13 - 1
labsl/src/main/kotlin/com/persagy/labsl/Swagger3Config.kt

@@ -89,8 +89,20 @@ open class Swagger3Config {
             .build()
     }
 
+    /**
+     * 平面图
+     */
+    @Bean
+    open fun planarApi(): GroupedOpenApi? {
+        return GroupedOpenApi.builder()
+            .group("平面图")
+            .pathsToMatch("/planar/**")
+            .addOperationCustomizer(operationCustomizer)
+            .build()
+    }
+
 
-} // Class Swagger2Config
+}
 
 /**
  * 全局参数

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/controller/GraphCategoryController.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.controller
 
-import com.persagy.labsl.models.entities.GraphCategory
+import com.persagy.labsl.models.entities.tpt.GraphCategory
 import com.persagy.labsl.models.request.GraphCategoryRequest
 import com.persagy.labsl.services.GraphCategoryService
 import com.persagy.service.models.responses.SQueryResponse

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

@@ -2,12 +2,11 @@ package com.persagy.labsl.controller
 
 import com.persagy.database.SFilter
 import com.persagy.labsl.Opts
-import com.persagy.labsl.models.entities.Graph
-import com.persagy.labsl.models.entities.pub.GraphPub
+import com.persagy.labsl.models.entities.tpt.Graph
+import com.persagy.labsl.models.entities.tpt.pub.GraphPub
 import com.persagy.labsl.models.response.SCommonResponse
 import com.persagy.labsl.services.GraphService
 import com.persagy.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

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/controller/MarkersController.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.controller
 
-import com.persagy.labsl.models.entities.Markers
+import com.persagy.labsl.models.entities.tpt.Markers
 import com.persagy.labsl.services.MarkersService
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest

+ 1 - 4
labsl/src/main/kotlin/com/persagy/labsl/controller/NodeController.kt

@@ -1,8 +1,6 @@
 package com.persagy.labsl.controller
 
-import com.persagy.base.extensions.toJson
-import com.persagy.labsl.models.entities.Graph
-import com.persagy.labsl.models.entities.Node
+import com.persagy.labsl.models.entities.tpt.Node
 import com.persagy.labsl.services.NodeService
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest
@@ -10,7 +8,6 @@ import com.persagy.service.models.requests.SUpdateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
-import com.persagy.service.utils.SSpringContextUtil
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.slf4j.LoggerFactory

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/controller/RelationController.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.controller
 
-import com.persagy.labsl.models.entities.Relation
+import com.persagy.labsl.models.entities.tpt.Relation
 import com.persagy.labsl.services.RelationService
 import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.requests.SQueryRequest

+ 190 - 0
labsl/src/main/kotlin/com/persagy/labsl/controller/planar/PlanarGraphController.kt

@@ -0,0 +1,190 @@
+package com.persagy.labsl.controller.planar
+
+import com.persagy.database.SFilter
+import com.persagy.labsl.Opts
+import com.persagy.labsl.models.entities.pbs.PlanarGraph
+import com.persagy.labsl.models.entities.pbs.PlanarGraphPub
+import com.persagy.labsl.models.response.SCommonResponse
+import com.persagy.labsl.services.planar.Building
+import com.persagy.labsl.services.planar.PlanarGraphService
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 图形
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ */
+@Tag(name = "002、平面图")
+@RestController
+@RequestMapping("/planar/graph")
+class PlanarGraphController {
+
+    /**
+     * 创建平面图
+     *
+     * @param planarGraph     待创建对象列表
+     * @return 创建完成图对象列表
+     */
+    @Operation(summary ="-未发布-单个图形创建", description = "id和graphId为必填,图中会包含多个节点,详细节点结构见示例")
+    @PostMapping("/drafts/create")
+    fun create(@RequestBody planarGraph: PlanarGraph): SCreateResponse<PlanarGraph> {
+        return PlanarGraphService.create(planarGraph)
+    }
+
+    /**
+     * 提交图形
+     *
+     * @param  graph   待图对象
+     * @return  图对象列表
+     */
+//   @Operation(summary = "未发布-保存图形", description = "")
+//    @PostMapping("/drafts/save")
+//    fun save(@RequestBody graph: PlanarGraph): SCreateResponse<PlanarGraph> {
+//        return PlanarGraphService.save(graph)
+//    } // Function save()
+
+    /**
+     * 发布图形
+     *
+     * @param graph     待发布的图对象
+     * @return 发布结果
+     */
+    @Operation(summary="未发布-发布图形", description =" Id 和 GraphId 必须填写")
+    @PostMapping("/drafts/publish")
+    fun pubDrawings(@RequestBody graph: PlanarGraphPub): SCreateResponse<PlanarGraphPub>{
+        return PlanarGraphService.pubDrawings(graph)
+    }
+
+
+    /**
+     * 图、移至或移出回收站
+     *
+     * @param idList    图例列表
+     * @return 移出结果
+     */
+    @Operation(summary = "未发布-移至回收站", description = " Id 和 GraphId 必填")
+    @PostMapping(value = ["/drafts/recycle"])
+    fun recycle(@RequestBody idList: ArrayList<PlanarGraph>): SBaseResponse {
+        return PlanarGraphService.recycle(idList)
+    }
+
+    /**
+     * 已发布图形移至回收站
+     *
+     * @param idList    图列表
+     * @return 移出结果
+     */
+    @Operation(summary = "已发布-图形移至回收站", description = "Id 和 GraphId 必填")
+    @PostMapping(value = ["/pub/recycle"])
+    fun recyclePub(@RequestBody idList: ArrayList<PlanarGraph>): SBaseResponse{
+        return PlanarGraphService.recyclePub(idList)
+    }
+
+    /**
+     * 更新图形信息
+     *
+     * @param request   更新的内容对象
+     * @return 更新的结果
+     */
+    @Operation(summary = "未发布-更新图形信息", description = "Id 和 GraphId 必填")
+    @PostMapping(value = ["/drafts/update"])
+    fun updates(@RequestBody request: SUpdateRequest<PlanarGraph>): SBaseResponse {
+        return PlanarGraphService.updateList(request)
+    }
+
+    /**
+     * 查询图形信息    *********************************************************************************************************
+     *
+     * @param  request  查询条件
+     * @return 查询结果
+     */
+    @Operation(summary = "未发布-查询图形信息", description = "state 1(未发布),state 4(回收站) ,Id 和 GraphId 必填")
+    @PostMapping(value = ["/drafts/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Building> {
+        return PlanarGraphService.pageQuerysDrafts(request)
+    }
+
+    /**
+     * 未发布 - 读取图形所有节点
+     *
+     * @param graph  图例对象
+     * @return 查询结果
+     */
+//   @Operation(summary = "未发布-查询图形以及所有节点信息", description = "Id 和 GraphId 必填")
+//    @PostMapping(value = ["/drafts/read"])
+//    fun readDrafts(@RequestBody graph: PlanarGraph): SCommonResponse<PlanarGraph> {
+//        return PlanarGraphService.readDrafts(graph)
+//    } // Fun readDrafts()
+
+    /**
+     * 已发布 - 读取图形所有节点
+     *
+     * @param graph  图例对象
+     * @return 查询结果
+     */
+//   @Operation(summary = "已发布-查询图形以及所有节点信息", description = "Id 和 GraphId 必填")
+//    @PostMapping(value = ["/pub/read"])
+//    fun readPub(@RequestBody graph: PlanarGraphPub): SCommonResponse<PlanarGraphPub> {
+//        return PlanarGraphService.readPub(graph)
+//    } // Fun readPub()
+
+    /**
+     * 已发布图形查询   *****************************************************
+     *
+     * @param request  查询条件
+     * @return 查询结果
+     */
+    @Operation(summary = "已发布-查询图形信息", description = "Id 和 GraphId 必填")
+    @PostMapping(value = ["/pub/query"])
+    fun querPub(@RequestBody request: SQueryRequest): SQueryResponse<Building> {
+        return PlanarGraphService.pageQuerysPub(request)
+    }
+
+    /**
+     * 更新图形信息
+     *
+     * @param request  更新的内容对象
+     * @return 更新的结果
+     */
+    @Operation(summary = "已发布-更新图形信息", description = "")
+    @PostMapping(value = ["/pub/update"])
+    fun updatePub(@RequestBody request: SUpdateRequest<PlanarGraphPub>): SBaseResponse {
+        return PlanarGraphService.planarGraphPubService.updateList(request)
+    }
+
+    /**
+     * 回收站- 恢复图形
+     *
+     * @param graph  图对象
+     * @return 恢复结果
+     */
+//   @Operation(summary = "回收站- 恢复图形", description = "Id 和 GraphId 必填 ")
+//    @PostMapping(value = ["recycle/recovery"])
+//    fun recovery(@RequestBody graph: PlanarGraph): SBaseResponse{
+//    return PlanarGraphService.recovery(graph)
+//    }
+
+    /**
+     * 根据id删除图形
+     *
+     * @param idList      图对象数组
+     * @return 删除的结果信息
+     */
+    @Operation(summary = "回收站-根据id删除图形信息,删除图形", description = "Id 和 GraphId 必填 ")
+    @PostMapping(value = ["recycle/delete"])
+    fun delete(@RequestBody idList: ArrayList<PlanarGraph>): SBaseResponse {
+        return PlanarGraphService.deleteByKeysList(idList)
+    }
+
+}

+ 90 - 0
labsl/src/main/kotlin/com/persagy/labsl/controller/planar/QbsFolderController.kt

@@ -0,0 +1,90 @@
+package com.persagy.labsl.controller.planar
+
+import com.persagy.database.SFilter
+import com.persagy.labsl.Opts
+import com.persagy.labsl.models.entities.pbs.QbsFolder
+import com.persagy.labsl.services.planar.QbsFolderService
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 平面图 - 文件夹
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/1 15:32
+ */
+@Tag(name = "001、文件夹")
+@RestController
+@RequestMapping("/planar/folder")
+class QbsFolderController {
+
+    /**
+     * 创建文件夹
+     *
+     * @param request    对象列表
+     * @return 创建完成对象列表
+     */
+    @Operation(summary ="创建文件夹", description = "name 不可以为空,不可以与已存在文件夹名称重复")
+    @PostMapping("/create")
+    fun create(@RequestBody request: SCreateRequest<QbsFolder>): SCreateResponse<QbsFolder> {
+        return QbsFolderService.creates(request)
+    }
+
+    /**
+     * 根据id删除文件夹
+     *
+     * @param idList   文件夹对象数组
+     * @return 删除的结果信息
+     */
+    @Operation(summary = "根据id删除文件夹", description = "id  必填 ")
+    @PostMapping(value = ["/delete"])
+    fun delete(@RequestBody idList: ArrayList<QbsFolder>): SBaseResponse {
+        return QbsFolderService.deletes(idList)
+    }
+
+    /**
+     * 更新信息
+     *
+     * @param request   更新的内容对象
+     * @return 更新的结果
+     */
+    @Operation(summary = "更新文件夹信息", description = "id 必填")
+    @PostMapping(value = ["/update"])
+    fun update(@RequestBody request: SUpdateRequest<QbsFolder>): SBaseResponse {
+        return QbsFolderService.updates(request)
+    }
+
+    /**
+     * 文件夹查询
+     *
+     * @param request  查询条件
+     * @return 查询结果
+     */
+    @Operation(summary = "文件夹查询", description = "")
+    @PostMapping(value = ["/query"])
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<QbsFolder> {
+        return QbsFolderService.pageQuery(request, arrayListOf(SFilter.eq("projectId", Opts.projectId!!)))
+    }
+
+    /**
+     * 根据条件查询统计数量
+     */
+    @Operation(summary = "根据条件查询统计数量", description = "")
+    @PostMapping(value = ["/count"])
+    fun count(@RequestBody request: SCountRequest): SCountResponse {
+        return QbsFolderService.count(request,arrayListOf(SFilter.eq("projectId", Opts.projectId!!)))
+    }
+
+}

+ 114 - 0
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/PlanarGraph.kt

@@ -0,0 +1,114 @@
+package com.persagy.labsl.models.entities.pbs
+
+import com.persagy.labsl.models.entities.tpt.Elements
+import com.persagy.service.models.SBaseEntity
+import io.swagger.v3.oas.annotations.media.Schema
+import java.io.Serializable
+import java.util.*
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+import javax.validation.constraints.NotNull
+
+/**
+ * 系统图
+ *
+ * @author wx  <zhangweixin@sagacloud.cn>
+ */
+@Schema(description = "平面图")
+@Table(name = "qibaishi_gallery.qbs_graph")
+open class PlanarGraph : SBaseEntity(), Serializable {
+
+    /** 图编码 id */
+    @Schema(description = "图编码 id", required = true)
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 图id */
+    @Schema(description = "图id", required = true)
+    @Id
+    @Column(name = "graph_id")
+    var graphId: String? = null
+
+    /** 图名称 */
+    @Schema(description = "图名称", required = true)
+    @Column(name = "name")
+    @NotNull(message = "图名称不可以为空")
+    var name: String? = null
+
+    /** 文件夹 id */
+    @Schema(description = "文件夹 id" )
+    @Column(name = "folder_id")
+    var folderId: String? = null
+
+    /** 文件夹名称 */
+    @Schema(description = "文件夹名称" )
+    var folderName: String? = null
+
+    /** 项目 id */
+    @Schema(description = "项目 id",required = true )
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 建筑 id */
+    @Schema(description = "建筑 id")
+    @Column(name = "building_id")
+    @NotNull(message = "建筑不可以为空")
+    var buildingId: String? = null
+
+    /** 楼层 id */
+    @Schema(description = "楼层 id")
+    @Column(name = "floor_id")
+    @NotNull(message = "楼层不可以为空")
+    var floorId: String? = null
+
+    /** 说明 */
+    @Schema(description = "说明")
+    @Column(name = "note")
+    var note: String? = null
+
+    /** 版本号 */
+    @Schema(description = "版本号")
+    @Column(name = "version")
+    var version: String? = null
+
+    @Schema(description = "系统图展示所需数据")
+    open var elements: Elements? = null
+
+    /** 移至回收站时间 */
+    @Schema(description = "移至回收站时间",example = "2020-09-20 08:30:00")
+    @Column(name = "del_time")
+    var delTime: Date? = null
+
+    /** 内部版本号 */
+    @Schema(description = "内部版本号")
+    @Column(name = "tag_version")
+    var tagVersion: Int? = null
+
+    /** 图片Key */
+    @Schema(description = "图片Key")
+    @Column(name = "pic")
+    var pic: String? = null
+
+    /** 图状态(1一般,2待审核,3审核完成,0发布) */
+    @Schema(description = "图状态(1草稿箱,2待审核,3审核完成,4回收站 ,0发布)")
+    @Column(name = "state")
+    var state: Int? = 1
+
+    /** 页面尺寸 */
+    @Schema(description = "页面尺寸")
+    @Column(name = "page_size")
+    var pageSize: HashMap<String,Any?>? = null
+
+    /** 标签 */
+    @Schema(description = "标签")
+    @Column(name = "label")
+    var label: ArrayList<String>? = null
+
+    /** 用户 */
+    @Schema(description = "用户")
+    @Column(name = "user")
+    var user: String? = null
+
+}

+ 15 - 0
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/PlanarGraphPub.kt

@@ -0,0 +1,15 @@
+package com.persagy.labsl.models.entities.pbs
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Table
+
+/**
+ * 平面图,已发布
+ *
+ * @author wx  <zhangweixin@sagacloud.cn>
+ */
+@Schema(description = "平面图 - 已发布")
+@Table(name = "qibaishi_gallery.qbs_graph_pub")
+open class PlanarGraphPub : PlanarGraph() {
+
+}

+ 38 - 0
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pbs/QbsFolder.kt

@@ -0,0 +1,38 @@
+package com.persagy.labsl.models.entities.pbs
+
+import com.persagy.service.models.SBaseEntity
+import io.swagger.v3.oas.annotations.media.Schema
+import java.io.Serializable
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+import javax.validation.constraints.NotNull
+
+/**
+ * 文件夹
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/1 15:11
+ */
+@Schema(description = "平面图 - 文件夹")
+@Table(name = "qibaishi_gallery.qbs_folder")
+class QbsFolder: Serializable, SBaseEntity() {
+
+    /** 文件夹 id */
+    @Schema(description = "文件夹 id")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 文件夹名称 */
+    @Schema(description = "文件夹名称")
+    @Column(name = "name")
+    @NotNull(message = "文件夹名称不可以为空")
+    var name: String? = null
+
+    /** 项目 id */
+    @Schema(description = "项目 id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+}

+ 2 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Anchor.kt

@@ -1,5 +1,6 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
+import com.persagy.labsl.models.entities.tpt.Pos
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/AttachObjectIds.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

+ 2 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Elements.kt

@@ -1,5 +1,6 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
+import com.persagy.labsl.models.entities.tpt.Relation
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.validation.Valid

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Graph.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/GraphCategory.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity

+ 3 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Markers.kt

@@ -1,5 +1,7 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
+import com.persagy.labsl.models.entities.tpt.Pos
+import com.persagy.labsl.models.entities.tpt.Size
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Node.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Pos.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Relation.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/Size.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities
+package com.persagy.labsl.models.entities.tpt
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

labsl/src/main/kotlin/com/persagy/labsl/models/entities/auxiliary/CategoryCode.kt → labsl/src/main/kotlin/com/persagy/labsl/models/entities/tpt/auxiliary/CategoryCode.kt


+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pic/Picture.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities.pic
+package com.persagy.labsl.models.entities.tpt.pic
 
 import com.alibaba.fastjson.annotation.JSONField
 import com.persagy.service.models.SBaseEntity

+ 2 - 2
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/AnchorPub.kt

@@ -1,6 +1,6 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
-import com.persagy.labsl.models.entities.Anchor
+import com.persagy.labsl.models.entities.tpt.Anchor
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Table

labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/AttachObjectIdsPub.kt → labsl/src/main/kotlin/com/persagy/labsl/models/entities/tpt/pub/AttachObjectIdsPub.kt


+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/ElementsPub.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/GraphPub.kt

@@ -1,4 +1,4 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema

+ 2 - 2
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/MarkersPub.kt

@@ -1,6 +1,6 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
-import com.persagy.labsl.models.entities.Markers
+import com.persagy.labsl.models.entities.tpt.Markers
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Table

+ 3 - 3
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/NodePub.kt

@@ -1,7 +1,7 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
-import com.persagy.labsl.models.entities.Pos
-import com.persagy.labsl.models.entities.Size
+import com.persagy.labsl.models.entities.tpt.Pos
+import com.persagy.labsl.models.entities.tpt.Size
 import com.persagy.service.models.SBaseEntity
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable

+ 2 - 2
labsl/src/main/kotlin/com/persagy/labsl/models/entities/pub/RelationPub.kt

@@ -1,6 +1,6 @@
-package com.persagy.labsl.models.entities.pub
+package com.persagy.labsl.models.entities.tpt.pub
 
-import com.persagy.labsl.models.entities.Relation
+import com.persagy.labsl.models.entities.tpt.Relation
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Table

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/services/AnchorService.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.services
 
-import com.persagy.labsl.models.entities.Anchor
+import com.persagy.labsl.models.entities.tpt.Anchor
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/services/AttachObjectIdsServices.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.services
 
-import com.persagy.labsl.models.entities.AttachObjectIds
+import com.persagy.labsl.models.entities.tpt.AttachObjectIds
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 

+ 1 - 2
labsl/src/main/kotlin/com/persagy/labsl/services/GraphCategoryService.kt

@@ -2,11 +2,10 @@ package com.persagy.labsl.services
 
 import com.persagy.database.SFilter
 import com.persagy.labsl.Opts
-import com.persagy.labsl.models.entities.GraphCategory
+import com.persagy.labsl.models.entities.tpt.GraphCategory
 import com.persagy.labsl.models.request.GraphCategoryRequest
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
-import com.persagy.service.SPageContext
 import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SQueryResponse
 import com.persagy.service.utils.SSpringContextUtil

+ 5 - 4
labsl/src/main/kotlin/com/persagy/labsl/services/GraphService.kt

@@ -4,9 +4,9 @@ import com.persagy.labsl.utils.IdUtils
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.labsl.Opts
-import com.persagy.labsl.models.entities.Elements
-import com.persagy.labsl.models.entities.Graph
-import com.persagy.labsl.models.entities.pub.*
+import com.persagy.labsl.models.entities.tpt.Elements
+import com.persagy.labsl.models.entities.tpt.Graph
+import com.persagy.labsl.models.entities.tpt.pub.*
 import com.persagy.labsl.models.response.SCommonResponse
 import com.persagy.labsl.services.pub.GraphPubService
 import com.persagy.mybatis.SMybatisDao
@@ -24,7 +24,8 @@ import kotlin.collections.ArrayList
  *
  * @author wx  <zhangweixin@sagacloud.com>
  */
-object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
+object GraphService : SObjectService<Graph>(SMybatisDao(
+    Graph::class.java)) {
 
     /** 日志 */
     private val logger = LoggerFactory.getLogger(GraphService::class.java)

+ 3 - 2
labsl/src/main/kotlin/com/persagy/labsl/services/MarkersService.kt

@@ -1,7 +1,7 @@
 package com.persagy.labsl.services
 
 import com.persagy.database.SFilter
-import com.persagy.labsl.models.entities.Markers
+import com.persagy.labsl.models.entities.tpt.Markers
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType
@@ -16,7 +16,8 @@ import java.util.*
  *
  * @author wx  <zhangweixin@sagacloud.com>
  */
-object MarkersService : SObjectService<Markers>(SMybatisDao(Markers::class.java)) {
+object MarkersService : SObjectService<Markers>(SMybatisDao(
+    Markers::class.java)) {
     /**
      * 创建说明
      *

+ 3 - 2
labsl/src/main/kotlin/com/persagy/labsl/services/NodeService.kt

@@ -1,7 +1,7 @@
 package com.persagy.labsl.services
 
 import com.persagy.database.SFilter
-import com.persagy.labsl.models.entities.Node
+import com.persagy.labsl.models.entities.tpt.Node
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType
@@ -16,7 +16,8 @@ import java.util.*
  *
  * @author wx  <zhangweixin@sagacloud.com>
  */
-object NodeService : SObjectService<Node>(SMybatisDao(Node::class.java)) {
+object NodeService : SObjectService<Node>(SMybatisDao(
+    Node::class.java)) {
     /**
      * 创建之前
      *

+ 3 - 2
labsl/src/main/kotlin/com/persagy/labsl/services/RelationService.kt

@@ -1,7 +1,7 @@
 package com.persagy.labsl.services
 
 import com.persagy.database.SFilter
-import com.persagy.labsl.models.entities.Relation
+import com.persagy.labsl.models.entities.tpt.Relation
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType
@@ -16,7 +16,8 @@ import java.util.*
  *
  * @author wx  <zhangweixin@sagacloud.com>
  */
-object RelationService : SObjectService<Relation>(SMybatisDao(Relation::class.java)){
+object RelationService : SObjectService<Relation>(SMybatisDao(
+    Relation::class.java)){
     /**
      * 创建之前的操作
      *

+ 46 - 0
labsl/src/main/kotlin/com/persagy/labsl/services/planar/Building.kt

@@ -0,0 +1,46 @@
+package com.persagy.labsl.services.planar
+
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/2 19:08
+ */
+@Schema(description = "建筑信息实体类")
+@Table(name = "public.building")
+class Building {
+
+    /** 建筑体ID */
+    @Schema(description = "建筑体ID")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 建筑体名称 */
+    @Schema(description = "建筑体名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 建筑本地编码 */
+    @Schema(description = "建筑本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 建筑本地名称 */
+    @Schema(description = "建筑本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    @Schema(description = "楼层列表")
+    var floorList: ArrayList<Floor>? = null
+
+}

+ 90 - 0
labsl/src/main/kotlin/com/persagy/labsl/services/planar/Floor.kt

@@ -0,0 +1,90 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.labsl.services.planar
+
+import com.persagy.labsl.models.entities.pbs.PlanarGraph
+import io.swagger.v3.oas.annotations.media.Schema
+import java.io.Serializable
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 楼层信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(name = "楼层信息实体类")
+@Table(name = "floor")
+open class Floor : Serializable {
+
+    /** 楼层ID */
+    @Schema(description = "楼层ID")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 楼层名称 */
+    @Schema(description = "楼层名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 楼层本地编码 */
+    @Schema(description = "楼层本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 楼层本地名称 */
+    @Schema(description = "楼层本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** 项目id */
+    @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** 建筑id */
+    @Schema(description = "建筑id")
+    @Column(name = "building_id")
+    var buildingId: String? = null
+
+    /** 楼层顺序码 */
+    @Schema(description = "楼层顺序码")
+    @Column(name = "sequence_id")
+    var floorSequenceId: Int? = null
+
+    /** 信息点 */
+    @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String,Any?>? = null
+
+
+    @Schema(description = "草稿图列表")
+    var planarGraphList: ArrayList<PlanarGraph>? = null
+
+}

ファイルの差分が大きいため隠しています
+ 1234 - 0
labsl/src/main/kotlin/com/persagy/labsl/services/planar/PlanarGraphService.kt


+ 136 - 0
labsl/src/main/kotlin/com/persagy/labsl/services/planar/QbsFolderService.kt

@@ -0,0 +1,136 @@
+package com.persagy.labsl.services.planar
+
+import com.persagy.database.SFilter
+import com.persagy.labsl.Opts
+import com.persagy.labsl.models.entities.pbs.PlanarGraphPub
+import com.persagy.labsl.models.entities.pbs.QbsFolder
+import com.persagy.labsl.utils.IdUtils
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.service.SObjectService
+import com.persagy.service.models.enums.SResponseType
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCreateResponse
+
+/**
+ * 文件夹服务
+ *
+ * @author wx  <zhangweixin@sagacloud.com>
+ * @date  2020/12/1 15:37
+ */
+object QbsFolderService : SObjectService<QbsFolder>(SMybatisDao(QbsFolder::class.java)) {
+
+    /** 已发布 */
+    val planarGraphPubService = SObjectService(SMybatisDao(PlanarGraphPub::class.java))
+
+    /**
+     * 创建文件夹
+     *
+     * @param request   对象列表
+     * @return 对象列表
+     */
+    fun creates(request: SCreateRequest<QbsFolder>): SCreateResponse<QbsFolder> {
+        val sCreateResponse = SCreateResponse<QbsFolder>()
+        try {
+            if (!request.content.isNullOrEmpty()) {
+                    for (content in request.content){
+                        val execList = select(SFilter.eq("projectId", Opts.projectId!!),SFilter.eq("name", content.name!!)).exec()
+                        if (execList.size>0){
+                            sCreateResponse.result = SResponseType.failure
+                            sCreateResponse.message ="文件夹名称已存在"
+                            return sCreateResponse
+                        }
+                        content.projectId = Opts.projectId
+                        content.id = IdUtils.uuidCreate()
+                        insert(content)
+
+                    }
+                sCreateResponse.entityList = request.content
+                sCreateResponse.result = SResponseType.success
+                } else {
+                sCreateResponse.result = SResponseType.failure
+                sCreateResponse.message ="创建内容不可以为空"
+                }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            sCreateResponse.result = SResponseType.failure
+        }
+        return sCreateResponse
+    }
+
+    /**
+     * 删除
+     */
+    fun deletes(idList: ArrayList<QbsFolder>): SBaseResponse {
+        val sBaseResponse = SBaseResponse()
+        if (idList.size>0) {
+            try {
+                for (qbsFolder in idList) {
+                    val planarGraphList = PlanarGraphService.select(
+                        SFilter.eq("folderId", qbsFolder.id!!),
+                        SFilter.eq("projectId", Opts.projectId!!),
+                        SFilter.eq("state", 1)
+                    ).exec()
+                    val planarGraphPubList = planarGraphPubService.select(
+                        SFilter.eq("folderId", qbsFolder.id!!),
+                        SFilter.eq("projectId", Opts.projectId!!),
+                        SFilter.eq("state", 0)
+                    ).exec()
+                    if (planarGraphList.size>0||planarGraphPubList.size>0) {
+                        sBaseResponse.message = "文件夹有内容,禁止删除"
+                        sBaseResponse.result = SResponseType.failure
+                        return sBaseResponse
+                    }
+                }
+
+                for (qbsFolder in idList) {
+                    val delete = delete(qbsFolder)
+                    if (delete) {
+                        PlanarGraphService.delete(
+                            SFilter.eq("id", qbsFolder.id!!),
+                            SFilter.eq("projectId", Opts.projectId!!),
+                            SFilter.eq("state", 4)
+                        )
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            sBaseResponse.result =SResponseType.success
+        } else {
+            sBaseResponse.result = SResponseType.failure
+        }
+        return sBaseResponse
+    }
+
+    /**
+     * 修改文件夹信息
+     *
+     * @param request   对象列表
+     * @return 返回修改标记对象
+     */
+    fun updates(request: SUpdateRequest<QbsFolder>): SBaseResponse {
+        val sBaseResponse = SBaseResponse()
+        if (!request.content.isNullOrEmpty()) {
+           for (content in request.content!!) {
+               val execList = select(SFilter.eq("projectId", Opts.projectId!!),SFilter.not(SFilter.eq("id",content.id!!)),SFilter.eq("name", content.name!!)).exec()
+               if (execList.size>0) {
+                   sBaseResponse.result = SResponseType.failure
+                   sBaseResponse.message = "文件夹名已存在"
+                   return sBaseResponse
+               }
+               if (!content.projectId.isNullOrEmpty()) {
+                   content.projectId = Opts.projectId
+               }
+               update(content)
+           }
+            sBaseResponse.result = SResponseType.success
+        } else {
+            sBaseResponse.result = SResponseType.failure
+        }
+        return  sBaseResponse
+    }
+
+
+}

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/services/pub/AnchorPubService.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.services.pub
 
-import com.persagy.labsl.models.entities.pub.AnchorPub
+import com.persagy.labsl.models.entities.tpt.pub.AnchorPub
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 

+ 1 - 1
labsl/src/main/kotlin/com/persagy/labsl/services/pub/GraphPubService.kt

@@ -1,6 +1,6 @@
 package com.persagy.labsl.services.pub
 
-import com.persagy.labsl.models.entities.pub.GraphPub
+import com.persagy.labsl.models.entities.tpt.pub.GraphPub
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.service.SObjectService
 

+ 2 - 2
labsl/src/main/resources/application-dev.yml

@@ -6,10 +6,10 @@ spring:
 #    url:                                jdbc:postgresql://172.16.44.234:5432/datacenter
 #    username:                           postgres
 #    password:                           123456
-#   url:                                jdbc:postgresql://60.205.177.43:5432/datacenter
+    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
 #   username:                           postgres
 #   password:                           123qwe!@#
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 1 - 0
labsl/src/main/resources/application-prod.yml

@@ -4,6 +4,7 @@ server:
 spring:
   datasource:
     url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           123qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 1 - 0
meiku/src/main/resources/application-prod.yml

@@ -4,6 +4,7 @@ server:
 spring:
   datasource:
     url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           123qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj