|
@@ -40,10 +40,7 @@ import com.persagy.service.models.responses.SQueryResponse
|
|
import io.swagger.v3.oas.annotations.Operation
|
|
import io.swagger.v3.oas.annotations.Operation
|
|
import io.swagger.v3.oas.annotations.tags.Tag
|
|
import io.swagger.v3.oas.annotations.tags.Tag
|
|
import org.slf4j.LoggerFactory
|
|
import org.slf4j.LoggerFactory
|
|
-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
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.*
|
|
|
|
|
|
/**
|
|
/**
|
|
* 竖井下的业务空间
|
|
* 竖井下的业务空间
|
|
@@ -82,7 +79,7 @@ class RShContainSpBaseController {
|
|
*/
|
|
*/
|
|
@Operation(summary = "根据对象删除竖井下的业务空间关系,只针对一个对象", description = "必填项:ShaftID(竖井id)、SpaceID(业务空间id)")
|
|
@Operation(summary = "根据对象删除竖井下的业务空间关系,只针对一个对象", description = "必填项:ShaftID(竖井id)、SpaceID(业务空间id)")
|
|
@PostMapping(value = ["/unlink"])
|
|
@PostMapping(value = ["/unlink"])
|
|
- fun delete(type: String,@RequestBody rShContainSpBase: ArrayList<RShContainSpBase>): SBaseResponse {
|
|
|
|
|
|
+ fun delete(@RequestParam type: String, @RequestBody rShContainSpBase: ArrayList<RShContainSpBase>): SBaseResponse {
|
|
return RShContainSpBaseService.deletes(type,rShContainSpBase)
|
|
return RShContainSpBaseService.deletes(type,rShContainSpBase)
|
|
} // Function delete()
|
|
} // Function delete()
|
|
|
|
|
|
@@ -122,7 +119,7 @@ class RShContainSpBaseController {
|
|
*/
|
|
*/
|
|
@Operation(summary = "竖井下的业务空间,竖井一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法不会覆盖以前的记录")
|
|
@Operation(summary = "竖井下的业务空间,竖井一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法不会覆盖以前的记录")
|
|
@PostMapping(value = ["link-shsps"])
|
|
@PostMapping(value = ["link-shsps"])
|
|
- fun createShSps(type: String?,@RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
|
|
|
|
|
|
+ fun createShSps(@RequestParam type: String?,@RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
|
|
logger.debug("space =${rShContainSpBase.toJson()}")
|
|
logger.debug("space =${rShContainSpBase.toJson()}")
|
|
return RShContainSpBaseService.createShSps(type,rShContainSpBase)
|
|
return RShContainSpBaseService.createShSps(type,rShContainSpBase)
|
|
} // Function createSp()
|
|
} // Function createSp()
|
|
@@ -136,7 +133,7 @@ class RShContainSpBaseController {
|
|
*/
|
|
*/
|
|
@Operation(summary = "竖井下的业务空间,空间一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceId(业务空间id)、ShaftIDList(竖井id列表),此方法不会覆盖以前的记录")
|
|
@Operation(summary = "竖井下的业务空间,空间一对多,此方法不会覆盖以前的记录", description = "必填项:SpaceId(业务空间id)、ShaftIDList(竖井id列表),此方法不会覆盖以前的记录")
|
|
@PostMapping(value = ["link-spshs"])
|
|
@PostMapping(value = ["link-spshs"])
|
|
- fun createSpShs(type: String,@RequestBody rSpContainShBase: RSpContainShBaseList): SCreateResponse<RSpContainShBaseList> {
|
|
|
|
|
|
+ fun createSpShs(@RequestParam type: String,@RequestBody rSpContainShBase: RSpContainShBaseList): SCreateResponse<RSpContainShBaseList> {
|
|
logger.debug("space =${rSpContainShBase.toJson()}")
|
|
logger.debug("space =${rSpContainShBase.toJson()}")
|
|
return RShContainSpBaseService.createSpShs(type,rSpContainShBase)
|
|
return RShContainSpBaseService.createSpShs(type,rSpContainShBase)
|
|
} // Function createSp()
|
|
} // Function createSp()
|
|
@@ -150,7 +147,7 @@ class RShContainSpBaseController {
|
|
*/
|
|
*/
|
|
@Operation(summary = "竖井下的业务空间,竖井一对多,此方法会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
|
|
@Operation(summary = "竖井下的业务空间,竖井一对多,此方法会覆盖以前的记录", description = "必填项:SpaceIdList(业务空间id列表)、ShaftID(竖井id),此方法会覆盖以前的记录")
|
|
@PostMapping(value = ["link-shsps-replace"])
|
|
@PostMapping(value = ["link-shsps-replace"])
|
|
- fun createShSpsReplace(Type: String,BuildingId: String,FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
|
|
|
|
|
|
+ fun createShSpsReplace(@RequestParam Type: String,BuildingId: String,FloorId: String, @RequestBody rShContainSpBase: RShContainSpBaseList): SCreateResponse<RShContainSpBaseList> {
|
|
logger.debug("space =${rShContainSpBase.toJson()}")
|
|
logger.debug("space =${rShContainSpBase.toJson()}")
|
|
return RShContainSpBaseService.createShSpsReplace(Type,BuildingId,FloorId,rShContainSpBase)
|
|
return RShContainSpBaseService.createShSpsReplace(Type,BuildingId,FloorId,rShContainSpBase)
|
|
} // Function createSp()
|
|
} // Function createSp()
|
|
@@ -163,7 +160,7 @@ class RShContainSpBaseController {
|
|
*/
|
|
*/
|
|
@Operation(summary = "查询空间类型和名称",description = "")
|
|
@Operation(summary = "查询空间类型和名称",description = "")
|
|
@PostMapping(value = ["/space-type-query"])
|
|
@PostMapping(value = ["/space-type-query"])
|
|
- fun spaceTypeQuery(shaftId: String): SQueryResponse<SpaceInfoDic> {
|
|
|
|
|
|
+ fun spaceTypeQuery(@RequestParam shaftId: String): SQueryResponse<SpaceInfoDic> {
|
|
val projectId = SPageContext.getHeader("projectId").toString()
|
|
val projectId = SPageContext.getHeader("projectId").toString()
|
|
return RShContainSpBaseService.spaceTypeQuery(projectId,shaftId)
|
|
return RShContainSpBaseService.spaceTypeQuery(projectId,shaftId)
|
|
} // Function spaceTypeQuery()
|
|
} // Function spaceTypeQuery()
|