From 5639719879759c287a0c020818104b9e72ffc292 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 29 五月 2023 09:25:45 +0800 Subject: [PATCH] Merge branch 'postgresql' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java index a0d120c..6ebdbe2 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java @@ -20,7 +20,7 @@ import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper; import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.vmanager.bean.BaseTree; -import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo; +import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -118,7 +118,7 @@ // 绗竴娆′笂绾� 鎴栧垯璁惧涔嬪墠鏄绾跨姸鎬�--杩涜閫氶亾鍚屾鍜岃澶囦俊鎭煡璇� if (device.getCreateTime() == null) { - device.setOnline(1); + device.setOnLine(true); device.setCreateTime(now); logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId()); deviceMapper.add(device); @@ -130,8 +130,8 @@ } sync(device); }else { - if(device.getOnline() == 0){ - device.setOnline(1); + if(!device.isOnLine()){ + device.setOnLine(true); device.setCreateTime(now); deviceMapper.update(device); redisCatchStorage.updateDevice(device); @@ -185,7 +185,7 @@ } String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId; dynamicTask.stop(registerExpireTaskKey); - device.setOnline(0); + device.setOnLine(false); redisCatchStorage.updateDevice(device); deviceMapper.update(device); //杩涜閫氶亾绂荤嚎 @@ -231,7 +231,7 @@ } logger.info("[绉婚櫎鐩綍璁㈤槄]: {}", device.getDeviceId()); String taskKey = device.getDeviceId() + "catalog"; - if (device.getOnline() == 1) { + if (device.isOnLine()) { Runnable runnable = dynamicTask.get(taskKey); if (runnable instanceof ISubscribeTask) { ISubscribeTask subscribeTask = (ISubscribeTask) runnable; @@ -264,7 +264,7 @@ } logger.info("[绉婚櫎绉诲姩浣嶇疆璁㈤槄]: {}", device.getDeviceId()); String taskKey = device.getDeviceId() + "mobile_position"; - if (device.getOnline() == 1) { + if (device.isOnLine()) { Runnable runnable = dynamicTask.get(taskKey); if (runnable instanceof ISubscribeTask) { ISubscribeTask subscribeTask = (ISubscribeTask) runnable; @@ -331,7 +331,7 @@ @Override public void checkDeviceStatus(Device device) { - if (device == null || device.getOnline() == 0) { + if (device == null || !device.isOnLine()) { return; } try { @@ -535,7 +535,7 @@ if (haveChannel) { // 鏌ヨ閭d簺civilCode涓嶅湪閫氶亾涓殑涓嶈鑼冮�氶亾锛屾斁缃湪鏍圭洰褰� - List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCiviCode(deviceId); + List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCivilCode(deviceId); if (nonstandardNode != null && nonstandardNode.size() > 0) { result.addAll(nonstandardNode); } @@ -568,7 +568,7 @@ @Override public void addDevice(Device device) { - device.setOnline(0); + device.setOnLine(false); device.setCreateTime(DateUtil.getNow()); device.setUpdateTime(DateUtil.getNow()); deviceMapper.addCustomDevice(device); @@ -652,8 +652,10 @@ } @Override - public ResourceBaceInfo getOverview() { - return deviceMapper.getOverview(); + public ResourceBaseInfo getOverview() { + List<Device> onlineDevices = deviceMapper.getOnlineDevices(); + List<Device> all = deviceMapper.getAll(); + return new ResourceBaseInfo(all.size(), onlineDevices.size()); } @Override -- Gitblit v1.8.0