From c20c1000540f447ab7964c64b201abe28558cadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 10 Apr 2025 09:52:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mobilebroken):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=8A=B6=E6=80=81=E7=A0=81=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD=E6=89=A9=E5=B1=95-=20=E5=9C=A8=20De?= =?UTF-8?q?viceController=20=E4=B8=AD=E5=B0=86=20STATE.BusinessError=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20STATE.DataNoCheckPass=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E5=87=86=E7=A1=AE=E5=9C=B0=E5=8F=8D=E6=98=A0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=B1=BB=E5=9E=8B=20-=20=E5=9C=A8=20SsePushService=20?= =?UTF-8?q?=E4=B8=AD=E4=B8=BA=20ChatMessageVO=20=E6=B7=BB=E5=8A=A0=20remin?= =?UTF-8?q?dUsers=20=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=AF=E6=8C=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92=E5=8A=9F=E8=83=BD=20-=20=E5=9C=A8?= =?UTF-8?q?=20TiketController=20=E4=B8=AD=E6=96=B0=E5=A2=9E=20getHandlers?= =?UTF-8?q?=20=E6=96=B9=E6=B3=95=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/DeviceController.java | 4 ++-- .../mobilebroken/cfs/controller/TiketController.java | 9 +++++++++ .../nflg/mobilebroken/cfs/service/SsePushService.java | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) 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