|
@@ -558,6 +558,7 @@ object SpaceUtil {
|
|
*/
|
|
*/
|
|
fun spaceTools(projectId: String,zoneSpace: ZoneSpace): ArrayList<HashMap<String,Any?>> {
|
|
fun spaceTools(projectId: String,zoneSpace: ZoneSpace): ArrayList<HashMap<String,Any?>> {
|
|
var list = ArrayList<HashMap<String,Any?>>()
|
|
var list = ArrayList<HashMap<String,Any?>>()
|
|
|
|
+ val removes = ArrayList<String>()
|
|
val hashMap = HashMap<String, Any?>()
|
|
val hashMap = HashMap<String, Any?>()
|
|
hashMap["id"] = zoneSpace.id
|
|
hashMap["id"] = zoneSpace.id
|
|
hashMap["name"] = zoneSpace.name
|
|
hashMap["name"] = zoneSpace.name
|
|
@@ -566,9 +567,13 @@ object SpaceUtil {
|
|
hashMap["classCode"] = zoneSpace.classCode
|
|
hashMap["classCode"] = zoneSpace.classCode
|
|
if (!zoneSpace.localName.isNullOrEmpty()){
|
|
if (!zoneSpace.localName.isNullOrEmpty()){
|
|
hashMap["localName"] = zoneSpace.localName
|
|
hashMap["localName"] = zoneSpace.localName
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("localName")
|
|
}
|
|
}
|
|
if (!zoneSpace.localId.isNullOrEmpty()){
|
|
if (!zoneSpace.localId.isNullOrEmpty()){
|
|
hashMap["localId"] = zoneSpace.localId
|
|
hashMap["localId"] = zoneSpace.localId
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("localId")
|
|
}
|
|
}
|
|
if (!zoneSpace.defaultQRCode.isNullOrEmpty()){
|
|
if (!zoneSpace.defaultQRCode.isNullOrEmpty()){
|
|
hashMap["defaultQRCode"] = zoneSpace.defaultQRCode
|
|
hashMap["defaultQRCode"] = zoneSpace.defaultQRCode
|
|
@@ -578,61 +583,102 @@ object SpaceUtil {
|
|
}
|
|
}
|
|
if (zoneSpace.roomSerial!=null&&zoneSpace.roomSerial!=0.0){
|
|
if (zoneSpace.roomSerial!=null&&zoneSpace.roomSerial!=0.0){
|
|
hashMap["roomSerial"] = zoneSpace.roomSerial
|
|
hashMap["roomSerial"] = zoneSpace.roomSerial
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("roomSerial")
|
|
}
|
|
}
|
|
if (!zoneSpace.roomFuncType.isNullOrEmpty()){
|
|
if (!zoneSpace.roomFuncType.isNullOrEmpty()){
|
|
hashMap["roomFuncType"] = zoneSpace.roomFuncType
|
|
hashMap["roomFuncType"] = zoneSpace.roomFuncType
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("roomFuncType")
|
|
}
|
|
}
|
|
if (!zoneSpace.bimId.isNullOrEmpty()){
|
|
if (!zoneSpace.bimId.isNullOrEmpty()){
|
|
hashMap["bimId"] = zoneSpace.bimId
|
|
hashMap["bimId"] = zoneSpace.bimId
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("bimId")
|
|
}
|
|
}
|
|
if (!zoneSpace.bimLocation.isNullOrEmpty()){
|
|
if (!zoneSpace.bimLocation.isNullOrEmpty()){
|
|
hashMap["bimLocation"] = zoneSpace.bimLocation
|
|
hashMap["bimLocation"] = zoneSpace.bimLocation
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("bimLocation")
|
|
}
|
|
}
|
|
if (!zoneSpace.outline.isNullOrEmpty()){
|
|
if (!zoneSpace.outline.isNullOrEmpty()){
|
|
hashMap["outline"] = zoneSpace.outline!!.toJson()
|
|
hashMap["outline"] = zoneSpace.outline!!.toJson()
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("outline")
|
|
}
|
|
}
|
|
if (zoneSpace.permanentPeopleNum!=null&&zoneSpace.permanentPeopleNum!=0){
|
|
if (zoneSpace.permanentPeopleNum!=null&&zoneSpace.permanentPeopleNum!=0){
|
|
hashMap["permanentPeopleNum"] = zoneSpace.permanentPeopleNum
|
|
hashMap["permanentPeopleNum"] = zoneSpace.permanentPeopleNum
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("permanentPeopleNum")
|
|
}
|
|
}
|
|
if (zoneSpace.depth!=null&&zoneSpace.depth!=0.0){
|
|
if (zoneSpace.depth!=null&&zoneSpace.depth!=0.0){
|
|
hashMap["depth"] = zoneSpace.depth
|
|
hashMap["depth"] = zoneSpace.depth
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("depth")
|
|
}
|
|
}
|
|
if (zoneSpace.width!=null&&zoneSpace.width!=0.0){
|
|
if (zoneSpace.width!=null&&zoneSpace.width!=0.0){
|
|
hashMap["width"] = zoneSpace.width
|
|
hashMap["width"] = zoneSpace.width
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("width")
|
|
}
|
|
}
|
|
|
|
+
|
|
if (zoneSpace.buildArea!=null&&zoneSpace.buildArea!=0.0){
|
|
if (zoneSpace.buildArea!=null&&zoneSpace.buildArea!=0.0){
|
|
hashMap["buildArea"] = zoneSpace.buildArea
|
|
hashMap["buildArea"] = zoneSpace.buildArea
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("buildArea")
|
|
}
|
|
}
|
|
if (zoneSpace.netArea!=null&&zoneSpace.netArea!=0.0){
|
|
if (zoneSpace.netArea!=null&&zoneSpace.netArea!=0.0){
|
|
hashMap["netArea"] = zoneSpace.netArea
|
|
hashMap["netArea"] = zoneSpace.netArea
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("netArea")
|
|
}
|
|
}
|
|
if (zoneSpace.height!=null&&zoneSpace.height!=0.0){
|
|
if (zoneSpace.height!=null&&zoneSpace.height!=0.0){
|
|
hashMap["height"] = zoneSpace.height
|
|
hashMap["height"] = zoneSpace.height
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("height")
|
|
}
|
|
}
|
|
if (zoneSpace.elecCap!=null&&zoneSpace.elecCap!=0.0){
|
|
if (zoneSpace.elecCap!=null&&zoneSpace.elecCap!=0.0){
|
|
hashMap["elecCap"] = zoneSpace.elecCap
|
|
hashMap["elecCap"] = zoneSpace.elecCap
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("elecCap")
|
|
}
|
|
}
|
|
if (!zoneSpace.zoneOrientation.isNullOrEmpty()){
|
|
if (!zoneSpace.zoneOrientation.isNullOrEmpty()){
|
|
hashMap["zoneOrientation"] = zoneSpace.zoneOrientation
|
|
hashMap["zoneOrientation"] = zoneSpace.zoneOrientation
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("zoneOrientation")
|
|
}
|
|
}
|
|
if (!zoneSpace.pollutionDegree.isNullOrEmpty()){
|
|
if (!zoneSpace.pollutionDegree.isNullOrEmpty()){
|
|
hashMap["pollutionDegree"] = zoneSpace.pollutionDegree
|
|
hashMap["pollutionDegree"] = zoneSpace.pollutionDegree
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("pollutionDegree")
|
|
}
|
|
}
|
|
if (!zoneSpace.intro.isNullOrEmpty()){
|
|
if (!zoneSpace.intro.isNullOrEmpty()){
|
|
hashMap["intro"] = zoneSpace.intro
|
|
hashMap["intro"] = zoneSpace.intro
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("intro")
|
|
}
|
|
}
|
|
if (!zoneSpace.projRoomFuncType.isNullOrEmpty()){
|
|
if (!zoneSpace.projRoomFuncType.isNullOrEmpty()){
|
|
hashMap["projRoomFuncType"] = zoneSpace.projRoomFuncType
|
|
hashMap["projRoomFuncType"] = zoneSpace.projRoomFuncType
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("projRoomFuncType")
|
|
}
|
|
}
|
|
if (!zoneSpace.pic.isNullOrEmpty()){
|
|
if (!zoneSpace.pic.isNullOrEmpty()){
|
|
hashMap["pic"] = zoneSpace.pic
|
|
hashMap["pic"] = zoneSpace.pic
|
|
|
|
+ }else {
|
|
|
|
+ removes.add("pic")
|
|
}
|
|
}
|
|
if (!zoneSpace.infos.isNullOrEmpty()){
|
|
if (!zoneSpace.infos.isNullOrEmpty()){
|
|
for (key in zoneSpace.infos!!.keys){
|
|
for (key in zoneSpace.infos!!.keys){
|
|
- hashMap[key] = zoneSpace.infos!![key]
|
|
|
|
|
|
+ if (zoneSpace.infos!![key]!=null&&!zoneSpace.infos!![key].toString().isNullOrEmpty()&&zoneSpace.infos!![key].toString()!="null"){
|
|
|
|
+ hashMap[key] = zoneSpace.infos!![key]
|
|
|
|
+ } else {
|
|
|
|
+ removes.add(key)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if (removes.isNotEmpty()){
|
|
|
|
+ hashMap["$"+"remove"] = removes
|
|
|
|
+ }
|
|
list.add(hashMap)
|
|
list.add(hashMap)
|
|
return list
|
|
return list
|
|
}
|
|
}
|