diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 0d280b9b..b820e40a 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -297,7 +297,7 @@ public class DeviceController extends ControllerBase { .stream().map(DictionaryItem::getName).collect(Collectors.toList()))) .writeTo(osOut); try(ByteArrayInputStream isIn = new ByteArrayInputStream(osOut.toByteArray())) { - return ApiResult.error(STATE.BusinessError, "导入文件失败",fileUploadService.upload("temp/" +DateTimeUtil.format(LocalDate.now(),"yyyyMMdd")+"/"+ IdUtil.fastUUID() + ".xlsx", isIn)); + return ApiResult.error(STATE.DataNoCheckPass, "导入文件失败",fileUploadService.upload("temp/" +DateTimeUtil.format(LocalDate.now(),"yyyyMMdd")+"/"+ IdUtil.fastUUID() + ".xlsx", isIn)); } }catch (Exception e){ return ApiResult.error(STATE.BusinessError, "保存文件出错"); @@ -510,7 +510,7 @@ public class DeviceController extends ControllerBase { .stream().map(DictionaryItem::getName).collect(Collectors.toList()))) .writeTo(osOut); try(ByteArrayInputStream isIn = new ByteArrayInputStream(osOut.toByteArray())) { - return ApiResult.error(STATE.BusinessError, "导入文件失败",fileUploadService.upload("temp/" +DateTimeUtil.format(LocalDate.now(),"yyyyMMdd")+"/"+ IdUtil.fastUUID() + ".xlsx", isIn)); + return ApiResult.error(STATE.DataNoCheckPass, "导入文件失败",fileUploadService.upload("temp/" +DateTimeUtil.format(LocalDate.now(),"yyyyMMdd")+"/"+ IdUtil.fastUUID() + ".xlsx", isIn)); } }catch (Exception e){ return ApiResult.error(STATE.BusinessError, "保存文件出错"); diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index 17f7a08e..81dcdfeb 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -426,4 +426,13 @@ public class TiketController extends ControllerBase { public ApiResult getSolutionMeasures(@Valid @RequestParam @NotNull Integer ticketId){ return ApiResult.success(ticketSolutionService.getSolutionMeasures(ticketId)); } + + /** + * 获取工单处理人 + * @param ticketId 工单编号 + */ + @GetMapping("/getHandlers") + public ApiResult> getHandlers(@Valid @RequestParam @NotNull Integer ticketId) { + return ApiResult.success(ticketService.getTicketHandle(ticketId)); + } } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java index 375f5917..9c25ad8c 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/service/SsePushService.java @@ -63,6 +63,7 @@ public class SsePushService { .setCreateTime(formatter.format(message.getCreateTime())) .setImages(message.getImages()) .setAttachments(message.getAttachments()) + .setRemindUsers(message.getRemindUsers()) .setQuote(Objects.isNull(message.getQuote()) ? null : new ChatMessageVO() .setId(message.getQuote().getId()) .setFrom(message.getQuote().getFrom()) @@ -73,6 +74,7 @@ public class SsePushService { .setContent(message.getQuote().getContent()) .setAttachments(message.getQuote().getAttachments()) .setImages(message.getQuote().getImages()) + .setRemindUsers(message.getQuote().getRemindUsers()) .setCreateTime(formatter.format(message.getQuote().getCreateTime()))); } } \ No newline at end of file