|
@@ -202,159 +202,164 @@ object GraphService : SObjectService<Graph>(SMybatisDao(Graph::class.java)) {
|
|
|
* @return 已发布的图对象列表
|
|
|
*/
|
|
|
fun pubDrawings(graphPub: GraphPub): SCreateResponse<GraphPub> {
|
|
|
- val sCreateResponse = SCreateResponse<GraphPub>()
|
|
|
- /** 项目id */
|
|
|
- val projectId = SPageContext.getHeader("projectId")
|
|
|
- val graph1 = Graph()
|
|
|
- graph1.projectId = projectId!!
|
|
|
- graph1.id = graphPub.id
|
|
|
- graph1.graphId = graphPub.graphId
|
|
|
- /** 查询草稿箱 */
|
|
|
- val squeryBuilder = GraphPubService.select(
|
|
|
- SFilter.eq("projectId", projectId!!),
|
|
|
- SFilter.eq("id", graphPub.id!!),
|
|
|
- SFilter.eq("graphId", graphPub.graphId!!),
|
|
|
- SFilter.eq("state", 1)
|
|
|
- )
|
|
|
- val graph = squeryBuilder.table("labsl.graph").entity()
|
|
|
- if (graph!=null){
|
|
|
- //开启事务
|
|
|
- openTransaction()
|
|
|
- /** 清除已发布的老数据 */
|
|
|
- delOldDataPub(graph1)
|
|
|
- /** 版本号 */
|
|
|
- val listVersion = graph.version!!.split(".")
|
|
|
- val num = listVersion[1].toInt() + 1
|
|
|
- graph.version = listVersion[0] + "." + num + "." + 0
|
|
|
- graph.state = 0
|
|
|
- graph.isAvailable = true
|
|
|
-// graph.isPub = true
|
|
|
- val insert = GraphPubService.insert(graph)
|
|
|
- if (!insert) {
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
- }
|
|
|
- /** 子节点 */
|
|
|
- val nodebuilder = nodePubService.select(
|
|
|
-// SFilter.eq("projectId", projectId!!),
|
|
|
- SFilter.eq("graphId", graph.graphId!!),
|
|
|
+ return try {
|
|
|
+ val sCreateResponse = SCreateResponse<GraphPub>()
|
|
|
+ /** 项目id */
|
|
|
+ val projectId = SPageContext.getHeader("projectId")
|
|
|
+ val graph1 = Graph()
|
|
|
+ graph1.projectId = projectId!!
|
|
|
+ graph1.id = graphPub.id
|
|
|
+ graph1.graphId = graphPub.graphId
|
|
|
+ /** 查询草稿箱 */
|
|
|
+ val squeryBuilder = GraphPubService.select(
|
|
|
+ SFilter.eq("projectId", projectId!!),
|
|
|
SFilter.eq("id", graphPub.id!!),
|
|
|
+ SFilter.eq("graphId", graphPub.graphId!!),
|
|
|
SFilter.eq("state", 1)
|
|
|
)
|
|
|
- val nodePubList = nodebuilder.table("labsl.node_pub").exec()
|
|
|
- if (nodePubList.size>0){
|
|
|
- for (nodePub in nodePubList){
|
|
|
- nodePub.id = graph.id
|
|
|
- nodePub.graphId = graph.graphId
|
|
|
- nodePub.state = 0
|
|
|
- val insert1 = nodePubService.insert(nodePub)
|
|
|
- if (!insert1){
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
+ val graph = squeryBuilder.table("labsl.graph").entity()
|
|
|
+ if (graph!=null){
|
|
|
+ //开启事务
|
|
|
+ openTransaction()
|
|
|
+ /** 清除已发布的老数据 */
|
|
|
+ delOldDataPub(graph1)
|
|
|
+ /** 版本号 */
|
|
|
+ val listVersion = graph.version!!.split(".")
|
|
|
+ val num = listVersion[1].toInt() + 1
|
|
|
+ graph.version = listVersion[0] + "." + num + "." + 0
|
|
|
+ graph.state = 0
|
|
|
+ graph.isAvailable = true
|
|
|
+ // graph.isPub = true
|
|
|
+ val insert = GraphPubService.insert(graph)
|
|
|
+ if (!insert) {
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
+ /** 子节点 */
|
|
|
+ val nodebuilder = nodePubService.select(
|
|
|
+ // SFilter.eq("projectId", projectId!!),
|
|
|
+ SFilter.eq("graphId", graph.graphId!!),
|
|
|
+ SFilter.eq("id", graphPub.id!!),
|
|
|
+ SFilter.eq("state", 1)
|
|
|
+ )
|
|
|
+ val nodePubList = nodebuilder.table("labsl.node").exec()
|
|
|
+ if (nodePubList.size>0){
|
|
|
+ for (nodePub in nodePubList){
|
|
|
+ nodePub.id = graph.id
|
|
|
+ nodePub.graphId = graph.graphId
|
|
|
+ nodePub.state = 0
|
|
|
+ val insert1 = nodePubService.insert(nodePub)
|
|
|
+ if (!insert1){
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- val markersbuilder = markersPubService.select(
|
|
|
-// SFilter.eq("projectId", projectId!!),
|
|
|
- SFilter.eq("graphId", graph.graphId!!),
|
|
|
- SFilter.eq("id", graphPub.id!!),
|
|
|
- SFilter.eq("state", 1)
|
|
|
- )
|
|
|
- val markersPubList = markersbuilder.table("labsl.marker_pub").exec()
|
|
|
- if (markersPubList.size>0){
|
|
|
- for (markersPub in markersPubList){
|
|
|
- markersPub.id = graph.id
|
|
|
- markersPub.graphId = graph.graphId
|
|
|
- markersPub.state = 0
|
|
|
- val insert1 = markersPubService.insert(markersPub)
|
|
|
- if (insert1){
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
+ val markersbuilder = markersPubService.select(
|
|
|
+ // 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()
|
|
|
+ if (markersPubList.size>0){
|
|
|
+ for (markersPub in markersPubList){
|
|
|
+ markersPub.id = graph.id
|
|
|
+ markersPub.graphId = graph.graphId
|
|
|
+ markersPub.state = 0
|
|
|
+ val insert1 = markersPubService.insert(markersPub)
|
|
|
+ if (!insert1){
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- val relationBuilder = relationPubService.select(
|
|
|
-// SFilter.eq("projectId", projectId!!),
|
|
|
- SFilter.eq("graphId", graph.graphId!!),
|
|
|
- SFilter.eq("id", graphPub.id!!),
|
|
|
- SFilter.eq("state", 1)
|
|
|
- )
|
|
|
- val relationList = relationBuilder.table("labsl.relation_pub").exec()
|
|
|
- if (relationList.size>0){
|
|
|
- for (relation in relationList){
|
|
|
- relation.id = graph.id
|
|
|
- relation.graphId = graph.graphId
|
|
|
- relation.state = 0
|
|
|
- val insert1 = relationPubService.insert(relation)
|
|
|
- if (!insert1){
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
+ val relationBuilder = relationPubService.select(
|
|
|
+ // 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()
|
|
|
+ if (relationList.size>0){
|
|
|
+ for (relation in relationList){
|
|
|
+ relation.id = graph.id
|
|
|
+ relation.graphId = graph.graphId
|
|
|
+ relation.state = 0
|
|
|
+ val insert1 = relationPubService.insert(relation)
|
|
|
+ if (!insert1){
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- val anchorBuilder = anchorPubService.select(
|
|
|
-// SFilter.eq("projectId", projectId!!),
|
|
|
- SFilter.eq("graphId", graph.graphId!!),
|
|
|
- SFilter.eq("id", graphPub.id!!),
|
|
|
- SFilter.eq("state", 1)
|
|
|
- )
|
|
|
- val anchorList = anchorBuilder.table("labsl.anchor_pub").exec()
|
|
|
- if (anchorList.size>0){
|
|
|
- for (anchor in anchorList){
|
|
|
- anchor.id = graph.id
|
|
|
- anchor.graphId = graph.graphId
|
|
|
- anchor.state = 0
|
|
|
- val insert1 = anchorPubService.insert(anchor)
|
|
|
- if (!insert1){
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
+ val anchorBuilder = anchorPubService.select(
|
|
|
+ // 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()
|
|
|
+ if (anchorList.size>0){
|
|
|
+ for (anchor in anchorList){
|
|
|
+ anchor.id = graph.id
|
|
|
+ anchor.graphId = graph.graphId
|
|
|
+ anchor.state = 0
|
|
|
+ val insert1 = anchorPubService.insert(anchor)
|
|
|
+ if (!insert1){
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- val attachObjectIdsBuilder = attachObjectIdsPubService.select(
|
|
|
-// 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_pub").exec()
|
|
|
- if (attachObjectIdsList.size>0){
|
|
|
- for (attachObjectIds in attachObjectIdsList){
|
|
|
- attachObjectIds.id = graph.id
|
|
|
- attachObjectIds.graphId = graph.graphId
|
|
|
- attachObjectIds.state = 0
|
|
|
- val insert1 = attachObjectIdsPubService.insert(attachObjectIds)
|
|
|
- if (!insert1){
|
|
|
- // 回滚
|
|
|
- backTransaction()
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- return sCreateResponse
|
|
|
+ val attachObjectIdsBuilder = attachObjectIdsPubService.select(
|
|
|
+ // 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()
|
|
|
+ if (attachObjectIdsList.size>0){
|
|
|
+ for (attachObjectIds in attachObjectIdsList){
|
|
|
+ attachObjectIds.id = graph.id
|
|
|
+ attachObjectIds.graphId = graph.graphId
|
|
|
+ attachObjectIds.state = 0
|
|
|
+ val insert1 = attachObjectIdsPubService.insert(attachObjectIds)
|
|
|
+ if (!insert1){
|
|
|
+ // 回滚
|
|
|
+ backTransaction()
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- /** 清除草稿箱图 */
|
|
|
- delOldData(graph1)
|
|
|
- // 提交事务
|
|
|
- commitTransaction()
|
|
|
- sCreateResponse.entityList = arrayListOf(graph)
|
|
|
- sCreateResponse.result = SResponseType.success
|
|
|
- }else{
|
|
|
- sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = "草稿箱中没有待发布图形"
|
|
|
+ /** 清除草稿箱图 */
|
|
|
+ delOldData(graph1)
|
|
|
+ // 提交事务
|
|
|
+ commitTransaction()
|
|
|
+ sCreateResponse.entityList = arrayListOf(graph)
|
|
|
+ sCreateResponse.result = SResponseType.success
|
|
|
+ }else{
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ sCreateResponse.message = "草稿箱中没有待发布图形"
|
|
|
+ }
|
|
|
+ return sCreateResponse
|
|
|
+ } catch (e: Exception) {
|
|
|
+ e.printStackTrace()
|
|
|
+ SCreateResponse(SResponseType.failure,e.message!!)
|
|
|
}
|
|
|
- return sCreateResponse
|
|
|
} // Fun pubDrawings()
|
|
|
|
|
|
/**
|