fix:手持设备权限补充提交

jinpengyong

2024-03-19 c5afb6b3503860c679990ccc7208ab418e1c5410

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

@@ -20,6 +20,7 @@
import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SysAreaService;
import com.moral.api.service.SysDictTypeService;
import com.moral.constant.Constants;

@@ -80,6 +81,9 @@

    @Autowired
    RedisTemplate redisTemplate;

    @Autowired
    private SysAreaService sysAreaService;

    private final static Double dis = 50d;

@@ -452,6 +456,8 @@
            ArrayList<String> rsList = new ArrayList<>();
            DailyVo dailyVo = new DailyVo();
            TbDaily tbDaily = dailyMapper.selectById(id);

            SysArea areaByCode = sysAreaService.getAreaByCode(Integer.parseInt(tbDaily.getCode()));
            if (tbDaily==null){
                continue;
            }
@@ -469,6 +475,8 @@
            String join = String.join("-", list);
            map.put("time",join);
            dailyVo.setCode(map);
            dailyVo.setName(areaByCode.getAreaName());
            dailyVo.setType(tbDaily.getType().equals("car")?"走航车":"无人机");
            dailyVos.add(dailyVo);
        }
        return dailyVos;
@@ -489,9 +497,11 @@

        Object mac = params.get("mac");
        if (!ObjectUtils.isEmpty(mac)){
            String MAC = mac.toString();
            String[] split = mac.toString().split(",");
            List<String> list = Arrays.asList(split);
            List<String> macList = new ArrayList<>(new TreeSet<>(list));
            QueryWrapper<TbDaily> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("type",type).eq("code",code).eq("mac",MAC);
            queryWrapper.eq("type",type).eq("code",code).in("mac",macList);
            queryWrapper.between("time",startTime,endTime);
            List<TbDaily> dailies = dailyMapper.selectList(queryWrapper);
            for (TbDaily daily : dailies) {