From f58ecce62bc5ecad8e8a862b7b0ad590005cfc7e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 10 Apr 2024 11:43:51 +0800
Subject: [PATCH] fix:走航日报补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 099b1a8..36e4685 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -476,7 +476,7 @@
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;
@@ -497,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) {
--
Gitblit v1.8.0