修改楼层字段

indoor-mock-service/src/main/java/com/ai/bss/mock/controller/MockController.java

@@ -76,8 +76,8 @@ public class MockController {
		LocationBean locationBean = new LocationBean(msgData.getId(), Double.valueOf(msgData.getX()),
				Double.valueOf(msgData.getY()));
		if (StringUtils.isNotBlank(msgData.getFloor()))
			locationBean.setFloor(Long.valueOf(msgData.getFloor()));
		if (StringUtils.isNotBlank(msgData.getFloorId()))
			locationBean.setFloorId(Long.valueOf(msgData.getFloorId()));
		if (StringUtils.isNotBlank(msgData.getZ()))
			locationBean.setZAxis(Double.valueOf(msgData.getZ()));

indoor-mock-service/src/main/java/com/ai/bss/mock/model/KakfaMsgData.java

@@ -8,6 +8,6 @@ public class KakfaMsgData {
	private String x;
	private String y;
	private String z;
	private String floor;
	private String floorId;
	private String topic;
}

indoor-mock-service/src/main/java/com/ai/bss/mock/model/LocationBean.java

@@ -23,7 +23,7 @@ public class LocationBean implements Serializable {
	private String buildingId;
	// 楼层
	private Long floor;
	private Long floorId;
	// x轴坐标
	private Double xAxis;
@@ -39,7 +39,7 @@ public class LocationBean implements Serializable {
	public LocationBean() {
		this.buildingId = "1";
		this.floor = 1L;
		this.floorId = 1L;
		this.xAxis = 0d;
		this.yAxis = 0d;
		this.zAxis = 0d;
@@ -49,18 +49,18 @@ public class LocationBean implements Serializable {
	public LocationBean(String terminalId, Double xAxis, Double yAxis) {
		this.terminalId = terminalId;
		this.buildingId = "1";
		this.floor = 1L;
		this.floorId = 1L;
		this.xAxis = xAxis;
		this.yAxis = yAxis;
		this.zAxis = 0d;
		this.timeStamp = new Date();
	}
	public LocationBean(String terminalId, String buildingId, Long floor, Double xAxis, Double yAxis, Double zAxis,
	public LocationBean(String terminalId, String buildingId, Long floorId, Double xAxis, Double yAxis, Double zAxis,
			Date timeStamp) {
		this.terminalId = terminalId;
		this.buildingId = buildingId;
		this.floor = floor;
		this.floorId = floorId;
		this.xAxis = xAxis;
		this.yAxis = yAxis;
		this.zAxis = zAxis;

indoor-mock-service/src/main/java/com/ai/bss/mock/service/impl/MockManageServiceImpl.java

@@ -83,7 +83,7 @@ public class MockManageServiceImpl implements MockManageService {
					Double.valueOf(mockScenarioData.getLongitude()), Double.valueOf(mockScenarioData.getLatitude()));
			
			if (StringUtils.isNotBlank(mockScenarioData.getFloor()))
				locationBean.setFloor(Long.valueOf(mockScenarioData.getFloor()));
				locationBean.setFloorId(Long.valueOf(mockScenarioData.getFloor()));
			if (StringUtils.isNotBlank(mockScenarioData.getHeight()))
				locationBean.setZAxis(Double.valueOf(mockScenarioData.getHeight()));