登录日志调整提交(西藏)

common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java

@@ -2,6 +2,7 @@ package com.founder.servicebase.logs;
 
 
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.founder.commonutils.Exception.TokenException;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.ThirdToken;
@@ -10,6 +11,7 @@ import com.founder.commonutils.util.JwtUser;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.util.NetworkUtil;
 import com.founder.servicebase.logs.mapper.mysqlMapper.SkSysLogMapper;
+import com.founder.servicebase.service.SysUserService;
 import io.jsonwebtoken.Claims;
 import lombok.SneakyThrows;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -27,6 +29,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
@@ -49,6 +52,8 @@ public class SysLogAspect {
     private SkSysLogMapper sysLogMapper;
     @Autowired
     private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private SysUserService sysUserService;
     private static Logger LOG = LoggerFactory.getLogger(SysLogAspect.class);
 
     //定义切点 @Pointcut
@@ -99,14 +104,35 @@ public class SysLogAspect {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
 
-        if (myLog != null && myLog.operation().equals("LOGIN")) {
+        if (myLog != null && (myLog.operation().equals("LOGIN")||myLog.operation().equals("DDLOGIN"))) {
             SysUser user = (SysUser) map.get("user");
             SimpleDateFormat ss = new SimpleDateFormat("yyyyMMdd");
             String today = ss.format(new Date());
             String KEY = "maplogin" + today;
             String IV = "map_vues" + today;
-            String trim = desEncrypt(user.getUsername(), KEY, IV).trim();
+            SysUser one = new SysUser();
+            String trim = "";
+            String usernameOrSfz = "";
+            if(myLog.operation().equals("LOGIN")){
+                 trim = desEncrypt(user.getUsername(), KEY, IV).trim();
+                usernameOrSfz = "USERNAME";
+            }else if(myLog.operation().equals("DDLOGIN")){
+                 trim = desEncrypt(user.getIdentitycard(), KEY, IV).trim();
+                usernameOrSfz = "IDENTITYCARD";
+            }
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq(usernameOrSfz, trim);
+            queryWrapper.eq("SCBZ", 0);
+            one = sysUserService.getOne(queryWrapper);
+            if(null != one){
+                sysLog.setUserid(one.getUsername());
+                sysLog.setYhxm(one.getTrueName());
+                sysLog.setYhgmsfhm(one.getIdentitycard());
+                sysLog.setYhdwgajgjgdm(one.getUnitcode());
+                sysLog.setYhdwgajgmc(one.getUnitname());
+            }else{
                 sysLog.setUserid(trim);
+            }
         } else {
             //获取token信息
             Claims claims = null;