chore:测试提交

cjl

2023-07-20 70f64fd6350728df6389b8d303854d284a932526

 screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -13,7 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,15 +41,16 @@
    public void judgeOffLineDevice() {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.ne("state", Constants.DEVICE_STATE_OFFLINE);
        queryWrapper.eq("is_delete",Constants.NOT_DELETE);
        //获取所有在线设备
        List<Device> devices = deviceMapper.selectList(queryWrapper);
        for (Device device : devices) {
            Map<String, Object> data = getDataFromRedis(device.getMac());
            Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_SECOND, device.getMac());
            device.setState(Constants.DEVICE_STATE_OFFLINE);
            if (data != null && data.containsKey("DataTime")) {
                long time = Long.parseLong(data.get("DataTime").toString());
                Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
                //超过两分钟无数据就离线
                if (DateUtils.getDateOfMin(new Date(time), 2).getTime() < new Date().getTime()) {
                if (DateUtils.getDateOfMin(time, 2).getTime() < new Date().getTime()) {
                    updateDeviceState(device);
                }
            } else {
@@ -57,13 +60,19 @@
    }

    @Override
    @Transactional
    public void updateDeviceState(Device device) {
        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", device.getId()).set("state", device.getState());
        deviceMapper.update(null, updateWrapper);
    }

    private Map<String, Object> getDataFromRedis(String mac) {
        return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + "_" + mac);
    @Override
    public List<Device> getDateByOrgId(int orgId) {
        QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
        wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgId);
        List<Device> devices = new ArrayList<>();
        devices = deviceMapper.selectList(wrapper_device);
        return devices;
    }
}
}