Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
#	screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

 screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java

@@ -35,4 +35,7 @@
    //获取半年内有数据的走航日期
    List<String> getDatesByMac(String mac);

    //获取半年内有数据的走航日期
    List<String> getDatesByMac(String mac);

}

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

@@ -2,6 +2,8 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondSpecial;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
import com.moral.api.mapper.HistorySecondCruiserMapper;
@@ -103,12 +105,13 @@
        return filterData(data);
    }


    @Override
    public SpecialDevice getSpecialDeviceMapByMac(String mac) {
        QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
        wrapper.eq("mac", mac);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        return specialDeviceMapper.selectOne(wrapper);
        QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
        queryWrapper.eq("mac",mac);
        queryWrapper.eq("is_delete",Constants.NOT_DELETE);
        SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
        return specialDevice;
    }



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

@@ -12,7 +12,6 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;