From 3306afced9292f6d2bc2a3bc97b21d213677fb62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 29 Jul 2025 11:05:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20bug-528=20app=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/common/pojo/request/SearchDeviceRequest.java | 3 +++ .../src/main/resources/mapper/DeviceMapper.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java index 17b0eb23..86b5b9f3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java @@ -15,6 +15,9 @@ public class SearchDeviceRequest extends PageRequest { // 设备型号 private String modelNo; + // 设备编号或设备型号 + private String key; + //开始时间 private LocalDate startTime; diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 98b4d7b8..ad4d57c2 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -86,6 +86,9 @@ and d.shipment_date <= #{request.endTime} + + and (d.device_no LIKE concat('%', #{request.key}, '%') or d.model_no LIKE concat('%', #{request.key}, '%')) + From a4d30acb4e06464fb8dc5822775b626878f6c239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 30 Jul 2025 17:06:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=A4=B9=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/TicketController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index e89bda54..66fa639e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -154,7 +154,7 @@ public class TicketController extends ControllerBase { @GetMapping("getFavorites") @ApiMark(moduleName = "工单管理", apiName = "获取收藏夹",isPublic = true) public ApiResult getFavorites(@RequestParam(defaultValue ="0") Integer id){ - return ApiResult.success(ticketFavoritesService.getList(AdminUserUtil.getUserId(),AppUserUtil.getFrom(),id)); + return ApiResult.success(ticketFavoritesService.getList(AdminUserUtil.getUserId(),Constant.FROM_ADMIN,id)); } /** @@ -165,7 +165,7 @@ public class TicketController extends ControllerBase { @PostMapping("addFavorites") @ApiMark(moduleName = "工单管理", apiName = "添加收藏夹",isPublic = true) public ApiResult addFavorites(@Valid @RequestBody AdminFavoritesRequest request){ - ticketFavoritesService.addFavorites(request,AdminUserUtil.getUserId(),AppUserUtil.getFrom()); + ticketFavoritesService.addFavorites(request,AdminUserUtil.getUserId(),Constant.FROM_ADMIN); return ApiResult.success(); } @@ -175,7 +175,7 @@ public class TicketController extends ControllerBase { */ @PostMapping("updateFavorites") public ApiResult updateFavorites(@Valid @RequestBody FavoritesUpdateRequest request){ - ticketFavoritesService.updateFavorites(request,AdminUserUtil.getUserId(),AppUserUtil.getFrom()); + ticketFavoritesService.updateFavorites(request,AdminUserUtil.getUserId(),Constant.FROM_ADMIN); return ApiResult.success(); } @@ -187,7 +187,7 @@ public class TicketController extends ControllerBase { @PostMapping("deleteFavorites") @ApiMark(moduleName = "工单管理", apiName = "删除收藏夹",isPublic = true) public ApiResult deleteFavorites(@Valid @RequestParam @NotNull Integer favoritesId){ - ticketFavoritesService.deleteFavorites(AdminUserUtil.getUserId(),AppUserUtil.getFrom(),favoritesId); + ticketFavoritesService.deleteFavorites(AdminUserUtil.getUserId(),Constant.FROM_ADMIN,favoritesId); return ApiResult.success(); } @@ -207,7 +207,7 @@ public class TicketController extends ControllerBase { */ @PostMapping("moveFavoritesTicket") public ApiResult moveFavoritesTicket(@Valid @RequestBody FavoritesTicketMoveRequest request){ - ticketFavoritesService.moveFavoritesTicket(AdminUserUtil.getUserId(),AppUserUtil.getFrom(),request); + ticketFavoritesService.moveFavoritesTicket(AdminUserUtil.getUserId(),Constant.FROM_ADMIN,request); return ApiResult.success(); } @@ -218,7 +218,7 @@ public class TicketController extends ControllerBase { @PostMapping("followTiket") @ApiMark(moduleName = "工单管理", apiName = "关注工单") public ApiResult followTiket(@Valid @RequestBody AdminFollowRequest request){ - ticketFollowService.follow(request, AdminUserUtil.getUserId(),AppUserUtil.getFrom()); + ticketFollowService.follow(request, AdminUserUtil.getUserId(),Constant.FROM_ADMIN); return ApiResult.success(); } @@ -228,7 +228,7 @@ public class TicketController extends ControllerBase { **/ @PostMapping("unfollowTicket") public ApiResult unfollowTicket(@Valid @RequestParam @NotNull Integer ticketId){ - ticketFollowService.unfollow(AdminUserUtil.getUserId(),AppUserUtil.getFrom(),ticketId); + ticketFollowService.unfollow(AdminUserUtil.getUserId(),Constant.FROM_ADMIN,ticketId); return ApiResult.success(); } From 039df14299e7389c72f7f2b7bd03fbb7e1c11c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 31 Jul 2025 17:21:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20bug-384=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E5=90=8E=E7=BB=AD=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 搜索消息接口优化 --- .../admin/controller/MessageController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java index e9efcbd2..1a617ebb 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.admin.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.mobilebroken.admin.annotation.ApiMark; import com.nflg.mobilebroken.common.constant.Constant; @@ -11,6 +12,7 @@ import com.nflg.mobilebroken.common.pojo.vo.AdminMessageVO; import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO; import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.PageUtil; +import com.nflg.mobilebroken.repository.entity.AdminUser; import com.nflg.mobilebroken.repository.entity.AppUser; import com.nflg.mobilebroken.repository.entity.AppUserApplyfor; import com.nflg.mobilebroken.repository.entity.Ticket; @@ -67,9 +69,14 @@ public class MessageController extends ControllerBase { return ApiResult.success(PageUtil.convert(datas, d -> { if (Objects.equals(d.getSource(), 0)) { Ticket ticket = ticketService.getById(d.getSourceId()); - AppUser appUser = appUserService.getById(ticket.getUserId()); d.setSourceCreateTime(ticket.getCreateTime()); - d.setSourceCreateUserName(appUser.getName()); + if (StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN)) { + AdminUser adminUser = adminUserService.getById(ticket.getUserId()); + d.setSourceCreateUserName(adminUser.getUserName()); + } else { + AppUser appUser = appUserService.getById(ticket.getUserId()); + d.setSourceCreateUserName(appUser.getName()); + } } else if (Objects.equals(d.getSource(), 1)) { AppUserApplyfor appUserApplyfor = appUserApplyforService.getById(d.getSourceId()); AppUser appUser = appUserService.getById(appUserApplyfor.getCreateBy()); From ebc9534c93ea341fdbd02ecb84b0e23c89af8ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 4 Aug 2025 17:57:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/ProductModelController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index 59b5fec2..8b4bd955 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -628,7 +628,7 @@ public class ProductModelController extends ControllerBase{ String indexName = null; DataFormatter dataFormatter = new DataFormatter(); for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) { -// log.info("处理第{}行", index); + log.info("处理第{}行", index); Row row = sheet.getRow(index); if (Objects.isNull(row)) { break; @@ -685,7 +685,7 @@ public class ProductModelController extends ControllerBase{ .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { - ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); + ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode())); item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode())); From e2596c36db88088ad5f28248e5a433af28cbd2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 5 Aug 2025 09:19:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/ProductModelController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index 8b4bd955..5ae2d7ab 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -643,6 +643,9 @@ public class ProductModelController extends ControllerBase{ indexName=dto.getIndexName(); } Cell cell1=row.getCell(1); + if ((Objects.isNull(cell1) || StrUtil.isBlank(cell1.getStringCellValue()))){ + break; + } dto.setName(StrUtil.trim(cell1.getStringCellValue())); Cell cell2=row.getCell(2); dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2))); @@ -739,7 +742,7 @@ public class ProductModelController extends ControllerBase{ .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { - ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); + ProductModelParamsItem en = items.stream().filter(it ->StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode())); item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode())); From da854f9c383a7bdf98b82cea814af2f3a1a45319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 8 Aug 2025 15:05:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20bug-558=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1=E7=B3=BB=E7=BB=9FPC?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=EF=BC=8C=E6=88=96APP=E7=AB=AF?= =?UTF-8?q?=E3=80=82=E4=BC=98=E5=85=88=E5=8F=96=E4=BB=A3=E7=90=86=E5=95=86?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E4=BB=A5=E4=BB=A3=E7=90=86=E5=95=86?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=E5=87=86=E3=80=82=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E5=8F=96=E7=AE=A1=E7=90=86=E7=AB=AF=E5=86=85=E9=83=A8=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AppController.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java index 10f27903..da5972ad 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java @@ -57,34 +57,8 @@ public class AppController extends ControllerBase { */ @GetMapping("login") public ApiResult login(String userName, String password) { - AdminUser adminUser =adminUserService.getUser(userName,password); - if (Objects.nonNull(adminUser)){ - VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState())) - .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage())); - VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState())) - .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage())); - List roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId()); - SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig - .setExtra("from", Constant.FROM_ADMIN) - .setExtra("name", adminUser.getUserName()) - .setExtra("code", adminUser.getUserCode()) - .setExtra("email", adminUser.getEmail()) - .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList()))); - String adminToken=SaTokenAdminUtil.getTokenInfo().getTokenValue(); - SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig - .setExtra("from", Constant.FROM_ADMIN) - .setExtra("name", adminUser.getUserName()) - .setExtra("email", adminUser.getEmail())); - SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo(); - return ApiResult.success(new AppLoginVO() - .setUserId(adminUser.getId()) - .setToken(tokenInfo.getTokenValue()) - .setAdminToken(adminToken) - .setExpire(tokenInfo.getTokenTimeout()) - .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) - .setPlatform(Constant.FROM_ADMIN)); - }else { - AppUser user=appUserService.getUser(userName,password); + AppUser user = appUserService.getUser(userName, password); + if (Objects.nonNull(user)) { VUtils.trueThrow(Objects.equals(user.getState(), UserState.Disabled.getState())) .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, user.getLanguageCode())); VUtils.trueThrow(Objects.equals(user.getState(), UserState.ToBeActivated.getState())) @@ -108,6 +82,32 @@ public class AppController extends ControllerBase { .setExpire(tokenInfo.getTokenTimeout()) .setLanguageCode(user.getLanguageCode()) .setPlatform(Constant.FROM_APP)); + } else { + AdminUser adminUser = adminUserService.getUser(userName, password); + VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState())) + .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage())); + VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState())) + .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage())); + List roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId()); + SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig + .setExtra("from", Constant.FROM_ADMIN) + .setExtra("name", adminUser.getUserName()) + .setExtra("code", adminUser.getUserCode()) + .setExtra("email", adminUser.getEmail()) + .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList()))); + String adminToken = SaTokenAdminUtil.getTokenInfo().getTokenValue(); + SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig + .setExtra("from", Constant.FROM_ADMIN) + .setExtra("name", adminUser.getUserName()) + .setExtra("email", adminUser.getEmail())); + SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo(); + return ApiResult.success(new AppLoginVO() + .setUserId(adminUser.getId()) + .setToken(tokenInfo.getTokenValue()) + .setAdminToken(adminToken) + .setExpire(tokenInfo.getTokenTimeout()) + .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) + .setPlatform(Constant.FROM_ADMIN)); } }