|
@@ -86,6 +86,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
if (entity.projectId.isNullOrEmpty()){
|
|
|
entity.projectId = Opts.projectId
|
|
|
}
|
|
|
+ entity.state = "Draft"
|
|
|
if (!entity.folderName.isNullOrEmpty()) {
|
|
|
|
|
|
val execList = QbsFolderService.select(SFilter.eq("projectId", Opts.projectId!!),SFilter.eq("name", entity.folderName!!)).exec()
|
|
@@ -281,9 +282,9 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
for (rule in graph.ruleList!!) {
|
|
|
rule.graphCoding = graph.id
|
|
|
rule.graphId = graph.graphId
|
|
|
- if (rule.id.isNullOrEmpty()) {
|
|
|
- rule.id = UUID.randomUUID().toString().replace("-", "")
|
|
|
- }
|
|
|
+// if (rule.id.isNullOrEmpty()) {
|
|
|
+// rule.id = UUID.randomUUID().toString().replace("-", "")
|
|
|
+// }
|
|
|
val insert = planarQbsRuleService.insert(rule)
|
|
|
if (!insert) {
|
|
|
/** 事务回滚 */
|
|
@@ -334,7 +335,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
SFilter.eq("projectId", Opts.projectId!!),
|
|
|
SFilter.eq("id", graphPub.id!!),
|
|
|
SFilter.eq("graphId", graphPub.graphId!!),
|
|
|
- SFilter.eq("state", 1)
|
|
|
+ SFilter.eq("state", "Draft")
|
|
|
)
|
|
|
/** 设置表明,查询 */
|
|
|
val graph = squeryBuilder.table("qibaishi_gallery.qbs_graph").entity()
|
|
@@ -391,6 +392,11 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
}
|
|
|
+ if (graph.elements == null) {
|
|
|
+ graph.elements = PlanarElementsPub()
|
|
|
+ } else {
|
|
|
+ graph.elements!!.objExtInfo = nodePubList
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/** 查询 */
|
|
@@ -420,6 +426,11 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
}
|
|
|
+ if (graph.elements == null) {
|
|
|
+ graph.elements = PlanarElementsPub()
|
|
|
+ } else {
|
|
|
+ graph.elements!!.markers = markersPubList
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/** 查询 */
|
|
@@ -451,12 +462,18 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
}
|
|
|
+ if (graph.elements == null) {
|
|
|
+ graph.elements = PlanarElementsPub()
|
|
|
+ } else {
|
|
|
+ graph.elements!!.relations = relationList
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/** 规则 */
|
|
|
val planarQbsRuleBuilder = planarQbsRulePubService.select(
|
|
|
SFilter.eq("graphId", graph.graphId!!),
|
|
|
- SFilter.eq("id", graphPub.id!!)
|
|
|
+ SFilter.eq("graphCoding", graphPub.id!!)
|
|
|
)
|
|
|
/** 设置表明,查询 */
|
|
|
val planarQbsRuleList = planarQbsRuleBuilder.table("qibaishi_gallery.qbs_rule").exec()
|
|
@@ -465,7 +482,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
/** 遍历列表 */
|
|
|
for (relation in planarQbsRuleList){
|
|
|
/** 图编码 */
|
|
|
- relation.id = graph.id
|
|
|
+ relation.graphCoding = graph.id
|
|
|
/** 图 id */
|
|
|
relation.graphId = graph.graphId
|
|
|
/** 插入数据 */
|
|
@@ -480,6 +497,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
}
|
|
|
+ graph.ruleList = planarQbsRuleList
|
|
|
}
|
|
|
|
|
|
/** 清除草稿箱图 */
|
|
@@ -527,18 +545,17 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
)
|
|
|
if (delete){
|
|
|
/** 清除图下子集 */
|
|
|
-// NodeService.delete(
|
|
|
-// SFilter.eq("id", graph.id!!),
|
|
|
-// SFilter.eq("graphId", graph.graphId!!))
|
|
|
-// MarkersService.delete(
|
|
|
-// SFilter.eq("id", graph.id!!),
|
|
|
-// SFilter.eq("graphId", graph.graphId!!))
|
|
|
-// RelationService.delete(
|
|
|
-// SFilter.eq("id", graph.id!!),
|
|
|
-// SFilter.eq("graphId", graph.graphId!!))
|
|
|
-// AnchorService.delete(
|
|
|
-// SFilter.eq("id", graph.id!!),
|
|
|
-// SFilter.eq("graphId", graph.graphId!!))
|
|
|
+ objExtInfoService.delete(
|
|
|
+ SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphId", graph.graphId!!))
|
|
|
+ planarMarkersService.delete(
|
|
|
+ SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphId", graph.graphId!!))
|
|
|
+ planarRelationService.delete(
|
|
|
+ SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphId", graph.graphId!!))
|
|
|
+ planarQbsRuleService.delete(SFilter.eq("graphCoding", graph.id!!),
|
|
|
+ SFilter.eq("graphId", graph.graphId!!))
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -577,7 +594,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
planarRelationService.delete(
|
|
|
SFilter.eq("id", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!))
|
|
|
- planarQbsRuleService.delete(SFilter.eq("id", graph.id!!),
|
|
|
+ planarQbsRuleService.delete(SFilter.eq("graphCoding", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!))
|
|
|
}
|
|
|
}
|
|
@@ -618,7 +635,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
SFilter.eq("id", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!))
|
|
|
planarQbsRulePubService.delete(
|
|
|
- SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphCoding", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!))
|
|
|
}
|
|
|
}
|
|
@@ -780,7 +797,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
|
|
|
/** 规则 */
|
|
|
val planarQbsRuleBuilder = planarQbsRuleService.select(
|
|
|
- SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphCoding", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!)
|
|
|
)
|
|
|
/** 设置表明,查询 */
|
|
@@ -789,7 +806,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
/** 遍历列表 */
|
|
|
for (relation in planarQbsRuleList ){
|
|
|
/** 图编码 */
|
|
|
- relation.id = graphPub.id
|
|
|
+ relation.graphCoding = graphPub.id
|
|
|
/** 插入数据 */
|
|
|
planarQbsRuleService.insert(relation)
|
|
|
}
|
|
@@ -854,7 +871,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
|
|
|
/** 规则 */
|
|
|
val planarQbsRuleList = planarQbsRuleService.select(
|
|
|
- SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphCoding", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!)
|
|
|
).exec()
|
|
|
if (planarQbsRuleList.size>0) {
|
|
@@ -925,7 +942,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
|
|
|
try {
|
|
|
val planarQbsRuleList = planarQbsRulePubService.select(
|
|
|
- SFilter.eq("id", graph.id!!),
|
|
|
+ SFilter.eq("graphCoding", graph.id!!),
|
|
|
SFilter.eq("graphId", graph.graphId!!)
|
|
|
).exec()
|
|
|
|