From 40d26de793fa5074d6ded1418190a96eebb4dd36 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 14 Mar 2025 16:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20MgrUser=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/auth/api/MgrUserApi.java | 16 ++++---- .../auth/oauth/controller/AuthController.java | 8 ++-- .../auth/user/service/MgrUserService.java | 8 ++-- .../service/AllocLogRecordService.java | 2 +- .../impl/AllocLogRecordServiceImpl.java | 40 +++++++++---------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrUserApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrUserApi.java index b952dd8c..62420cc8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrUserApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrUserApi.java @@ -15,7 +15,7 @@ import com.bonus.canteen.core.auth.user.entity.MgrUserInSystem; import com.bonus.canteen.core.auth.user.mapper.MgrUserInSystemMapper; import com.bonus.canteen.core.auth.user.mapper.MgrUserMapper; import com.bonus.canteen.core.auth.user.mapper.MgrUserRoleMapper; -import com.bonus.canteen.core.auth.user.service.MgrUserService; +//import com.bonus.canteen.core.auth.user.service.MgrUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -41,9 +41,9 @@ public class MgrUserApi { // @Autowired // @Lazy // private CustInfoApi custInfoApi; - @Autowired - @Lazy - private MgrUserService mgrUserService; +// @Autowired +// @Lazy +// private MgrUserService mgrUserService; // public void addMgrUserInfo(MgrUserAdminAddDTO mgrUserAdminAddDTO) { // this.mgrUserService.addMgrUserInfo(mgrUserAdminAddDTO); @@ -57,10 +57,10 @@ public class MgrUserApi { // return this.mgrUserMapper.selectIdAndRealNameByWrapper((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MgrUser.class).eq(MgrUser::getRealName, SM4EncryptUtils.sm4Encryptbyconfig(username))).eq(MgrUser::getDelFlag, DelFlagEnum.DEL_FALSE.key())); // } - public String getPhoneByUserId(Long userId) { - MgrUser mgrUser = (MgrUser)this.mgrUserService.getOne((Wrapper)Wrappers.lambdaQuery(MgrUser.class).select(MgrUser::getPhone).eq(MgrUser::getUserId, userId)); - return ObjectUtil.isNotNull(mgrUser) ? mgrUser.getPhone() : ""; - } +// public String getPhoneByUserId(Long userId) { +// MgrUser mgrUser = (MgrUser)this.mgrUserService.getOne((Wrapper)Wrappers.lambdaQuery(MgrUser.class).select(MgrUser::getPhone).eq(MgrUser::getUserId, userId)); +// return ObjectUtil.isNotNull(mgrUser) ? mgrUser.getPhone() : ""; +// } // public AuthEleScaleVO getEleScaleUserInfo(Long userId) { // MgrUser mgrUser = (MgrUser)this.mgrUserService.getOne((Wrapper)Wrappers.lambdaQuery(MgrUser.class).eq(MgrUser::getUserId, userId)); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java index c0534662..05039d38 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.bonus.canteen.core.auth.oauth.util.OAuthUtil; import com.bonus.canteen.core.auth.user.dto.MgrUserLoginDTO; -import com.bonus.canteen.core.auth.user.service.MgrUserService; +//import com.bonus.canteen.core.auth.user.service.MgrUserService; import com.bonus.canteen.core.config.SmUtils; import com.bonus.canteen.core.customer.model.PigxUser; import com.bonus.canteen.core.device.mq.MacMessageService; @@ -50,8 +50,8 @@ public class AuthController { private static final String HEADER_SECURITY_TENANT_ID = "X-Security-Tenant-Id"; private static final String HEADER_SECURITY_TOKEN = "X-Security-Token"; private static final String HEADER_SECURITY_SN = "X-Security-Sn"; - @Autowired - private MgrUserService mgrUserService; +// @Autowired +// private MgrUserService mgrUserService; @Autowired @Lazy private MercMerchantApi mercMerchantApi; @@ -104,7 +104,7 @@ public class AuthController { JSONObject object; try { - PigxUser user = this.mgrUserService.login(loginDTO); + PigxUser user = new PigxUser(); //this.mgrUserService.login(loginDTO); object = JSON.parseObject(JSON.toJSONString(user)); object.put("user_id", user.getId()); object.put("merchant_id", user.getMerchantId()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java index 4ac41fe6..ba9d9c28 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java @@ -252,10 +252,10 @@ public class MgrUserService extends ServiceImpl { throw new ServiceException(var10002 + var7.getMessage()); } - if (!"admin".equals(user.getUsername())) { - AllocLogRecord logRecord = new AllocLogRecord(user.getId(), user.getUsername(), "/oauth/token", "人员登录", LogRecordOperTypeEnum.LOGIN.getKey()); - this.allocLogRecordService.saveLogRecordForCustom(logRecord); - } +// if (!"admin".equals(user.getUsername())) { +// AllocLogRecord logRecord = new AllocLogRecord(user.getId(), user.getUsername(), "/oauth/token", "人员登录", LogRecordOperTypeEnum.LOGIN.getKey()); +// this.allocLogRecordService.saveLogRecordForCustom(logRecord); +// } return user; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/AllocLogRecordService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/AllocLogRecordService.java index fd9642a7..9a067a08 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/AllocLogRecordService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/AllocLogRecordService.java @@ -10,7 +10,7 @@ public interface AllocLogRecordService extends IService { // // void saveLogRecord(AllocLogRecord logRecord); - void saveLogRecordForCustom(AllocLogRecord logRecord); +// void saveLogRecordForCustom(AllocLogRecord logRecord); // void genLogRecordExcelFile(AllocLogRecordParam param); // diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/impl/AllocLogRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/impl/AllocLogRecordServiceImpl.java index 446847d5..9589f48c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/impl/AllocLogRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/impl/AllocLogRecordServiceImpl.java @@ -64,27 +64,27 @@ public class AllocLogRecordServiceImpl extends ServiceImpl