Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
e666d8c4a4

+ 4 - 0
src/main/java/com/persagy/proxy/object/model/AdmBuilding.java

@@ -28,6 +28,10 @@ public class AdmBuilding extends AdmBaseEntity<AdmBuilding> {
     private String defaultQRCode;
     private String defaultQRCode;
     /** 建筑二维码图片 */
     /** 建筑二维码图片 */
     private String buildQRCode;
     private String buildQRCode;
+    /** 文字简介 */
+    private String intro;
+    /** 建筑常驻人数 */
+    private String permanentPeopleNum;
     /** 对象类型 */
     /** 对象类型 */
     private String objectType = OBJ_TYPE;
     private String objectType = OBJ_TYPE;
     /** 建筑下楼层模型被使用的数量 */
     /** 建筑下楼层模型被使用的数量 */

+ 2 - 1
src/main/java/com/persagy/proxy/object/model/AdmFloor.java

@@ -1,6 +1,7 @@
 package com.persagy.proxy.object.model;
 package com.persagy.proxy.object.model;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.proxy.adm.annotations.CascadeColumn;
 import com.persagy.proxy.adm.annotations.CascadeColumn;
 import com.persagy.proxy.adm.model.AdmBaseEntity;
 import com.persagy.proxy.adm.model.AdmBaseEntity;
@@ -71,7 +72,7 @@ public class AdmFloor extends AdmBaseEntity<AdmFloor> {
     private String propertiesInfo;
     private String propertiesInfo;
 
 
     /** 二维码图片 */
     /** 二维码图片 */
-    private String qrcodePic;
+    private ArrayNode qrcodePic;
 
 
 
 
     /** 对象类型 */
     /** 对象类型 */

+ 1 - 1
src/main/java/com/persagy/proxy/object/model/AdmSpace.java

@@ -93,7 +93,7 @@ public class AdmSpace extends AdmBaseEntity<AdmSpace> {
     private String classCode;
     private String classCode;
 
 
     /** 二维码图片 */
     /** 二维码图片 */
-    private String qrcodePic;
+    private ArrayNode qrcodePic;
     /** BIM模型中坐标 */
     /** BIM模型中坐标 */
     private String bimLocation;
     private String bimLocation;
     /** 二维码图片 */
     /** 二维码图片 */

+ 0 - 4
src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

@@ -153,10 +153,6 @@ public class AdmSpaceInfoController {
 		if(StrUtil.isNotBlank(request.getFloorId())) {
 		if(StrUtil.isNotBlank(request.getFloorId())) {
 			sb.append("floorId = '").append(request.getFloorId()).append("'; ");
 			sb.append("floorId = '").append(request.getFloorId()).append("'; ");
 		}
 		}
-		// 补充模型条件
-		if(StrUtil.isNotBlank(floor.getModelId())) {
-			sb.append("modelId = '").append(floor.getModelId()).append("'; ");
-		}
 		if(sb.length() > 0) {
 		if(sb.length() > 0) {
 			request.setFilters(sb.substring(0, sb.length() - 1));
 			request.setFilters(sb.substring(0, sb.length() - 1));
 		}
 		}