|
@@ -41,10 +41,7 @@ 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.beans.factory.annotation.Autowired
|
|
|
-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.*
|
|
|
|
|
|
/**
|
|
|
* 空间接口
|
|
@@ -68,21 +65,21 @@ class SpaceController {
|
|
|
@Operation(summary="查询没有和当前空间绑定的系统", description= "例如:prijectId=Pj4201050001,type=AirConditioningZone spaceId=Sp4201050001df2091cdf719443b80bb737aeabf0525 " +
|
|
|
"spaceId 为当前空间id type为当前空间类型 ")
|
|
|
@PostMapping(value = ["/unspace-in-sys"])
|
|
|
- fun unSpaceSys( type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<GeneralSystem> {
|
|
|
+ fun unSpaceSys(@RequestParam type: String, @RequestParam spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<GeneralSystem> {
|
|
|
return GeneralSystemService.unSpaceSys(type,spaceId, request)
|
|
|
} // Function unSpaceSys()
|
|
|
|
|
|
@Operation(summary="查询没有和当前空间绑定的设备", description ="例如:prijectId=Pj4201050001,type=AirConditioningZone spaceId=Sp4201050001df2091cdf719443b80bb737aeabf0525 " +
|
|
|
"spaceId 为当前空间id type为当前空间类型 ")
|
|
|
@PostMapping(value = ["/unspace-in-eq"])
|
|
|
- fun unSpaceEq(type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
+ fun unSpaceEq(@RequestParam type: String, @RequestParam spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
return EquipmentService.pageQueryEquip(type,spaceId,request)
|
|
|
} // Function unSpaceEq()
|
|
|
|
|
|
@Operation(summary="查询没有服务于当前空间的设备", description ="例如:prijectId=Pj4201050001,type=AirConditioningZone spaceId=Sp4201050001df2091cdf719443b80bb737aeabf0525 " +
|
|
|
"spaceId 为当前空间id type为当前空间类型 ")
|
|
|
@PostMapping(value = ["/unspace-for-eq"])
|
|
|
- fun unSpaceForEq(type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
+ fun unSpaceForEq(@RequestParam type: String, @RequestParam spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
return EquipmentService.pageQueryForEquip(type,spaceId,request)
|
|
|
} // Function unSpaceEq()
|
|
|
|
|
@@ -91,7 +88,7 @@ class SpaceController {
|
|
|
*/
|
|
|
@Operation(summary=" 空间内没有服务于当前空间的设备 根据坐标计算", description ="")
|
|
|
@PostMapping(value = ["/unspace-for-eq-point"])
|
|
|
- fun unSpaceForEqPoint(type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
+ fun unSpaceForEqPoint(@RequestParam type: String,@RequestParam spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
return EquipmentService.unSpaceForEqPoint(type,spaceId,request)
|
|
|
} // Function unSpaceForEqPoint()
|
|
|
|
|
@@ -100,7 +97,7 @@ class SpaceController {
|
|
|
*/
|
|
|
@Operation(summary=" 空间内没有和空间关联的设备 根据坐标计算", description ="")
|
|
|
@PostMapping(value = ["/unspace-fIn-eq-point"])
|
|
|
- fun unSpaceInEqPoint(type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
+ fun unSpaceInEqPoint(@RequestParam type: String, spaceId: String,@RequestBody request: SQueryRequest): SQueryResponse<Equipment> {
|
|
|
return EquipmentService.unSpaceInEqPoint(type,spaceId,request)
|
|
|
} // Function unSpaceForEqPoint()
|
|
|
|
|
@@ -109,7 +106,7 @@ class SpaceController {
|
|
|
*/
|
|
|
@Operation(summary=" 未关联业务空间的元空间", description ="")
|
|
|
@PostMapping(value = ["/unspace-ispace"])
|
|
|
- fun unSpaceIspace(objectType: String, @RequestBody request: ZoneISpaceQueryRequest): SQueryResponse<ZoneIspace> {
|
|
|
+ fun unSpaceIspace(@RequestParam objectType: String, @RequestBody request: ZoneISpaceQueryRequest): SQueryResponse<ZoneIspace> {
|
|
|
return ISpaceService.unSpaceIspace(objectType,request)
|
|
|
} // Function unSpaceIspace()
|
|
|
|
|
@@ -132,7 +129,7 @@ class SpaceController {
|
|
|
" \"PageSize\": 50\n" +
|
|
|
" }")
|
|
|
@PostMapping(value = ["/in-bdfl-zonespacebase"])
|
|
|
- fun inBdflZoneSpace(X: String, Y: String, @RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace> {
|
|
|
+ fun inBdflZoneSpace(@RequestParam X: String,@RequestParam Y: String, @RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace> {
|
|
|
return service.inBdflZoneSpace(X,Y,request)
|
|
|
} // Function unSpaceIspace()
|
|
|
|