chore:测试提交

jinpengyong

2023-12-05 ac326c1db9de13a81d8b807276689df88486307d

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

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
@@ -11,6 +12,8 @@
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.UnitConversionMapper;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SensorService;
@@ -503,19 +506,22 @@
     * @return
     */
    @Override
    public List<Device> getFuzzySearch(String mac) {
        LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
        if (ObjectUtils.isEmpty(mac)){
            return null;
    public List<AppDeviceVo> getFuzzySearch(String mac) {
        QxUser user = UserHelper.getCurrentUser();
        Integer organizationId = user.getOrganizationId();
//        Integer organizationId = 24;
        List<AppDeviceVo> devices;
        if (organizationId!=24){
             devices = deviceMapper.getDevices(mac,organizationId);
        }else {
             devices = deviceMapper.getDevices(mac,null);
        }
        wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
        wrapper.like(Device::getMac,mac);
        List<Device> devices = deviceMapper.selectList(wrapper);
        return devices;
    }


    /**
     * 根据组织查询设备
     * 根据站点查询设备
     *
     * @param id
     * @return
@@ -523,7 +529,7 @@
    @Override
    public List<Device> getOrganizationDevice(Integer id) {
        LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Device::getOrganizationId,id);
        wrapper.eq(Device::getMonitorPointId,id);
        wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
        wrapper.orderByAsc(Device::getCreateTime);
        List<Device> devices = deviceMapper.selectList(wrapper);