Browse Source

离线只考虑终端关机场景,再不考虑超时离线

konghl 4 years ago
parent
commit
33205bef7e

+ 1 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/LocationRescueApp.java

@ -18,7 +18,7 @@ import com.ai.ipu.server.stomp.WebSocketStompServer;
18 18
@EnableJpaRepositories(basePackages = "com.ai.bss")
19 19
@EntityScan(basePackages = {"com.ai.bss","com.ai.abc"})
20 20
@ComponentScan(basePackages = {"com.ai.bss","com.ai.abc"})
21
@EnableScheduling  //开启定时任务
21
//@EnableScheduling  //开启定时任务
22 22
@EnableAsync  //开启异步任务
23 23
@SpringBootApplication
24 24
public class LocationRescueApp {

+ 0 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/model/EbcEntityPosition.java

@ -1,7 +1,6 @@
1 1
package com.ai.bss.location.rescue.model;
2 2
3 3
import com.ai.bss.position.model.EntityPosition;
4
import com.alibaba.fastjson.JSON;
5 4
6 5
public class EbcEntityPosition extends EntityPosition {
7 6
@ -22,4 +21,3 @@ public class EbcEntityPosition extends EntityPosition {
22 21
	}
23 22
24 23
}
25

+ 1 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/model/EbcMapArea.java

@ -54,7 +54,7 @@ public class EbcMapArea extends MapArea {
54 54
	public void setEbcEntityPositionList(List<EbcEntityPosition> ebcEntityPositionList) {
55 55
		this.ebcEntityPositionList = ebcEntityPositionList;
56 56
	}
57
	
57
58 58
	public void setEmployeeCount(int employeeCount) {
59 59
		this.employeeCount = employeeCount;
60 60
	}

+ 1 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/LocationManagementServiceImpl.java

@ -128,7 +128,7 @@ public class LocationManagementServiceImpl implements LocationManagementService
128 128
		resultMap.put("violationNum", violationNum);
129 129
		resultMap.put("sosNum", sosNum);
130 130
		resultMap.put("offlineNum", offlineNum);
131
		logger.debug("人员定位获取缓存统计数据: " + JSON.toJSONString(resultMap));
131
		logger.debug("人员定位统计数据: " + JSON.toJSONString(resultMap));
132 132
		return resultMap;
133 133
	}
134 134

+ 2 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/TimingTask.java

@ -12,7 +12,7 @@ import com.ai.abc.api.model.CommonResponse;
12 12
import com.ai.bss.location.rescue.util.DateUtil;
13 13
import com.ai.bss.position.service.api.EntityPositionCommand;
14 14
15
@Component
15
//@Component
16 16
public class TimingTask {
17 17
	Logger logger = LoggerFactory.getLogger(TimingTask.class);
18 18
@ -23,7 +23,7 @@ public class TimingTask {
23 23
	@Value("${device.overtime.offline:20}")
24 24
	private String overtime;
25 25
26
	@Scheduled(cron = "0 */1 * * * ?")
26
	//@Scheduled(cron = "0 */1 * * * ?")
27 27
	public void checkDeviceOvertime() {
28 28
		try {
29 29
			logger.debug("执行定时任务:" + DateUtil.getSysDateTime());