Commit 3a56e9ea by zhaoqingwei

阿拉丁-魔登

parent 3bee4e0f
...@@ -12,9 +12,8 @@ import com.ruoyi.adsdesk.util.AdsPageUtil; ...@@ -12,9 +12,8 @@ import com.ruoyi.adsdesk.util.AdsPageUtil;
import com.ruoyi.framework.aspectj.lang.annotation.DataSource; import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -26,8 +25,8 @@ import java.util.Objects; ...@@ -26,8 +25,8 @@ import java.util.Objects;
@Service @Service
public class AdsDeskRequestLogBusiness { public class AdsDeskRequestLogBusiness {
@Resource @Autowired
private AdsDeskRequestLogService requestLogService; private AdsDeskRequestLogService adsDeskRequestLogService;
@DataSource @DataSource
public IPage<AdsDeskRequestLog> list(AdsdeskRequestListParam param) { public IPage<AdsDeskRequestLog> list(AdsdeskRequestListParam param) {
...@@ -42,7 +41,7 @@ public class AdsDeskRequestLogBusiness { ...@@ -42,7 +41,7 @@ public class AdsDeskRequestLogBusiness {
} else { } else {
queryWrapper.orderByDesc(AdsDeskRequestLog.COL_GMT_CREATE); queryWrapper.orderByDesc(AdsDeskRequestLog.COL_GMT_CREATE);
} }
return requestLogService.page(AdsPageUtil.buildPage(param), queryWrapper); return adsDeskRequestLogService.page(AdsPageUtil.buildPage(param), queryWrapper);
} }
@DataSource @DataSource
...@@ -61,6 +60,6 @@ public class AdsDeskRequestLogBusiness { ...@@ -61,6 +60,6 @@ public class AdsDeskRequestLogBusiness {
if (Objects.nonNull(sysUser)) { if (Objects.nonNull(sysUser)) {
requestLog.setCreateBy(sysUser.getUserId()); requestLog.setCreateBy(sysUser.getUserId());
}*/ }*/
requestLogService.save(requestLog); adsDeskRequestLogService.save(requestLog);
} }
} }
package com.ruoyi.adsdesk.config.mybatis;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* mybatis-plus 属性自动填充
* @author Xingbz
* 014 06-14
*/
@Component
public class CreateUpdateTimeHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
LoginUser loginUser = SecurityUtils.getLoginUserIgnoreUnAuth();
if (Objects.nonNull(loginUser)) {
this.strictInsertFill(metaObject, "createBy", Objects.requireNonNull(loginUser)::getUserId, Long.class);
}
this.strictInsertFill(metaObject, "gmtCreate", LocalDateTime::now, LocalDateTime.class);
}
@Override
public void updateFill(MetaObject metaObject) {
LoginUser loginUser = SecurityUtils.getLoginUserIgnoreUnAuth();
if (Objects.nonNull(loginUser)) {
this.strictUpdateFill(metaObject, "updateBy", Objects.requireNonNull(loginUser)::getUserId, Long.class);
}
this.strictUpdateFill(metaObject, "gmtModified", LocalDateTime::now, LocalDateTime.class);
}
}
...@@ -2,7 +2,7 @@ package com.ruoyi.adsdesk.service; ...@@ -2,7 +2,7 @@ package com.ruoyi.adsdesk.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.adsdesk.domain.AdsDeskRequestLog; import com.ruoyi.adsdesk.domain.AdsDeskRequestLog;
import com.ruoyi.adsdesk.mapper.AdsDeskRequestLogMapper; import com.ruoyi.project.system.mapper.AdsDeskRequestLogMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
......
...@@ -20,6 +20,19 @@ import com.ruoyi.project.system.domain.SysRole; ...@@ -20,6 +20,19 @@ import com.ruoyi.project.system.domain.SysRole;
*/ */
public class SecurityUtils public class SecurityUtils
{ {
/**
* 获取用户, 获取不到不会抛出异常
*/
public static LoginUser getLoginUserIgnoreUnAuth() {
try {
return (LoginUser) getAuthentication().getPrincipal();
} catch (Exception e) {
return null;
}
}
/** /**
* 用户ID * 用户ID
**/ **/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment