From 7fda9f2a43dac4a67bc3a456eb51780ce0b61cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 24 Jun 2025 14:42:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-369=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/auth/controller/AppController.java | 13 ++++++------- .../mobilebroken/cfs/controller/UserController.java | 6 +++--- .../mobilebroken/common/pojo/vo/AppLoginVO.java | 6 ++++++ .../nflg/mobilebroken/common/pojo/vo/AppUserVO.java | 6 ++++++ .../src/main/resources/mapper/TicketMapper.xml | 4 ++-- 5 files changed, 23 insertions(+), 12 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 691e4961..f5c514a1 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 @@ -10,7 +10,6 @@ import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO; import com.nflg.mobilebroken.common.pojo.vo.MenuVO; import com.nflg.mobilebroken.common.util.AppUserUtil; -import com.nflg.mobilebroken.common.util.SaTokenAdminUtil; import com.nflg.mobilebroken.common.util.SaTokenAppUtil; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.AdminUser; @@ -69,7 +68,7 @@ public class AppController extends ControllerBase { VUtils.trueThrow(user.getExpireTime().isBefore(ChronoLocalDate.from(LocalDateTime.now())) && !user.getIsPrimary()) .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, user.getLanguageCode())); SaTokenAppUtil.login(user.getId(), SaLoginConfig - .setExtra("from", "app") + .setExtra("from", Constant.FROM_APP) .setExtra("name", user.getName()) .setExtra("email", user.getEmail()) .setExtra("companyIds", StrUtil.split(user.getCompanyId(), ",").stream().map(Integer::valueOf).collect(Collectors.toList())) @@ -82,7 +81,7 @@ public class AppController extends ControllerBase { .setToken(tokenInfo.getTokenValue()) .setExpire(tokenInfo.getTokenTimeout()) .setLanguageCode(user.getLanguageCode()) - .setPlatform("app")); + .setPlatform(Constant.FROM_APP)); }else { AdminUser adminUser =adminUserService.getUser(userName,password); VUtils.trueThrow(Objects.isNull(adminUser)) @@ -92,7 +91,7 @@ public class AppController extends ControllerBase { VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState())) .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, Constant.DEFAULT_LANGUAGE_CODE)); SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig - .setExtra("from", "admin") + .setExtra("from", Constant.FROM_ADMIN) .setExtra("name", adminUser.getUserName()) .setExtra("email", adminUser.getEmail())); SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo(); @@ -101,7 +100,7 @@ public class AppController extends ControllerBase { .setToken(tokenInfo.getTokenValue()) .setExpire(tokenInfo.getTokenTimeout()) .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) - .setPlatform("admin")); + .setPlatform(Constant.FROM_ADMIN)); } } @@ -120,7 +119,7 @@ public class AppController extends ControllerBase { */ @GetMapping("getPermissionMenus") public ApiResult> getPermissionMenus() { - VUtils.trueThrow(!SaTokenAdminUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录"); - return ApiResult.success(adminRoleService.getMenusByRoleCodes("app",AppUserUtil.getUserId(), "app")); + VUtils.trueThrow(!SaTokenAppUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录"); + return ApiResult.success(adminRoleService.getMenusByRoleCodes(AppUserUtil.getFrom(),AppUserUtil.getUserId(),Constant.FROM_APP)); } } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java index 2d2ac936..ce97b15c 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java @@ -96,9 +96,9 @@ public class UserController extends ControllerBase { **/ @GetMapping("getInfo") public ApiResult getInfo(){ - if (StrUtil.equals(AppUserUtil.getFrom(), "app")) { + if (StrUtil.equals(AppUserUtil.getFrom(), Constant.FROM_APP)) { return ApiResult.success(appUserService.getInfo(AppUserUtil.getUserId())); - } else if (StrUtil.equals(AppUserUtil.getFrom(), "admin")) { + } else if (StrUtil.equals(AppUserUtil.getFrom(), Constant.FROM_ADMIN)) { AdminUserVO adminUser = adminUserService.getInfo(AppUserUtil.getUserId()); return ApiResult.success(new AppUserVO() .setId(adminUser.getId()) @@ -108,7 +108,7 @@ public class UserController extends ControllerBase { .setAvatar(adminUser.getAvatar()) .setPhone(adminUser.getPhone()) .setTitle(adminUser.getTitleName()) - .setPlatform("admin")); + .setPlatform(Constant.FROM_ADMIN)); } VUtils.trueThrowBusinessError(true).throwMessage("不支持的平台:" + AppUserUtil.getFrom()); return null; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java index 80abf5e2..4742a117 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.common.pojo.vo; +import com.nflg.mobilebroken.common.constant.Constant; import lombok.Data; import lombok.experimental.Accessors; @@ -15,4 +16,9 @@ public class AppLoginVO { //语言编码 private String languageCode; + + /** + * 来源平台 + */ + private String platform = Constant.FROM_APP; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java index 8a8e5a75..e7ecc651 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java @@ -3,6 +3,7 @@ package com.nflg.mobilebroken.common.pojo.vo; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.nflg.mobilebroken.common.constant.Constant; import lombok.Data; import lombok.experimental.Accessors; @@ -98,4 +99,9 @@ public class AppUserVO { * 语言编码 */ private String languageCode; + + /** + * 来源平台 + */ + private String platform = Constant.FROM_APP; } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 80debf1b..e8564263 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -89,7 +89,7 @@ FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_area a2 ON u.area_id=a2.id - LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=#{from=='app'?0:1} + LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=IF(#{from} = 'app', 0, 1) LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2 LEFT JOIN t_base_part p ON t.component_id=p.id LEFT JOIN t_base_language_data l ON p.id=l.source_id AND l.language_code=#{language} @@ -105,7 +105,7 @@ FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_area a2 ON u.area_id=a2.id - INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.from==#{from=='app'?0:1} + INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.from=IF(#{from} = 'app', 0, 1) LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2 LEFT JOIN t_base_part p ON t.component_id=p.id LEFT JOIN t_base_language_data l ON p.id=l.source_id AND l.language_code=#{language}