|
@@ -516,56 +516,92 @@ object SpaceUtil {
|
|
|
return zoneSpace
|
|
|
}
|
|
|
|
|
|
-// fun spaceTools(projectId: String,zoneSpace: ZoneSpace): ArrayList<HashMap<String,Any?>> {
|
|
|
-// var list = ArrayList<HashMap<String,Any?>>()
|
|
|
-// val hashMap = HashMap<String, Any?>()
|
|
|
-// hashMap["id"] = zoneSpace.id
|
|
|
-// hashMap["name"] = zoneSpace.name
|
|
|
-// hashMap["projectId"] = projectId
|
|
|
-// hashMap["objType"] = "space"
|
|
|
-// hashMap["classCode"] = zoneSpace.classCode
|
|
|
-// hashMap["zoneSpaceSequenceId"] = zoneSpace.zoneSpaceSequenceId
|
|
|
-// if (!zoneSpace.localName.isNullOrEmpty()){
|
|
|
-// hashMap["localName"] = zoneSpace.localName
|
|
|
-// }
|
|
|
-// if (!zoneSpace.localId.isNullOrEmpty()){
|
|
|
-// hashMap["localId"] = zoneSpace.localId
|
|
|
-// }
|
|
|
-// if (!zoneSpace.defaultQRCode.isNullOrEmpty()){
|
|
|
-// hashMap["defaultQRCode"] = zoneSpace.defaultQRCode
|
|
|
-// }
|
|
|
-// if (!zoneSpace.qRCodePic.isNullOrEmpty()){
|
|
|
-// hashMap["qRCodePic"] = zoneSpace.qRCodePic
|
|
|
-// }
|
|
|
-// if (zoneSpace.roomSerial!=null&&zoneSpace.roomSerial!=0.0){
|
|
|
-// hashMap["roomSerial"] = zoneSpace.roomSerial
|
|
|
-// }
|
|
|
-// if (!zoneSpace.roomFuncType.isNullOrEmpty()){
|
|
|
-// hashMap["roomFuncType"] = zoneSpace.roomFuncType
|
|
|
-// }
|
|
|
-// if (!zoneSpace.bimId.isNullOrEmpty()){
|
|
|
-// hashMap["bimId"] = zoneSpace.bimId
|
|
|
-// }
|
|
|
-// if (!zoneSpace.bimLocation.isNullOrEmpty()){
|
|
|
-// hashMap["bimLocation"] = zoneSpace.bimLocation
|
|
|
-// }
|
|
|
-// if (!zoneSpace.outline.isNullOrEmpty()){
|
|
|
-// hashMap["outline"] = zoneSpace.outline.toString()
|
|
|
-// }
|
|
|
-// if (zoneSpace.permanentPeopleNum!=null&&zoneSpace.permanentPeopleNum!=0){
|
|
|
-// hashMap["permanentPeopleNum"] = zoneSpace.permanentPeopleNum
|
|
|
-// }
|
|
|
-// if (!zoneSpace.zoneSpaceIdentity.isNullOrEmpty()){
|
|
|
-// hashMap["zoneSpaceIdentity"] = zoneSpace.zoneSpaceIdentity
|
|
|
-// }
|
|
|
-// if (!zoneSpace.infos.isNullOrEmpty()){
|
|
|
-// for (key in zoneSpace.infos!!.keys){
|
|
|
-// hashMap[key] = zoneSpace.infos!![key]
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// list.add(hashMap)
|
|
|
-// return list
|
|
|
-// }
|
|
|
+ /**
|
|
|
+ * 空间工具
|
|
|
+ *
|
|
|
+ * @param projectId 项目 id
|
|
|
+ * @param zoneSpace 空间对象
|
|
|
+ * @return 返回结果
|
|
|
+ */
|
|
|
+ fun spaceTools(projectId: String,zoneSpace: ZoneSpace): ArrayList<HashMap<String,Any?>> {
|
|
|
+ var list = ArrayList<HashMap<String,Any?>>()
|
|
|
+ val hashMap = HashMap<String, Any?>()
|
|
|
+ hashMap["id"] = zoneSpace.id
|
|
|
+ hashMap["name"] = zoneSpace.name
|
|
|
+ hashMap["projectId"] = projectId
|
|
|
+ hashMap["objType"] = "space"
|
|
|
+ hashMap["classCode"] = zoneSpace.classCode
|
|
|
+ if (!zoneSpace.localName.isNullOrEmpty()){
|
|
|
+ hashMap["localName"] = zoneSpace.localName
|
|
|
+ }
|
|
|
+ if (!zoneSpace.localId.isNullOrEmpty()){
|
|
|
+ hashMap["localId"] = zoneSpace.localId
|
|
|
+ }
|
|
|
+ if (!zoneSpace.defaultQRCode.isNullOrEmpty()){
|
|
|
+ hashMap["defaultQRCode"] = zoneSpace.defaultQRCode
|
|
|
+ }
|
|
|
+ if (!zoneSpace.qRCodePic.isNullOrEmpty()){
|
|
|
+ hashMap["qRCodePic"] = zoneSpace.qRCodePic
|
|
|
+ }
|
|
|
+ if (zoneSpace.roomSerial!=null&&zoneSpace.roomSerial!=0.0){
|
|
|
+ hashMap["roomSerial"] = zoneSpace.roomSerial
|
|
|
+ }
|
|
|
+ if (!zoneSpace.roomFuncType.isNullOrEmpty()){
|
|
|
+ hashMap["roomFuncType"] = zoneSpace.roomFuncType
|
|
|
+ }
|
|
|
+ if (!zoneSpace.bimId.isNullOrEmpty()){
|
|
|
+ hashMap["bimId"] = zoneSpace.bimId
|
|
|
+ }
|
|
|
+ if (!zoneSpace.bimLocation.isNullOrEmpty()){
|
|
|
+ hashMap["bimLocation"] = zoneSpace.bimLocation
|
|
|
+ }
|
|
|
+ if (!zoneSpace.outline.isNullOrEmpty()){
|
|
|
+ hashMap["outline"] = zoneSpace.outline.toString()
|
|
|
+ }
|
|
|
+ if (zoneSpace.permanentPeopleNum!=null&&zoneSpace.permanentPeopleNum!=0){
|
|
|
+ hashMap["permanentPeopleNum"] = zoneSpace.permanentPeopleNum
|
|
|
+ }
|
|
|
+ if (zoneSpace.depth!=null&&zoneSpace.depth!=0.0){
|
|
|
+ hashMap["depth"] = zoneSpace.depth
|
|
|
+ }
|
|
|
+ if (zoneSpace.width!=null&&zoneSpace.width!=0.0){
|
|
|
+ hashMap["width"] = zoneSpace.width
|
|
|
+ }
|
|
|
+ if (zoneSpace.buildArea!=null&&zoneSpace.buildArea!=0.0){
|
|
|
+ hashMap["buildArea"] = zoneSpace.buildArea
|
|
|
+ }
|
|
|
+ if (zoneSpace.netArea!=null&&zoneSpace.netArea!=0.0){
|
|
|
+ hashMap["netArea"] = zoneSpace.netArea
|
|
|
+ }
|
|
|
+ if (zoneSpace.height!=null&&zoneSpace.height!=0.0){
|
|
|
+ hashMap["height"] = zoneSpace.height
|
|
|
+ }
|
|
|
+ if (zoneSpace.elecCap!=null&&zoneSpace.elecCap!=0.0){
|
|
|
+ hashMap["elecCap"] = zoneSpace.elecCap
|
|
|
+ }
|
|
|
+ if (!zoneSpace.zoneOrientation.isNullOrEmpty()){
|
|
|
+ hashMap["zoneOrientation"] = zoneSpace.zoneOrientation
|
|
|
+ }
|
|
|
+ if (!zoneSpace.pollutionDegree.isNullOrEmpty()){
|
|
|
+ hashMap["pollutionDegree"] = zoneSpace.pollutionDegree
|
|
|
+ }
|
|
|
+ if (!zoneSpace.intro.isNullOrEmpty()){
|
|
|
+ hashMap["intro"] = zoneSpace.intro
|
|
|
+ }
|
|
|
+ if (!zoneSpace.projRoomFuncType.isNullOrEmpty()){
|
|
|
+ hashMap["projRoomFuncType"] = zoneSpace.projRoomFuncType
|
|
|
+ }
|
|
|
+ if (!zoneSpace.pic.isNullOrEmpty()){
|
|
|
+ hashMap["pic"] = zoneSpace.pic
|
|
|
+ }
|
|
|
+ if (!zoneSpace.infos.isNullOrEmpty()){
|
|
|
+ for (key in zoneSpace.infos!!.keys){
|
|
|
+ hashMap[key] = zoneSpace.infos!![key]
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ list.add(hashMap)
|
|
|
+ return list
|
|
|
+ }
|
|
|
|
|
|
}
|