统一添加操作日志工具类

sapi/src/main/java/com/xhkjedu/sapi/aop/WebControllerAop.java

@@ -0,0 +1,218 @@
+package com.xhkjedu.sapi.aop;
+
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.sapi.config.ConfigKey;
+import com.xhkjedu.sapi.interceptors.RequestWrapper;
+import com.xhkjedu.sapi.mapper.system.UserMapper;
+import com.xhkjedu.sapi.listener.HandleLogSender;
+import com.xhkjedu.utils.IpRegionUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+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;
+
+/*
+ * @Description: AOP 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 18:52:24
+ **/
+@Aspect
+@Component
+@Slf4j
+public class WebControllerAop {
+    @Resource
+    private HandleLogSender handleLogSender;
+    @Resource
+    private UserMapper userMapper;
+
+    private THandleLog handleLog;
+
+    /*
+     * @Description 指定切点 匹配 使用@Action修饰所有方法
+     * @Date 2023/11/15 18:52:48
+     * @Author WN
+     * @Return void
+     **/
+    @Pointcut("execution(public * com.xhkjedu.sapi.controller..*.*(..))")
+    public void handleLog() {
+    }
+
+    /*
+     * @Description 前置通知，方法调用前被调用
+     * @Date 2023/11/15 17:46:51
+     * @Param [joinPoint]
+     **/
+    @Before("handleLog()")
+    public void doBefore(JoinPoint joinPoint){
+
+        //获取方法
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        // 获取AspectAnnotation注解
+        Action action = method.getAnnotation(Action.class);
+        if (action == null) {
+            handleLog = null;
+            return;
+        }
+        // 在此处初始化，避免某些方法不用记录报错
+        handleLog = new THandleLog();
+
+        // 获取方法名字
+        String value = action.value();
+        String[] valueStr = value.split("-");
+        // 操作名称
+        handleLog.setHandlemodel(valueStr[0]);
+        handleLog.setHandleaction(valueStr[1]);
+
+        if(joinPoint.getArgs() != null && joinPoint.getArgs().length > 0){
+            Object[] args = joinPoint.getArgs();
+            RequestWrapper st = (RequestWrapper) args[1];
+            // 设置请求参数
+            handleLog.setHandleparas(st.getBody());
+        }
+
+        try {
+            ServletRequestAttributes ss = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (ss != null) {
+                HttpServletRequest request = ss.getRequest();
+                Integer userid = request.getIntHeader(PlatformConstant.XH_USER_ID);
+                // 用户名
+                handleLog.setUserid(request.getIntHeader(PlatformConstant.XH_USER_ID));
+                handleLog.setDevicetype(request.getHeader(PlatformConstant.XH_DEVICE));
+                handleLog.setVersionnum(request.getHeader(PlatformConstant.XH_VERSION));
+                // 请求地址
+                handleLog.setHandleurl("/sapi" + request.getRequestURI());
+
+                //获取请求ip并解析区域
+                String ip = N_Utils.getIpAddress(request);
+                String region = null;
+                if (N_Utils.isNotEmpty(ip)) {
+                    IpRegionUtil ipRegionUtil = new IpRegionUtil();
+                    region = ipRegionUtil.getIpForAddress(ip, ConfigKey.ipregiondb);
+                }
+                handleLog.setHandleip(ip);
+                handleLog.setHandleaddress(region);
+                if(N_Utils.isTrueInteger(userid)){
+                    UserVo user = userMapper.getUserInfoForHandleLog(userid);
+                    if(user != null){
+                        handleLog.setUsertype(user.getUsertype());
+                        handleLog.setSchoolid(user.getSchoolid());
+                        handleLog.setUsername(user.getUsername());
+                        handleLog.setLoginname(user.getLoginname());
+                        if(N_Utils.isNotEmpty(handleLog.getDevicetype()) && "p_web".equals(handleLog.getDevicetype())){
+                            if(user.getUsertype() == 2){
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_s");
+                            }else{
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_t");
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /*
+     * @Description 处理完请求返回内容 发送mq消息
+     * @Date 2023/11/15 17:47:12
+     * @Author WN
+     * @Param [ret]
+     **/
+    @AfterReturning(returning = "ret", pointcut = "handleLog()")
+    public void doAfterReturning(Object ret){
+        if (ret == null) {
+            return;
+        }
+        if (handleLog == null) {
+            return;
+        }
+
+        if (ret instanceof ResultVo) {
+            ResultVo result = (ResultVo) ret;
+            if (result.getCode() == 0) {
+                handleLog.setHandlestate(1);
+            } else {
+                handleLog.setHandlestate(2);
+            }
+        }
+    }
+
+    /*
+     * @Description  后置异常
+     * @Date 2023/11/15 17:47:28
+     * @Author WN
+     * @Param [jp, e] (JoinPoint jp, Exception e)
+     **/
+    @AfterThrowing(pointcut = "handleLog()", throwing = "e")
+    public void throwss(Exception e) {
+
+        if (handleLog == null) {
+            return;
+        }
+
+        handleLog.setHandlestate(2);
+
+        log.info("方法异常时执行....." + e.getMessage());
+    }
+
+    /*
+     * @Description 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行
+     * @Date 2023/11/15 17:49:15
+     * @Author WN
+     * @Param [jp](JoinPoint jp)
+     **/
+    @After("handleLog()")
+    public void after() {
+        if (handleLog == null) {
+            return;
+        }
+        sendOut();
+        log.info("后置最终通知");
+    }
+
+    /*
+     * @Description 环绕通知,环绕增强，相当于MethodInterceptor
+     * @Date 2023/11/15 17:49:34
+     * @Author WN
+     * @Param [pjp]
+     * @Return java.lang.Object
+     **/
+    @Around("handleLog()")
+    public Object arround(ProceedingJoinPoint pjp) {
+        try {
+            return pjp.proceed();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            if (e instanceof Exception) {
+                throw new ServiceException(e.getMessage());
+            }
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(handleLog);
+    }
+
+}

sapi/src/main/java/com/xhkjedu/sapi/config/ConfigKey.java

@@ -112,4 +112,11 @@ public class ConfigKey {
     public void setBuildnum(Integer buildnum){
         this.buildnum = buildnum;
     }
+
+    public static String ipregiondb;//解析ip地址归属地
+
+    @Value("${ipregiondb}")
+    public void setIpregiondb(String ipregiondb){
+        ConfigKey.ipregiondb = ipregiondb;
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/config/RabbitConfig.java

@@ -54,4 +54,13 @@ public class RabbitConfig {
     public Queue resourceDelQueue2() {
         return new Queue(resourceDelQueue2);
     }
+
+    //生产者mq-操作日志
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    @Bean
+    public Queue handleLogQueue() {
+        return new Queue(handleLogQueue);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/listener/HandleLogSender.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sapi.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.model.slog.THandleLog;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/*
+ * @Description: 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 16:20:25
+ **/
+@Component
+public class HandleLogSender {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+    //生产者mq
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    //操作日志
+    public void handleLogSend(THandleLog handleLog) {
+        rabbitTemplate.convertAndSend(handleLogQueue, JSON.toJSONString(handleLog));
+    }
+
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/UserMapper.java

@@ -2,7 +2,7 @@ package com.xhkjedu.sapi.mapper.system;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.system.TUser;
-import com.xhkjedu.sapi.vo.system.UserVo;
+import com.xhkjedu.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -42,4 +42,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //获取用户信息
     TUser getUserTypeAndSchool(@Param("userid") Integer userid);
+
+    //获取用户信息用于操作日志
+    UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
 }

sapi/src/main/java/com/xhkjedu/sapi/service/dock/LcService.java

@@ -5,12 +5,12 @@ import com.xhkjedu.sapi.config.ConfigKey;
 import com.xhkjedu.sapi.mapper.system.SchoolMapper;
 import com.xhkjedu.sapi.mapper.system.UserMapper;
 import com.xhkjedu.sapi.model.system.TSchool;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.sapi.vo.dock.LcAdminVo;
 import com.xhkjedu.sapi.vo.dock.LcResultVo;
 import com.xhkjedu.sapi.vo.dock.LcSchoolVo;
-import com.xhkjedu.sapi.vo.system.UserVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

sapi/src/main/resources/application.properties

@@ -50,6 +50,7 @@ spring.redis.jedis.pool.max-active=60000
 redisdatatime=18000
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
+
 #消费者mq
 rabbitmq.researchHandleQueue=xhkjedutest.xhschool.researchHandleQueue_dev
 #负载一生产者mq
@@ -58,6 +59,10 @@ rabbitmq.resourceDelQueue=xhkjedutest.xhschool.resourceDelQueue_node01_dev
 #负载二生产者mq
 rabbitmq.researchTransferQueue2=xhkjedutest.xhschool.researchTransferQueue_node02_dev
 rabbitmq.resourceDelQueue2=xhkjedutest.xhschool.resourceDelQueue_node02_dev
+
+#操作日志生产者
+rabbitmq.handleLogQueue=xhkjedutest.xhschool.handleLogQueue_dev
+
 spring.rabbitmq.host=49.4.26.249
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu
@@ -106,6 +111,9 @@ cron.syncnum=100
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
 
+#解析ip归属地数据
+ipregiondb=D:\\school\\ip2region.xdb
+
 #白名单接口
 whitelistAPI=/get_new,/stype/list,/cloud/detail,/school/detail,/sanalyze/,/sr/,/ranalyze/,/rr/,/status/info
 

sapi/src/main/resources/mapper/system/UserMapper.xml

@@ -28,9 +28,8 @@
         </foreach>
     </update>
 
-
     <!--获取学校管理员-->
-    <select id="getSchoolAdminBySchoolid" resultType="com.xhkjedu.sapi.vo.system.UserVo">
+    <select id="getSchoolAdminBySchoolid" resultType="com.xhkjedu.vo.system.UserVo">
         select userid,username,loginname,loginpwd from t_user where schoolid=#{schoolid}
         and usertype=0 and userstate=1 order by userid limit 1
     </select>
@@ -48,4 +47,10 @@
     <select id="getUserTypeAndSchool" resultType="com.xhkjedu.sapi.model.system.TUser">
         select usertype,schoolid from t_user where userid=#{userid}
     </select>
+
+    <!--获取用户信息用于操作日志-->
+    <select id="getUserInfoForHandleLog" resultType="com.xhkjedu.vo.system.UserVo">
+        select userid,username,loginname,usertype,schoolid from t_user where userid=#{userid}
+    </select>
+
 </mapper>

sclass/src/main/java/com/xhkjedu/sclass/SclassApplication.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.slog;
+package com.xhkjedu.sclass;
 
-import com.xhkjedu.slog.config.ConfigKey;
+import com.xhkjedu.sclass.config.ConfigKey;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import tk.mybatis.spring.annotation.MapperScan;

sclass/src/main/java/com/xhkjedu/sclass/aop/WebControllerAop.java

@@ -0,0 +1,218 @@
+package com.xhkjedu.sclass.aop;
+
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.sclass.config.ConfigKey;
+import com.xhkjedu.sclass.interceptors.RequestWrapper;
+import com.xhkjedu.sclass.mq.HandleLogSender;
+import com.xhkjedu.sclass.mapper.system.UserMapper;
+import com.xhkjedu.utils.IpRegionUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+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;
+
+/*
+ * @Description: AOP 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 18:52:24
+ **/
+@Aspect
+@Component
+@Slf4j
+public class WebControllerAop {
+    @Resource
+    private HandleLogSender handleLogSender;
+    @Resource
+    private UserMapper userMapper;
+
+    private THandleLog handleLog;
+
+    /*
+     * @Description 指定切点 匹配 使用@Action修饰所有方法
+     * @Date 2023/11/15 18:52:48
+     * @Author WN
+     * @Return void
+     **/
+    @Pointcut("execution(public * com.xhkjedu.sclass.controller..*.*(..))")
+    public void handleLog() {
+    }
+
+    /*
+     * @Description 前置通知，方法调用前被调用
+     * @Date 2023/11/15 17:46:51
+     * @Param [joinPoint]
+     **/
+    @Before("handleLog()")
+    public void doBefore(JoinPoint joinPoint){
+
+        //获取方法
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        // 获取AspectAnnotation注解
+        Action action = method.getAnnotation(Action.class);
+        if (action == null) {
+            handleLog = null;
+            return;
+        }
+        // 在此处初始化，避免某些方法不用记录报错
+        handleLog = new THandleLog();
+
+        // 获取方法名字
+        String value = action.value();
+        String[] valueStr = value.split("-");
+        // 操作名称
+        handleLog.setHandlemodel(valueStr[0]);
+        handleLog.setHandleaction(valueStr[1]);
+
+        if(joinPoint.getArgs() != null && joinPoint.getArgs().length > 0){
+            Object[] args = joinPoint.getArgs();
+            RequestWrapper st = (RequestWrapper) args[1];
+            // 设置请求参数
+            handleLog.setHandleparas(st.getBody());
+        }
+
+        try {
+            ServletRequestAttributes ss = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (ss != null) {
+                HttpServletRequest request = ss.getRequest();
+                Integer userid = request.getIntHeader(PlatformConstant.XH_USER_ID);
+                // 用户名
+                handleLog.setUserid(request.getIntHeader(PlatformConstant.XH_USER_ID));
+                handleLog.setDevicetype(request.getHeader(PlatformConstant.XH_DEVICE));
+                handleLog.setVersionnum(request.getHeader(PlatformConstant.XH_VERSION));
+                // 请求地址
+                handleLog.setHandleurl("/sclass" + request.getRequestURI());
+
+                //获取请求ip并解析区域
+                String ip = N_Utils.getIpAddress(request);
+                String region = null;
+                if (N_Utils.isNotEmpty(ip)) {
+                    IpRegionUtil ipRegionUtil = new IpRegionUtil();
+                    region = ipRegionUtil.getIpForAddress(ip, ConfigKey.ipregiondb);
+                }
+                handleLog.setHandleip(ip);
+                handleLog.setHandleaddress(region);
+                if(N_Utils.isTrueInteger(userid)){
+                    UserVo user = userMapper.getUserInfoForHandleLog(userid);
+                    if(user != null){
+                        handleLog.setUsertype(user.getUsertype());
+                        handleLog.setSchoolid(user.getSchoolid());
+                        handleLog.setUsername(user.getUsername());
+                        handleLog.setLoginname(user.getLoginname());
+                        if(N_Utils.isNotEmpty(handleLog.getDevicetype()) && "p_web".equals(handleLog.getDevicetype())){
+                            if(user.getUsertype() == 2){
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_s");
+                            }else{
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_t");
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /*
+     * @Description 处理完请求返回内容 发送mq消息
+     * @Date 2023/11/15 17:47:12
+     * @Author WN
+     * @Param [ret]
+     **/
+    @AfterReturning(returning = "ret", pointcut = "handleLog()")
+    public void doAfterReturning(Object ret){
+        if (ret == null) {
+            return;
+        }
+        if (handleLog == null) {
+            return;
+        }
+
+        if (ret instanceof ResultVo) {
+            ResultVo result = (ResultVo) ret;
+            if (result.getCode() == 0) {
+                handleLog.setHandlestate(1);
+            } else {
+                handleLog.setHandlestate(2);
+            }
+        }
+    }
+
+    /*
+     * @Description  后置异常
+     * @Date 2023/11/15 17:47:28
+     * @Author WN
+     * @Param [jp, e] (JoinPoint jp, Exception e)
+     **/
+    @AfterThrowing(pointcut = "handleLog()", throwing = "e")
+    public void throwss(Exception e) {
+
+        if (handleLog == null) {
+            return;
+        }
+
+        handleLog.setHandlestate(2);
+
+        log.info("方法异常时执行....." + e.getMessage());
+    }
+
+    /*
+     * @Description 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行
+     * @Date 2023/11/15 17:49:15
+     * @Author WN
+     * @Param [jp](JoinPoint jp)
+     **/
+    @After("handleLog()")
+    public void after() {
+        if (handleLog == null) {
+            return;
+        }
+        sendOut();
+        log.info("后置最终通知");
+    }
+
+    /*
+     * @Description 环绕通知,环绕增强，相当于MethodInterceptor
+     * @Date 2023/11/15 17:49:34
+     * @Author WN
+     * @Param [pjp]
+     * @Return java.lang.Object
+     **/
+    @Around("handleLog()")
+    public Object arround(ProceedingJoinPoint pjp) {
+        try {
+            return pjp.proceed();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            if (e instanceof Exception) {
+                throw new ServiceException(e.getMessage());
+            }
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(handleLog);
+    }
+
+}

sclass/src/main/java/com/xhkjedu/sclass/config/ConfigKey.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.config;
+package com.xhkjedu.sclass.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

sclass/src/main/java/com/xhkjedu/sclass/config/RabbitConfig.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.sclass.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/*
+ * @Description: mq配置
+ * @Author: WN
+ * @Date: 2023/11/16 9:28:45
+ **/
+@Configuration
+public class RabbitConfig {
+
+    //生产者mq-操作日志
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    @Bean
+    public Queue handleLogQueue() {
+        return new Queue(handleLogQueue);
+    }
+}

sclass/src/main/java/com/xhkjedu/sclass/config/ScheduledConfig.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.config;
+package com.xhkjedu.sclass.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Condition;

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -1,18 +1,18 @@
-package com.xhkjedu.slog.controller.classroom;
+package com.xhkjedu.sclass.controller.classroom;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.slog.model.classroom.*;
-import com.xhkjedu.slog.model.paperstudent.TPaperStudent;
-import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
-import com.xhkjedu.slog.service.classroom.ClassroomPaperService;
-import com.xhkjedu.slog.service.classroom.ClassroomService;
-import com.xhkjedu.slog.vo.classroom.*;
-import com.xhkjedu.slog.vo.paper.CheckClassVo;
-import com.xhkjedu.slog.vo.paperstudent.StudentVo;
-import com.xhkjedu.slog.vo.room.RoomPVo;
-import com.xhkjedu.slog.vo.room.RoomParamVo;
+import com.xhkjedu.sclass.model.classroom.*;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.sclass.service.classroom.ClassroomPaperService;
+import com.xhkjedu.sclass.service.classroom.ClassroomService;
+import com.xhkjedu.sclass.vo.classroom.*;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
+import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
+import com.xhkjedu.sclass.vo.room.RoomPVo;
+import com.xhkjedu.sclass.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomVideoController.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.controller.classroom;
+package com.xhkjedu.sclass.controller.classroom;
 
-import com.xhkjedu.slog.model.classroom.TClassroomVideo;
-import com.xhkjedu.slog.service.classroom.ClassroomVideoService;
+import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
+import com.xhkjedu.sclass.service.classroom.ClassroomVideoService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;

sclass/src/main/java/com/xhkjedu/sclass/controller/status/StatusController.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.controller.status;
+package com.xhkjedu.sclass.controller.status;
 
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.GetMapping;

sclass/src/main/java/com/xhkjedu/sclass/interceptors/HttpServletFilter.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.interceptors;
+package com.xhkjedu.sclass.interceptors;
 
 import org.springframework.stereotype.Component;
 

sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestInterceptor.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.slog.interceptors;
+package com.xhkjedu.sclass.interceptors;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.exception.MissingParametersException;
-import com.xhkjedu.slog.utils.ClassUtil;
+import com.xhkjedu.sclass.utils.ClassUtil;
 import com.xhkjedu.utils.JedisUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;

sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestWrapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.interceptors;
+package com.xhkjedu.sclass.interceptors;
 
 import lombok.extern.slf4j.Slf4j;
 

sclass/src/main/java/com/xhkjedu/sclass/interceptors/WebMvcConfg.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.interceptors;
+package com.xhkjedu.sclass.interceptors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomActivestudentMapper.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroom;
-import com.xhkjedu.slog.model.classroom.TClassroomActivestudent;
+import com.xhkjedu.sclass.model.classroom.TClassroom;
+import com.xhkjedu.sclass.model.classroom.TClassroomActivestudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomAskstudentMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomAskstudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
 import org.apache.ibatis.annotations.Param;
 
 public interface ClassroomAskstudentMapper extends TkMapper<TClassroomAskstudent> {

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomAskteacherMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomAskteacher;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomFileMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomFile;
 import org.apache.ibatis.annotations.Param;
 
 public interface ClassroomFileMapper extends TkMapper<TClassroomFile> {

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomMapper.java

@@ -1,15 +1,15 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroom;
-import com.xhkjedu.slog.model.classroom.TClassroomFile;
-import com.xhkjedu.slog.vo.classroom.ObjectiveVo;
-import com.xhkjedu.slog.vo.classroom.ReportEQuestionVo;
-import com.xhkjedu.slog.vo.classroom.ReportExamVo;
-import com.xhkjedu.slog.vo.classroom.ReportRoomVo;
-import com.xhkjedu.slog.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.slog.vo.classroom.SubjectiveVo;
-import com.xhkjedu.slog.vo.paper.CheckClassVo;
+import com.xhkjedu.sclass.model.classroom.TClassroom;
+import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
+import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
+import com.xhkjedu.sclass.vo.classroom.ReportExamVo;
+import com.xhkjedu.sclass.vo.classroom.ReportRoomVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
+import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperFileMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaper;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperQtypeMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperQtype;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperScantronMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperScantron;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperStudentMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperStudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperStudentScantronMapper.java

@@ -1,8 +1,8 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperStudentScantron;
-import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomSignMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomSign;
+import com.xhkjedu.sclass.model.classroom.TClassroomSign;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomVideoMapper.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.mapper.classroom;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomVideo;
+import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/mapper/system/UserMapper.java

@@ -0,0 +1,10 @@
+package com.xhkjedu.sclass.mapper.system;
+
+import com.xhkjedu.vo.system.UserVo;
+import org.apache.ibatis.annotations.Param;
+
+public interface UserMapper {
+
+    //获取用户信息用于操作日志
+    UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
+}

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroom.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomActivestudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomAskstudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomAskteacher.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomFile.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperFile.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperQtype.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperStudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperStudentScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomSign.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomVideo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.classroom;
+package com.xhkjedu.sclass.model.classroom;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/paperstudent/TPaperStudent.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.paperstudent;
+package com.xhkjedu.sclass.model.paperstudent;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/model/paperstudent/TPaperStudentScantron.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.model.paperstudent;
+package com.xhkjedu.sclass.model.paperstudent;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;

sclass/src/main/java/com/xhkjedu/sclass/mq/HandleLogSender.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sclass.mq;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.model.slog.THandleLog;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/*
+ * @Description: 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 16:20:25
+ **/
+@Component
+public class HandleLogSender {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+    //生产者mq
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    //操作日志
+    public void handleLogSend(THandleLog handleLog) {
+        rabbitTemplate.convertAndSend(handleLogQueue, JSON.toJSONString(handleLog));
+    }
+
+}

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomPaperService.java

@@ -1,20 +1,20 @@
-package com.xhkjedu.slog.service.classroom;
+package com.xhkjedu.sclass.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperFileMapper;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperMapper;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperQtypeMapper;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperScantronMapper;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperStudentMapper;
-import com.xhkjedu.slog.mapper.classroom.ClassroomPaperStudentScantronMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaper;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperQtype;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperScantron;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperStudent;
-import com.xhkjedu.slog.model.classroom.TClassroomPaperStudentScantron;
-import com.xhkjedu.slog.model.paperstudent.TPaperStudentScantron;
-import com.xhkjedu.slog.utils.ArithUtil;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperQtypeMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperScantronMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentScantronMapper;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.sclass.utils.ArithUtil;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -1,12 +1,12 @@
-package com.xhkjedu.slog.service.classroom;
+package com.xhkjedu.sclass.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.slog.mapper.classroom.*;
-import com.xhkjedu.slog.model.classroom.*;
-import com.xhkjedu.slog.utils.ArithUtil;
-import com.xhkjedu.slog.vo.classroom.*;
-import com.xhkjedu.slog.vo.paper.CheckClassVo;
-import com.xhkjedu.slog.vo.room.RoomParamVo;
+import com.xhkjedu.sclass.mapper.classroom.*;
+import com.xhkjedu.sclass.model.classroom.*;
+import com.xhkjedu.sclass.utils.ArithUtil;
+import com.xhkjedu.sclass.vo.classroom.*;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
+import com.xhkjedu.sclass.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomVideoService.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.service.classroom;
+package com.xhkjedu.sclass.service.classroom;
 
-import com.xhkjedu.slog.mapper.classroom.ClassroomVideoMapper;
-import com.xhkjedu.slog.model.classroom.TClassroomVideo;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomVideoMapper;
+import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 

sclass/src/main/java/com/xhkjedu/sclass/task/UriMapTask.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.slog.task;
+package com.xhkjedu.sclass.task;
 
-import com.xhkjedu.slog.utils.ClassUtil;
+import com.xhkjedu.sclass.utils.ClassUtil;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

sclass/src/main/java/com/xhkjedu/sclass/utils/ArithUtil.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.utils;
+package com.xhkjedu.sclass.utils;
 
 import java.math.BigDecimal;
 

sclass/src/main/java/com/xhkjedu/sclass/utils/ClassUtil.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.utils;
+package com.xhkjedu.sclass.utils;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ObjectiveAnswerVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ObjectiveVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ReportEQuestionVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ReportExamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ReportRoomVo.java

@@ -1,6 +1,6 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
-import com.xhkjedu.slog.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomFile;
 import lombok.Data;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/RoomAskTeacherVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/RoomCorrectCallVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/RoomCorrectExamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/RoomCorrectVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/RoomVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/SubjectiveVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.classroom;
+package com.xhkjedu.sclass.vo.classroom;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/paper/CheckClassVo.java

@@ -1,7 +1,7 @@
-package com.xhkjedu.slog.vo.paper;
+package com.xhkjedu.sclass.vo.paper;
 
-import com.xhkjedu.slog.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.slog.vo.paperstudent.StudentVo;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
 import lombok.Data;
 
 import java.util.List;

sclass/src/main/java/com/xhkjedu/sclass/vo/paper/PaperVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.paper;
+package com.xhkjedu.sclass.vo.paper;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/paperstudent/StudentVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.paperstudent;
+package com.xhkjedu.sclass.vo.paperstudent;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/room/RoomPVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.room;
+package com.xhkjedu.sclass.vo.room;
 
 import lombok.Data;
 

sclass/src/main/java/com/xhkjedu/sclass/vo/room/RoomParamVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog.vo.room;
+package com.xhkjedu.sclass.vo.room;
 
 import lombok.Data;
 

sclass/src/main/resources/application.properties

@@ -37,7 +37,7 @@ mapper.mappers=com.xhkjedu.base.TkMapper
 mybatis.configuration.call-setters-on-nulls=true
 mapper.identity=MYSQL
 #打印日志
-logging.level.com.xhkjedu.slog.mapper=debug
+logging.level.com.xhkjedu.sclass.mapper=debug
 #分页
 spring.pagehelper.helper-dialect=mysql
 
@@ -57,12 +57,33 @@ redisdatatime=18000
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
 
+#操作日志生产者
+rabbitmq.handleLogQueue=xhkjedutest.xhschool.handleLogQueue_dev
+spring.rabbitmq.host=49.4.26.249
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=xhkjedu
+spring.rabbitmq.password=xhkjedud07
+spring.rabbitmq.connection-timeout=15000
+#rabbitmq自动签收
+spring.rabbitmq.listener.simple.acknowledge-mode=auto
+# 是否开启消费者重试（为false时关闭消费者重试）
+spring.rabbitmq.listener.simple.retry.enabled=true
+# 最大重试重新投递消息次数
+spring.rabbitmq.listener.simple.retry.max-attempts=3
+# 重试重新投递消息的间隔时间（单位毫秒）
+spring.rabbitmq.listener.simple.retry.initial-interval=30000ms
+#重试次数超过上面的设置之后，是否丢弃(消费者listener抛出异常，是否重回队列（默认true：重回队列，false：不重回队列（可结合死信交换机））
+spring.rabbitmq.listener.simple.default-requeue-rejected=false
+
 #定时任务
 #默认为false，不开启定时任务
 enable.scheduled=false
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
 
+#解析ip归属地数据
+ipregiondb=D:\\school\\ip2region.xdb
+
 #白名单接口
 whitelistAPI=/status/info
 

sclass/src/main/resources/mapper/classroom/ClassroomActivestudentMapper.xml

@@ -48,7 +48,7 @@
         select group_concat(asktid) from t_classroom_askteacher where roomid=#{roomid}
     </select>
     <!--课堂学生-->
-    <select id="listRoomStu" resultType="com.xhkjedu.slog.model.classroom.TClassroomActivestudent">
+    <select id="listRoomStu" resultType="com.xhkjedu.sclass.model.classroom.TClassroomActivestudent">
         select cs.studentid,(
             (select count(distinct s.userid) from t_classroom_sign s where s.roomid=#{roomid} and s.userid=cs.studentid)
         <if test="asktids!=null and asktids!=''">

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -16,7 +16,7 @@
         where r.roomid=#{roomid};
     </select>
     <!--获取批阅信息-->
-    <resultMap id="correctResult" type="com.xhkjedu.slog.vo.classroom.RoomCorrectVo">
+    <resultMap id="correctResult" type="com.xhkjedu.sclass.vo.classroom.RoomCorrectVo">
         <result property="roomid" column="roomid"></result>
         <result property="roomname" column="roomname"></result>
         <result property="createtime" column="createtime"></result>
@@ -24,21 +24,21 @@
         <result property="classname" column="classname"></result>
         <result property="gradeid" column="gradeid"></result>
         <result property="teachername" column="teachername"></result>
-        <collection property="calls" ofType="com.xhkjedu.slog.vo.classroom.RoomCorrectCallVo"
+        <collection property="calls" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo"
                     select="listCall" column="{roomid=roomid,realstunum=realstunum}">
         </collection>
-        <collection property="exams" ofType="com.xhkjedu.slog.vo.classroom.RoomCorrectExamVo"
+        <collection property="exams" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo"
                     select="listExam" column="{roomid=roomid,realstunum=realstunum}">
         </collection>
     </resultMap>
-    <select id="listCall" resultType="com.xhkjedu.slog.vo.classroom.RoomCorrectCallVo">
+    <select id="listCall" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo">
         select s.asktid,count(*)commitnum,count(*) stunum
         ,sum(case when s.radiocorrect!=0 then 1 else 0 end)correctnum
         from t_classroom_askstudent s left join t_classroom_askteacher rt on s.asktid=rt.asktid
         where rt.roomid=#{roomid} and rt.asktype between 32 and 33
         group by s.asktid order by rt.createtime
     </select>
-    <select id="listExam" resultType="com.xhkjedu.slog.vo.classroom.RoomCorrectExamVo">
+    <select id="listExam" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo">
         select s.paperid,p.papername,count(*)commitnum,count(*) stunum
         ,sum(case when s.pschecked!=0 then 1 else 0 end)correctnum
         from t_classroom_paper_student s left join t_classroom_paper p on s.paperid=p.paperid
@@ -55,13 +55,13 @@
     </select>
 
     <!--获取提问批改学生列表-->
-    <resultMap id="checkResult" type="com.xhkjedu.slog.vo.paper.CheckClassVo">
+    <resultMap id="checkResult" type="com.xhkjedu.sclass.vo.paper.CheckClassVo">
         <result property="classid" column="classid"></result>
         <result property="classnum" column="classnum"></result>
         <result property="ytjnum" column="ytjnum"></result>
         <result property="ypynum" column="ypynum"></result>
         <result property="teacherpic" column="teacherpic"></result>
-        <collection property="students" ofType="com.xhkjedu.slog.vo.paperstudent.StudentVo">
+        <collection property="students" ofType="com.xhkjedu.sclass.vo.paperstudent.StudentVo">
             <result property="psid" column="psid"></result>
             <result property="studentid" column="studentid"></result>
             <result property="studentname" column="studentname"></result>
@@ -90,7 +90,7 @@
         group by ps.psid order by ps.studentid
     </select>
 
-    <resultMap id="objectiveResult" type="com.xhkjedu.slog.vo.classroom.ObjectiveVo">
+    <resultMap id="objectiveResult" type="com.xhkjedu.sclass.vo.classroom.ObjectiveVo">
         <result property="typename" column="typename"></result>
         <result property="answer" column="answer"></result>
         <result property="correctrate" column="correctrate"></result>
@@ -98,7 +98,7 @@
         <result property="psscore" column="psscore"></result>
         <result property="avgscore" column="avgscore"></result>
         <result property="maxscore" column="maxscore"></result>
-        <collection property="answers" ofType="com.xhkjedu.slog.vo.classroom.ObjectiveAnswerVo">
+        <collection property="answers" ofType="com.xhkjedu.sclass.vo.classroom.ObjectiveAnswerVo">
             <result property="section" column="section"></result>
             <result property="stunum" column="stunum"></result>
             <result property="stuscore" column="stuscore"></result>
@@ -132,7 +132,7 @@
         group by pss.useranswer
     </select>
 
-    <resultMap id="subjectiveResult" type="com.xhkjedu.slog.vo.classroom.SubjectiveVo">
+    <resultMap id="subjectiveResult" type="com.xhkjedu.sclass.vo.classroom.SubjectiveVo">
         <result property="typename" column="typename"></result>
         <result property="correctrate" column="correctrate"></result>
         <result property="psorder" column="psorder"></result>
@@ -222,11 +222,11 @@
         <collection property="asks" ofType="java.util.Map"
                     select="listStuAsk" column="{roomid=roomid,studentid=studentid}">
         </collection>
-        <collection property="files" ofType="com.xhkjedu.slog.model.classroom.TClassroomFile"
+        <collection property="files" ofType="com.xhkjedu.sclass.model.classroom.TClassroomFile"
                     select="listFile" column="{roomid=roomid}">
         </collection>
     </resultMap>
-    <select id="listFile" resultType="com.xhkjedu.slog.model.classroom.TClassroomFile">
+    <select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
         select * from t_classroom_file where roomid=#{roomid}
     </select>
     <select id="getReportStu" resultMap="stuRoomResult">
@@ -324,7 +324,7 @@
         <result property="wpynum" column="wpynum"></result>
         <result property="classnum" column="classnum"></result>
         <result property="signstate" column="signstate"></result>
-        <collection property="hdlist" ofType="com.xhkjedu.slog.vo.classroom.RoomAskTeacherVo"
+        <collection property="hdlist" ofType="com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo"
                     select="listAskTeachersForRoom" column="{roomid=roomid}">
             <result property="asktid" column="asktid"></result>
             <result property="asktype" column="asktype"></result>
@@ -362,7 +362,7 @@
         </if>
         ORDER BY c.createtime DESC
     </select>
-    <select id="listAskTeachersForRoom" resultType="com.xhkjedu.slog.vo.classroom.RoomAskTeacherVo">
+    <select id="listAskTeachersForRoom" resultType="com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo">
         select asktid,asktype from t_classroom_askteacher where roomid=#{roomid}
     </select>
     <select id="listFilesForRoom" resultType="java.util.Map">
@@ -386,7 +386,7 @@
         </foreach>
     </update>
     <!--课堂回顾详情-->
-    <select id="getReport" resultType="com.xhkjedu.slog.vo.classroom.ReportRoomVo">
+    <select id="getReport" resultType="com.xhkjedu.sclass.vo.classroom.ReportRoomVo">
         select r.roomname,r.classnum,r.realstunum,r.createtime,r.endtime,c.classname,c.gradeid,u.username createname
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=20)asknum
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=21)callnum
@@ -426,11 +426,11 @@
         order by convert(u.username using gbk)
     </select>
     <!--课堂截图列表-->
-    <select id="listFileReport" resultType="com.xhkjedu.slog.model.classroom.TClassroomFile">
+    <select id="listFileReport" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
         select * from t_classroom_file f where f.roomid=#{roomid} order by f.createtime
     </select>
     <!--课堂考试列表-->
-    <select id="listExamReport" resultType="com.xhkjedu.slog.vo.classroom.ReportEQuestionVo">
+    <select id="listExamReport" resultType="com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo">
         select ps.paperid,ps.psorder,ps.psanswer,ps.psscore,ps.ctypename,ps.ctype,ps.pscaid
         ,sum(case when q.answered=1 then 1 else 0 end)commitrate
         ,sum(case when q.stuscore=ps.psscore then 1 else 0 end)correctrate
@@ -443,7 +443,7 @@
         group by ps.pscaid order by ps.psorder
     </select>
     <!--获取课堂考试列表-->
-    <select id="listPaper" resultType="com.xhkjedu.slog.vo.classroom.ReportExamVo">
+    <select id="listPaper" resultType="com.xhkjedu.sclass.vo.classroom.ReportExamVo">
         SELECT p.paperid,p.papername,c.classid,ifnull(truncate(SUM(ps.stuscore)*100/(p.paperscore*COUNT(ps.psid)),2),0)scorerate
         ,ifnull(truncate(SUM(ps.stuscore)/COUNT(ps.psid),2),0)avgscore,ifnull(MAX(ps.stuscore),0)maxscore,COUNT(ps.psid)ytjnum
         FROM t_classroom_paper p
@@ -490,7 +490,7 @@
         </foreach>
     </update>
     <!--根据班级ids获取学生数量-->
-    <select id="listStudentNumByClassIds" resultType="com.xhkjedu.slog.model.classroom.TClassroom">
+    <select id="listStudentNumByClassIds" resultType="com.xhkjedu.sclass.model.classroom.TClassroom">
         SELECT classid,classnum FROM t_class WHERE classid in
         <foreach collection="classids" item="classid" open="(" close=")" separator=",">
             ${classid}

sclass/src/main/resources/mapper/classroom/ClassroomPaperFileMapper.xml

@@ -2,14 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper">
     <!-- 根据作业id获取作业附件 -->
-    <select id="listObjsByPaperid" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperFile">
+    <select id="listObjsByPaperid" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperFile">
         SELECT pfid,paperid,filepath,fileclass,fileorder,createtime
         FROM
         <if test="qctype==2">t_paper_file</if>
         <if test="qctype==3">t_classroom_paper_file</if>
         WHERE paperid=#{paperid} ORDER BY fileorder asc
     </select>
-    <select id="listFilepath" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperFile">
+    <select id="listFilepath" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperFile">
         SELECT paperid,filepath FROM t_classroom_paper_file
         WHERE paperid in
         <foreach collection="paperids" item="paperid" index="index" open="(" separator="," close=")">

sclass/src/main/resources/mapper/classroom/ClassroomPaperScantronMapper.xml

@@ -13,7 +13,7 @@
     </insert>
 
     <!--获取试题详情-->
-    <select id="listByIds" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperScantron">
+    <select id="listByIds" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron">
         select pscaid,psanswer,ctype from t_classroom_paper_scantron where pscaid in
         <foreach collection="pscaids" item="pscaid" index="index" open="(" separator="," close=")">
             ${pscaid}

sclass/src/main/resources/mapper/classroom/ClassroomPaperStudentMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper">
     <!--获取考试学生信息-->
-    <select id="findById" resultType="com.xhkjedu.slog.model.classroom.TClassroomPaperStudent">
+    <select id="findById" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent">
         select s.*,p.subjectid,p.papername from t_classroom_paper_student s
         left join t_classroom_paper p on p.paperid=s.paperid
         where s.psid=#{psid} limit 1

sclass/src/main/resources/mapper/system/UserMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sclass.mapper.system.UserMapper">
+
+    <!--获取用户信息用于操作日志-->
+    <select id="getUserInfoForHandleLog" resultType="com.xhkjedu.vo.system.UserVo">
+        select userid,username,loginname,usertype,schoolid from t_user where userid=#{userid}
+    </select>
+</mapper>

sclass/src/test/java/com/xhkjedu/sclass/SclassApplicationTests.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.slog;
+package com.xhkjedu.sclass;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

scommons/src/main/java/com/xhkjedu/vo/system/UserVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.suser.vo.system;
+package com.xhkjedu.vo.system;
 
 import lombok.Data;
 
@@ -120,6 +120,9 @@ public class UserVo {
     //科目id
     private String subjectid;
 
+    //班级id
+    private Integer classid;
+
     //有效期
     private String usertime;
     private String token_key;

sexam/src/main/java/com/xhkjedu/sexam/aop/WebControllerAop.java

@@ -0,0 +1,218 @@
+package com.xhkjedu.sexam.aop;
+
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.sexam.config.ConfigKey;
+import com.xhkjedu.sexam.interceptors.RequestWrapper;
+import com.xhkjedu.sexam.listener.HandleLogSender;
+import com.xhkjedu.sexam.mapper.system.UserMapper;
+import com.xhkjedu.utils.IpRegionUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+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;
+
+/*
+ * @Description: AOP 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 18:52:24
+ **/
+@Aspect
+@Component
+@Slf4j
+public class WebControllerAop {
+    @Resource
+    private HandleLogSender handleLogSender;
+    @Resource
+    private UserMapper userMapper;
+
+    private THandleLog handleLog;
+
+    /*
+     * @Description 指定切点 匹配 使用@Action修饰所有方法
+     * @Date 2023/11/15 18:52:48
+     * @Author WN
+     * @Return void
+     **/
+    @Pointcut("execution(public * com.xhkjedu.sexam.controller..*.*(..))")
+    public void handleLog() {
+    }
+
+    /*
+     * @Description 前置通知，方法调用前被调用
+     * @Date 2023/11/15 17:46:51
+     * @Param [joinPoint]
+     **/
+    @Before("handleLog()")
+    public void doBefore(JoinPoint joinPoint){
+
+        //获取方法
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        // 获取AspectAnnotation注解
+        Action action = method.getAnnotation(Action.class);
+        if (action == null) {
+            handleLog = null;
+            return;
+        }
+        // 在此处初始化，避免某些方法不用记录报错
+        handleLog = new THandleLog();
+
+        // 获取方法名字
+        String value = action.value();
+        String[] valueStr = value.split("-");
+        // 操作名称
+        handleLog.setHandlemodel(valueStr[0]);
+        handleLog.setHandleaction(valueStr[1]);
+
+        if(joinPoint.getArgs() != null && joinPoint.getArgs().length > 0){
+            Object[] args = joinPoint.getArgs();
+            RequestWrapper st = (RequestWrapper) args[1];
+            // 设置请求参数
+            handleLog.setHandleparas(st.getBody());
+        }
+
+        try {
+            ServletRequestAttributes ss = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (ss != null) {
+                HttpServletRequest request = ss.getRequest();
+                Integer userid = request.getIntHeader(PlatformConstant.XH_USER_ID);
+                // 用户名
+                handleLog.setUserid(request.getIntHeader(PlatformConstant.XH_USER_ID));
+                handleLog.setDevicetype(request.getHeader(PlatformConstant.XH_DEVICE));
+                handleLog.setVersionnum(request.getHeader(PlatformConstant.XH_VERSION));
+                // 请求地址
+                handleLog.setHandleurl("/sexam" + request.getRequestURI());
+
+                //获取请求ip并解析区域
+                String ip = N_Utils.getIpAddress(request);
+                String region = null;
+                if (N_Utils.isNotEmpty(ip)) {
+                    IpRegionUtil ipRegionUtil = new IpRegionUtil();
+                    region = ipRegionUtil.getIpForAddress(ip, ConfigKey.ipregiondb);
+                }
+                handleLog.setHandleip(ip);
+                handleLog.setHandleaddress(region);
+                if(N_Utils.isTrueInteger(userid)){
+                    UserVo user = userMapper.getUserInfoForHandleLog(userid);
+                    if(user != null){
+                        handleLog.setUsertype(user.getUsertype());
+                        handleLog.setSchoolid(user.getSchoolid());
+                        handleLog.setUsername(user.getUsername());
+                        handleLog.setLoginname(user.getLoginname());
+                        if(N_Utils.isNotEmpty(handleLog.getDevicetype()) && "p_web".equals(handleLog.getDevicetype())){
+                            if(user.getUsertype() == 2){
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_s");
+                            }else{
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_t");
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /*
+     * @Description 处理完请求返回内容 发送mq消息
+     * @Date 2023/11/15 17:47:12
+     * @Author WN
+     * @Param [ret]
+     **/
+    @AfterReturning(returning = "ret", pointcut = "handleLog()")
+    public void doAfterReturning(Object ret){
+        if (ret == null) {
+            return;
+        }
+        if (handleLog == null) {
+            return;
+        }
+
+        if (ret instanceof ResultVo) {
+            ResultVo result = (ResultVo) ret;
+            if (result.getCode() == 0) {
+                handleLog.setHandlestate(1);
+            } else {
+                handleLog.setHandlestate(2);
+            }
+        }
+    }
+
+    /*
+     * @Description  后置异常
+     * @Date 2023/11/15 17:47:28
+     * @Author WN
+     * @Param [jp, e] (JoinPoint jp, Exception e)
+     **/
+    @AfterThrowing(pointcut = "handleLog()", throwing = "e")
+    public void throwss(Exception e) {
+
+        if (handleLog == null) {
+            return;
+        }
+
+        handleLog.setHandlestate(2);
+
+        log.info("方法异常时执行....." + e.getMessage());
+    }
+
+    /*
+     * @Description 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行
+     * @Date 2023/11/15 17:49:15
+     * @Author WN
+     * @Param [jp](JoinPoint jp)
+     **/
+    @After("handleLog()")
+    public void after() {
+        if (handleLog == null) {
+            return;
+        }
+        sendOut();
+        log.info("后置最终通知");
+    }
+
+    /*
+     * @Description 环绕通知,环绕增强，相当于MethodInterceptor
+     * @Date 2023/11/15 17:49:34
+     * @Author WN
+     * @Param [pjp]
+     * @Return java.lang.Object
+     **/
+    @Around("handleLog()")
+    public Object arround(ProceedingJoinPoint pjp) {
+        try {
+            return pjp.proceed();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            if (e instanceof Exception) {
+                throw new ServiceException(e.getMessage());
+            }
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(handleLog);
+    }
+
+}

sexam/src/main/java/com/xhkjedu/sexam/config/ConfigKey.java

@@ -69,4 +69,11 @@ public class ConfigKey {
         this.buildnum = buildnum;
     }
 
+    public static String ipregiondb;//解析ip地址归属地
+
+    @Value("${ipregiondb}")
+    public void setIpregiondb(String ipregiondb){
+        ConfigKey.ipregiondb = ipregiondb;
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/config/RabbitConfig.java

@@ -92,4 +92,13 @@ public class RabbitConfig {
     public Queue examBaseToScanImgQueue2(){ return new Queue(examBaseToScanImgQueue2);}
     @Bean
     public Queue examImgToPdfQueue2(){ return new Queue(examImgToPdfQueue2);}
+
+    //生产者mq-操作日志
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    @Bean
+    public Queue handleLogQueue() {
+        return new Queue(handleLogQueue);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -15,12 +15,12 @@ import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
 import com.xhkjedu.sexam.vo.paper.EPaperVo;
-import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

sexam/src/main/java/com/xhkjedu/sexam/listener/HandleLogSender.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sexam.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.model.slog.THandleLog;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/*
+ * @Description: 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 16:20:25
+ **/
+@Component
+public class HandleLogSender {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+    //生产者mq
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    //操作日志
+    public void handleLogSend(THandleLog handleLog) {
+        rabbitTemplate.convertAndSend(handleLogQueue, JSON.toJSONString(handleLog));
+    }
+
+}

sexam/src/main/java/com/xhkjedu/sexam/mapper/system/UserMapper.java

@@ -1,6 +1,6 @@
 package com.xhkjedu.sexam.mapper.system;
 
-import com.xhkjedu.sexam.vo.system.UserVo;
+import com.xhkjedu.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -36,4 +36,7 @@ public interface UserMapper {
 
     //根据用户id获取用户所属学校id
     Integer getSchoolidByUserid(@Param("userid")Integer userid);
+
+    //获取用户信息用户操作日志
+    UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -14,9 +14,9 @@ import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
-import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

sexam/src/main/java/com/xhkjedu/sexam/service/notice/NoticeService.java

@@ -8,8 +8,8 @@ import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.utils.SMSSender;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
 import com.xhkjedu.sexam.vo.exam.ZtMsgVo;
-import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperCorrectTeacherService.java

@@ -10,9 +10,9 @@ import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.vo.paper.EPCTeacherVo;
 import com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo;
 import com.xhkjedu.sexam.vo.paper.EPaperVo;
-import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -25,8 +25,8 @@ import com.xhkjedu.sexam.utils.ConvertUtil;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paper.QuestionPointVo;
 import com.xhkjedu.sexam.vo.report.*;
-import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

sexam/src/main/resources/application.properties

@@ -69,6 +69,9 @@ rabbitmq.examBaseToPdfQueue2=xhkjedutest.xhschool.examBaseToPdfQueue_node02_dev
 rabbitmq.examBaseToScanImgQueue2=xhkjedutest.xhschool.examBaseToScanImgQueue_node02_dev
 rabbitmq.examImgToPdfQueue2=xhkjedutest.xhschool.examImgToPdfQueue_node02_dev
 
+#操作日志生产者
+rabbitmq.handleLogQueue=xhkjedutest.xhschool.handleLogQueue_dev
+
 spring.rabbitmq.host=49.4.26.249
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu
@@ -108,6 +111,9 @@ exam.face=https://face.xhkjedu.com/
 #配置考试结束时间范围
 exam.endtime=30
 
+#解析ip归属地数据
+ipregiondb=D:\\school\\ip2region.xdb
+
 #白名单接口
 whitelistAPI=/pdf,/status/info
 

sexam/src/main/resources/mapper/system/UserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sexam.mapper.system.UserMapper">
     <!--根据用户ids查找手机号-->
-    <select id="listPhoneByUserIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
+    <select id="listPhoneByUserIds" resultType="com.xhkjedu.vo.system.UserVo">
         select userid,userphone from t_user where userid in
         <foreach collection="userids" item="userid" open="(" separator="," close=")">
             ${userid}
@@ -16,7 +16,7 @@
         where ec.examid=#{examid}
     </select>
     <!--获取考试班级任教老师-->
-    <select id="listTeacherByClassIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
+    <select id="listTeacherByClassIds" resultType="com.xhkjedu.vo.system.UserVo">
         select u.userid,u.userphone
         from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
         where ct.classid in(${classids}) and u.userstate=1
@@ -47,7 +47,7 @@
         select userid from t_user where examno=#{examno}
     </select>
     <!--根据用户ids查找用户姓名-->
-    <select id="listNameByUserIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
+    <select id="listNameByUserIds" resultType="com.xhkjedu.vo.system.UserVo">
         select userid,username,loginname from t_user where userid in
         <foreach collection="userids" item="userid" open="(" separator="," close=")">
             ${userid}
@@ -69,4 +69,9 @@
     <select id="getSchoolidByUserid" resultType="java.lang.Integer">
         select schoolid from t_user where userid=#{userid}
     </select>
+
+    <!--获取用户信息用于操作日志-->
+    <select id="getUserInfoForHandleLog" resultType="com.xhkjedu.vo.system.UserVo">
+        select userid,username,loginname,usertype,schoolid from t_user where userid=#{userid}
+    </select>
 </mapper>

slive/src/main/java/com/xhkjedu/slive/aop/WebControllerAop.java

@@ -0,0 +1,218 @@
+package com.xhkjedu.slive.aop;
+
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.slive.config.ConfigKey;
+import com.xhkjedu.slive.interceptors.RequestWrapper;
+import com.xhkjedu.slive.listener.HandleLogSender;
+import com.xhkjedu.slive.mapper.system.UserMapper;
+import com.xhkjedu.utils.IpRegionUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+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;
+
+/*
+ * @Description: AOP 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 18:52:24
+ **/
+@Aspect
+@Component
+@Slf4j
+public class WebControllerAop {
+    @Resource
+    private HandleLogSender handleLogSender;
+    @Resource
+    private UserMapper userMapper;
+
+    private THandleLog handleLog;
+
+    /*
+     * @Description 指定切点 匹配 使用@Action修饰所有方法
+     * @Date 2023/11/15 18:52:48
+     * @Author WN
+     * @Return void
+     **/
+    @Pointcut("execution(public * com.xhkjedu.slive.controller..*.*(..))")
+    public void handleLog() {
+    }
+
+    /*
+     * @Description 前置通知，方法调用前被调用
+     * @Date 2023/11/15 17:46:51
+     * @Param [joinPoint]
+     **/
+    @Before("handleLog()")
+    public void doBefore(JoinPoint joinPoint){
+
+        //获取方法
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        // 获取AspectAnnotation注解
+        Action action = method.getAnnotation(Action.class);
+        if (action == null) {
+            handleLog = null;
+            return;
+        }
+        // 在此处初始化，避免某些方法不用记录报错
+        handleLog = new THandleLog();
+
+        // 获取方法名字
+        String value = action.value();
+        String[] valueStr = value.split("-");
+        // 操作名称
+        handleLog.setHandlemodel(valueStr[0]);
+        handleLog.setHandleaction(valueStr[1]);
+
+        if(joinPoint.getArgs() != null && joinPoint.getArgs().length > 0){
+            Object[] args = joinPoint.getArgs();
+            RequestWrapper st = (RequestWrapper) args[1];
+            // 设置请求参数
+            handleLog.setHandleparas(st.getBody());
+        }
+
+        try {
+            ServletRequestAttributes ss = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (ss != null) {
+                HttpServletRequest request = ss.getRequest();
+                Integer userid = request.getIntHeader(PlatformConstant.XH_USER_ID);
+                // 用户名
+                handleLog.setUserid(request.getIntHeader(PlatformConstant.XH_USER_ID));
+                handleLog.setDevicetype(request.getHeader(PlatformConstant.XH_DEVICE));
+                handleLog.setVersionnum(request.getHeader(PlatformConstant.XH_VERSION));
+                // 请求地址
+                handleLog.setHandleurl("/slive" + request.getRequestURI());
+
+                //获取请求ip并解析区域
+                String ip = N_Utils.getIpAddress(request);
+                String region = null;
+                if (N_Utils.isNotEmpty(ip)) {
+                    IpRegionUtil ipRegionUtil = new IpRegionUtil();
+                    region = ipRegionUtil.getIpForAddress(ip, ConfigKey.ipregiondb);
+                }
+                handleLog.setHandleip(ip);
+                handleLog.setHandleaddress(region);
+                if(N_Utils.isTrueInteger(userid)){
+                    UserVo user = userMapper.getUserInfoForHandleLog(userid);
+                    if(user != null){
+                        handleLog.setUsertype(user.getUsertype());
+                        handleLog.setSchoolid(user.getSchoolid());
+                        handleLog.setUsername(user.getUsername());
+                        handleLog.setLoginname(user.getLoginname());
+                        if(N_Utils.isNotEmpty(handleLog.getDevicetype()) && "p_web".equals(handleLog.getDevicetype())){
+                            if(user.getUsertype() == 2){
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_s");
+                            }else{
+                                handleLog.setDevicetype(handleLog.getDevicetype()+"_t");
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /*
+     * @Description 处理完请求返回内容 发送mq消息
+     * @Date 2023/11/15 17:47:12
+     * @Author WN
+     * @Param [ret]
+     **/
+    @AfterReturning(returning = "ret", pointcut = "handleLog()")
+    public void doAfterReturning(Object ret){
+        if (ret == null) {
+            return;
+        }
+        if (handleLog == null) {
+            return;
+        }
+
+        if (ret instanceof ResultVo) {
+            ResultVo result = (ResultVo) ret;
+            if (result.getCode() == 0) {
+                handleLog.setHandlestate(1);
+            } else {
+                handleLog.setHandlestate(2);
+            }
+        }
+    }
+
+    /*
+     * @Description  后置异常
+     * @Date 2023/11/15 17:47:28
+     * @Author WN
+     * @Param [jp, e] (JoinPoint jp, Exception e)
+     **/
+    @AfterThrowing(pointcut = "handleLog()", throwing = "e")
+    public void throwss(Exception e) {
+
+        if (handleLog == null) {
+            return;
+        }
+
+        handleLog.setHandlestate(2);
+
+        log.info("方法异常时执行....." + e.getMessage());
+    }
+
+    /*
+     * @Description 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行
+     * @Date 2023/11/15 17:49:15
+     * @Author WN
+     * @Param [jp](JoinPoint jp)
+     **/
+    @After("handleLog()")
+    public void after() {
+        if (handleLog == null) {
+            return;
+        }
+        sendOut();
+        log.info("后置最终通知");
+    }
+
+    /*
+     * @Description 环绕通知,环绕增强，相当于MethodInterceptor
+     * @Date 2023/11/15 17:49:34
+     * @Author WN
+     * @Param [pjp]
+     * @Return java.lang.Object
+     **/
+    @Around("handleLog()")
+    public Object arround(ProceedingJoinPoint pjp) {
+        try {
+            return pjp.proceed();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            if (e instanceof Exception) {
+                throw new ServiceException(e.getMessage());
+            }
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(handleLog);
+    }
+
+}

slive/src/main/java/com/xhkjedu/slive/config/RabbitConfig.java

@@ -20,4 +20,13 @@ public class RabbitConfig {
     public Queue queueA() {
         return new Queue(rabbitmqQueue); //队列持久
     }
+
+    //生产者mq-操作日志
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    @Bean
+    public Queue handleLogQueue() {
+        return new Queue(handleLogQueue);
+    }
 }

slive/src/main/java/com/xhkjedu/slive/listener/HandleLogSender.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.slive.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.model.slog.THandleLog;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/*
+ * @Description: 操作日志
+ * @Author: WN
+ * @Date: 2023/11/15 16:20:25
+ **/
+@Component
+public class HandleLogSender {
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+    //生产者mq
+    @Value("${rabbitmq.handleLogQueue}")
+    private String handleLogQueue;
+
+    //操作日志
+    public void handleLogSend(THandleLog handleLog) {
+        rabbitTemplate.convertAndSend(handleLogQueue, JSON.toJSONString(handleLog));
+    }
+
+}

slive/src/main/java/com/xhkjedu/slive/mapper/system/UserMapper.java

@@ -1,5 +1,7 @@
 package com.xhkjedu.slive.mapper.system;
 
+import com.xhkjedu.vo.system.UserVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Map;
@@ -30,4 +32,7 @@ public interface UserMapper {
 
     //根据用户id获取用户信息
     Map getObjById(Integer userid);
+
+    //获取用户信息用于操作日志
+    UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
 }

slive/src/main/resources/application.properties

@@ -59,6 +59,8 @@ redisdatatime=18000
 secretKey=nanhuakaizhangjianwangni
 
 rabbitmq.queue=xhkjedutest.xhschool.livequeue_dev
+#操作日志生产者
+rabbitmq.handleLogQueue=xhkjedutest.xhschool.handleLogQueue_dev
 spring.rabbitmq.host=49.4.26.249
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu

slive/src/main/resources/mapper/system/UserMapper.xml

@@ -30,4 +30,9 @@
         select u.userid,u.username,u.loginname,u.usertype,u.userstate,u.schoolid
         from t_user u where u.userid=#{userid} limit 1
     </select>
+
+    <!--获取用户信息用于操作日志-->
+    <select id="getUserInfoForHandleLog" resultType="com.xhkjedu.vo.system.UserVo">
+        select userid,username,loginname,usertype,schoolid from t_user where userid=#{userid}
+    </select>
 </mapper>