diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java index d330523..4b34c7a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java @@ -113,4 +113,13 @@ public class KqCmdBean { this.subId = subId; this.teamId = teamId; } + public KqCmdBean(String deviceCode, String subName, String teamName, Integer proId, Integer subId, Integer teamId,String onLine) { + this.deviceCode = deviceCode; + this.subName = subName; + this.teamName = teamName; + this.proId = proId; + this.subId = subId; + this.teamId = teamId; + this.onLine = onLine; + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java index f180d10..648a55a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java @@ -112,7 +112,7 @@ public class KqCmdServiceImpl implements KqCmdService { // 遍历数据,建立映射关系 for (KqCmdBean item : data) { String proName = item.getProName(); - proToDeviceMap.computeIfAbsent(proName, k -> new ArrayList<>()).add(new KqCmdBean(item.getDeviceCode(), item.getSubName(), item.getTeamName(), item.getProId(), item.getSubId(), item.getTeamId())); + proToDeviceMap.computeIfAbsent(proName, k -> new ArrayList<>()).add(new KqCmdBean(item.getDeviceCode(), item.getSubName(), item.getTeamName(), item.getProId(), item.getSubId(), item.getTeamId(), item.getOnLine())); } // 构建树形结构 List result = new ArrayList<>(); diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java index 11fe8dd..4446027 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java @@ -352,7 +352,7 @@ public class TaskService { return; } List userSends = mapper.getTaskUserInfoList(task.getId()); - if(CollectionUtil.isEmpty(userSends)) { + if(CollUtil.isEmpty(userSends)) { String msg = "待新增用户为空,自动取消处理"; log.error(msg); task.setTransStatus(TaskStatusEnum.CANCEL.ordinal()); @@ -361,6 +361,7 @@ public class TaskService { return; } List userList = new ArrayList<>(); + boolean noZip= userSends.size() != 1; for(TaskUserVo userVo: userSends) { DeviceUserDto user = new DeviceUserDto(); user.setUserId(userVo.getUserId()); @@ -379,7 +380,11 @@ public class TaskService { if(fileList!=null && !fileList.isEmpty()) { String bast64=fileList.get(0).getBast64(); if(StringUtils.isNotBlank(bast64)) { - user.setPhoto_base64(ImageResizer.transImageByJpg(bast64)); + if(noZip){ + user.setPhoto_base64(ImageResizer.transImageByJpg(bast64)); + }else{ + user.setPhoto_base64(bast64); + } user.setPhotoEnroll(1); } }