| | |
|---|
| | | map.put("time",join); |
|---|
| | | dailyVo.setCode(map); |
|---|
| | | dailyVo.setName(areaByCode.getAreaName()); |
|---|
| | | dailyVo.setType(tbDaily.getType().equals("car")?"走航车":"无人机"); |
|---|
| | | dailyVo.setType(tbDaily.getType().equals("car")?"走航":"无人机"); |
|---|
| | | dailyVos.add(dailyVo); |
|---|
| | | } |
|---|
| | | return dailyVos; |
|---|
| | |
|---|
| | | |
|---|
| | | 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) { |
|---|
