111

4dkankan-common-web/src/main/java/com/fdkankan/web/response/BaseResponseAdvice.java

@@ -55,6 +55,8 @@ public class BaseResponseAdvice implements ResponseBodyAdvice<Object> {
         }
         if (body instanceof ResultData) {
             return getI18n((ResultData) body);
+        }else if(body instanceof Result){
+            return body;
         } else {
             return getI18n(ResultData.ok(body));
         }

4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateHouseJsonUtil.java

@@ -95,19 +95,22 @@ public class CreateHouseJsonUtil {
 		Map<String, PointBean> pointMap = new HashMap<>();
 		Map<Integer, String> vpMap = new HashMap<>();
 		JSONArray vertexArr = floor.getJSONArray("vertex-xy");
-		for(int i = 0; i < vertexArr.size(); i++){
-			Object o = vertexArr.get(i);
+		if(CollUtil.isNotEmpty(vertexArr)){
+			for(int i = 0; i < vertexArr.size(); i++){
+				Object o = vertexArr.get(i);
 
-			VertexBean vertexBean = JSON.parseObject(JSON.toJSONString(o), VertexBean.class);
-			Integer vertexId = vertexBean.getId();
-			vertexMap.put(vertexId, vertexBean);
+				VertexBean vertexBean = JSON.parseObject(JSON.toJSONString(o), VertexBean.class);
+				Integer vertexId = vertexBean.getId();
+				vertexMap.put(vertexId, vertexBean);
 
-			String pointId = "Point" + i;
-			pointMap.put(pointId, PointBean.builder().vectorId(pointId).x(vertexBean.getX()).y(vertexBean.getY()).build());
+				String pointId = "Point" + i;
+				pointMap.put(pointId, PointBean.builder().vectorId(pointId).x(vertexBean.getX()).y(vertexBean.getY()).build());
 
-			vpMap.put(vertexId, pointId);
+				vpMap.put(vertexId, pointId);
+			}
 		}
 
+
 		//处理墙
 		Map<Integer, SegmentBean> segmentMap = new HashMap<>();
 		Map<String, WallBean> wallMap = new HashMap<>();
@@ -115,32 +118,34 @@ public class CreateHouseJsonUtil {
 		JSONArray segmentArr = floor.getJSONArray("segment");
 		Map<String, String> startMap = new HashMap<>();
 		Map<String, String> endMap = new HashMap<>();
-		for(int i = 0; i < segmentArr.size(); i++){
-			Object o = segmentArr.get(i);
-
-			SegmentBean segmentBean = JSON.parseObject(JSON.toJSONString(o), SegmentBean.class);
-			String startPointId = vpMap.get(segmentBean.getA());
-			String endPointId = vpMap.get(segmentBean.getB());
-			segmentBean.setStartPointId(startPointId);
-			segmentBean.setEndPointId(endPointId);
-
-			Integer segmentId = segmentBean.getId();
-			segmentMap.put(segmentId, segmentBean);
-
-			String wallId = "Wall" + i;
-			WallBean wallBean = WallBean.builder()
-				.vectorId(wallId)
-				.start(segmentBean.getStartPointId())
-				.end(segmentBean.getEndPointId())
-				.children(new String[]{})
-				.width(0.2d)
-				.build();
-			wallMap.put(wallId, wallBean);
-
-			startMap.put(wallBean.getStart(), wallBean.getVectorId());
-			endMap.put(wallBean.getEnd(), wallBean.getVectorId());
-
-			swMap.put(segmentId, wallId);
+		if(CollUtil.isNotEmpty(segmentArr)){
+			for(int i = 0; i < segmentArr.size(); i++){
+				Object o = segmentArr.get(i);
+
+				SegmentBean segmentBean = JSON.parseObject(JSON.toJSONString(o), SegmentBean.class);
+				String startPointId = vpMap.get(segmentBean.getA());
+				String endPointId = vpMap.get(segmentBean.getB());
+				segmentBean.setStartPointId(startPointId);
+				segmentBean.setEndPointId(endPointId);
+
+				Integer segmentId = segmentBean.getId();
+				segmentMap.put(segmentId, segmentBean);
+
+				String wallId = "Wall" + i;
+				WallBean wallBean = WallBean.builder()
+						.vectorId(wallId)
+						.start(segmentBean.getStartPointId())
+						.end(segmentBean.getEndPointId())
+						.children(new String[]{})
+						.width(0.2d)
+						.build();
+				wallMap.put(wallId, wallBean);
+
+				startMap.put(wallBean.getStart(), wallBean.getVectorId());
+				endMap.put(wallBean.getEnd(), wallBean.getVectorId());
+
+				swMap.put(segmentId, wallId);
+			}
 		}
 
 		Collection<PointBean> pointBeans = pointMap.values();
@@ -163,6 +168,11 @@ public class CreateHouseJsonUtil {
 
 	}
 
+	public static void main(String[] args) {
+		JSONObject houseTypeJsonByCad = createHouseTypeJsonByCad("D:\\Downloads\\floorplan_cad.json");
+		FileUtil.writeUtf8String(houseTypeJsonByCad.toJSONString(), "D:\\Downloads\\houseType.json");
+	}
+
 	private static JSONObject init() {
 		JSONObject outContent = new JSONObject();
 		outContent.put("name", "houseType.json");

4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/FloorPlanUserUtil.java

@@ -20,8 +20,8 @@ import java.util.Map;
 public class FloorPlanUserUtil {
 
 	public static void main(String[] args) {
-		JSONObject floorPlanUserJson = FloorPlanUserUtil.createFloorPlanUserJson("D:\\test\\新建文件夹\\floorplan_cad.json");
-		FileUtil.writeUtf8String(floorPlanUserJson.toJSONString(), "D:\\test\\新建文件夹\\floorplan.json");
+		JSONObject floorPlanUserJson = FloorPlanUserUtil.createFloorPlanUserJson("D:\\Downloads\\floorplan_cad.json");
+		FileUtil.writeUtf8String(floorPlanUserJson.toJSONString(), "D:\\Downloads\\floorplan.json");
 
 	}
 
@@ -91,18 +91,20 @@ public class FloorPlanUserUtil {
 		Map<String, PointBean> pointMap = new HashMap<>();
 		Map<Integer, String> vpMap = new HashMap<>();
 		JSONArray vertexArr = floor.getJSONArray("vertex-xy");
-		for(int i = 0; i < vertexArr.size(); i++){
-			Object o = vertexArr.get(i);
+		if(CollUtil.isNotEmpty(vertexArr)){
+			for(int i = 0; i < vertexArr.size(); i++){
+				Object o = vertexArr.get(i);
 
-			VertexBean vertexBean = JSON.parseObject(JSON.toJSONString(o), VertexBean.class);
-			Integer vertexId = vertexBean.getId();
-			vertexMap.put(vertexId, vertexBean);
+				VertexBean vertexBean = JSON.parseObject(JSON.toJSONString(o), VertexBean.class);
+				Integer vertexId = vertexBean.getId();
+				vertexMap.put(vertexId, vertexBean);
 
-			String pointId = "Point" + currentId;
-			pointMap.put(pointId, PointBean.builder().geoType("Point").vectorId(pointId).x(vertexBean.getX()).y(vertexBean.getY()).build());
-			++currentId;
+				String pointId = "Point" + currentId;
+				pointMap.put(pointId, PointBean.builder().geoType("Point").vectorId(pointId).x(vertexBean.getX()).y(vertexBean.getY()).build());
+				++currentId;
 
-			vpMap.put(vertexId, pointId);
+				vpMap.put(vertexId, pointId);
+			}
 		}
 
 		//处理墙
@@ -112,34 +114,36 @@ public class FloorPlanUserUtil {
 		JSONArray segmentArr = floor.getJSONArray("segment");
 		Map<String, String> startMap = new HashMap<>();
 		Map<String, String> endMap = new HashMap<>();
-		for(int i = 0; i < segmentArr.size(); i++){
-			Object o = segmentArr.get(i);
-
-			SegmentBean segmentBean = JSON.parseObject(JSON.toJSONString(o), SegmentBean.class);
-			String startPointId = vpMap.get(segmentBean.getA());
-			String endPointId = vpMap.get(segmentBean.getB());
-			segmentBean.setStartPointId(startPointId);
-			segmentBean.setEndPointId(endPointId);
-
-			Integer segmentId = segmentBean.getId();
-			segmentMap.put(segmentId, segmentBean);
-
-			String wallId = "Wall" + currentId;
-			WallBean wallBean = WallBean.builder()
-				.geoType("Wall")
-				.vectorId(wallId)
-				.start(segmentBean.getStartPointId())
-				.end(segmentBean.getEndPointId())
-				.children(new String[]{})
-				.width(0.2d)
-				.build();
-			wallMap.put(wallId, wallBean);
-			++currentId;
-
-			startMap.put(wallBean.getStart(), wallBean.getVectorId());
-			endMap.put(wallBean.getEnd(), wallBean.getVectorId());
-
-			swMap.put(segmentId, wallId);
+		if(CollUtil.isNotEmpty(segmentArr)){
+			for(int i = 0; i < segmentArr.size(); i++){
+				Object o = segmentArr.get(i);
+
+				SegmentBean segmentBean = JSON.parseObject(JSON.toJSONString(o), SegmentBean.class);
+				String startPointId = vpMap.get(segmentBean.getA());
+				String endPointId = vpMap.get(segmentBean.getB());
+				segmentBean.setStartPointId(startPointId);
+				segmentBean.setEndPointId(endPointId);
+
+				Integer segmentId = segmentBean.getId();
+				segmentMap.put(segmentId, segmentBean);
+
+				String wallId = "Wall" + currentId;
+				WallBean wallBean = WallBean.builder()
+						.geoType("Wall")
+						.vectorId(wallId)
+						.start(segmentBean.getStartPointId())
+						.end(segmentBean.getEndPointId())
+						.children(new String[]{})
+						.width(0.2d)
+						.build();
+				wallMap.put(wallId, wallBean);
+				++currentId;
+
+				startMap.put(wallBean.getStart(), wallBean.getVectorId());
+				endMap.put(wallBean.getEnd(), wallBean.getVectorId());
+
+				swMap.put(segmentId, wallId);
+			}
 		}
 
 		Collection<PointBean> pointBeans = pointMap.values();

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneCallMessage.java

@@ -3,6 +3,7 @@ package com.fdkankan.rabbitmq.bean;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Data
@@ -23,4 +24,5 @@ public class BuildSceneCallMessage extends BaseBuildSceneMessage {
     private Map<String,Object> ext;
 
     private String bizType;
+
 }

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneResultMqMessage.java

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Data
@@ -24,4 +25,6 @@ public class BuildSceneResultMqMessage extends BaseBuildSceneMessage{
     private Map<String,Object> ext;
 
     private Integer errorType;
+
+    private LinkedHashMap<Integer, Boolean> detFloorplan;
 }

pom.xml

@@ -41,22 +41,6 @@
     <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-
-    <repositories>
-        <repository>
-            <id>releases</id>
-            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>nexus-aliyun</id>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>snapshots</id>
-            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
-
     <properties>
         <java.version>1.8</java.version>
         <fastjson-version>1.2.83</fastjson-version>
@@ -221,12 +205,12 @@
     <distributionManagement>
         <repository>
             <!-- 这里的ID要和setting的id一致 -->
-            <id>releases</id>
+            <id>fdkk-releases</id>
             <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/releases/</url>
         </repository>
         <!--这是打成快照版本的配置 -->
         <snapshotRepository>
-            <id>snapshots</id>
+            <id>fdkk-snapshots</id>
             <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>