bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除 MgrUser 相关

This commit is contained in:
sxu 2025-03-14 16:19:06 +08:00
parent c26404a0d5
commit 40d26de793
5 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrUserApi.java
View File

@ -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));

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
View File

@ -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());

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/service/MgrUserService.java
View File

@ -252,10 +252,10 @@ public class MgrUserService extends ServiceImpl<MgrUserMapper, MgrUser> {
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;
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/AllocLogRecordService.java
View File

@ -10,7 +10,7 @@ public interface AllocLogRecordService extends IService<AllocLogRecord> {
//
// void saveLogRecord(AllocLogRecord logRecord);
void saveLogRecordForCustom(AllocLogRecord logRecord);
// void saveLogRecordForCustom(AllocLogRecord logRecord);
// void genLogRecordExcelFile(AllocLogRecordParam param);
//

40
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/notice/hawkeye/service/impl/AllocLogRecordServiceImpl.java
View File

@ -64,27 +64,27 @@ public class AllocLogRecordServiceImpl extends ServiceImpl<AllocLogRecordMapper,
// return recordPage;
// }
public void saveLogRecord(AllocLogRecord logRecord) {
if (!"admin".equals(logRecord.getLoginUserName())) {
if (ObjectUtil.isNotNull(logRecord.getLogRecordId())) {
logRecord.setLoginUserPhone(this.mgrUserApi.getPhoneByUserId(logRecord.getLogRecordId()));
if (ObjectUtil.isNotEmpty(logRecord.getLoginUserPhone())) {
logRecord.setLoginUserPhoneSuffix(logRecord.getLoginUserPhone().substring(logRecord.getLoginUserPhone().length() - 4));
}
}
// public void saveLogRecord(AllocLogRecord logRecord) {
// if (!"admin".equals(logRecord.getLoginUserName())) {
// if (ObjectUtil.isNotNull(logRecord.getLogRecordId())) {
// logRecord.setLoginUserPhone(this.mgrUserApi.getPhoneByUserId(logRecord.getLogRecordId()));
// if (ObjectUtil.isNotEmpty(logRecord.getLoginUserPhone())) {
// logRecord.setLoginUserPhoneSuffix(logRecord.getLoginUserPhone().substring(logRecord.getLoginUserPhone().length() - 4));
// }
// }
//
// logRecord.setLogRecordId(Id.next());
// ((AllocLogRecordMapper)this.baseMapper).insert(logRecord);
// }
// }
logRecord.setLogRecordId(Id.next());
((AllocLogRecordMapper)this.baseMapper).insert(logRecord);
}
}
public void saveLogRecordForCustom(AllocLogRecord logRecord) {
HttpServletRequest request = ((ServletRequestAttributes)Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
//logRecord.setLoginIp(JakartaServletUtil.getClientIP(request, new String[0]));
logRecord.setCrby(logRecord.getLoginUserName());
logRecord.setCrtime(LocalDateTime.now());
this.saveLogRecord(logRecord);
}
// public void saveLogRecordForCustom(AllocLogRecord logRecord) {
// HttpServletRequest request = ((ServletRequestAttributes)Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
// //logRecord.setLoginIp(JakartaServletUtil.getClientIP(request, new String[0]));
// logRecord.setCrby(logRecord.getLoginUserName());
// logRecord.setCrtime(LocalDateTime.now());
// this.saveLogRecord(logRecord);
// }
// public void genLogRecordExcelFile(AllocLogRecordParam param) {
// Long userId = (Long)SecureManager.getSubjectId().get();