|
@@ -16,6 +16,7 @@ import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.service.SObjectService
|
|
|
import com.persagy.service.models.enums.SResponseType
|
|
|
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
|
|
@@ -87,6 +88,28 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
entity.projectId = Opts.projectId
|
|
|
}
|
|
|
entity.state = "Draft"
|
|
|
+
|
|
|
+ val entity1 = select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", entity.floorId!!),
|
|
|
+ SFilter.eq("name", entity.name!!)
|
|
|
+ ).entity()
|
|
|
+ if (entity1!=null) {
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ sCreateResponse.message = "图名称已存在"
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
+ val entity2 = planarGraphPubService.select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", entity.floorId!!),
|
|
|
+ SFilter.eq("name", entity.name!!)
|
|
|
+ ).entity()
|
|
|
+ if (entity2!=null) {
|
|
|
+ sCreateResponse.result = SResponseType.failure
|
|
|
+ sCreateResponse.message = "图名称已存在"
|
|
|
+ return sCreateResponse
|
|
|
+ }
|
|
|
+
|
|
|
if (!entity.folderName.isNullOrEmpty()) {
|
|
|
|
|
|
val execList = QbsFolderService.select(SFilter.eq("projectId", Opts.projectId!!),SFilter.eq("name", entity.folderName!!)).exec()
|
|
@@ -95,6 +118,7 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
sCreateResponse.message ="文件夹名称已存在"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
+
|
|
|
val qbsFolder = QbsFolder()
|
|
|
qbsFolder.id = IdUtils.uuidCreate()
|
|
|
entity.folderId = qbsFolder.id
|
|
@@ -522,6 +546,75 @@ object PlanarGraphService : SObjectService<PlanarGraph>(SMybatisDao(PlanarGraph:
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ fun draftsUpdate(request: SUpdateRequest<PlanarGraph>): SBaseResponse {
|
|
|
+ val sBaseResponse = SBaseResponse(SResponseType.success)
|
|
|
+ if (!request.content.isNullOrEmpty()) {
|
|
|
+ for (content in request.content!!) {
|
|
|
+ val entity1 = select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", content.floorId!!),
|
|
|
+ SFilter.eq("name", content.name!!),
|
|
|
+ SFilter.not(SFilter.eq("graphId",content.graphId!!))
|
|
|
+ ).entity()
|
|
|
+ if (entity1!=null) {
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
+ sBaseResponse.message = "图名称已存在"
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+ val entity2 = planarGraphPubService.select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", content.floorId!!),
|
|
|
+ SFilter.eq("name", content.name!!),
|
|
|
+ SFilter.not(SFilter.eq("graphId",content.graphId!!))
|
|
|
+ ).entity()
|
|
|
+ if (entity2!=null) {
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
+ sBaseResponse.message = "图名称已存在"
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+
|
|
|
+ update(content)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+
|
|
|
+ fun pubUpdate(request: SUpdateRequest<PlanarGraphPub>): SBaseResponse {
|
|
|
+ val sBaseResponse = SBaseResponse(SResponseType.success)
|
|
|
+ if (!request.content.isNullOrEmpty()) {
|
|
|
+ for (content in request.content!!) {
|
|
|
+ val entity1 = select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", content.floorId!!),
|
|
|
+ SFilter.eq("name", content.name!!),
|
|
|
+ SFilter.not(SFilter.eq("graphId",content.graphId!!))
|
|
|
+ ).entity()
|
|
|
+ if (entity1!=null) {
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
+ sBaseResponse.message = "图名称已存在"
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+ val entity2 = planarGraphPubService.select(
|
|
|
+ SFilter.eq("projectId", Opts.projectId!!),
|
|
|
+ SFilter.eq("floorId", content.floorId!!),
|
|
|
+ SFilter.eq("name", content.name!!),
|
|
|
+ SFilter.not(SFilter.eq("graphId",content.graphId!!))
|
|
|
+ ).entity()
|
|
|
+ if (entity2!=null) {
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
+ sBaseResponse.message = "图名称已存在"
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+ planarGraphPubService.update(content)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return sBaseResponse
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 清除草稿箱以前数据
|
|
|
*
|