konghl лет назад: 4
Родитель
Сommit
d21695c005

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

76
		LocationBean locationBean = new LocationBean(msgData.getId(), Double.valueOf(msgData.getX()),
76
		LocationBean locationBean = new LocationBean(msgData.getId(), Double.valueOf(msgData.getX()),
77
				Double.valueOf(msgData.getY()));
77
				Double.valueOf(msgData.getY()));
78
78
79
		if (StringUtils.isNotBlank(msgData.getFloor()))
80
			locationBean.setFloor(Long.valueOf(msgData.getFloor()));
79
		if (StringUtils.isNotBlank(msgData.getFloorId()))
80
			locationBean.setFloorId(Long.valueOf(msgData.getFloorId()));
81
81
82
		if (StringUtils.isNotBlank(msgData.getZ()))
82
		if (StringUtils.isNotBlank(msgData.getZ()))
83
			locationBean.setZAxis(Double.valueOf(msgData.getZ()));
83
			locationBean.setZAxis(Double.valueOf(msgData.getZ()));

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

8
	private String x;
8
	private String x;
9
	private String y;
9
	private String y;
10
	private String z;
10
	private String z;
11
	private String floor;
11
	private String floorId;
12
	private String topic;
12
	private String topic;
13
}
13
}

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

23
	private String buildingId;
23
	private String buildingId;
24
24
25
	// 楼层
25
	// 楼层
26
	private Long floor;
26
	private Long floorId;
27
27
28
	// x轴坐标
28
	// x轴坐标
29
	private Double xAxis;
29
	private Double xAxis;
39
39
40
	public LocationBean() {
40
	public LocationBean() {
41
		this.buildingId = "1";
41
		this.buildingId = "1";
42
		this.floor = 1L;
42
		this.floorId = 1L;
43
		this.xAxis = 0d;
43
		this.xAxis = 0d;
44
		this.yAxis = 0d;
44
		this.yAxis = 0d;
45
		this.zAxis = 0d;
45
		this.zAxis = 0d;
49
	public LocationBean(String terminalId, Double xAxis, Double yAxis) {
49
	public LocationBean(String terminalId, Double xAxis, Double yAxis) {
50
		this.terminalId = terminalId;
50
		this.terminalId = terminalId;
51
		this.buildingId = "1";
51
		this.buildingId = "1";
52
		this.floor = 1L;
52
		this.floorId = 1L;
53
		this.xAxis = xAxis;
53
		this.xAxis = xAxis;
54
		this.yAxis = yAxis;
54
		this.yAxis = yAxis;
55
		this.zAxis = 0d;
55
		this.zAxis = 0d;
56
		this.timeStamp = new Date();
56
		this.timeStamp = new Date();
57
	}
57
	}
58
58
59
	public LocationBean(String terminalId, String buildingId, Long floor, Double xAxis, Double yAxis, Double zAxis,
59
	public LocationBean(String terminalId, String buildingId, Long floorId, Double xAxis, Double yAxis, Double zAxis,
60
			Date timeStamp) {
60
			Date timeStamp) {
61
		this.terminalId = terminalId;
61
		this.terminalId = terminalId;
62
		this.buildingId = buildingId;
62
		this.buildingId = buildingId;
63
		this.floor = floor;
63
		this.floorId = floorId;
64
		this.xAxis = xAxis;
64
		this.xAxis = xAxis;
65
		this.yAxis = yAxis;
65
		this.yAxis = yAxis;
66
		this.zAxis = zAxis;
66
		this.zAxis = zAxis;

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

83
					Double.valueOf(mockScenarioData.getLongitude()), Double.valueOf(mockScenarioData.getLatitude()));
83
					Double.valueOf(mockScenarioData.getLongitude()), Double.valueOf(mockScenarioData.getLatitude()));
84
			
84
			
85
			if (StringUtils.isNotBlank(mockScenarioData.getFloor()))
85
			if (StringUtils.isNotBlank(mockScenarioData.getFloor()))
86
				locationBean.setFloor(Long.valueOf(mockScenarioData.getFloor()));
86
				locationBean.setFloorId(Long.valueOf(mockScenarioData.getFloor()));
87
87
88
			if (StringUtils.isNotBlank(mockScenarioData.getHeight()))
88
			if (StringUtils.isNotBlank(mockScenarioData.getHeight()))
89
				locationBean.setZAxis(Double.valueOf(mockScenarioData.getHeight()));
89
				locationBean.setZAxis(Double.valueOf(mockScenarioData.getHeight()));