Merge branch 'wn'

# Conflicts:
#	sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/RequestInterceptor.java
#	sstudy/src/main/resources/application.properties

README.md

@@ -7,8 +7,9 @@ sexam考试
 slive直播  
 sstudy作业相  
 suser用户  
-sapi分析及其他  
-scommons公共   
+sapi分析及其他
+slog操作日志
+scommons公共
 
 资源说明   version 版本  
 subject 科目  

gateway/pom.xml

@@ -43,7 +43,32 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
+        </dependency>
+         <!--redis -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/tk.mybatis/mapper-spring-boot-starter -->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.0.2</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

gateway/src/main/java/com/xhkjedu/gateway/GatewayApplication.java

@@ -2,10 +2,10 @@ package com.xhkjedu.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import tk.mybatis.spring.annotation.MapperScan;
 
-@SpringBootApplication
-@EnableEurekaClient
+@SpringBootApplication(scanBasePackages = "com.xhkjedu")
+@MapperScan("com.xhkjedu.gateway.mapper")
 public class GatewayApplication {
 
     public static void main(String[] args) {

gateway/src/main/java/com/xhkjedu/gateway/advice/GlobalExceptionHandlerAdvice.java

@@ -0,0 +1,58 @@
+package com.xhkjedu.gateway.advice;
+
+import com.google.common.base.Throwables;
+import com.xhkjedu.gateway.exceptions.GatewayException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.net.ConnectException;
+
+/**
+ * @Description 这个不是SpringMVC统一异常处理（具体说明详见：ExceptionHandlerCore）
+ * @Author: YWX
+ * @Date 2023/11/15 17:52
+ **/
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandlerAdvice {
+
+    @ExceptionHandler(GatewayException.class)
+    public ResultVo handler(GatewayException e) {
+        return new ResultVo(e.getCode(), e.getMsg());
+    }
+
+    @ExceptionHandler(ResponseStatusException.class)
+    public ResultVo handler(ResponseStatusException e) {
+        return new ResultVo(1, e.getReason());
+    }
+
+    @ExceptionHandler(ConnectException.class)
+    public ResultVo handler(ConnectException e) {
+        log.error(Throwables.getStackTraceAsString(e));
+        return new ResultVo(1, "网络异常,请稍候再试!");
+    }
+
+    @ExceptionHandler(Throwable.class)
+    public ResultVo handler(Throwable e) {
+        log.error(Throwables.getStackTraceAsString(e));
+        return new ResultVo(1, "服务器异常");
+    }
+
+}
+
+@Data
+@AllArgsConstructor
+class ResultVo{
+    private Integer code;// 返回是否成功  0成功 1失败
+    private String msg;// 返回提示信息
+    private Object obj;// 返回对象或者对象列表
+
+    public ResultVo(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

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

@@ -17,4 +17,18 @@ public class ConfigKey {
         ConfigKey.rqovertime = rqovertime;
     }
 
+    public static Integer redisumtime;//缓存用户权限模块有效时长
+
+    @Value("${redisumtime}")
+    public void setRedisumtime(Integer redisumtime) {
+        ConfigKey.redisumtime = redisumtime;
+    }
+
+    public static Integer redismoduletime;//缓存模块对应操作有效时长
+
+    @Value("${redismoduletime}")
+    public void setRedismoduletime(Integer redismoduletime) {
+        ConfigKey.redismoduletime = redismoduletime;
+    }
+
 }

gateway/src/main/java/com/xhkjedu/gateway/config/SpringContextHolder.java

@@ -0,0 +1,68 @@
+package com.xhkjedu.gateway.config;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+@Component
+public class SpringContextHolder implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringContextHolder.applicationContext = applicationContext;
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        assertApplicationContext();
+        return applicationContext;
+    }
+
+    /**
+     * 通过实例类型获取实例
+     *
+     * @param requiredType 实例类型
+     * @param <T>          T
+     * @return T
+     */
+    public static <T> T getBean(Class<T> requiredType) {
+        assertApplicationContext();
+        return applicationContext.getBean(requiredType);
+    }
+
+    /**
+     * 通过实例，名称获取实例
+     *
+     * @param beanName 实例名称
+     * @param <T>      T
+     * @return T
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getBean(String beanName) {
+        assertApplicationContext();
+        return (T) applicationContext.getBean(beanName);
+    }
+
+    /**
+     * 通过类上的注解获取类
+     *
+     * @param annotation anno
+     * @return map
+     */
+    public static Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotation) {
+        assertApplicationContext();
+        return applicationContext.getBeansWithAnnotation(annotation);
+    }
+
+    private static void assertApplicationContext() {
+        if (SpringContextHolder.applicationContext == null) {
+            throw new RuntimeException("application Context属性为null,请检查是否注入了SpringContextHolder!");
+        }
+    }
+
+}

gateway/src/main/java/com/xhkjedu/gateway/exceptions/GatewayException.java

@@ -0,0 +1,14 @@
+package com.xhkjedu.gateway.exceptions;
+
+import lombok.Getter;
+
+@Getter
+public class GatewayException extends RuntimeException {
+    private Integer code;
+    private String msg;
+
+    public GatewayException(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

gateway/src/main/java/com/xhkjedu/gateway/handler/ErrorHandlerConfiguration.java

@@ -0,0 +1,58 @@
+package com.xhkjedu.gateway.handler;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.WebProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.reactive.error.ErrorAttributes;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.codec.ServerCodecConfigurer;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.result.view.ViewResolver;
+
+import java.util.Collections;
+import java.util.List;
+
+@Component
+@EnableConfigurationProperties({ServerProperties.class, WebProperties.class})
+public class ErrorHandlerConfiguration {
+
+    private final ServerProperties serverProperties;
+
+    private final ApplicationContext applicationContext;
+
+    private final WebProperties resourceProperties;
+
+    private final List<ViewResolver> viewResolvers;
+
+    private final ServerCodecConfigurer serverCodecConfigurer;
+
+    public ErrorHandlerConfiguration(ServerProperties serverProperties,
+                                     WebProperties resourceProperties,
+                                     ObjectProvider<List<ViewResolver>> viewResolversProvider,
+                                     ServerCodecConfigurer configurer,
+                                     ApplicationContext applicationContext) {
+        this.serverProperties = serverProperties;
+        this.applicationContext = applicationContext;
+        this.resourceProperties = resourceProperties;
+        this.viewResolvers = viewResolversProvider.getIfAvailable(Collections::emptyList);
+        this.serverCodecConfigurer = configurer;
+    }
+
+    @Bean
+    @Order
+    public ErrorWebExceptionHandler errorWebExceptionHandler(ErrorAttributes attributes) {
+        GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(
+                attributes,
+                this.resourceProperties,
+                this.serverProperties.getError(),
+                this.applicationContext);
+        exceptionHandler.setViewResolvers(this.viewResolvers);
+        exceptionHandler.setMessageWriters(this.serverCodecConfigurer.getWriters());
+        exceptionHandler.setMessageReaders(this.serverCodecConfigurer.getReaders());
+        return exceptionHandler;
+    }
+}

gateway/src/main/java/com/xhkjedu/gateway/handler/ExceptionHandlerCore.java

@@ -0,0 +1,156 @@
+package com.xhkjedu.gateway.handler;
+
+import com.google.common.collect.Maps;
+import com.xhkjedu.gateway.config.SpringContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * @Description 虽然spring webflux支持springMVC注解，
+ *但是，Filter抛出的异常不属于MVC层，所以，处理Filter抛出的异常依旧不能用SpringMVC那一套注解
+ *但是我们可以自己模仿做一套和MVC类似的注解
+ *该处理类使用SpringMVC的注解
+ *让用户可以无感知的像处理MVC层抛出的异常那样处理Filter抛出的异常
+ * @Author: YWX
+ * @Date 2023/11/16 8:56
+ **/
+@Slf4j
+@Component
+public class ExceptionHandlerCore implements ApplicationRunner {
+
+    /**
+     * key是处理异常的类型
+     * value是处理异常的方法
+     */
+    private LinkedHashMap<Class<? extends Throwable>, Node> exceptionHandlerMap;
+
+    /**
+     * 解析类上的注解
+     * 将处理异常的方法注册到map中
+     */
+    private void register(Object exceptionAdvice) {
+        Method[] methods = exceptionAdvice.getClass().getMethods();
+        Arrays.stream(methods).forEach(method -> {
+            ExceptionHandler exceptionHandler = method.getAnnotation(ExceptionHandler.class);
+            if (Objects.isNull(exceptionHandler)) {
+                return;
+            }
+            ResponseStatus responseStatus = method.getAnnotation(ResponseStatus.class);
+            HttpStatus status = null;
+            if (Objects.nonNull(responseStatus)) {
+                status = responseStatus.value();
+            }
+            HttpStatus finalStatus = status;
+            Arrays.asList(exceptionHandler.value()).forEach(a -> exceptionHandlerMap.put(a, new Node(method, exceptionAdvice, finalStatus)));
+        });
+    }
+
+    /**
+     * 根据异常对象获取解决异常的方法
+     *
+     * @param throwable 异常对象
+     * @return handler method
+     */
+    private Node getHandlerExceptionMethodNode(Throwable throwable) {
+        ArrayList<Class<?>> superClass = this.getSuperClass(throwable.getClass());
+        for (Class<?> aClass : superClass) {
+            Node handlerNode = null;
+            if ((handlerNode = exceptionHandlerMap.get(aClass)) != null) {
+                return handlerNode;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        Map<String, Object> beans = SpringContextHolder.getBeansWithAnnotation(RestControllerAdvice.class);
+        log.info("-------------异常处理对象获取完毕-------------");
+        exceptionHandlerMap = Maps.newLinkedHashMapWithExpectedSize(beans.size());
+        log.info("-------------异常处理容器内存分配完毕-------------");
+        beans.keySet()
+             .stream()
+             .map(beans::get)
+             .forEach(this::register);
+        log.info("-------------异常处理方法注册完毕-------------");
+    }
+
+    /**
+     * 对外暴露的处理异常的方法
+     *
+     * @param throwable 处理的异常
+     * @return 调用异常后的返回值
+     */
+    public HashMap<String, Object> handlerException(Throwable throwable) {
+        Node exceptionMethodNode = this.getHandlerExceptionMethodNode(throwable);
+        if (Objects.isNull(exceptionMethodNode)) {
+            log.error("未定义异常处理方法，处理异常失败,异常处理信息如下：{}", throwable.getMessage());
+            throw new RuntimeException("未定义异常处理方法，处理异常失败");
+        }
+        /**
+         * 本人水平有限。
+         * 现在支持持一个入参类型类{@link Throwable}
+         * 后人可以随意扩展~
+         */
+        Object returnResult = null;
+        try {
+            returnResult = exceptionMethodNode.method.invoke(exceptionMethodNode.thisObj, throwable);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        HashMap<String, Object> resultMap = Maps.newHashMapWithExpectedSize(2);
+        resultMap.put("status", exceptionMethodNode.status);
+        resultMap.put("result", returnResult);
+        return resultMap;
+    }
+
+    /**
+     * 用于存放方法和方法所在的实例
+     */
+    private static class Node {
+        Node(Method method, Object thisObj, HttpStatus status) {
+            this.method = method;
+            this.thisObj = thisObj;
+            this.status = status;
+        }
+
+        /**
+         * 状态码
+         */
+        HttpStatus status;
+        /**
+         * 处理异常的方法
+         */
+        Method method;
+        /**
+         * 方法所在的实例
+         */
+        Object thisObj;
+    }
+
+
+    /**
+     * 获取该类的class以及所有父的class
+     *
+     * @param clazz this.class
+     * @return list
+     */
+    public ArrayList<Class<?>> getSuperClass(Class<?> clazz) {
+        ArrayList<Class<?>> classes = new ArrayList<>();
+        classes.add(clazz);
+        Class<?> suCl = clazz.getSuperclass();
+        while (suCl != null) {
+            classes.add(suCl);
+            suCl = suCl.getSuperclass();
+        }
+        return classes;
+    }
+}

gateway/src/main/java/com/xhkjedu/gateway/handler/GlobalExceptionHandler.java

@@ -0,0 +1,84 @@
+package com.xhkjedu.gateway.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.web.ErrorProperties;
+import org.springframework.boot.autoconfigure.web.WebProperties;
+import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWebExceptionHandler;
+import org.springframework.boot.web.error.ErrorAttributeOptions;
+import org.springframework.boot.web.reactive.error.ErrorAttributes;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.server.*;
+import reactor.core.publisher.Mono;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description 全局异常处理
+ * @Author: YWX
+ * @Date 2023/11/16 8:57
+ **/
+@Slf4j
+public class GlobalExceptionHandler extends DefaultErrorWebExceptionHandler {
+
+    @Resource
+    private ExceptionHandlerCore handlerCore;
+
+
+    public GlobalExceptionHandler(ErrorAttributes errorAttributes, WebProperties webProperties, ErrorProperties errorProperties, ApplicationContext applicationContext) {
+        super(errorAttributes, webProperties.getResources(), errorProperties, applicationContext);
+    }
+
+    /**
+     * 统一处理异常信息
+     */
+    @Override
+    @SuppressWarnings(value = "unchecked")
+    protected Map<String, Object> getErrorAttributes(ServerRequest request, boolean includeStackTrace) {
+        Throwable error = super.getError(request);
+        //调用处理异常的方法，并将对象转换成map
+        return handlerCore.handlerException(error);
+    }
+
+    /**
+     * Extract the error attributes from the current request, to be used to populate error
+     * views or JSON payloads.
+     *
+     * @param request the source request
+     * @param options options to control error attributes
+     * @return the error attributes as a Map
+     */
+    @Override
+    protected Map<String, Object> getErrorAttributes(ServerRequest request, ErrorAttributeOptions options) {
+        Throwable error = super.getError(request);
+        return handlerCore.handlerException(error);
+    }
+
+    @Override
+    protected RouterFunction<ServerResponse> getRoutingFunction(ErrorAttributes errorAttributes) {
+        return RouterFunctions.route(RequestPredicates.all(), this::renderErrorResponse);
+    }
+
+    @Override
+    protected Mono<ServerResponse> renderErrorResponse(ServerRequest request) {
+        boolean includeStackTrace = isIncludeStackTrace(request, MediaType.ALL);
+        Map<String, Object> error = getErrorAttributes(request, includeStackTrace);
+        return ServerResponse
+                .status(getHttpStatus(error))
+                .contentType(MediaType.APPLICATION_JSON_UTF8)
+                .body(BodyInserters.fromObject(error.get("result")));
+    }
+
+    @Override
+    protected int getHttpStatus(Map<String, Object> errorAttributes) {
+        HttpStatus status = (HttpStatus) errorAttributes.get("status");
+        if (Objects.isNull(status)) {
+            return HttpStatus.OK.value();
+        }
+        return status.value();
+    }
+}

gateway/src/main/java/com/xhkjedu/gateway/interceptors/DecryptRequestionBodyFilter.java

@@ -1,8 +1,17 @@
 package com.xhkjedu.gateway.interceptors;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.gateway.config.ConfigKey;
+import com.xhkjedu.gateway.exceptions.GatewayException;
+import com.xhkjedu.gateway.mapper.ModuleCheckMapper;
+import com.xhkjedu.gateway.model.TModuleCheck;
 import com.xhkjedu.gateway.utils.AES;
+import com.xhkjedu.gateway.utils.ApiUtil;
+import com.xhkjedu.gateway.utils.JedisUtil;
+import com.xhkjedu.gateway.vo.SchoolVo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.factory.rewrite.CachedBodyOutputMessage;
@@ -15,7 +24,6 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;
-import org.springframework.util.AntPathMatcher;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -25,7 +33,10 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 请求参数解密
@@ -34,11 +45,16 @@ import java.util.List;
  **/
 @Component
 @Slf4j
-public class DecryptRequestionBodyFilter implements GlobalFilter, Ordered {
+public class DecryptRequestionBodyFilter extends JedisUtil implements GlobalFilter, Ordered {
+    @Value("${Xh-St}")
+    private String xhSt;
+    @Value("${whitelistAPI}")
+    private String whitelistAPI;
 
-    private static String AES_KEY = "XINGHUOLIAOYUAN7";
+    private static final String AES_KEY = "XINGHUOLIAOYUAN7";
 
-    private AntPathMatcher antPathMatcher= new AntPathMatcher();
+    @Resource
+    private ModuleCheckMapper moduleCheckMapper;
 
     @SneakyThrows
     @Override
@@ -49,27 +65,87 @@ public class DecryptRequestionBodyFilter implements GlobalFilter, Ordered {
         String path = request.getURI().getPath(); // 当前调用方法的url
         HttpHeaders headers = request.getHeaders();
 //        log.info("HttpMethod:{},Url:{}", request.getMethod(), request.getURI().getRawPath());
-        List<String> decrypts = headers.get("st");
+        String st = "Xh-St";
+        response.getHeaders().add(st, this.xhSt);
+        response.getHeaders().add("Access-Control-Expose-Headers", st);
+        List<String> decrypts = headers.get(st);
         String decrypt = isListNotEmpty(decrypts)?decrypts.get(0):"false";
-        if (!decrypt.equals("true")) {
-            return chain.filter(exchange);
+        boolean rtn = ApiUtil.whiteAPI(path, whitelistAPI);
+        if (!rtn && !xhSt.equals(decrypt)) {//非白名单接口验证加密方式
+            throw new GatewayException(1, "验证失败，请刷新重试");
+        }
+        Mono<Void> voidMono;
+        if (!"true".equals(decrypt)) {
+            //白名单中的接口
+            voidMono = returnMononew(chain, exchange);
         }else{
-            return readBody(exchange, chain);
+            voidMono = readBody(exchange, chain);
+        }
+
+        String userid = ApiUtil.listToStr(headers.get("Xh-User-Id"));
+        //验证token
+        String key = ApiUtil.listToStr(headers.get("Xh-Token-Key"));
+        String token = ApiUtil.listToStr(headers.get("Xh-Token-Value"));
+        if (!rtn) {//非白名单接口验证token
+            String redis_token = get(key);//系统缓存中保存的token
+
+            if (ApiUtil.isEmpty(token) || !token.equals(redis_token)
+                    || ApiUtil.isEmpty(key) || !key.split("_")[1].equals(userid)) {
+                throw new GatewayException(2, "登录失效");
+            } else {
+                refreshToken(key, redis_token);//刷新token
+            }
         }
 
-//        //  登录跳过网关验证，检查白名单（配置）最好把不拦截路径放入配置文件，此处通过正则
-//        if(antPathMatcher.match("/**/api/login/auth/**",path)){
-//            return readBody(exchange, chain);
-//        }
-//        // 处理参数
-//        MediaType contentType = headers.getContentType();
-//        long contentLength = headers.getContentLength();
-//        if (contentLength > 0) {
-//            if (MediaType.APPLICATION_JSON.equals(contentType) || MediaType.APPLICATION_JSON_UTF8.equals(contentType)) {
-//                return readBody(exchange, chain);
-//            }
-//        }
-//        return chain.filter(exchange);
+        if(ApiUtil.isNotEmpty(userid)){
+            //验证操作用户模块权限
+            SchoolVo schoolVo = moduleCheckMapper.getSchoolCloudByUserid(Integer.parseInt(userid));
+            if(schoolVo.getUsertype() == 1 || schoolVo.getUsertype() == 0){
+                String umodule_key = schoolVo.getCloudcode() + "_module_" + schoolVo.getSchoolid() + "_" + userid;
+                String umodule_value = get(umodule_key);//获取用户的模块权限
+                List<String> userModules = null;//用户模块全新啊
+
+                if(ApiUtil.isEmpty(umodule_value)){
+                    //缓存中用户模块为空，获取用户角色对应所有模块
+                    userModules = moduleCheckMapper.listModuleurlsByUserid(Integer.parseInt(userid));
+                    if(ApiUtil.isListNotEmpty(userModules)){
+                        //用户有模块权限，存入缓存
+                        set(umodule_key, userModules, ConfigKey.redisumtime);
+                    }else{
+                        throw new GatewayException(1, "没有权限");
+                    }
+                }else{
+                    userModules = JSON.parseArray(umodule_value,String.class);
+                }
+
+                String allmodule_key = "modules_operate";//校验模块对应操作
+                String allmodule_value = get(allmodule_key);
+                List<TModuleCheck> allModules = null;//校验模块对应操作
+                if(ApiUtil.isEmpty(allmodule_value)){
+                    allModules = moduleCheckMapper.listAllModuleChecks();
+                    if(ApiUtil.isListNotEmpty(allModules)){
+                        set(allmodule_key,allModules,ConfigKey.redismoduletime);
+                    }
+                }else{
+                    allModules = JSON.parseArray(allmodule_value,TModuleCheck.class);
+                }
+
+                if(ApiUtil.isListNotEmpty(allModules)){
+                    //校验模块有值，进行校验。校验模块对应操作如果不在
+                    Map<String,List<TModuleCheck>> mMap = allModules.stream().collect(Collectors.groupingBy(m -> m.getOperate()));
+                    if(mMap.containsKey(path)){
+                        List<TModuleCheck> checkList = mMap.get(path);
+                        List<String> checkUrlList = checkList.stream().map(TModuleCheck::getModuleurl).collect(Collectors.toList());
+
+                        boolean hasIntersection = userModules.stream().anyMatch(checkUrlList::contains);
+                        if(!hasIntersection){
+                            throw new GatewayException(1, "没有权限");
+                        }
+                    }
+                }
+            }
+        }
+        return voidMono;
     }
 
     ServerHttpRequestDecorator decorate(ServerWebExchange exchange, HttpHeaders headers, CachedBodyOutputMessage outputMessage) {
@@ -92,8 +168,15 @@ public class DecryptRequestionBodyFilter implements GlobalFilter, Ordered {
     }
 
 
-    private Mono<Void> returnMononew(GatewayFilterChain chain, ServerWebExchange exchange){
-        return chain.filter(exchange).then(Mono.fromRunnable(()->{
+    private Mono<Void> returnMononew(GatewayFilterChain chain, ServerWebExchange exchange) {
+        long startTime = System.currentTimeMillis();
+        return chain.filter(exchange).then(Mono.fromRunnable(() -> {
+            long endTime = System.currentTimeMillis();
+            long executeTime = endTime - startTime;
+            if (executeTime > 1000) {
+                String path = exchange.getRequest().getURI().getPath();
+                log.error(" {}；耗时：{}s", path, executeTime / 1000);
+            }
         }));
     }
     private Mono<Void> readBody(ServerWebExchange exchange, GatewayFilterChain chain) {

gateway/src/main/java/com/xhkjedu/gateway/mapper/ModuleCheckMapper.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.gateway.mapper;
+
+import com.xhkjedu.gateway.model.TModuleCheck;
+import com.xhkjedu.gateway.vo.SchoolVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description：模块权限表
+ * @Author: WN
+ * @Date: 2023/11/27 15:18:22
+ **/
+public interface ModuleCheckMapper {
+
+    //获取地址对应所有操作
+    List<TModuleCheck> listAllModuleChecks();
+
+    //获取用户当前年份及区域码
+    SchoolVo getSchoolCloudByUserid(@Param("userid")Integer userid);
+
+    //获取用户所属角色对应的所有模块地址
+    List<String> listModuleurlsByUserid(@Param("userid")Integer userid);
+}

gateway/src/main/java/com/xhkjedu/gateway/model/TModuleCheck.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.gateway.model;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description：模块检查
+ * @Author: WN
+ * @Date: 2023/11/27 15:10:44
+ **/
+@Data
+@Table(name = "t_model_check")
+public class TModuleCheck {
+    @Id
+    private Integer mcid;
+
+    private String moduleurl;//地址
+
+    private String operate;//操作
+}

gateway/src/main/java/com/xhkjedu/gateway/utils/ApiUtil.java

@@ -0,0 +1,128 @@
+package com.xhkjedu.gateway.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName ApiUtil
+ * Description api工具类
+ * Author WN
+ * Date 2022/2/21 11:08
+ **/
+@Slf4j
+public class ApiUtil {
+
+    /*
+    * @Description 比较当前时间和时间段
+    * @Author WN
+    * @Date 2023/6/15 11:24:59
+    */
+    public static boolean compareCurrDateTime(String starttimeStr,String stoptimeStr) throws Exception{
+        boolean rtn = false;
+        if(isEmpty(starttimeStr) || isEmpty(stoptimeStr)){
+            rtn = false;
+        }else{
+            SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
+
+            Date starttime = sdf.parse(starttimeStr); //开始时间
+            Date stoptime = sdf.parse(stoptimeStr); //结束时间
+
+            Date nowtime = new Date();
+            String times = sdf.format(nowtime);
+            Date currtime = sdf.parse(times);//当前时间
+
+            //当前时间在开始时间之前或者等于开始时间  并且 当前时间在结束时间之后或者等于结束时间
+            if((starttime.before(currtime) || starttime.equals(currtime)) && (stoptime.after(currtime) || stoptime.equals(currtime))){
+                rtn = true;
+            }
+        }
+
+        return rtn;
+    }
+    /**
+     * 字符串是否为空
+     *
+     * @param: @param obj
+     * @param: @return
+     * @author WN
+     */
+    public static boolean isNotEmpty(Object obj) {
+        if (null == obj || "".equals(obj.toString().trim()) || "null".equals(obj.toString().trim())) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 字符串是否为空
+     *
+     * @param: @param obj
+     * @param: @return
+     * @author zj
+     */
+    public static boolean isEmpty(Object obj) {
+        if (null == obj || "".equals(obj.toString().trim()) || "null".equals(obj.toString().trim())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @Description 是否是白名单接口
+     * @Date 2023/11/16 9:02
+     * @Author YWX
+     * @Param [requestURI, whitelistAPI]
+     * @Return boolean
+     **/
+    public static boolean whiteAPI(String requestURI, String whitelistAPI) {
+        boolean rtn = false;
+        if (isEmpty(whitelistAPI)) return rtn;
+
+        String[] apis = whitelistAPI.split(",");
+        for (String api : apis) {
+            if (requestURI.contains(api)) {
+                rtn = true;
+                break;
+            }
+        }
+        return rtn;
+    }
+
+    /**
+     * @Description 判断list是否不为空
+     * @Date 2023/11/16 9:01
+     * @Author YWX
+     * @Param [list]
+     * @Return boolean
+     **/
+    public static boolean isListNotEmpty(List list) {
+        if (CollectionUtils.isEmpty(list)){
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * @Description list转字符
+     * @Date 2023/11/16 9:01
+     * @Author YWX
+     * @Param [list]
+     * @Return java.lang.String
+     **/
+    public static String listToStr(List<String> list) {
+        String str = "";
+        if (isListNotEmpty(list)) {
+            for (String s : list) {
+                str += s;
+            }
+        }
+        return str;
+    }
+}

gateway/src/main/java/com/xhkjedu/gateway/utils/JedisUtil.java

@@ -0,0 +1,123 @@
+package com.xhkjedu.gateway.utils;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ywx
+ * @classname JedisUtil
+ * @description Redis工具类
+ * @date 2019/8/2 16:48
+ **/
+@Component
+public class JedisUtil {
+	@Autowired
+	private StringRedisTemplate stringRedisTemplate;
+	private ValueOperations<String, String> valueOperations;
+
+	@PostConstruct
+	public void init(){
+		this.valueOperations = stringRedisTemplate.opsForValue();
+	}
+
+	/**  默认过期时长，单位：秒 */
+	//redis失效时间
+	@Value("${redisdatatime}")
+	private Integer redisdatatime;
+	/**  不设置过期时长 */
+	public final static long NOT_EXPIRE = -1;
+
+	public boolean set(String key, Object value, Integer expire){
+		boolean rtn = false;
+		valueOperations.set(key, toJson(value));
+		if(expire != NOT_EXPIRE){
+			rtn = stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return rtn;
+	}
+
+	public void set(String key, Object value){
+		set(key, value, redisdatatime);
+	}
+
+	public Boolean setObject(String key, Object value, int cacheSeconds) {
+		String val = toJson(value);
+		return set(key,val,cacheSeconds);
+	}
+
+	public <T> T get(String key, Class<T> clazz, long expire) {
+		String value = valueOperations.get(key);
+		if(expire != NOT_EXPIRE){
+			stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return value == null ? null : fromJson(value, clazz);
+	}
+
+	public <T> T get(String key, Class<T> clazz) {
+		return get(key, clazz, NOT_EXPIRE);
+	}
+
+	public String get(String key, long expire) {
+		String value = valueOperations.get(key);
+		if (expire != NOT_EXPIRE) {
+			stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return value;
+	}
+
+	public String get(String key) {
+		try {
+			return get(key, NOT_EXPIRE);
+		} catch (Exception e) {
+			return "0";
+		}
+	}
+
+	//获取剩余有效期
+	public Long getExpire(String key) {
+		return stringRedisTemplate.getExpire(key);
+	}
+
+	//如果token有效期低于10分钟更新有效期
+	public void refreshToken(String key,String value) {
+		Long expire = getExpire(key);
+		if (expire <= 10 * 60) {
+			set(key, value);
+		}
+	}
+
+	public Object getObject(String key, Class<?> clazz) {
+		String value = get(key);
+		return fromJson(value, clazz);
+	}
+
+	public boolean delete(String key) {
+		return stringRedisTemplate.delete(key);
+	}
+
+	/**
+	 * Object转成JSON数据
+	 */
+	private String toJson(Object object){
+		if(object instanceof Integer || object instanceof Long || object instanceof Float ||
+				object instanceof Double || object instanceof Boolean || object instanceof String){
+			return String.valueOf(object);
+		}
+		return JSON.toJSONString(object);
+	}
+
+	/**
+	 * JSON数据，转成Object
+	 */
+	private <T> T fromJson(String json, Class<T> clazz){
+		return JSON.parseObject(json, clazz);
+	}
+
+}

gateway/src/main/java/com/xhkjedu/gateway/vo/SchoolVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.gateway.vo;
+
+import lombok.Data;
+
+/**
+ * @Description：学校基本信息类
+ * @Author: WN
+ * @Date: 2023/11/27 14:40:44
+ **/
+@Data
+public class SchoolVo {
+    private Integer schoolid;//学校id
+
+    private Integer year;//学校当前年份
+
+    //云平台码
+    private String cloudcode;
+
+    private Integer usertype;//用户类型
+}

gateway/src/main/resources/application.properties

@@ -50,9 +50,78 @@ spring.cloud.gateway.routes[5].filters[1].name=CircuitBreaker
 spring.cloud.gateway.routes[5].filters[1].args.name=fallbackcmd
 spring.cloud.gateway.routes[5].filters[1].args.fallbackUri=forward:/fallback
 
+spring.cloud.gateway.routes[6].id=path_slog
+spring.cloud.gateway.routes[6].uri=lb://slog
+spring.cloud.gateway.routes[6].predicates[0]=Path=/slog/**
+spring.cloud.gateway.routes[6].filters[0]=RewritePath=/slog/(?<segment>.*), /$\{segment}
+spring.cloud.gateway.routes[6].filters[1].name=CircuitBreaker
+spring.cloud.gateway.routes[6].filters[1].args.name=fallbackcmd
+spring.cloud.gateway.routes[6].filters[1].args.fallbackUri=forward:/fallback
+
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@localhost:8081/eureka/
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
 #设置eureka输出日志级别
 logging.level.com.netflix=error
 
 #请求超时时间30s
 rq.overtime = 30000
+
+#接口是否加密
+Xh-St = false
+
+#mysql数据库
+spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:3306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
+spring.datasource.username=root
+spring.datasource.password=HNxhkjedu!@#07
+spring.mvc.hiddenmethod.filter.enabled=true
+#数据库连接池配置
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#允许的最小空闲数
+spring.datasource.hikari.minimum-idle=5
+#连接池最大连接数
+spring.datasource.hikari.maximum-pool-size=50
+spring.datasource.hikari.auto-commit=true
+#空闲超时是 180000 毫秒，当数据库连接的空闲时间大于180000毫秒时，这些空闲超时的连接会被关闭，直到超时的空闲连接数达到 minimum-idle的值
+spring.datasource.hikari.idle-timeout=180000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+#连接超时时间设置，默认是30s
+spring.datasource.hikari.connection-timeout=20000
+# 测试连接是否可用的query 语句 在oracle是 select 1 from dual  36   28.26
+spring.datasource.hikari.connection-test-query=SELECT 1
+# 所有Entity别名类所在包
+mybatis.type-aliases-package=com.xhkjedu.model,com.xhkjedu.gateway.model
+mybatis.mapper-Locations=classpath*:mapper/**/*.xml
+#mapper.mappers=com.xhkjedu.base.TkMapper
+mybatis.configuration.call-setters-on-nulls=true
+mapper.identity=MYSQL
+
+#redis配置
+spring.redis.host=cachetest.xhkjedu.com
+spring.redis.port=6379
+spring.redis.password=xhkjedud07
+#超时时间：单位ms
+spring.redis.timeout=5000
+#设置过期时间10min
+spring.redis.jedis.pool.max-idle=300
+#最大等待时间：单位ms //高版本改为maxWaitMillis
+spring.redis.jedis.pool.max-wait=1000000
+spring.redis.jedis.pool.max-active=60000
+#缓存访问数据有效时长5*60*60
+redisdatatime=18000
+#缓存用户权限模块有效时长60*60*24
+redisumtime=86400
+#缓存模块对应操作有效时长60*5
+redismoduletime=300
+
+
+#白名单接口
+whitelistAPI=user/login,/class_student/stu_class,/user/detail,/status/info,/user/qrg,/user/check_user\
+  ,/user/update_code,/user/update_pwd_byCode,/user/list_usecret,/user/check_usecret,/user/reset_pwd\
+  ,/class_student/import_user,/user/import_teacher\
+  ,/get_new,/stype/list,/cloud/detail,/auser/import,/pdf,/epsb/import,\
+  ,/section/get_zjr,/csw/add,/xz/import,/agora_token/rtc_token,/epqt/pqs,/eb/get_mn,/scan/save,/eps/sca,/eps/scaer
+
+#版本号
+versionname=Test_v3.13.0

gateway/src/main/resources/mapper/ModuleCheckMapper.xml

@@ -0,0 +1,23 @@
+<?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.gateway.mapper.ModuleCheckMapper">
+
+    <!--获取地址对应所有操作-->
+    <select id="listAllModuleChecks" resultType="com.xhkjedu.gateway.model.TModuleCheck">
+        select * from t_module_check
+    </select>
+
+    <!--获取用户当前年份及区域码-->
+    <select id="getSchoolCloudByUserid" resultType="com.xhkjedu.gateway.vo.SchoolVo">
+        select s.year,u.schoolid,u.usertype,(select cloudcode from t_cloud limit 1) cloudcode
+        from t_user u left join t_school s on u.schoolid=s.schoolid
+        where u.userid=#{userid}
+    </select>
+
+    <!--获取用户所属角色对应的所有模块地址-->
+    <select id="listModuleurlsByUserid" resultType="java.lang.String">
+        select m.moduleurl from t_module m left join t_role_module rm on m.moduleid=rm.moduleid
+        left join t_user_role ur on rm.roleid=ur.roleid
+        where ur.userid=#{userid} and m.`level`=2 group by m.moduleurl
+    </select>
+</mapper>

gateway/src/test/java/com/xhkjedu/gateway/GatewayApplicationTests.java

@@ -8,6 +8,7 @@ class GatewayApplicationTests {
 
     @Test
     void contextLoads() {
+        System.out.println("网关打印");
     }
 
 }

pom.xml

@@ -21,6 +21,7 @@
         <module>sapi</module>
         <module>scommons</module>
         <module>sexam</module>
+        <module>slog</module>
     </modules>
 
     <parent>
@@ -87,6 +88,11 @@
                 <artifactId>sexam</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>com.xhkjedu</groupId>
+                <artifactId>slog</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

register/src/main/resources/application.properties

@@ -3,10 +3,13 @@ server.port=8081
 #禁止注册自己
 eureka.client.register-with-eureka=false
 eureka.client.fetch-registry=false
-eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
+eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8081/eureka/
 
 spring.security.user.name=xhschool
 spring.security.user.password=Xhkjedud07
 
 #设置eureka输出日志级别
 logging.level.com.netflix=error
+
+#版本号
+versionname=Test_v3.13.0

sapi/pom.xml

@@ -32,12 +32,6 @@
             <version>3.17</version>
         </dependency>
 
-        <!--amqp的起步依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>

sapi/src/main/java/com/xhkjedu/sapi/SapiApplication.java

@@ -1,17 +1,17 @@
 package com.xhkjedu.sapi;
 
+import com.xhkjedu.sapi.config.ConfigKey;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication(scanBasePackages = "com.xhkjedu")
-@EnableEurekaClient
 @MapperScan(basePackages = {"com.xhkjedu.sapi.mapper"})
 public class SapiApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SapiApplication.class, args);
+        System.out.println("构建号：" + ConfigKey.buildnum);
     }
 
 }

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

@@ -0,0 +1,208 @@
+package com.xhkjedu.sapi.aop;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.sapi.config.ConfigKey;
+import com.xhkjedu.sapi.listener.HandleLogSender;
+import com.xhkjedu.sapi.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.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();
+
+        try {
+            // 获取方法名字
+            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();
+                // 设置请求参数
+                handleLog.setHandleparas(JSON.toJSONString(args[0]));
+            }
+
+            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) {
+            log.error("操作日志doBefore执行异常：" + 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);
+    }
+
+    /*
+     * @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();
+    }
+
+    /*
+     * @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();
+    //     }
+    //     return null;
+    // }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        // log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(logHandlelogNew);
+    }
+
+}

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

@@ -31,19 +31,6 @@ public class ConfigKey {
         ConfigKey.numadd = numadd;
     }
 
-    public static Integer redisdatatime;//缓存访问数据有效时长
-    public static String secretKey;//secretKey必须为24位
-
-    @Value("${redisdatatime}")
-    public void setRedisdatatime(Integer redisdatatime) {
-        ConfigKey.redisdatatime = redisdatatime;
-    }
-
-    @Value("${secretKey}")
-    public void setSecretKey(String secretKey) {
-        ConfigKey.secretKey = secretKey;
-    }
-
     public static String cloudapi;//云平台接口
     public static String showurl;//文件访问路径
     public static String oldshowurl;//原文件访问路径
@@ -105,4 +92,18 @@ public class ConfigKey {
     public void setSyncnum(Integer syncnum) {
         ConfigKey.syncnum = syncnum;
     }
+
+    public static Integer buildnum;//构建号
+
+    @Value("${buildnum}")
+    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/controller/appversion/AppLiveController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppLive;
 import com.xhkjedu.sapi.service.appversion.AppLiveService;
 import com.xhkjedu.sapi.vo.appversion.AppversionVo;
@@ -29,6 +30,7 @@ public class AppLiveController {
     private AppLiveService appLiveService;
 
     @PostMapping("/add")
+    @Action("直播端-增加")
     public ResultVo add(@RequestBody TAppLive appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionname(),"版本名称",2,
                 appclient.getVersioncode(),"版本号",2,appclient.getVersionpath(),"应用文件",2});
@@ -37,6 +39,7 @@ public class AppLiveController {
     }
 
     @PostMapping("/delete")
+    @Action("直播端-删除")
     public ResultVo delete(@RequestBody TAppLive appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appLiveService.deleteById(appclient.getVersionid());
@@ -44,6 +47,7 @@ public class AppLiveController {
     }
 
     @PostMapping("/update")
+    @Action("直播端-修改")
     public ResultVo update(@RequestBody TAppLive appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appLiveService.update(appclient);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppMonitorController.java

@@ -4,13 +4,13 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sapi.model.appversion.TAppMonitor;
 import com.xhkjedu.sapi.service.appversion.AppMonitorService;
+import com.xhkjedu.sapi.vo.appversion.AppMonitorPVo;
+import com.xhkjedu.sapi.vo.appversion.AppMonitorVo;
+import com.xhkjedu.sapi.vo.appversion.AppSearchVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.sapi.vo.appversion.AppMonitorPVo;
-import com.xhkjedu.sapi.vo.appversion.AppMonitorVo;
-import com.xhkjedu.sapi.vo.appversion.AppSearchVo;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppRecordController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppRecord;
 import com.xhkjedu.sapi.service.appversion.AppRecordService;
 import com.xhkjedu.utils.N_Utils;
@@ -29,6 +30,7 @@ public class AppRecordController {
     private AppRecordService appRecordService;
 
     @PostMapping("/add")
+    @Action("教师微课端-增加")
     public ResultVo add(@RequestBody TAppRecord apprecord) {
         N_Utils.validation(new Object[]{apprecord.getVersionname(),"版本名称",2,
                 apprecord.getVersioncode(),"版本号",2,apprecord.getVersionpath(),"应用文件",2});
@@ -37,6 +39,7 @@ public class AppRecordController {
     }
 
     @PostMapping("/delete")
+    @Action("教师微课端-删除")
     public ResultVo delete(@RequestBody TAppRecord apprecord) {
         N_Utils.validation(new Object[]{apprecord.getVersionid(),"版本id",1});
         appRecordService.deleteById(apprecord.getVersionid());
@@ -44,6 +47,7 @@ public class AppRecordController {
     }
 
     @PostMapping("/update")
+    @Action("教师微课端-修改")
     public ResultVo update(@RequestBody TAppRecord apprecord) {
         N_Utils.validation(new Object[]{apprecord.getVersionid(),"版本id",1});
         appRecordService.update(apprecord);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppScanController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppScan;
 import com.xhkjedu.sapi.service.appversion.AppScanService;
 import com.xhkjedu.sapi.vo.appversion.AppversionVo;
@@ -30,6 +31,7 @@ public class AppScanController {
     private AppScanService appScanService;
 
     @PostMapping("/add")
+    @Action("扫描客户端-增加")
     public ResultVo add(@RequestBody TAppScan appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionname(),"版本名称",2,
                 appclient.getVersioncode(),"版本号",2,appclient.getVersionpath(),"应用文件",2});
@@ -38,6 +40,7 @@ public class AppScanController {
     }
 
     @PostMapping("/delete")
+    @Action("扫描客户端-删除")
     public ResultVo delete(@RequestBody TAppScan appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appScanService.deleteById(appclient.getVersionid());
@@ -45,6 +48,7 @@ public class AppScanController {
     }
 
     @PostMapping("/update")
+    @Action("扫描客户端-修改")
     public ResultVo update(@RequestBody TAppScan appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appScanService.update(appclient);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppStuappController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppStuapp;
 import com.xhkjedu.sapi.service.appversion.AppStuappService;
 import com.xhkjedu.utils.N_Utils;
@@ -31,6 +32,7 @@ public class AppStuappController {
     private AppStuappService appStuappService;
 
     @PostMapping("/add")
+    @Action("学生平板端-增加")
     public ResultVo add(@RequestBody TAppStuapp tAppStuapp) {
         N_Utils.validation(new Object[]{tAppStuapp.getVersionname(),"版本名称",2,
                 tAppStuapp.getVersioncode(),"版本号",2,tAppStuapp.getVersionpath(),"应用文件",2});
@@ -39,6 +41,7 @@ public class AppStuappController {
     }
 
     @PostMapping("/delete")
+    @Action("学生平板端-删除")
     public ResultVo delete(@RequestBody TAppStuapp tAppStuapp) {
         N_Utils.validation(new Object[]{tAppStuapp.getVersionid(),"版本id",1});
         appStuappService.deleteById(tAppStuapp.getVersionid());
@@ -46,6 +49,7 @@ public class AppStuappController {
     }
 
     @PostMapping("/update")
+    @Action("学生平板端-修改")
     public ResultVo update(@RequestBody TAppStuapp tAppStuapp) {
         N_Utils.validation(new Object[]{tAppStuapp.getVersionid(),"版本id",1});
         appStuappService.update(tAppStuapp);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppTeacherappController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppTeacherapp;
 import com.xhkjedu.sapi.service.appversion.AppTeacherappService;
 import com.xhkjedu.utils.N_Utils;
@@ -30,6 +31,7 @@ public class AppTeacherappController {
     private AppTeacherappService appTeacherappService;
 
     @PostMapping("/add")
+    @Action("教师手机端-增加")
     public ResultVo add(@RequestBody TAppTeacherapp app) {
         N_Utils.validation(new Object[]{app.getVersionname(),"版本名称",2,
                 app.getVersioncode(),"版本号",2,app.getVersionpath(),"应用文件",2});
@@ -38,6 +40,7 @@ public class AppTeacherappController {
     }
 
     @PostMapping("/delete")
+    @Action("教师手机端-删除")
     public ResultVo delete(@RequestBody TAppTeacherapp app) {
         N_Utils.validation(new Object[]{app.getVersionid(),"版本id",1});
         appTeacherappService.deleteById(app.getVersionid());
@@ -45,6 +48,7 @@ public class AppTeacherappController {
     }
 
     @PostMapping("/update")
+    @Action("教师手机端-修改")
     public ResultVo update(@RequestBody TAppTeacherapp app) {
         N_Utils.validation(new Object[]{app.getVersionid(),"版本id",1});
         appTeacherappService.update(app);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppTeacherclientController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppTeacherclient;
 import com.xhkjedu.sapi.service.appversion.AppTeacherclientService;
 import com.xhkjedu.utils.N_Utils;
@@ -30,6 +31,7 @@ public class AppTeacherclientController {
     private AppTeacherclientService appTeacherclientService;
 
     @PostMapping("/add")
+    @Action("教师手机端-增加")
     public ResultVo add(@RequestBody TAppTeacherclient appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionname(),"版本名称",2,
                 appclient.getVersioncode(),"版本号",2,appclient.getVersionpath(),"应用文件",2});
@@ -38,6 +40,7 @@ public class AppTeacherclientController {
     }
 
     @PostMapping("/delete")
+    @Action("教师手机端-删除")
     public ResultVo delete(@RequestBody TAppTeacherclient appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appTeacherclientService.deleteById(appclient.getVersionid());
@@ -45,6 +48,7 @@ public class AppTeacherclientController {
     }
 
     @PostMapping("/update")
+    @Action("教师手机端-修改")
     public ResultVo update(@RequestBody TAppTeacherclient appclient) {
         N_Utils.validation(new Object[]{appclient.getVersionid(),"版本id",1});
         appTeacherclientService.update(appclient);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppthirdController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.appversion;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppthird;
 import com.xhkjedu.sapi.model.appversion.TAppthirdHistory;
 import com.xhkjedu.sapi.service.appversion.AppthirdService;
@@ -28,6 +29,7 @@ public class AppthirdController {
     private AppthirdService appthirdService;
 
     @PostMapping("/add")
+    @Action("第三方应用-增加")
     public ResultVo add(@RequestBody TAppthird appthird) {
         N_Utils.validation(new Object[]{
                 appthird.getAppname(),"第三方应用名称",2,
@@ -39,6 +41,7 @@ public class AppthirdController {
 
 
     @PostMapping("/update")
+    @Action("第三方应用-修改")
     public ResultVo update(@RequestBody TAppthird appthird) {
         N_Utils.validation(new Object[]{appthird.getAppid(),"第三方应用id",1});
         appthirdService.update(appthird);
@@ -46,6 +49,7 @@ public class AppthirdController {
     }
 
     @PostMapping("/delete")
+    @Action("第三方应用-删除")
     public ResultVo delete(@RequestBody TAppthird appthird) {
         N_Utils.validation(new Object[]{appthird.getAppid(),"第三方应用id",1});
         appthirdService.deleteById(appthird.getAppid());
@@ -54,6 +58,7 @@ public class AppthirdController {
 
 
     @PostMapping("/update_state")
+    @Action("第三方应用-修改状态")
     public ResultVo updateState(@RequestBody TAppthird appthird) {
         Integer appid = appthird.getAppid();
         Integer appstate = appthird.getAppstate();
@@ -84,12 +89,14 @@ public class AppthirdController {
 
 
     @PostMapping("/add_history")
+    @Action("第三方应用-增加版本")
     public ResultVo addHistory(@RequestBody TAppthirdHistory history) {
         Integer id = appthirdService.saveHistory(history);
         return new ResultVo(0, "保存成功",id);
     }
 
     @PostMapping("/delete_history")
+    @Action("第三方应用-删除版本")
     public ResultVo deleteHistory(@RequestBody TAppthirdHistory history) {
         N_Utils.validation(new Object[]{history.getApphid(),"第三方应用历史id",1});
         appthirdService.deleteByApphId(history.getApphid());

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppthirdManagerController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppthirdManager;
 import com.xhkjedu.sapi.service.appversion.AppthirdManagerService;
 import com.xhkjedu.utils.N_Utils;
@@ -29,6 +30,7 @@ public class AppthirdManagerController {
     private AppthirdManagerService appthirdManagerService;
 
     @PostMapping("/add")
+    @Action("应用白名单-增加")
     public ResultVo add(@RequestBody TAppthirdManager manager) {
         String id = appthirdManagerService.save(manager);
         if (id == null) {
@@ -39,12 +41,14 @@ public class AppthirdManagerController {
     }
 
     @PostMapping("/delete")
+    @Action("应用白名单-删除")
     public ResultVo delete(@RequestBody TAppthirdManager manager) {
         appthirdManagerService.deleteById(manager.getMid());
         return new ResultVo(0,"删除成功");
     }
 
     @PostMapping("/update")
+    @Action("应用白名单-修改")
     public ResultVo update(@RequestBody TAppthirdManager tAppthirdManager) {
         return appthirdManagerService.update(tAppthirdManager);
     }

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/AppthirdMonitorController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TAppthirdMonitor;
 import com.xhkjedu.sapi.service.appversion.AppthirdMonitorService;
 import com.xhkjedu.utils.N_Utils;
@@ -32,6 +33,7 @@ public class AppthirdMonitorController {
     private AppthirdMonitorService appthirdMonitorService;
 
     @PostMapping("/add")
+    @Action("三方应用监控-增加")
     public ResultVo add(@RequestBody TAppthirdMonitor monitor) {
         Integer id = appthirdMonitorService.save(monitor);
         return new ResultVo(0, "保存成功",id);
@@ -69,6 +71,7 @@ public class AppthirdMonitorController {
     }
 
     @PostMapping("/handle")
+    @Action("三方应用监控-标记")
     public ResultVo handle(@RequestBody AppSearchVo monitor) {
         N_Utils.validation(new Object[]{monitor.getCreateid(),"处理人id",1,monitor.getSchoolid(),"学校id",1});
         appthirdMonitorService.handle(monitor);

sapi/src/main/java/com/xhkjedu/sapi/controller/appversion/WebVersionController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.appversion;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.appversion.TWebVersion;
 import com.xhkjedu.sapi.service.appversion.WebVersionService;
 import com.xhkjedu.utils.N_Utils;
@@ -30,6 +31,7 @@ public class WebVersionController {
     private WebVersionService webVersionService;
 
     @PostMapping("/add")
+    @Action("校园网页端-增加")
     public ResultVo add(@RequestBody TWebVersion app) {
         N_Utils.validation(new Object[]{app.getVersionname(), "版本名称", 2
                 , app.getVersiontype(), "网页端类型", 1, app.getVersioncomm(), "更新内容", 2});
@@ -38,6 +40,7 @@ public class WebVersionController {
     }
 
     @PostMapping("/delete")
+    @Action("校园网页端-删除")
     public ResultVo delete(@RequestBody TWebVersion app) {
         N_Utils.validation(new Object[]{app.getVersionid(), "版本id", 1});
         webVersionService.deleteById(app.getVersionid());
@@ -45,6 +48,7 @@ public class WebVersionController {
     }
 
     @PostMapping("/update")
+    @Action("校园网页端-修改")
     public ResultVo update(@RequestBody TWebVersion app) {
         N_Utils.validation(new Object[]{app.getVersionid(), "版本id", 1});
         webVersionService.update(app);

sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.assess;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.assess.TAssess;
 import com.xhkjedu.sapi.service.assess.AssessService;
 import com.xhkjedu.utils.N_Utils;
@@ -30,18 +31,21 @@ public class AssessController {
     private AssessService assessService;
 
     @PostMapping("/add")
+    @Action("评价录入-增加")
     public ResultVo add(@RequestBody TAssess assess) {
         TAssess tAssess = assessService.save(assess);
         return new ResultVo(0,"保存成功",tAssess);
     }
 
     @PostMapping("/delete")
+    @Action("评价录入-删除")
     public ResultVo delete(@RequestBody TAssess assess) {
         assessService.deleteById(assess.getAssessid());
         return new ResultVo(0,"删除成功");
     }
 
     @PostMapping("/update")
+    @Action("评价录入-修改")
     public ResultVo update(@RequestBody TAssess assess) {
         assessService.update(assess);
         return new ResultVo(0,"修改成功");

sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessQuotaController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.assess;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.assess.TAssessQuota;
 import com.xhkjedu.sapi.service.assess.AssessQuotaService;
 import com.xhkjedu.utils.N_Utils;
@@ -27,6 +28,7 @@ public class AssessQuotaController {
 
     //保存
     @PostMapping("/add")
+    @Action("评价指标-增加")
     public ResultVo add(@RequestBody TAssessQuota quota) {
         String quotaname = quota.getQuotaname();
         Integer createid = quota.getCreateid();
@@ -38,6 +40,7 @@ public class AssessQuotaController {
 
     //删除
     @PostMapping("/delete")
+    @Action("评价指标-删除")
     public ResultVo delete(@RequestBody TAssessQuota quota) {
         Integer quotaid = quota.getQuotaid();
         N_Utils.validation(new Object[]{quotaid,"指标id",1});
@@ -51,6 +54,7 @@ public class AssessQuotaController {
 
     //修改
     @PostMapping("/update")
+    @Action("评价指标-修改")
     public ResultVo update(@RequestBody TAssessQuota quota) {
         String quotaname = quota.getQuotaname();
         Integer createid = quota.getCreateid();

sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessTemplateController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.assess;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.assess.TAssessTemplate;
 import com.xhkjedu.sapi.service.assess.AssessTemplateService;
 import com.xhkjedu.utils.N_Utils;
@@ -27,6 +28,7 @@ public class AssessTemplateController {
 
     //添加
     @PostMapping("/add")
+    @Action("评价模版-增加")
     public ResultVo add(@RequestBody TAssessTemplate template) {
         List<Integer> quotaids = template.getQutoaids();
         if(quotaids==null || quotaids.size()==0){
@@ -44,6 +46,7 @@ public class AssessTemplateController {
 
     //删除
     @PostMapping("/delete")
+    @Action("评价模版-删除")
     public ResultVo delete(@RequestBody TAssessTemplate template) {
         Integer templateid = template.getTemplateid();
         N_Utils.validation(new Object[]{templateid,"模版id",1});
@@ -53,6 +56,7 @@ public class AssessTemplateController {
 
     //修改
     @PostMapping("/update")
+    @Action("评价模版-修改")
     public ResultVo update(@RequestBody TAssessTemplate template) {
         List<Integer> quotaids = template.getQutoaids();
         if(quotaids==null || quotaids.size()==0){

sapi/src/main/java/com/xhkjedu/sapi/controller/assess/AssessUserController.java

@@ -2,11 +2,12 @@ package com.xhkjedu.sapi.controller.assess;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.assess.TAssessUser;
 import com.xhkjedu.sapi.service.assess.AssessUserService;
+import com.xhkjedu.sapi.utils.PoiUtils;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.sapi.utils.PoiUtils;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,12 +34,14 @@ public class AssessUserController {
     private AssessUserService assessUserService;
 
     @PostMapping("/add")
+    @Action("评价录入-增加用户")
     public ResultVo add(@RequestBody TAssessUser user) {
         TAssessUser assessUser = assessUserService.save(user);
         return new ResultVo(0,"保存成功",assessUser);
     }
 
     @PostMapping("/delete")
+    @Action("评价录入-删除用户")
     public ResultVo delete(@RequestBody TAssessUser user) {
         Integer auid = user.getAuid();
         N_Utils.validation(new Object[]{auid,"评价用户id",1});
@@ -73,7 +76,8 @@ public class AssessUserController {
     }
 
     @PostMapping("/import")
-    public ResultVo importAssess(MultipartFile file, TAssessUser user) {
+    @Action("评价录入-导入用户")
+    public ResultVo importAssess(TAssessUser user,MultipartFile file) {
         Integer schoolid = user.getSchoolid();
         Integer assessid = user.getAssessid();
         Integer templateid = user.getTemplateid();

sapi/src/main/java/com/xhkjedu/sapi/controller/cloud/CloudController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.cloud;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.cloud.TCloud;
 import com.xhkjedu.sapi.service.cloud.CloudService;
 import com.xhkjedu.utils.N_Utils;
@@ -32,6 +33,7 @@ public class CloudController {
 
     //修改主题色
     @PostMapping("/update")
+    @Action("区域信息-修改主题")
     public ResultVo update(@RequestBody TCloud cloud) {
         N_Utils.validation(new Object[]{cloud.getCloudid(), "平台id", 1
         ,cloud.getTheme(),"主题色",2,cloud.getLoginbg(),"登录背景图片",2
@@ -42,6 +44,7 @@ public class CloudController {
 
     //修改区域基础信息
     @PostMapping("/upinfo")
+    @Action("区域信息-修改基础信息")
     public ResultVo updateInfo(@RequestBody TCloud cloud) {
         N_Utils.validation(new Object[]{cloud.getCloudid(), "平台id", 1,cloud.getCloudname(),"平台名称",2});
         cloudService.updateInfo(cloud);

sapi/src/main/java/com/xhkjedu/sapi/controller/cloud/CloudSyncController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.cloud;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.cloud.TCloudSync;
 import com.xhkjedu.sapi.service.cloud.CloudSyncService;
 import com.xhkjedu.utils.N_Utils;
@@ -41,9 +42,22 @@ public class CloudSyncController {
     }
 
     @PostMapping("/sync")
+    @Action("同步任务-同步")
     public ResultVo sync(@RequestBody TCloudSync sync) {
         N_Utils.validation(new Object[]{sync.getCreateid(), "创建人id", 1
                 ,sync.getCloudcode(),"平台码",2,sync.getSyncnum(),"一次同步数量",1});
         return cloudSyncService.sync(sync);
     }
+
+    /**
+     * @Description 获取同步类型
+     * @Date 2023/10/13 15:15
+     * @Author YWX
+     * @Param []
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_module")
+    public ResultVo listModule() {
+        return cloudSyncService.listModule();
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/controller/dock/LcController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.dock;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.service.dock.LcService;
 import com.xhkjedu.utils.N_Utils;
@@ -26,6 +27,7 @@ public class LcController {
 
     //绑定领创管控信息
     @PostMapping("/add")
+    @Action("领创管控-绑定学校")
     public ResultVo addSchool(@RequestBody LcSchoolVo school) {
         Integer schoolid = school.getSchoolid();
         N_Utils.validation(new Object[]{schoolid,"学校id",1});
@@ -34,6 +36,7 @@ public class LcController {
 
     //绑定管理员
     @PostMapping("/adda")
+    @Action("领创管控-绑定学校管理员")
     public ResultVo addAdmin(@RequestBody TSchool school) {
         Integer schoolid = school.getSchoolid();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1});

sapi/src/main/java/com/xhkjedu/sapi/controller/itemtool/ReadController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.itemtool;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.itemtool.TRead;
 import com.xhkjedu.sapi.model.itemtool.TReadStudent;
 import com.xhkjedu.sapi.service.itemtool.ReadService;
@@ -38,6 +39,7 @@ public class ReadController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/save")
+    @Action("电子书-增加")
     public ResultVo save(@RequestBody TRead read){
         N_Utils.validation(new Object[]{read.getReadname(),"阅读标题",2,
                 read.getReadpath(),"阅读文件",2});
@@ -57,6 +59,7 @@ public class ReadController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/up")
+    @Action("电子书-修改")
     public ResultVo update(@RequestBody TRead read){
         N_Utils.validation(new Object[]{
                 read.getReadid(),"阅读id",1,
@@ -77,6 +80,7 @@ public class ReadController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/del")
+    @Action("电子书-删除")
     public ResultVo del(@RequestBody TRead read){
         N_Utils.validation(new Object[]{read.getReadid(),"阅读id",1});
         Integer result = readService.del(read.getReadid());
@@ -196,6 +200,7 @@ public class ReadController {
     }
 
     @PostMapping("/update_state")
+    @Action("电子书-修改状态")
     public ResultVo updateState(@RequestBody TRead read){
         Integer readid = read.getReadid();
         Integer readstate = read.getReadstate();

sapi/src/main/java/com/xhkjedu/sapi/controller/itemtool/TodoController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.itemtool;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.itemtool.TTodo;
 import com.xhkjedu.sapi.service.itemtool.TodoService;
 import com.xhkjedu.utils.N_Utils;
@@ -25,12 +26,14 @@ public class TodoController {
     private TodoService todoService;
 
     @PostMapping("/add")
+    @Action("待办事项-增加")
     public ResultVo add(@RequestBody TTodo tTodo) {
         Integer id = todoService.save(tTodo);
         return new ResultVo(0, "保存成功",id);
     }
 
     @PostMapping("/delete")
+    @Action("待办事项-删除")
     public ResultVo delete(@RequestBody TTodo tTodo) {
         N_Utils.validation(new Object[]{tTodo.getTodoid(),"待办事项id",1});
         todoService.deleteById(tTodo.getTodoid());
@@ -38,6 +41,7 @@ public class TodoController {
     }
 
     @PostMapping("/update")
+    @Action("待办事项-修改")
     public ResultVo update(@RequestBody TTodo tTodo) {
         N_Utils.validation(new Object[]{tTodo.getTodoid(),"待办事项id",1});
         todoService.update(tTodo);

sapi/src/main/java/com/xhkjedu/sapi/controller/notice/NoticeController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.notice;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.sapi.service.notice.NoticeService;
 import com.xhkjedu.utils.N_Utils;
@@ -30,12 +31,14 @@ public class NoticeController {
     private NoticeService noticeService;
 
     @PostMapping("/add")
+    @Action("通知管理-增加")
     public ResultVo add(@RequestBody TNotice tNotice) {
         Integer id = noticeService.save(tNotice);
         return new ResultVo(0, "保存成功",id);
     }
 
     @PostMapping("/delete")
+    @Action("通知管理-删除")
     public ResultVo delete(@RequestBody TNotice tNotice) {
         N_Utils.validation(new Object[]{tNotice.getNoticeid(),"通知id",1});
         noticeService.deleteById(tNotice.getNoticeid());
@@ -43,6 +46,7 @@ public class NoticeController {
     }
 
     @PostMapping("/update")
+    @Action("通知管理-修改")
     public ResultVo update(@RequestBody TNotice tNotice) {
         N_Utils.validation(new Object[]{tNotice.getNoticeid(),"通知id",1});
         noticeService.update(tNotice);

sapi/src/main/java/com/xhkjedu/sapi/controller/research/ResearchController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.research;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.research.TResearch;
 import com.xhkjedu.sapi.model.research.TResearchUser;
 import com.xhkjedu.sapi.service.research.ResearchService;
@@ -60,6 +61,7 @@ public class ResearchController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/save")
+    @Action("教研管理-增加")
     public ResultVo save(@RequestBody TResearch research){
         N_Utils.validation(new Object[]{
                 research.getResearchname(),"教研标题",2,
@@ -81,6 +83,7 @@ public class ResearchController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/up")
+    @Action("教研管理-修改")
     public ResultVo update(@RequestBody TResearch research){
         N_Utils.validation(new Object[]{
                 research.getResearchid(),"教研id",1,
@@ -99,6 +102,7 @@ public class ResearchController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/del")
+    @Action("教研管理-删除")
     public ResultVo del(@RequestBody TResearch research){
         N_Utils.validation(new Object[]{
                 research.getResearchid(),"教研id",1
@@ -172,6 +176,7 @@ public class ResearchController {
     * @Date 2023/8/8 15:39:05
     */
     @PostMapping("deltr")
+    @Action("教研管理-删除教师教研")
     public ResultVo delTeacherResearch(@RequestBody TResearchUser ruser){
         N_Utils.validation(new Object[]{
                 ruser.getRuid(),"教师教研id",1,

sapi/src/main/java/com/xhkjedu/sapi/controller/research/ResearchUserController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.research;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.research.TResearch;
 import com.xhkjedu.sapi.model.research.TResearchUser;
 import com.xhkjedu.sapi.service.research.ResearchUserService;
@@ -108,6 +109,7 @@ public class ResearchUserController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/up")
+    @Action("教研管理-保存教师教研")
     public ResultVo up(@RequestBody TResearchUser research){
         N_Utils.validation(new Object[]{
                 research.getResearchid(),"教研id",1,
@@ -136,6 +138,7 @@ public class ResearchUserController {
      * @Date 2023/8/8 15:39:05
      */
     @PostMapping("deltr")
+    @Action("教研管理-删除教师教研")
     public ResultVo delTeacherResearch(@RequestBody TResearchUser ruser){
         N_Utils.validation(new Object[]{ruser.getRuid(),"教师教研id",1,ruser.getUserid(),"当前登录教师id",1});
         return researchUserService.delTeacherResearch(ruser);
@@ -147,6 +150,7 @@ public class ResearchUserController {
     * @Date 2023/8/8 16:03:54
     */
     @PostMapping("uptr")
+    @Action("教研管理-修改教研内容")
     public ResultVo updateTeacherResearch(@RequestBody TResearchUser ruser){
         N_Utils.validation(new Object[]{ruser.getRuid(),"教师教研id",1,ruser.getUserid(),"当前登录教师id",1});
         return researchUserService.updateTeacherResearch(ruser);

sapi/src/main/java/com/xhkjedu/sapi/controller/system/AreazoneController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.system;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TAreazone;
 import com.xhkjedu.sapi.service.system.AreazoneService;
 import com.xhkjedu.vo.ResultVo;
@@ -25,18 +26,21 @@ public class AreazoneController {
     private AreazoneService areazoneService;
 
     @PostMapping("/add")
+    @Action("区域管理-增加")
     public ResultVo add(@RequestBody TAreazone areazone) {
         areazoneService.save(areazone);
         return new ResultVo(0, "保存成功");
     }
 
     @PostMapping("/delete")
+    @Action("区域管理-删除")
     public ResultVo delete(@RequestBody TAreazone areazone) {
         areazoneService.deleteById(areazone.getAreaid());
         return new ResultVo(0,"删除成功");
     }
 
     @PostMapping("/update")
+    @Action("区域管理-修改")
     public ResultVo update(@RequestBody TAreazone areazone) {
         areazoneService.update(areazone);
         return new ResultVo(0,"修改成功");

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuleController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.system;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TModule;
 import com.xhkjedu.sapi.service.system.ModuleService;
 import com.xhkjedu.utils.N_Utils;
@@ -89,6 +90,7 @@ public class ModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/add")
+    @Action("学校模块-增加")
     public ResultVo add(@RequestBody TModule module){
         N_Utils.validation(new Object[]{
                 module.getModulename(),"应用名称",2,
@@ -116,6 +118,7 @@ public class ModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/up")
+    @Action("学校模块-修改")
     public ResultVo update(@RequestBody TModule module){
         N_Utils.validation(new Object[]{
                 module.getModuleid(),"应用id",1,
@@ -136,6 +139,7 @@ public class ModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/del")
+    @Action("学校模块-删除")
     public ResultVo del(@RequestBody TModule module) {
         if (N_Utils.isEmpty(module.getModuleid()))
             return new ResultVo(1,"未选择删除的应用");
@@ -159,6 +163,7 @@ public class ModuleController {
     }
 
     @PostMapping("/move_up")
+    @Action("学校模块-移动")
     public ResultVo moveUp(@RequestBody List<TModule> modules){
         if (N_Utils.isListEmpty(modules)) {
             return new ResultVo(1,"要移动的模块信息不能为空");
@@ -178,6 +183,7 @@ public class ModuleController {
 
     //设置显示
     @PostMapping("/dis")
+    @Action("学校模块-设置显示")
     public ResultVo updateModuleDisplay(@RequestBody TModule module){
         N_Utils.validation(new Object[]{module.getModuleid(),"模块id",2});
         moduleService.updateModuleDisplay(module.getModuleid(),1);
@@ -186,6 +192,7 @@ public class ModuleController {
 
     //设置模块不显示
     @PostMapping("/nodis")
+    @Action("学校模块-设置不显示")
     public ResultVo updateModuleNoDisplay(@RequestBody TModule module){
         N_Utils.validation(new Object[]{module.getModuleid(),"模块id",2});
         moduleService.updateModuleDisplay(module.getModuleid(),10);

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuledefaultController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.system;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TModuledefault;
 import com.xhkjedu.sapi.service.system.ModuledefaultService;
 import com.xhkjedu.utils.N_Utils;
@@ -26,6 +27,7 @@ public class ModuledefaultController {
     private ModuledefaultService moduledefaultService;
 
     @PostMapping("/add")
+    @Action("模块管理-增加")
     public ResultVo add(@RequestBody TModuledefault tModuledefault) {
         N_Utils.validation(new Object[]{tModuledefault.getBelong(),"模块归属",1});
         if(tModuledefault.getLevel() == 2){
@@ -35,6 +37,7 @@ public class ModuledefaultController {
     }
 
     @PostMapping("/delete")
+    @Action("模块管理-删除")
     public ResultVo delete(@RequestBody TModuledefault tModuledefault) {
         N_Utils.validation(new Object[]{tModuledefault.getModuleid(),"模块id",2});
         moduledefaultService.deleteById(tModuledefault.getModuleid());
@@ -42,6 +45,7 @@ public class ModuledefaultController {
     }
 
     @PostMapping("/update")
+    @Action("模块管理-修改")
     public ResultVo update(@RequestBody TModuledefault tModuledefault) {
         moduledefaultService.update(tModuledefault);
         return new ResultVo(0,"修改成功");

sapi/src/main/java/com/xhkjedu/sapi/controller/system/PictureController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.system;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TPicture;
 import com.xhkjedu.sapi.service.system.PictureService;
 import com.xhkjedu.utils.N_Utils;
@@ -46,12 +47,14 @@ public class PictureController {
     }
 
     @PostMapping("/add")
+    @Action("图片管理-增加")
     public ResultVo add(@RequestBody TPicture picture) {
         pictureService.add(picture);
         return new ResultVo(0,"添加成功");
     }
 
     @PostMapping("/del")
+    @Action("图片管理-删除")
     public ResultVo del(@RequestBody TPicture picture) {
         Integer picid = picture.getPicid();
         N_Utils.validation(new Object[]{picid,"图片id",1});

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.system;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.model.system.TSchoolUpgradeHistory;
 import com.xhkjedu.sapi.service.system.SchoolService;
@@ -34,6 +35,7 @@ public class SchoolController {
     private SchoolService schoolService;
 
     @PostMapping("/add")
+    @Action("学校管理-增加")
     public ResultVo add(@RequestBody TSchool tSchool) {
         try {
             String schoolname = tSchool.getSchoolname();
@@ -48,6 +50,7 @@ public class SchoolController {
     }
 
     @PostMapping("/delete")
+    @Action("学校管理-删除")
     public ResultVo delete(@RequestBody TSchool tSchool) {
         N_Utils.validation(new Object[]{tSchool.getSchoolid(),"学校id",1});
         schoolService.deleteById(tSchool.getSchoolid());
@@ -55,6 +58,7 @@ public class SchoolController {
     }
 
     @PostMapping("/update")
+    @Action("学校管理-修改")
     public ResultVo update(@RequestBody TSchool tSchool) {
         N_Utils.validation(new Object[]{tSchool.getSchoolid(),"学校id",1});
         schoolService.update(tSchool);
@@ -93,6 +97,7 @@ public class SchoolController {
 
     //学年升级
     @PostMapping("/upgrade")
+    @Action("学校管理-学年升级")
     public ResultVo upgrade(@RequestBody TSchool tSchool) {
         Integer schoolid = tSchool.getSchoolid();
         Integer createid = tSchool.getCreateid();
@@ -111,6 +116,7 @@ public class SchoolController {
 
     //学年降级
     @PostMapping("/downgrade")
+    @Action("学校管理-学校降级")
     public ResultVo downgrade(@RequestBody TSchool tSchool) {
         Integer schoolid = tSchool.getSchoolid();
         Integer createid = tSchool.getCreateid();
@@ -184,6 +190,7 @@ public class SchoolController {
      * @Date 2022/9/22 16:24
      **/
     @PostMapping("/sfschool")
+    @Action("学校管理-保存关联学校")
     public ResultVo saveSchoolFriend(@RequestBody SchoolParams params) {
         Integer schoolid = params.getSchoolid();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1});

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolStypeController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.system;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TSchoolStype;
 import com.xhkjedu.sapi.service.system.SchoolStypeService;
 import com.xhkjedu.utils.N_Utils;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author ywx
@@ -25,6 +27,7 @@ public class SchoolStypeController {
     private SchoolStypeService schoolStypeService;
 
     @PostMapping("/add")
+    @Action("学校主题-增加")
     public ResultVo add(@RequestBody List<TSchoolStype> list) {
         return schoolStypeService.batchSave(list);
     }
@@ -37,6 +40,7 @@ public class SchoolStypeController {
     }
 
     @PostMapping("/add2")
+    @Action("学校主题-增加")
     public ResultVo add2(@RequestBody List<TSchoolStype> list) {
         if (N_Utils.isListEmpty(list)) return new ResultVo(1,"学校样式不能为空");
         return schoolStypeService.batchSave2(list);
@@ -49,4 +53,18 @@ public class SchoolStypeController {
         List<TSchoolStype> list = schoolStypeService.listAll2(stype);
         return new ResultVo(0,"获取学校样式列表成功",list);
     }
+
+    /*
+     * @Description 获取学校样式（设置登录页面获取数据）
+     * @Date 2023/11/21 10:19:12
+     * @Author WN
+     * @Param [stype]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/sstyles")
+    public ResultVo allList(@RequestBody TSchoolStype stype) {
+        N_Utils.validation(new Object[]{stype.getSchoolid(),"学校id",1});
+        Map<String,List<TSchoolStype>> rtnMap = schoolStypeService.listSchoolStypeAndDefault(stype);
+        return new ResultVo(0,"获取学校样式列表成功",rtnMap);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SyserrorController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.controller.system;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TSyserror;
 import com.xhkjedu.sapi.service.system.SyserrorService;
 import com.xhkjedu.utils.PageUtil;
@@ -28,6 +29,7 @@ public class SyserrorController {
     private SyserrorService syserrorService;
 
     @PostMapping("/add")
+    @Action("系统错误-增加")
     public ResultVo add(@RequestBody TSyserror error) {
         Integer id = syserrorService.save(error);
         return new ResultVo(0, "保存成功",id);

sapi/src/main/java/com/xhkjedu/sapi/controller/system/UserModuleController.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.controller.system;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sapi.model.system.TUserModule;
 import com.xhkjedu.sapi.service.system.UserModuleService;
 import com.xhkjedu.utils.N_Utils;
@@ -43,6 +44,7 @@ public class UserModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/save")
+    @Action("常用应用-增加")
     public ResultVo save(@RequestBody TUserModule userModule){
         N_Utils.validation(new Object[]{
                 userModule.getUserid(),"用户id",1,
@@ -74,6 +76,7 @@ public class UserModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/up")
+    @Action("常用应用-修改")
     public ResultVo update(@RequestBody TUserModule userModule){
         N_Utils.validation(new Object[]{
                 userModule.getUmid(),"用户应用id",1,
@@ -92,6 +95,7 @@ public class UserModuleController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/del")
+    @Action("常用应用-删除")
     public ResultVo del(@RequestBody TUserModule userModule) {
         if (!N_Utils.isTrueInteger(userModule.getUmid()))
             return new ResultVo(1,"未选择删除的常用应用");

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

@@ -1,31 +0,0 @@
-package com.xhkjedu.sapi.interceptors;
-
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * @author ywx
- * @classname HttpServletFilter
- * @description 过滤器 以便http post请求body输入流可多次读取
- * @date 2020/11/9 11:25
- **/
-@Component
-public class HttpServletFilter implements Filter {
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        ServletRequest requestWrapper = null;
-        if (request instanceof HttpServletRequest) {
-            requestWrapper = new RequestWrapper((HttpServletRequest) request);
-        }
-        if (requestWrapper == null) {
-            chain.doFilter(request, response);
-        } else {
-            chain.doFilter(requestWrapper, response);
-        }
-    }
-
-}

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

@@ -1,131 +0,0 @@
-package com.xhkjedu.sapi.interceptors;
-
-import com.alibaba.fastjson.JSON;
-import com.xhkjedu.exception.MissingParametersException;
-import com.xhkjedu.sapi.utils.ApiUtil;
-import com.xhkjedu.utils.JedisUtil;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-
-@Configuration
-@Slf4j
-public class RequestInterceptor extends JedisUtil implements HandlerInterceptor {
-    @Override
-    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
-            throws Exception {
-        // 请求结束时间
-        Long endTime = System.currentTimeMillis();
-        // 从HttpServletRequest获取开始时间
-        Long startTime = (Long) arg0.getAttribute("_startTime");
-        double time = ((endTime - startTime) * 1.000) / 1000;
-        // 打印接口信息及耗时
-        if (time > 1) {
-            log.error(" {}；耗时：{}s", arg0.getRequestURI(), time);
-        }
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
-            throws Exception {
-
-    }
-
-    /**
-     * 在调用controller具体方法前拦截
-     */
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-//        log.info("请求的uri:" + request.getRequestURI());
-        response.setHeader("Access-Control-Allow-Origin", "*");
-        //response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-        response.setContentType("application/json;charset=UTF-8");
-
-        // 记录请求开始时间
-        request.setAttribute("_startTime", System.currentTimeMillis());
-        String requestURI = request.getRequestURI();
-        String key = request.getHeader("Token-Key");
-        String token = request.getHeader("Token-Value");
-        if (!requestURI.contains("user/login") && !requestURI.endsWith("/get_new")
-                && N_Utils.isNotEmpty(key) && N_Utils.isNotEmpty(token)) {//非登录和获取最新版本相关接口验证token
-            String redis_token = get(key);//系统缓存中保存的token
-            if (redis_token != null && redis_token.equals("0")) {//获取token失败不对比
-            } else if (!token.equals(redis_token)) {
-                ResultVo result = new ResultVo();
-                result.setCode(2);
-                result.setMsg("登录失效");
-
-                response.getWriter().print(JSON.toJSONString(result));
-                return false;
-            } else {
-                refreshToken(key, redis_token);//刷新token
-            }
-        }
-
-        if (interceptorApi(requestURI)) {//需要拦截的请求
-            String encoding = request.getCharacterEncoding();
-            int contentLength = request.getContentLength();
-            byte buffer[] = new byte[request.getContentLength()];
-            request.getInputStream();
-            for (int i = 0;i < contentLength;) {
-
-                int readLen = request.getInputStream().read(buffer, i, contentLength - i);
-                if (readLen == -1) {
-                    break;
-                }
-                i += readLen;
-            }
-            if (encoding == null) {
-                encoding = "UTF-8";
-            }
-            String params = new String(buffer, encoding);
-            Map<String, String> uriMap = ApiUtil.uriMap;
-            String params2 = uriMap.get(requestURI);
-            if (N_Utils.isNotEmpty(params2) && params2.equals(params)) {
-                log.error("地址：{}，参数：{}",requestURI,params);
-                throw new MissingParametersException("提交过快，请稍后重试");
-            } else {
-                uriMap.put(requestURI, params);
-            }
-        }
-       /* if("dev".equals(ConfigKey.env)){//开发环境接口不拦截
-            return true;
-        }*/
-        return true;
-    }
-
-    /**
-     * 需要拦截的请求
-     * @Param [uri]
-     * @Author ywx
-     * @Date 2020/5/20 14:14
-     * @return java.lang.Boolean
-     **/
-    private Boolean interceptorApi(String uri) {
-        boolean rtn = false;
-        String[] url = new String[]{
-                "/resource/add",//资源--添加
-                "/research/save",//教研管理--添加
-                "/researchu/up",//教研教师--保存评价
-                "/notice/add" //通知--添加
-        };
-
-        for (int i = 0; i < url.length; i++) {
-            String urlstr = "/sapi"+url[i];
-            if (uri.equals(urlstr)) {
-                rtn = true;
-                break;
-            }
-        }
-
-        return rtn;
-    }
-
-}

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

@@ -1,78 +0,0 @@
-package com.xhkjedu.sapi.interceptors;
-
-import lombok.extern.slf4j.Slf4j;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.*;
-
-/**
- * @author ywx
- * @classname RequestWrapper
- * @description 解决POST请求中的BODY参数不能重复读取多次的问题
- * @date 2020/11/9 11:24
- **/
-@Slf4j
-public class RequestWrapper extends HttpServletRequestWrapper {
-    private static final int BUFFER_LEN = 128;
-
-    private final String body;
-
-    public RequestWrapper(HttpServletRequest request) throws IOException {
-        super(request);
-        StringBuilder stringBuilder = new StringBuilder();
-        BufferedReader bufferedReader = null;
-        try {
-            InputStream inputStream = request.getInputStream();
-            if (inputStream != null) {
-                bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-                char[] charBuffer = new char[BUFFER_LEN];
-                int bytesRead;
-                while ((bytesRead = bufferedReader.read(charBuffer)) > 0) {
-                    stringBuilder.append(charBuffer, 0, bytesRead);
-                }
-            }
-        } catch (IOException ex) {
-            throw ex;
-        } finally {
-            if (bufferedReader != null) {
-                try {
-                    bufferedReader.close();
-                } catch (IOException ex) {
-                    throw ex;
-                }
-            }
-        }
-        body = stringBuilder.toString();
-    }
-
-    @Override
-    public ServletInputStream getInputStream() throws IOException {
-        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
-        ServletInputStream servletInputStream = new ServletInputStream() {
-            public boolean isFinished() {
-                return false;
-            }
-            public boolean isReady() {
-                return false;
-            }
-            public void setReadListener(ReadListener readListener) {}
-            public int read() throws IOException {
-                return byteArrayInputStream.read();
-            }
-        };
-        return servletInputStream;
-
-    }
-    @Override
-    public BufferedReader getReader() throws IOException {
-        return new BufferedReader(new InputStreamReader(this.getInputStream()));
-    }
-
-    public String getBody() {
-        return this.body;
-    }
-
-}

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

@@ -1,62 +0,0 @@
-package com.xhkjedu.sapi.interceptors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-/**
- * @author WN
- * @description
- * @date 2019/4/3 15:50
- **/
-@Configuration
-public class WebMvcConfg implements WebMvcConfigurer {
-
-    @Autowired
-    private RequestInterceptor requestInterceptor;
-    @Resource
-    private HttpServletFilter httpServletFilter;
-
-    /**
-     * 拦截器addPathPatterns用于添加拦截规则 excludePathPatterns 用于排除拦截
-     * @Param: registry
-     * @return void
-     * @author wn
-     * @date 2019/4/8
-     */
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(requestInterceptor).addPathPatterns("/**");
-    }
-
-    /**
-     * 允许跨域
-     * @Param: registry
-     * @return void
-     * @author wn
-     * @date 2019/4/8
-     */
-    @Override
-    public void addCorsMappings(CorsRegistry registry){
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowCredentials(true)
-                .allowedMethods("GET","POST")
-                .maxAge(3600);
-    }
-
-    @Bean
-    public FilterRegistrationBean registerFilter() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(httpServletFilter);
-        registration.addUrlPatterns("/*");
-        registration.setOrder(1);
-        return registration;
-    }
-}

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/analyze/SchoolResourceMapper.java

@@ -23,6 +23,9 @@ public interface SchoolResourceMapper {
     //资源分半--资源格式
     List<SchoolResourceClassNumVo> listSchoolResourceClassNum(Integer schoolid);
 
+    //获取所有资源resourcetype值
+    List<Integer> listAllResourceType();
+
     //资源上传量
     List<SchoolResourceUploadNumVo> listSchoolResourceUploadNum(Integer schoolid, Long starttime, Long endtime);
 

sapi/src/main/java/com/xhkjedu/sapi/mapper/cloud/CloudSyncMapper.java

@@ -71,4 +71,7 @@ public interface CloudSyncMapper extends TkMapper<TCloudSync> {
 
     //添加知识点外键
     void addPointFk();
+
+    //获取同步类型
+    List<Map> listModule();
 }

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

@@ -1,9 +1,8 @@
 package com.xhkjedu.sapi.mapper.system;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sapi.model.gradeclass.TClassStudent;
 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;
 
@@ -40,4 +39,10 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //删除学生绑定信息
     void delBindmac(@Param("schoolid") Integer schoolid);
+
+    //获取用户信息
+    TUser getUserTypeAndSchool(@Param("userid") Integer userid);
+
+    //获取用户信息用于操作日志
+    UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloudSync.java

@@ -50,4 +50,8 @@ public class TCloudSync extends BaseBean {
     @Transient
     //详情列表
     private List<TCloudSyncDetail> syncdetails;
+
+    @Transient
+    //同步的模块
+    private List<String> modules;
 }

sapi/src/main/java/com/xhkjedu/sapi/service/analyze/SchoolResourceService.java

@@ -6,8 +6,10 @@ import com.xhkjedu.sapi.vo.analyze.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -55,10 +57,24 @@ public class SchoolResourceService {
         Long endtime = N_Utils.getNowtimestamp();
         Long starttime = N_Utils.getLongGoTime(type);
         List<SchoolResourceUploadNumVo> lst = schoolResourceMapper.listSchoolResourceUploadNum(schoolid,starttime,endtime);
+        //获取资源resourcetyp的值
+        List<Integer> resourcetypes = schoolResourceMapper.listAllResourceType();
         for(SchoolResourceUploadNumVo rupload : lst){
             List<SchoolResourceTypeNumVo> rtypelist = rupload.getRtypelist();
             rtypelist = saveListSchoolResourceTypeNumVo(rtypelist);
 
+            Map<Integer, SchoolResourceTypeNumVo> typeMap = rtypelist.stream().collect(Collectors.toMap(SchoolResourceTypeNumVo::getResourcetype, obj -> obj, (key1, key2) -> key1));
+            List<SchoolResourceTypeNumVo> newTypes = new ArrayList<>();
+            for(Integer rt : resourcetypes){
+                if(typeMap.containsKey(rt)){
+                    newTypes.add(typeMap.get(rt));
+                }else{
+                    SchoolResourceTypeNumVo srt = new SchoolResourceTypeNumVo();
+                    srt.setResourcetype(rt);
+                    newTypes.add(srt);
+                }
+            }
+            rupload.setRtypelist(newTypes);
         }
         return lst;
     }

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppthirdService.java

@@ -47,8 +47,8 @@ public class AppthirdService {
     @Transactional(rollbackFor = Exception.class)
     public Integer deleteById(Integer appid) {
         List<String> resourceUrls = appthirdHistoryMapper.listApppath(appid);//获取APP文件
-        Integer result = appthirdMapper.deleteByPrimaryKey(appid);
         handleThirdManager(appid, 2);//处理应用白名单
+        Integer result = appthirdMapper.deleteByPrimaryKey(appid);
         if(N_Utils.isListNotEmpty(resourceUrls)){
             messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         }

sapi/src/main/java/com/xhkjedu/sapi/service/classreport/ClassReportService.java

@@ -280,7 +280,7 @@ public class ClassReportService {
                     }
                     list1.add(rg);
                 } catch (Exception e) {
-                    log.error("保存预习报告数据出错", e.getMessage());
+                    log.error("保存预习报告数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -401,7 +401,7 @@ public class ClassReportService {
                     }
                     list1.add(rr);
                 } catch (Exception e) {
-                    log.error("保存课堂数据出错", e.getMessage());
+                    log.error("保存课堂数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -577,7 +577,7 @@ public class ClassReportService {
                     }
                     list1.add(rp);
                 } catch (Exception e) {
-                    log.error("保存作业数据出错", e.getMessage());
+                    log.error("保存作业数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -726,7 +726,7 @@ public class ClassReportService {
                     }
                     list1.add(rr);
                 } catch (Exception e) {
-                    log.error("保存背诵数据出错", e.getMessage());
+                    log.error("保存背诵数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -822,7 +822,7 @@ public class ClassReportService {
                     }
                     list1.add(ref);
                 } catch (Exception e) {
-                    log.error("保存错题辅导数据出错", e.getMessage());
+                    log.error("保存错题辅导数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -928,7 +928,7 @@ public class ClassReportService {
                     }
                     list1.add(rq);
                 } catch (Exception e) {
-                    log.error("保存错题数据出错", e.getMessage());
+                    log.error("保存错题数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -1045,7 +1045,7 @@ public class ClassReportService {
                     }
                     list1.add(rl);
                 } catch (Exception e) {
-                    log.error("保存直播数据出错", e.getMessage());
+                    log.error("保存直播数据出错：{}", e.getMessage());
                 }
             }
         }
@@ -1470,7 +1470,7 @@ public class ClassReportService {
                 }
                 list1.addAll(points);
             } catch (Exception e) {
-                log.error("保存知识点掌握统计出错", e.getMessage());
+                log.error("保存知识点掌握统计出错：{}", e.getMessage());
             }
         }
         return list1;

sapi/src/main/java/com/xhkjedu/sapi/service/cloud/CloudSyncService.java

@@ -16,9 +16,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author ywx
@@ -53,7 +51,12 @@ public class CloudSyncService {
         if (lastSync == null || lastSync.getSyncstate() == 1 || lastSync.getSynctask() == 0) {
             String cloudcode = sync.getCloudcode();
             Integer begintime = lastSync==null?null:lastSync.getEndtime();
-            String param = "{\"cloudcode\": \""+cloudcode+"\",\"begintime\":"+begintime+"}";
+            Map map = new HashMap();
+            map.put("cloudcode", cloudcode);
+            map.put("begintime", begintime);
+            //同步所有基本信息
+            //map.put("modules", sync.getModules());
+            String param = JSON.toJSONString(map);
             //同步任务
             ResultVo vo = getResultVo("csync/g",param);
             if (vo.getCode() != 0) return vo;
@@ -164,7 +167,7 @@ public class CloudSyncService {
             } else if (synctable.equals("t_point")) {//同步知识点
                 handleid = (String) list.get(list.size()-1).get("pointid");
                 cloudSyncMapper.syncPoint(list, N_Utils.getSecondTimestamp());
-            } else if (synctable.equals("t_question")) {//同步试题
+            } /*else if (synctable.equals("t_question")) {//同步试题
                 handleid = (String) list.get(list.size()-1).get("questionid");
                 for (Map question : list) {
                     Integer ctype = (Integer) question.get("ctype");
@@ -235,7 +238,7 @@ public class CloudSyncService {
                         log.error("同步【"+synctable+" "+resourceid+"】失败",e.getMessage());
                     }
                 }
-            }
+            }*/
 
         } catch (Exception e) {
             syncnum--;
@@ -265,4 +268,15 @@ public class CloudSyncService {
     public TCloudSync getCloudInfo() {
         return cloudSyncMapper.getCloudInfo();
     }
+
+    /**
+     * @Description 获取同步类型
+     * @Date 2023/10/13 15:15
+     * @Author YWX
+     * @Param []
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo listModule() {
+        return new ResultVo(0, "获取同步类型成功！", cloudSyncMapper.listModule());
+    }
 }

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/java/com/xhkjedu/sapi/service/region/RPaperAnalyzeService.java

@@ -261,7 +261,7 @@ public class RPaperAnalyzeService {
                 Integer usetimes = Integer.parseInt(map.get("costtime").toString());
                 Integer stunum = Integer.parseInt(map.get("stunum").toString());
 
-                double avgtime = N_Utils.formatAvg(day * stunum,usetimes);
+                double avgtime = N_Utils.formatAvg(usetimes, day * stunum);
                 map.put("avgtime",avgtime);
             }
         }
@@ -280,7 +280,7 @@ public class RPaperAnalyzeService {
                 Integer usetimes = Integer.parseInt(map.get("costtime").toString());
                 Integer stunum = Integer.parseInt(map.get("stunum").toString());
 
-                double avgtime = N_Utils.formatAvg(day * stunum,usetimes);
+                double avgtime = N_Utils.formatAvg(usetimes, day * stunum);
                 map.put("avgtime",avgtime);
             }
         }

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolStypeService.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -146,4 +147,31 @@ public class SchoolStypeService {
         }
         return rtnlst;
     }
+
+    /*
+     * @Description 获取学校样式（设置登录页面获取数据）
+     * @Date 2023/11/21 10:39:18
+     * @Author WN
+     * @Param [stype]
+     * @Return java.util.Map<java.lang.String,java.util.List<com.xhkjedu.sapi.model.system.TSchoolStype>>
+     **/
+    public Map<String,List<TSchoolStype>> listSchoolStypeAndDefault(TSchoolStype stype) {
+        List<TSchoolStype> lst = schoolStypeMapper.findAll2(stype);
+
+        Map<String,List<TSchoolStype>> rtnMap = new HashMap<>();
+        if(N_Utils.isListNotEmpty(lst)){
+            //获取学校设置的
+            List<TSchoolStype> schoolStypes = lst.stream().filter(s -> stype.getSchoolid().equals(s.getSchoolid())).collect(Collectors.toList());
+            //默认地址
+            List<TSchoolStype> defaultStypes = lst.stream().filter(s -> "default".equals(s.getSchooldomain())).collect(Collectors.toList());
+
+            rtnMap.put("school",schoolStypes);
+            rtnMap.put("default",defaultStypes);
+        }else{
+            rtnMap.put("school",new ArrayList<>());
+            rtnMap.put("default",new ArrayList<>());
+        }
+
+        return rtnMap;
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/vo/analyze/SchoolResourceTypeNumVo.java

@@ -11,6 +11,6 @@ import lombok.Data;
 @Data
 public class SchoolResourceTypeNumVo {
     private Integer resourcetype;//资源分类1课件 2学案（导学案）3习题 4微课视频（视频库）5教学设计
-    private Integer resourcenum;//资源数量
-    private double  resourcerate;//占比
+    private Integer resourcenum = 0;//资源数量
+    private double  resourcerate = 0;//占比
 }

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

@@ -1,116 +0,0 @@
-package com.xhkjedu.sapi.vo.system;
-
-import lombok.Data;
-
-/**
- * @ClassName UserVo
- * Description
- * Author WN
- * Date 2020/5/29 17:16
- **/
-@Data
-public class UserVo {
-    //用户表
-    private Integer userid;
-
-    //姓名
-    private String username;
-
-    //登录账号
-    private String loginname;
-
-    //登录密码
-    private String loginpwd;
-
-    //学生学号
-    private String studentno;
-
-    //用户手机号
-    private String userphone;
-
-    //出生日期
-    private Integer userbirthday;
-
-    //身份证号
-    private String cardid;
-
-    //头像地址
-    private String headpic;
-
-    //用户类型999超级管理员0学校管理员1老师2学生
-    private Integer usertype;
-
-    //用户状态1正常2删除
-    private Integer userstate;
-
-    //是否绑定硬件地址0不绑定1绑定
-    private Integer bindmac;
-
-    //硬件地址
-    private String mac;
-
-    //硬件地址绑定的账号
-    private String macname;
-
-    //学校是否绑定硬件地址0不绑定1绑定
-    private Integer sbindmac;
-
-    //操作密码（教师操作密码）
-    private String opepassword;
-
-    //创建人id
-    private Integer createid;
-
-    //创建人姓名
-    private String createname;
-
-    //创建时间
-    private Integer createtime;
-
-    //删除人id
-    private Integer deleteid;
-
-    //删除时间
-    private Integer deletetime;
-
-    //学校id
-    private Integer schoolid;
-
-    private String schoolname;
-
-    //学校阶段1小学2初中3高中4大学
-    private Integer schoollevel;
-
-    //学校状态1正常10删除
-    private Integer schoolstate;
-
-    //错误率%
-    private Integer errorrate;
-
-    //当前年份
-    private Integer year;
-
-    //性别1男2女
-    private Integer usersex;
-
-    //云平台码
-    private String cloudcode;
-
-    //行政班数量
-    private Integer xznum;
-
-    //是否绑定手机号0不绑定1绑定
-    private Integer bindphone;
-
-    //是否有手机号0没有1有
-    private Integer hasphone;
-
-    //学校域名地址
-    private String schooldomain;
-
-    //有效期
-    private String usertime;
-    private String token_key;
-    private String token_value;
-
-}

sapi/src/main/resources/application.properties

@@ -2,8 +2,8 @@ server.port=8087
 spring.application.name=sapi
 #注册到我们本地的eureka注册中心，端口8081
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
-#eureka.client.register-with-eureka=false
-#eureka.client.fetch-registry=false
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
 #设置eureka输出日志级别
 logging.level.com.netflix=error
 spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:3306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
@@ -35,21 +35,7 @@ mapper.identity=MYSQL
 logging.level.com.xhkjedu.sapi.mapper=debug
 #分页
 spring.pagehelper.helper-dialect=mysql
-#redis配置
-spring.redis.host=cachetest.xhkjedu.com
-spring.redis.port=6379
-spring.redis.password=xhkjedud07
-#超时时间：单位ms
-spring.redis.timeout=5000
-#设置过期时间10min
-spring.redis.jedis.pool.max-idle=300
-#最大等待时间：单位ms //高版本改为maxWaitMillis
-spring.redis.jedis.pool.max-wait=1000000
-spring.redis.jedis.pool.max-active=60000
-#缓存访问数据有效时长60*60*24*7
-redisdatatime=604800
-#secretKey必须为24位
-secretKey=nanhuakaizhangjianwangni
+
 #消费者mq
 rabbitmq.researchHandleQueue=xhkjedutest.xhschool.researchHandleQueue_dev
 #负载一生产者mq
@@ -58,6 +44,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
@@ -105,5 +95,12 @@ cron.synctime=0 0 3 ? * SUN
 cron.syncnum=100
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
+
+#开启spring的aop配置，默认true
+spring.aop.auto=true
+#解析ip归属地数据
+ipregiondb=D:\\school\\ip2region.xdb
+
 #版本号
-versionname=Test_v3.9.0
+buildnum=300
+versionname=Test_v3.13.0

sapi/src/main/resources/mapper/analyze/SchoolResourceMapper.xml

@@ -3,12 +3,17 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.analyze.SchoolResourceMapper">
     <!-- 校本资源总数量 -->
     <select id="getSchoolResourceNum" resultType="com.xhkjedu.sapi.vo.analyze.SchoolResourceNumVo">
-        SELECT COUNT(distinct r.resourceid) resourcenum,SUM(resourcesize) resourcesize,SUM(downcount) downnum
-        ,count(DISTINCT rc.resourceid) collectnum
+        SELECT COUNT(r.resourceid) resourcenum,SUM(resourcesize) as resourcesize,SUM(downcount) as downnum
+        ,sum(r2.collectnum) as collectnum
+        from(select distinct r.resourceid,count(distinct rc.rcid)collectnum
         FROM t_resource r left join t_resource_collect rc on rc.resourceid=r.resourceid
         left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1
+        and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid})r2
+        left join t_resource r on r2.resourceid=r.resourceid
     </select>
 
     <!--资源分布-分资源类统计-->
@@ -16,7 +21,9 @@
         SELECT r.resourcetype,COUNT(distinct r.resourceid)AS resourcenum
          FROM t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-         WHERE r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
          GROUP BY r.resourcetype
     </select>
 
@@ -25,15 +32,22 @@
         SELECT r.resourceclass,COUNT(distinct r.resourceid)AS resourcenum
          FROM t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-         WHERE r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
          GROUP BY r.resourceclass
     </select>
 
+    <!--获取所有资源resourcetype值-->
+    <select id="listAllResourceType" resultType="java.lang.Integer">
+        select resourcetype from t_resource where resourcestate=1 and level!=2 group by resourcetype
+    </select>
+
     <resultMap id="sResourceUpload" type="com.xhkjedu.sapi.vo.analyze.SchoolResourceUploadNumVo">
-        <result property="uploadtime" column="uploadtime"></result>
+        <result property="uploadtime" column="uploadtime"/>
         <collection property="rtypelist" ofType="com.xhkjedu.sapi.vo.analyze.SchoolResourceTypeNumVo">
-            <result property="resourcetype" column="resourcetype"></result>
-            <result property="resourcenum" column="resourcenum"></result>
+            <result property="resourcetype" column="resourcetype"/>
+            <result property="resourcenum" column="resourcenum"/>
         </collection>
     </resultMap>
     <!--资源上传量-->
@@ -41,17 +55,19 @@
         SELECT FROM_UNIXTIME(r.createtime,'%Y-%m') AS uploadtime,r.resourcetype,COUNT(distinct r.resourceid) AS resourcenum
         FROM t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
-        AND r.createtime<![CDATA[ >= ]]>#{starttime} AND r.createtime<![CDATA[ <= ]]>#{endtime}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        AND r.createtime >= #{starttime} AND r.createtime <![CDATA[ <= ]]>#{endtime}
         GROUP BY uploadtime,r.resourcetype
     </select>
 
     <resultMap id="sResourceRank" type="com.xhkjedu.sapi.vo.analyze.SchoolResourceRankVo">
-        <result property="userid" column="userid"></result>
-        <result property="username" column="username"></result>
+        <result property="userid" column="userid"/>
+        <result property="username" column="username"/>
         <collection property="rtypelist" ofType="com.xhkjedu.sapi.vo.analyze.SchoolResourceTypeNumVo">
-            <result property="resourcetype" column="resourcetype"></result>
-            <result property="resourcenum" column="resourcenum"></result>
+            <result property="resourcetype" column="resourcetype"/>
+            <result property="resourcenum" column="resourcenum"/>
         </collection>
     </resultMap>
     <!--资源排行-->
@@ -64,14 +80,16 @@
             left join t_class_teacher ct on r.createid=ct.teacherid
             LEFT JOIN t_class c ON ct.classid=c.classid
         </if>
-        WHERE r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
         <if test="subjectid!=null and subjectid!='0'.toString() and subjectid!=''">
             AND r.subjectid=#{subjectid}
         </if>
         <if test="gradeid>0">
             AND c.gradeid=#{gradeid} and c.year=ts.year
         </if>
-        AND r.createtime<![CDATA[ >= ]]>#{starttime} AND r.createtime<![CDATA[ <= ]]>#{endtime}
+        AND r.createtime >= #{starttime} AND r.createtime <![CDATA[ <= ]]>#{endtime}
         GROUP BY r.createid,r.resourcetype
 
     </select>
@@ -81,24 +99,28 @@
          SELECT q.subjectid,s.subjectname,COUNT(DISTINCT q.questionid) AS questionnum
           FROM t_question q LEFT JOIN t_subject s ON q.subjectid=s.subjectid
           left join t_school ts on s.level=ts.schoollevel
-          WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
         <if test="params.type!=null and params.type!=0">
-          AND q.createtime<![CDATA[ >= ]]>#{params.starttime} AND q.createtime<![CDATA[ <= ]]>#{params.stoptime}
+          AND q.createtime >= #{params.starttime} AND q.createtime <![CDATA[ <= ]]>#{params.stoptime}
         </if>
-          GROUP BY q.subjectid ORDER BY s.subjectorder asc
+          GROUP BY q.subjectid ORDER BY s.subjectorder
     </select>
     <!-- 结构性试题统计 年级试题数量-->
     <select id="listSchoolResourceQuestionGrade" resultType="com.xhkjedu.sapi.vo.analyze.SchoolResourceQuestionVo">
       SELECT c.gradeid,COUNT(DISTINCT q.questionid) AS questionnum
-	  FROM t_question q left join t_class_teacher ct on q.createid=ct.teacherid
+      FROM t_question q left join t_class_teacher ct on q.createid=ct.teacherid
       LEFT JOIN t_class c ON ct.classid=c.classid
       left join t_subject s on q.subjectid=s.subjectid
       left join t_school ts on s.level=ts.schoollevel
-      WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid} and c.year=ts.year
+      left join t_question_director qd on q.questionid=qd.questionid
+      left join t_director d on qd.directorid=d.directorid
+      where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid} and c.year=ts.year
       <if test="params.type!=null and params.type!=0">
-          AND q.createtime<![CDATA[ >= ]]>#{params.starttime} AND q.createtime<![CDATA[ <= ]]>#{params.stoptime}
+          AND q.createtime >= #{params.starttime} AND q.createtime <![CDATA[ <= ]]>#{params.stoptime}
       </if>
-      GROUP BY c.gradeid ORDER BY c.gradeid ASC
+      GROUP BY c.gradeid ORDER BY c.gradeid
     </select>
 
     <!--结构性试题 教师上传排行榜-->
@@ -111,9 +133,11 @@
         </if>
         left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
         <if test="params.type!=null and params.type!=0">
-            AND q.createtime<![CDATA[ >= ]]>#{params.starttime} AND q.createtime<![CDATA[ <= ]]>#{params.stoptime}
+            AND q.createtime >= #{params.starttime} AND q.createtime <![CDATA[ <= ]]>#{params.stoptime}
         </if>
         <if test="params.subjectid!=null and params.subjectid!='0'.toString() and params.subjectid!=''">
             and q.subjectid=#{params.subjectid}
@@ -133,25 +157,29 @@
         FROM t_question q
         left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
     </select>
     <resultMap id="sQuestionUpload" type="com.xhkjedu.sapi.vo.analyze.SchoolQuestionUploadNumVo">
-        <result property="uploadtime" column="uploadtime"></result>
+        <result property="uploadtime" column="uploadtime"/>
         <collection property="questions" ofType="com.xhkjedu.sapi.vo.analyze.SchoolQuestionNumVo">
-            <result property="gradeid" column="gradeid"></result>
-            <result property="subjectname" column="subjectname"></result>
-            <result property="questionnum" column="questionnum"></result>
+            <result property="gradeid" column="gradeid"/>
+            <result property="subjectname" column="subjectname"/>
+            <result property="questionnum" column="questionnum"/>
         </collection>
     </resultMap>
     <!--获取按年级试题上传变化列表-->
     <select id="listSchoolGQuestionUpload" resultMap="sQuestionUpload">
-        SELECT FROM_UNIXTIME(q.createtime,'%Y-%m') AS uploadtime,COUNT(q.questionid) AS questionnum,c.gradeid
+        SELECT FROM_UNIXTIME(q.createtime,'%Y-%m') AS uploadtime,COUNT(distinct q.questionid) AS questionnum,c.gradeid
         FROM t_question q LEFT JOIN t_class_teacher ct ON q.createid=ct.teacherid
         LEFT JOIN t_class c ON ct.classid=c.classid
         left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
-        AND q.createtime<![CDATA[ >= ]]>#{starttime} AND q.createtime<![CDATA[ <= ]]>#{endtime}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
+        AND q.createtime >= #{starttime} AND q.createtime <![CDATA[ <= ]]>#{endtime}
         GROUP BY uploadtime,c.gradeid
     </select>
     <!--获取按科目试题上传变化列表-->
@@ -160,8 +188,10 @@
         ,s.subjectname
         FROM t_question q left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
-        AND q.createtime<![CDATA[ >= ]]>#{starttime} AND q.createtime<![CDATA[ <= ]]>#{endtime}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        AND q.createtime >= #{starttime} AND q.createtime <![CDATA[ <= ]]>#{endtime}
         GROUP BY uploadtime,q.subjectid
     </select>
     <!--本月新增情况-->
@@ -171,14 +201,18 @@
         union select 'resource' type,count(distinct r.resourceid)num
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and r.resourcestate=1 and ts.schoolid=#{schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and r.resourcestate=1 and ts.schoolid=#{schoolid}
         and DATE_FORMAT(FROM_UNIXTIME(r.createtime),'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
         union select 'research' type,count(r.researchid)num from t_research r where r.schoolid=#{schoolid}
         and DATE_FORMAT(FROM_UNIXTIME(r.createtime),'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
         union select 'question' type,count(distinct q.questionid)num
         from t_question q left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and q.qstate=1 and ts.schoolid=#{schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qlevel!=3 and (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{schoolid})) and q.qstate=1 and ts.schoolid=#{schoolid}
         and DATE_FORMAT(FROM_UNIXTIME(q.createtime),'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
     </select>
 
@@ -189,30 +223,32 @@
         left join t_class c on ct.classid=c.classid
         left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid} and c.year=ts.year
         group by c.gradeid
     </select>
     <!--按科目资源统计列表-->
     <select id="listSchoolResourceSubject" resultType="com.xhkjedu.sapi.vo.analyze.SchoolResourceSubjectNumVo">
         select s.subjectname,count(distinct r.resourceid)as resourcenum
         from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
-        left join t_subject_book sb on rd.lsbid = sb.lsbid
         left join t_subject s on r.subjectid = s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
         group by r.subjectid
     </select>
     <!--资源上传详情排行-->
     <select id="listSchoolResourceRank2" resultType="com.xhkjedu.sapi.vo.analyze.SchoolUserResourceNumVo">
         SELECT count(distinct r.resourceid)totalnum,u.username
-        ,count(distinct case when r.resourcetype=1 then r.resourceid else null end)xtnum
-        ,count(distinct case when r.resourcetype=2 then r.resourceid else null end)janum
-        ,count(distinct case when r.resourcetype=3 then r.resourceid else null end)kjnum
-        ,count(distinct case when r.resourcetype=4 then r.resourceid else null end)jcnum
-        ,count(distinct case when r.resourcetype=5 then r.resourceid else null end)spnum
-        ,count(distinct case when r.resourcetype=6 then r.resourceid else null end)xanum
-        ,count(distinct case when r.resourcetype=7 then r.resourceid else null end)ywbnum
-        ,count(distinct case when r.resourcetype=10 then r.resourceid else null end)qtnum
+        ,count(distinct if(r.resourcetype=1,r.resourceid,null))xtnum
+        ,count(distinct if(r.resourcetype=2,r.resourceid,null))janum
+        ,count(distinct if(r.resourcetype=3,r.resourceid,null))kjnum
+        ,count(distinct if(r.resourcetype=4,r.resourceid,null))jcnum
+        ,count(distinct if(r.resourcetype=5,r.resourceid,null))spnum
+        ,count(distinct if(r.resourcetype=6,r.resourceid,null))xanum
+        ,count(distinct if(r.resourcetype=7,r.resourceid,null))ywbnum
+        ,count(distinct if(r.resourcetype=10,r.resourceid,null))qtnum
         FROM t_resource r LEFT JOIN t_user u ON r.createid=u.userid
         left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
@@ -220,9 +256,11 @@
             LEFT JOIN t_class_teacher ct ON r.createid=ct.teacherid
             LEFT JOIN t_class c ON ct.classid=c.classid
         </if>
-        WHERE r.resourcestate=1 AND (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 AND (r.belong IN(1,2) OR (r.belong=3 AND r.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}
         <if test="params.type!=null and params.type!=0">
-            AND r.createtime<![CDATA[ >= ]]>#{params.starttime} AND r.createtime<![CDATA[ <= ]]>#{params.stoptime}
+            AND r.createtime >= #{params.starttime} AND r.createtime <![CDATA[ <= ]]>#{params.stoptime}
         </if>
         <if test="params.subjectid!=null and params.subjectid!='0'.toString() and params.subjectid!=''">
             and r.subjectid=#{params.subjectid}

sapi/src/main/resources/mapper/analyze/SchoolRoomMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.analyze.SchoolRoomMapper">
     <!--课堂统计-->
     <resultMap id="schoolroomsbuject" type="com.xhkjedu.sapi.vo.analyze.SchoolRoomSubjectVo">
-        <result property="subjectid" column="subjectid"></result>
-        <result property="subjectname" column="subjectname"></result>
+        <result property="subjectid" column="subjectid"/>
+        <result property="subjectname" column="subjectname"/>
         <collection property="roomlist" ofType="com.xhkjedu.sapi.vo.analyze.SchoolRoomGradeRoomVo">
-            <result property="roomid" column="roomid"></result>
-            <result property="roomtime" column="roomtime"></result>
+            <result property="roomid" column="roomid"/>
+            <result property="roomtime" column="roomtime"/>
         </collection>
     </resultMap>
     <select id="listSchoolRoomSubject" resultMap="schoolroomsbuject">
@@ -17,12 +17,13 @@
          LEFT JOIN t_class c ON r.classid=c.classid
          LEFT JOIN t_subject s ON sb.subjectid = s.subjectid
          LEFT JOIN t_user u ON r.createid=u.userid
-          WHERE r.roomstate=2 AND r.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid} and r.year=#{sparams.year} AND u.userstate=1
+        left join t_director d on r.directorid=d.directorid
+        where d.disabled=0 and r.roomstate=2 AND r.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid} and r.year=#{sparams.year} AND u.userstate=1
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND r.createtime >= #{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND r.createtime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
           GROUP BY r.roomid ORDER BY s.subjectorder
     </select>
@@ -30,19 +31,19 @@
 
     <!--课堂统计详情-->
     <resultMap id="schoolroomdetail" type="com.xhkjedu.sapi.vo.analyze.SchoolRoomGradeUserVo">
-        <result property="userid" column="userid"></result>
-        <result property="username" column="username"></result>
-        <result property="headpic" column="headpic"></result>
+        <result property="userid" column="userid"/>
+        <result property="username" column="username"/>
+        <result property="headpic" column="headpic"/>
         <collection property="udlist" ofType="com.xhkjedu.sapi.vo.analyze.SchoolRoomGradeUserDetailVo">
-            <result property="roomid" column="roomid"></result>
-            <result property="questionnum" column="questionnum"></result>
-            <result property="examnum" column="examnum"></result>
-            <result property="asknum" column="asknum"></result>
-            <result property="callnum" column="callnum"></result>
-            <result property="picnum" column="picnum"></result>
-            <result property="totaltime" column="totaltime"></result>
-            <result property="classnum" column="classnum"></result>
-            <result property="realstunum" column="realstunum"></result>
+            <result property="roomid" column="roomid"/>
+            <result property="questionnum" column="questionnum"/>
+            <result property="examnum" column="examnum"/>
+            <result property="asknum" column="asknum"/>
+            <result property="callnum" column="callnum"/>
+            <result property="picnum" column="picnum"/>
+            <result property="totaltime" column="totaltime"/>
+            <result property="classnum" column="classnum"/>
+            <result property="realstunum" column="realstunum"/>
         </collection>
     </resultMap>
     <select id="listSchoolRoomDetailBySubject" resultMap="schoolroomdetail">
@@ -58,7 +59,8 @@
           LEFT JOIN t_subject s ON sb.subjectid=s.subjectid
          LEFT JOIN t_class c ON r.classid=c.classid
           LEFT JOIN t_user u ON r.createid=u.userid
-        WHERE r.roomstate=2 AND r.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and r.year=#{sparams.year} AND u.userstate=1
+        left join t_director d on r.directorid=d.directorid
+        where d.disabled=0 and r.roomstate=2 AND r.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and r.year=#{sparams.year} AND u.userstate=1
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             AND s.subjectid=#{sparams.subjectid}
         </if>
@@ -66,10 +68,10 @@
             AND u.username like '%${sparams.username}%'
         </if>
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND r.createtime >= #{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND r.createtime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
          GROUP BY r.roomid
     </select>

sapi/src/main/resources/mapper/analyze/SchoolSummaryMapper.xml

@@ -3,30 +3,30 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.analyze.SchoolSummaryMapper">
     <!--获取用户集合-->
     <select id="listUser" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
-        select u.userid,u.username,u.loginname,sb.subjectid,s.subjectname
+        select u.userid,u.username,u.loginname,tp.subjectid,s.subjectname
         from t_class_teacher ct left join t_class c on ct.classid=c.classid
         right join t_teacher_powersb tp on tp.teacherid=ct.teacherid
-        left join t_subject_book sb on sb.lsbid=tp.lsbid
-        left join t_subject s on s.subjectid=sb.subjectid
+        left join t_subject s on s.subjectid=tp.subjectid
         left join t_user u on ct.teacherid=u.userid
         where u.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid}
         and c.classstate=1 and c.year=#{sparams.year} and u.userstate=1 and c.classtype in (1,2)
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
-            and sb.subjectid=#{sparams.subjectid}
+            and tp.subjectid=#{sparams.subjectid}
         </if>
         group by u.userid order by s.subjectorder,u.username
     </select>
     <!--获取教师作业统计-->
     <select id="getPaperAnalyze" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
         select p.createid as userid, count(distinct p.paperid)pfabunum,ifnull(round(avg(p.papernum)),0)pquestionnum,
-        count(distinct case when pg.starttime&lt;=#{sparams.timestamp} then ps.psid else null end)pstunum,
-        count(distinct case when ps.psstate in (1,2) then ps.psid else null end)pcommitnum,
-        count(distinct case when ps.psstate in (1,2) and ps.pschecked=1 then ps.psid else null end)pchecknum
+        count(distinct if(pg.starttime&lt;=#{sparams.timestamp},ps.psid,null))pstunum,
+        count(distinct if(ps.psstate in (1,2),ps.psid,null))pcommitnum,
+        count(distinct if(ps.psstate in (1,2) and ps.pschecked=1,ps.psid,null))pchecknum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
-        where p.paperstate=22 and p.schoolid=#{sparams.schoolid} and pg.schoolid=#{sparams.schoolid}
-        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and p.paperstate=22 and p.schoolid=#{sparams.schoolid} and pg.schoolid=#{sparams.schoolid}
+        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} and (d.disabled=0 or p.directorid is null)
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and p.subjectid=#{sparams.subjectid}
         </if>
@@ -41,16 +41,18 @@
     <!--获取教师资源统计-->
     <select id="getResourceAnalyze" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
         select r.createid as userid, count(distinct r.resourceid)zytotal
-        ,sum(case when r.resourcetype=1 then 1 else 0 end)zyxtnum
-        ,sum(case when r.resourcetype=2 then 1 else 0 end)zyjanum
-        ,sum(case when r.resourcetype=3 then 1 else 0 end)zykjnum
-        ,sum(case when r.resourcetype=4 then 1 else 0 end)zyscnum
-        ,sum(case when r.resourcetype=5 then 1 else 0 end)zyspnum
-        ,sum(case when r.resourcetype=6 then 1 else 0 end)zyxanum
-        ,sum(case when r.resourcetype=7 then 1 else 0 end)zyywbnum
-        ,sum(case when r.resourcetype=10 then 1 else 0 end)zyqtnum
+        ,count(distinct if(r.resourcetype=1,r.resourceid,null))zyxtnum
+        ,count(distinct if(r.resourcetype=2,r.resourceid,null))zyjanum
+        ,count(distinct if(r.resourcetype=3,r.resourceid,null))zykjnum
+        ,count(distinct if(r.resourcetype=4,r.resourceid,null))zyscnum
+        ,count(distinct if(r.resourcetype=5,r.resourceid,null))zyspnum
+        ,count(distinct if(r.resourcetype=6,r.resourceid,null))zyxanum
+        ,count(distinct if(r.resourcetype=7,r.resourceid,null))zyywbnum
+        ,count(distinct if(r.resourcetype=10,r.resourceid,null))zyqtnum
         from t_resource r
-        where r.resourcestate=1 and r.belong!=4 AND r.schoolid=#{sparams.schoolid}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 AND r.schoolid=#{sparams.schoolid}
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}
         </if>
@@ -65,16 +67,17 @@
     <!--获取教师课堂统计-->
     <select id="getRoomAnalyze" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
         select r.teacherid as userid, count(distinct r.roomid)kttotal,count(distinct rf.rfid)ktpicnum
-        ,count(distinct case when rt.asktype=20 then rt.asktid else null end)ktasknum
-        ,count(distinct case when rt.asktype=21 then rt.asktid else null end)ktcallnum
-        ,count(distinct case when rt.asktype between 30 and 33 then rt.asktid else null end)ktquestionnum
-        ,count(distinct case when rt.asktype=40 then rt.asktid else null end)ktexamnum
+        ,count(distinct if(rt.asktype=20,rt.asktid,null))ktasknum
+        ,count(distinct if(rt.asktype=21,rt.asktid,null))ktcallnum
+        ,count(distinct if(rt.asktype between 30 and 33,rt.asktid,null))ktquestionnum
+        ,count(distinct if(rt.asktype=40,rt.asktid,null))ktexamnum
         ,(r.endtime-r.createtime)kttimes,r.classnum,r.realstunum
         from t_classroom r left join t_classroom_askteacher rt on rt.roomid=r.roomid
         left join t_classroom_file rf on rf.roomid=r.roomid
         left join t_subject_book sb on r.lsbid=sb.lsbid
         left join t_class c on c.classid=r.classid
-        where r.roomstate=2 and r.schoolid=#{sparams.schoolid}
+        left join t_director d on r.directorid=d.directorid
+        where d.disabled=0 and r.roomstate=2 and r.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and r.year=#{sparams.year}
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and sb.subjectid=#{sparams.subjectid}
@@ -91,10 +94,11 @@
     <select id="getPreviewAnalyze" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
         select g.createid as userid, count(distinct g.guideid)yxfbnum,
         count(distinct ggs.rgsid)yxstunum,
-        count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end)yxcomitnum
+        count(distinct if(ggs.costtime!=0,ggs.rgsid,null))yxcomitnum
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on c.classid=ggs.classid
-        where g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and g.year=#{sparams.year}
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and g.subjectid=#{sparams.subjectid}
@@ -111,7 +115,7 @@
     <select id="getReciteAnalyze" resultType="com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo">
         select r.createid as userid, count(distinct r.reciteid)bsfbnum,
         count(distinct rs.rsid)bsstunum,
-        count(distinct case when rs.rsstate!=0 then rs.rsid else null end)bscomitnum
+        count(distinct if(rs.rsstate!=0,rs.rsid,null))bscomitnum
         from t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
         left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
         left join t_class c on c.classid=rg.classid

sapi/src/main/resources/mapper/analyze/SchoolTaskMapper.xml

@@ -4,28 +4,29 @@
     <!--常规作业统计-->
 
     <resultMap id="taskwork" type="com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo">
-        <result property="subjectid" column="subjectid"></result>
-        <result property="subjectname" column="subjectname"></result>
-        <result property="fabunum" column="fabunum"></result>
-        <result property="stunum" column="stunum"></result>
-        <result property="commitnum" column="commitnum"></result>
-        <result property="checknum" column="checknum"></result>
+        <result property="subjectid" column="subjectid"/>
+        <result property="subjectname" column="subjectname"/>
+        <result property="fabunum" column="fabunum"/>
+        <result property="stunum" column="stunum"/>
+        <result property="commitnum" column="commitnum"/>
+        <result property="checknum" column="checknum"/>
         <!--<collection property="worklist" ofType="com.xhkjedu.vo.analyze.work.SchoolWorkDetailVo">
-            <result property="paperid" column="paperid"></result>
+            <result property="paperid" column="paperid"/>
         </collection>-->
     </resultMap>
     <select id="listSchoolTaskWork" resultMap="taskwork">
       SELECT p.subjectid,s.subjectname,count(distinct p.paperid)fabunum,
-        count(distinct case when pg.starttime&lt;=#{sparams.timestamp} then ps1.psid else null end)stunum,
-        count(distinct case when ps1.psstate in (1,2) then ps1.psid else null end) commitnum,
-        count(distinct case when ps1.psstate in (1,2) and ps1.pschecked=1 then ps1.psid else null end) checknum
+        count(distinct if(pg.starttime&lt;=#{sparams.timestamp},ps1.psid,null))stunum,
+        count(distinct if(ps1.psstate in (1,2),ps1.psid,null)) commitnum,
+        count(distinct if(ps1.psstate in (1,2) and ps1.pschecked=1,ps1.psid,null)) checknum
         FROM t_paper p LEFT JOIN t_subject s ON p.subjectid=s.subjectid
         left join t_paper_class pg on p.paperid=pg.paperid
         LEFT JOIN t_paper_student ps1 ON p.paperid=ps1.paperid and ps1.classid=pg.classid
         LEFT JOIN t_class c ON pg.classid=c.classid
         LEFT JOIN T_USER U ON p.createid=u.userid
-        WHERE p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND pg.schoolid=#{sparams.schoolid}
-        AND c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} AND u.userstate=1
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND pg.schoolid=#{sparams.schoolid}
+        AND c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} AND u.userstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND pg.starttime>=#{sparams.starttime}
         </if>
@@ -38,14 +39,15 @@
     <!--常规作业 详情-->
     <select id="listSchoolTaskWorkDetail" resultType="com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo">
         select p.createid userid,count(distinct p.paperid)fabunum,
-        count(distinct case when pg.starttime&lt;=#{sparams.timestamp} then ps1.psid else null end)stunum,
-        count(distinct case when ps1.psstate in (1,2) then ps1.psid else null end) commitnum,
-        count(distinct case when ps1.psstate in (1,2) and ps1.pschecked=1 then ps1.psid else null end) checknum
+        count(distinct if(pg.starttime&lt;=#{sparams.timestamp},ps1.psid,null))stunum,
+        count(distinct if(ps1.psstate in (1,2),ps1.psid,null)) commitnum,
+        count(distinct if(ps1.psstate in (1,2) and ps1.pschecked=1,ps1.psid,null)) checknum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps1 on ps1.paperid=pg.paperid and ps1.classid=pg.classid
         left join t_class c on c.classid=pg.classid
-        where p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
-        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
+        and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} and (d.disabled=0 or p.directorid is null)
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND pg.starttime>=#{sparams.starttime}
         </if>
@@ -62,34 +64,36 @@
     <select id="listSchoolTaskGuide" resultMap="taskwork">
           SELECT s.subjectid,s.subjectname,count(distinct g.guideid)fabunum,
          count(distinct ggs.rgsid)stunum,
-         count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end) commitnum
+         count(distinct if(ggs.costtime!=0,ggs.rgsid,null)) commitnum
          FROM t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
          LEFT JOIN t_class c ON ggs.classid=c.classid
          LEFT JOIN t_subject s ON g.subjectid=s.subjectid
          LEFT JOIN T_USER U ON g.createid=u.userid
-         WHERE g.schoolid=#{sparams.schoolid} AND ggs.schoolid=#{sparams.schoolid}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and g.schoolid=#{sparams.schoolid} AND ggs.schoolid=#{sparams.schoolid}
         AND c.gradeid=#{sparams.gradeid} and g.year=#{sparams.year} and u.userstate=1
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND g.createtime >= #{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND g.createtime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
          GROUP BY g.subjectid ORDER BY s.subjectorder
     </select>
     <select id="listSchoolTaskGuideDetail" resultType="com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo">
         select g.createid userid,count(distinct g.guideid)fabunum,
         count(distinct ggs.rgsid)stunum,
-        count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end) commitnum
+        count(distinct if(ggs.costtime!=0,ggs.rgsid,null)) commitnum
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on c.classid=ggs.classid
-        where g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and g.year=#{sparams.year}
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND g.createtime >= #{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND g.createtime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and g.subjectid=#{sparams.subjectid}
@@ -101,7 +105,7 @@
     <select id="listSchoolTaskRecite" resultMap="taskwork">
           SELECT r.subjectid,s.subjectname,count(distinct r.reciteid)fabunum,
          count(distinct rs.rsid) stunum,
-         count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
+         count(distinct if(rs.rsstate!=0,rs.rsid,null)) commitnum
          FROM t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
           LEFT JOIN t_subject s ON r.subjectid=s.subjectid
          LEFT JOIN t_recite_student rs ON rg.reciteid=rs.reciteid and rg.classid=rs.classid
@@ -122,7 +126,7 @@
     <select id="listSchoolTaskReciteDetail" resultType="com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo">
         select r.createid userid,count(distinct r.reciteid)fabunum,
         count(distinct rs.rsid) stunum,
-        count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
+        count(distinct if(rs.rsstate!=0,rs.rsid,null)) commitnum
         from t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
         left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
         left join t_class c on c.classid=rg.classid
@@ -142,7 +146,7 @@
 
     <!--获取用户集合-->
     <select id="listUser" resultType="com.xhkjedu.sapi.vo.analyze.SchoolParams">
-        select u.userid createid,u.username
+        select u.userid as createid,u.username
         from t_class_teacher ct left join t_class c on ct.classid=c.classid
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
         right join t_teacher_powersb tp on tp.teacherid=ct.teacherid

sapi/src/main/resources/mapper/classreport/ClassReportMapper.xml

@@ -5,16 +5,17 @@
     <select id="listPreview" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,g.subjectid,s.year,g.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=g.schoolid)classnum
-        ,count(ggs.rgsid)xsnum
-        ,sum(case when ggs.costtime!=0 then 1 else 0 end)tjnum
-        ,ifnull(truncate(sum(case when ggs.costtime!=0 then 1 else 0 end)*100/count(ggs.rgsid),2),0)numrate
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=g.schoolid) as classnum
+        ,count(distinct ggs.rgsid)xsnum
+        ,count(distinct if(ggs.costtime!=0,ggs.rgsid,null))tjnum
+        ,ifnull(truncate(count(distinct if(ggs.costtime!=0,ggs.rgsid,null))*100/count(distinct ggs.rgsid),2),0)numrate
         ,from_unixtime(g.createtime,'%Y-%m-%d')begindate,count(distinct g.guideid)fbnum
         from t_guide g left join t_guide_group gg on g.guideid=gg.guideid
         left join t_guide_group_student ggs on ggs.guideid=gg.guideid and ggs.classid=gg.classid
         left join t_class c on gg.classid=c.classid
         left join t_school s on g.schoolid=s.schoolid and gg.schoolid=s.schoolid
-        where s.schoolstate=1 and s.year=c.year and c.classstate=1
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1 and s.year=c.year and c.classstate=1
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(g.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(g.createtime))=MONTH(now())-#{type.basenum}</if>
         <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(g.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
@@ -48,21 +49,22 @@
     <select id="listClassroom" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,sb.subjectid,s.year,r.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid)classnum
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid) as classnum
         ,r.classnum xsnum
         ,r.realstunum tjnum
         ,ifnull(truncate(r.realstunum*100/r.classnum,2),0)numrate
-        ,count(distinct case when rt.asktype between 30 and 33 then rt.asktid else null end)twnum
-        ,count(distinct case when rt.asktype =40 then rt.asktid else null end)tcnum
-        ,count(distinct case when rt.asktype =21 then rt.asktid else null end)dmnum
-        ,count(distinct case when rt.asktype =20 then rt.asktid else null end)qdnum
+        ,count(distinct if(rt.asktype between 30 and 33,rt.asktid,null))twnum
+        ,count(distinct if(rt.asktype=40,rt.asktid,null))tcnum
+        ,count(distinct if(rt.asktype=21,rt.asktid,null))dmnum
+        ,count(distinct if(rt.asktype=20,rt.asktid,null))qdnum
         ,from_unixtime(r.createtime,'%Y-%m-%d')begindate,count(distinct r.roomid)fbnum
         from t_classroom r left join t_class c on r.classid=c.classid
         left join t_classroom_askteacher rt on r.roomid=rt.roomid
         left join t_classroom_sign rs on rs.roomid=r.roomid
         left join t_school s on r.schoolid=s.schoolid
         left join t_subject_book sb on r.lsbid=sb.lsbid
-        where r.roomstate=2 and r.realstunum!=0 and s.schoolstate=1 and s.year=c.year and c.classstate=1
+        left join t_director d on r.directorid=d.directorid
+        where d.disabled=0 and r.roomstate=2 and r.realstunum!=0 and s.schoolstate=1 and s.year=c.year and c.classstate=1
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(r.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(r.createtime))=MONTH(now())-#{type.basenum}</if>
         <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(r.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
@@ -96,22 +98,23 @@
     <select id="listPaper" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,p.subjectid,s.year,p.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=p.schoolid)classnum
-        ,count(distinct case when pg.starttime&lt;=#{type.createtime} then ps.psid else null end)xsnum
-        ,sum(case when ps.psstate!=0 then 1 else 0 end)tjnum
-        ,ifnull(truncate(sum(case when ps.psstate!=0 then 1 else 0 end)*100/
-        count(distinct case when pg.starttime&lt;=#{type.createtime} then ps.psid else null end),2),0)numrate
-        ,sum(case when ps.pschecked=1 then 1 else 0 end)pgnum
-        ,ifnull(truncate(sum(case when ps.pschecked=1 then 1 else 0 end)*100/sum(case when ps.psstate!=0 then 1 else 0 end),2),0)pgrate
-        ,sum(case when pg.starttime&lt;=#{type.createtime} then ps.paperscore else 0 end)pscore
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=p.schoolid) as classnum
+        ,count(distinct if(pg.starttime&lt;=#{type.createtime},ps.psid,null))xsnum
+        ,count(distinct if(ps.psstate in(1,2),ps.psid,null))tjnum
+        ,ifnull(truncate(count(distinct if(ps.psstate in(1,2),ps.psid,null))*100/
+        count(distinct if(pg.starttime&lt;=#{type.createtime},ps.psid,null)),2),0)numrate
+        ,count(distinct if(ps.pschecked=1,ps.psid,null))pgnum
+        ,ifnull(truncate(count(distinct if(ps.pschecked=1,ps.psid,null))*100/count(distinct if(ps.psstate in(1,2),ps.psid,null)),2),0)pgrate
+        ,sum(if(pg.starttime&lt;=#{type.createtime},ps.paperscore,0))pscore
         ,sum(ps.userscore)uscore
-        ,ifnull(truncate(sum(ps.userscore)*100/sum(case when pg.starttime&lt;=#{type.createtime} then ps.paperscore else 0 end),2),0)zqrate
+        ,ifnull(truncate(sum(ps.userscore)*100/sum(if(pg.starttime&lt;=#{type.createtime},ps.paperscore,0)),2),0)zqrate
         ,from_unixtime(pg.starttime,'%Y-%m-%d')begindate,count(distinct p.paperid)fbnum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
-        where p.paperstate=22 and s.schoolstate=1 and s.year=c.year and c.classstate=1
+        left join t_director d on p.directorid=d.directorid
+        where (d.disabled=0 or p.directorid is null) and p.paperstate=22 and s.schoolstate=1 and s.year=c.year and c.classstate=1
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(pg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(pg.starttime))=MONTH(now())-#{type.basenum}</if>
         <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(pg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
@@ -146,13 +149,13 @@
     <select id="listRecite" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,r.subjectid,s.year,r.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid)classnum
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid) as classnum
         ,count(rs.rsid)xsnum
-        ,sum(case when rs.rsstate!=0 then 1 else 0 end)tjnum
-        ,ifnull(truncate(sum(case when rs.rsstate!=0 then 1 else 0 end)*100/count(rs.rsid),2),0)numrate
-        ,sum(case when rs.rsstate!=0 then 1 else 0 end)*100 pscore
+        ,sum(if(rs.rsstate!=0,1,0))tjnum
+        ,ifnull(truncate(sum(if(rs.rsstate!=0,1,0))*100/count(rs.rsid),2),0) as numrate
+        ,sum(if(rs.rsstate!=0,1,0))*100 as pscore
         ,sum(rs.userscore)uscore
-        ,ifnull(truncate(sum(rs.userscore)*100/(sum(case when rs.rsstate!=0 then 1 else 0 end)*100),2),0)zqrate
+        ,ifnull(truncate(sum(rs.userscore)*100/(sum(if(rs.rsstate!=0,1,0))*100),2),0)zqrate
         ,from_unixtime(rg.starttime,'%Y-%m-%d')begindate,count(distinct r.reciteid)fbnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
@@ -192,7 +195,7 @@
     <select id="listErrQuestionFd" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,p.subjectid,s.year,qc.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=qc.schoolid)classnum
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=qc.schoolid) as classnum
         ,from_unixtime(qe.createtime,'%Y-%m-%d')begindate,count(distinct qe.qcpid)fbnum
         from t_question_explain qe left join t_question_class qc on qe.qctype=qc.qctype and qc.questionid=qe.questionid
         left join t_class c on qc.classid=c.classid
@@ -232,9 +235,10 @@
     <select id="listErrQuestion" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,p.subjectid,s.year,qc.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=qc.schoolid)classnum
-        ,(select t.qtypename from t_subject_questiontype t where t.qtypeid=qc.qtypeid)typename
-        ,qc.qtypeid typeid
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=qc.schoolid) as classnum
+        ,if(qc.qtypeid is null,(select ps.qtypename from t_paper_scantron ps where ps.pscaid=qc.questionid)
+            ,(select t.qtypename from t_subject_questiontype t where t.qtypeid=qc.qtypeid))typename
+        ,ifnull(qc.qtypeid,(select ps.psqtypeid from t_paper_scantron ps where ps.pscaid=qc.questionid)) typeid
         from t_question_class qc left join t_class c on qc.classid=c.classid
         left join t_school s on qc.schoolid=s.schoolid
         left join t_paper p on qc.paperid=p.paperid
@@ -284,10 +288,10 @@
     <select id="listLive" resultType="com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo">
         select c.classid,c.classtype,c.gradeid,l.subjectid,s.year,l.schoolid
         ,(select count(*) from t_class c1 where c1.gradeid=c.gradeid and c1.year=c.year
-        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=l.schoolid)classnum
+        and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=l.schoolid) as classnum
         ,sum(time_to_sec(timediff(ifnull(ls.endtime,ls.planendtime)
         ,ifnull(ls.begintime,ls.planbegintime))))/60 minutenum
-        ,from_unixtime(ls.createtime,'%Y-%m-%d')begindate,count(distinct ls.sectionid)fbnum
+        ,from_unixtime(ls.createtime,'%Y-%m-%d') as begindate,count(distinct ls.sectionid)fbnum
         from l_course_section ls left join l_course l on l.courseid=ls.courseid
         left join l_course_class cs on l.courseid=cs.courseid
         left join t_class c on cs.classid=c.classid
@@ -330,7 +334,8 @@
         left join t_question_point qp on psq.questionpid=qp.questionid
         left join t_class c on psq.classid=c.classid
         left join t_school s on p.schoolid=s.schoolid
-        where s.schoolstate=1 and s.year=c.year and c.classstate=1 and psq.checked=1
+        left join t_director d on p.directorid=d.directorid
+        where (d.disabled=0 or p.directorid is null) and s.schoolstate=1 and s.year=c.year and c.classstate=1 and psq.checked=1
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(p.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(p.createtime))=MONTH(now())-#{type.basenum}</if>
         <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(p.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>

sapi/src/main/resources/mapper/cloud/CloudSyncMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.cloud.CloudSyncMapper">
   <!--列表-->
   <resultMap id="syncResult" type="java.util.Map">
-    <id column="csid" property="csid"></id>
+    <id column="csid" property="csid"/>
     <collection property="details" javaType="java.util.List" select="listDetail" column="csid">
     </collection>
   </resultMap>
@@ -14,7 +14,7 @@
     ,(select v.versionname from t_version v where v.versionid=sb.versionid)versionname
     ,(case synctable when 't_subject' then '科目' when 't_version' then '版本' when 't_subject_book' then '教材'
     when 't_director' then '章节' when 't_point' then '知识点' when 't_subject_questiontype' then '题型'
-    when 't_resource' then '资源' when 't_question' then '试题' else synctable end)synctable
+    when 't_resource' then '资源' when 't_question' then '试题' else synctable end) as synctable
     from t_cloud_sync_detail d left join t_subject_book sb on d.lsbid=sb.lsbid
     where csid=#{csid}
   </select>
@@ -165,4 +165,25 @@
         ALTER TABLE t_point ADD CONSTRAINT fk_pointpid
         FOREIGN KEY (pointpid) REFERENCES t_point(pointid) ON DELETE CASCADE ON UPDATE CASCADE;
     </update>
+    <!--获取同步类型-->
+    <select id="listModule" resultType="java.util.Map">
+        select 't_subject' as moduleid,'科目管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_subject'
+        order by createtime desc limit 1)createtime
+        union select 't_version' as moduleid,'版本管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_version'
+        order by createtime desc limit 1)createtime
+        union select 't_subject_book' as moduleid,'教材管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_subject_book'
+        order by createtime desc limit 1)createtime
+        union select 't_director' as moduleid,'章节管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_director'
+        order by createtime desc limit 1)createtime
+        union select 't_point' as moduleid,'知识点管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_point'
+        order by createtime desc limit 1)createtime
+        union select 't_questionqtype' as moduleid,'题型管理' as modulename
+        ,(select createtime from t_cloud_sync_detail where synctable='t_questionqtype'
+        order by createtime desc limit 1)createtime
+    </select>
 </mapper>

sapi/src/main/resources/mapper/itemtool/StudentTodoMapper.xml

@@ -5,7 +5,7 @@
     <select id="listTodoNum" resultType="com.xhkjedu.sapi.vo.itemtool.StudentTodoVo">
         <foreach collection ="todos" item="todo" index= "index" separator ="union">
             <if test="todo.todotype=='guide'">
-                select 'guide' todotype,count(distinct g.guideid)num,#{todo.subjectid} subjectid
+                select 'guide' as todotype,count(distinct g.guideid)num,#{todo.subjectid} as subjectid
                 from t_guide_group_student s left join t_guide g on s.guideid = g.guideid
                 where s.studentid=#{todo.studentid} and s.costtime=0
                 <if test="todo.subjectid!=null and todo.subjectid!='0'.toString() and todo.subjectid!=''">
@@ -16,7 +16,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='classroom'">
-                select 'classroom' todotype,count(distinct r.roomid)num,#{todo.subjectid} subjectid
+                select 'classroom' as todotype,count(distinct r.roomid)num,#{todo.subjectid} as subjectid
                 from t_class_student s left join t_classroom r on s.classid = r.classid
                 left join t_subject_book sb on r.lsbid = sb.lsbid
                 where r.roomstate=1 and s.studentid=#{todo.studentid}
@@ -28,10 +28,10 @@
                 </if>
             </if>
             <if test="todo.todotype=='paper'">
-                select 'paper' todotype,count(distinct p.paperid)num,#{todo.subjectid} subjectid
+                select 'paper' as todotype,count(distinct p.paperid)num,#{todo.subjectid} as subjectid
                 from t_paper_student s join t_paper p on p.paperid = s.paperid
                 left join t_paper_class pg on s.paperid = pg.paperid and s.classid=pg.classid
-                where pg.starttime&lt;=#{timestamp} and s.studentid=#{todo.studentid} and s.psstate=0
+                where pg.starttime&lt;=#{timestamp} and s.studentid=#{todo.studentid} and s.psstate in(0,3)
                 <if test="todo.subjectid!=null and todo.subjectid!='0'.toString() and todo.subjectid!=''">
                     and p.subjectid=#{todo.subjectid}
                 </if>
@@ -40,7 +40,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='errorque'">
-                select 'errorque' todotype,count(*)num,#{todo.subjectid} subjectid
+                select 'errorque' as todotype,count(*)num,#{todo.subjectid} as subjectid
                 from t_question_student s
                 where s.studentid=#{todo.studentid} and s.delstate=0
                 <if test="todo.subjectid!=null and todo.subjectid!='0'.toString() and todo.subjectid!=''">
@@ -51,7 +51,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='video'">
-                select 'video' todotype,count(distinct r.resourceid)num,#{todo.subjectid} subjectid
+                select 'video' as todotype,count(distinct r.resourceid)num,#{todo.subjectid} as subjectid
                 from t_resource r
                 where (r.belong in(1,2) or (r.belong in(3,10) and r.schoolid=#{schoolid})) and r.resourcestate=1 and r.level=4
                 <if test="todo.subjectid!=null and todo.subjectid!='0'.toString() and todo.subjectid!=''">
@@ -62,7 +62,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='notice'">
-                select 'notice' todotype,count(distinct n.noticeid)num,#{todo.subjectid} subjectid
+                select 'notice' as todotype,count(distinct n.noticeid)num,#{todo.subjectid} as subjectid
                 from t_notice n left join t_notice_class nc on n.noticeid = nc.noticeid
                 left join t_class_student s on nc.classid=s.classid
                 where s.studentid=#{todo.studentid}
@@ -71,16 +71,16 @@
                 </if>
             </if>
             <if test="todo.todotype=='checkpaper'">
-                select 'checkpaper' todotype,count(distinct p.paperid)num,#{todo.subjectid} subjectid
+                select 'checkpaper' as todotype,count(distinct p.paperid)num,#{todo.subjectid} as subjectid
                 from t_paper_student ps join t_paper p on p.paperid = ps.paperid
                 left join t_paper_class pg on ps.paperid = pg.paperid and ps.classid=pg.classid
-                where ps.checkid=#{todo.studentid} and ps.psstate!=0 and ps.pschecked!=1
+                where ps.checkid=#{todo.studentid} and ps.psstate in(1,2) and ps.pschecked!=1
                 <if test="todo.showtime!=null and todo.showtime!=0">
                     and pg.starttime>=#{todo.showtime}
                 </if>
             </if>
             <if test="todo.todotype=='recite'">
-                select 'recite' todotype,count(distinct r.reciteid)num,#{todo.subjectid} subjectid
+                select 'recite' as todotype,count(distinct r.reciteid)num,#{todo.subjectid} as subjectid
                 from t_recite_student rs LEFT JOIN t_recite r ON rs.reciteid=r.reciteid
                 LEFT JOIN t_recite_group rg ON rs.reciteid=rg.reciteid AND rg.classid=rs.classid
                 where rg.starttime&lt;=#{timestamp} and rs.studentid=#{todo.studentid} and rs.rsstate=0
@@ -92,7 +92,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='read'">
-                select 'read' todotype
+                select 'read' as todotype
                 ,count(distinct r.readid)-count(distinct rs.readid)num
                 ,#{todo.subjectid} subjectid
                 from t_read r left join t_read_date rd on r.readid=rd.readid
@@ -112,7 +112,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='classroomreview'">
-                select 'classroomreview' todotype,count(distinct r.roomid)num,#{todo.subjectid} subjectid
+                select 'classroomreview' as todotype,count(distinct r.roomid)num,#{todo.subjectid} as subjectid
                 from t_classroom_sign rs left join t_classroom r on rs.roomid=r.roomid
                 left join t_subject_book sb on r.lsbid=sb.lsbid
                 where rs.userid=#{todo.studentid}
@@ -124,7 +124,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='sellive'">
-                select 'sellive' todotype,count(distinct l.courseid)num,#{todo.subjectid} subjectid
+                select 'sellive' as todotype,count(distinct l.courseid)num,#{todo.subjectid} as subjectid
                 from l_course l
                 where l.schoolid=#{schoolid} and l.coursetype=0 and l.deleted=1 and l.coursestate!=3
                 and l.limitstamp>=#{timestamp}
@@ -136,7 +136,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='mylive'">
-                select 'mylive' todotype,count(distinct l.courseid)num,#{todo.subjectid} subjectid
+                select 'mylive' as todotype,count(distinct l.courseid)num,#{todo.subjectid} as subjectid
                 from l_course l left join t_class_student cs on l.classid=cs.classid
                 left join l_course_section ls on ls.courseid=l.courseid
                 where cs.studentid=#{todo.studentid} and l.deleted=1 and ls.sectiondate=CURRENT_DATE()
@@ -148,7 +148,7 @@
                 </if>
             </if>
             <if test="todo.todotype=='exam'">
-                select 'exam' todotype,count(distinct eps.epsid)num,#{todo.subjectid} subjectid
+                select 'exam' as todotype,count(distinct eps.epsid) as num,#{todo.subjectid} as subjectid
                 from e_paper_student eps left join e_subject es on eps.esid=es.esid
                 left join e_base e on eps.examid=e.examid
                 where e.deleted=1 and e.exammode=1 and eps.studentid=#{todo.studentid} and e.examstate>=1

sapi/src/main/resources/mapper/region/RPaperAnalyzeMapper.xml

@@ -7,7 +7,9 @@
       select count(DISTINCT pg.paperid) from t_paper_class pg left join t_paper p on pg.paperid=p.paperid
         LEFT JOIN t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -17,7 +19,8 @@
         select count(DISTINCT g.guideid) from t_guide_group gg left join t_guide g on gg.guideid=g.guideid
         LEFT JOIN t_school s on g.schoolid=s.schoolid and gg.schoolid=s.schoolid
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>
@@ -34,7 +37,7 @@
     </select>
     <!--作业数量统计——错题视频数量-->
     <select id="getRegionPaperNumQueexp" resultType="java.lang.Integer">
-        select count(distinct qe.qcpid) from t_question_explain qe left join t_question_class qc on qe.questionid=qe.questionid
+        select count(distinct qe.qcpid) from t_question_explain qe left join t_question_class qc on qe.questionid=qc.questionid
         left JOIN t_school s on qc.schoolid=s.schoolid
         left join t_class c on c.classid=qc.classid
         where s.schoollevel=#{param.level} and s.schoolstate=1 and qe.year=#{param.year}
@@ -45,32 +48,34 @@
 
     <!--作业各类率统计-->
     <resultMap id="rpaperMap" type="com.xhkjedu.sapi.vo.region.RSchoolVo">
-        <result column="schoolid" property="schoolid"></result>
-        <result column="schoolname" property="schoolname"></result>
-        <result column="shortname" property="shortname"></result>
+        <result column="schoolid" property="schoolid"/>
+        <result column="schoolname" property="schoolname"/>
+        <result column="shortname" property="shortname"/>
         <collection property="paperlist" ofType="com.xhkjedu.sapi.vo.region.RPaperVo">
-            <result column="paperid" property="paperid"></result>
-            <result column="resourceid" property="resourceid"></result>
-            <result column="stunum" property="stunum"></result>
-            <result column="commitnum" property="commitnum"></result>
-            <result column="commitasnum" property="commitasnum"></result>
-            <result column="checknum" property="checknum"></result>
-            <result column="paperscore" property="paperscore"></result>
-            <result column="stuscore" property="stuscore"></result>
+            <result column="paperid" property="paperid"/>
+            <result column="resourceid" property="resourceid"/>
+            <result column="stunum" property="stunum"/>
+            <result column="commitnum" property="commitnum"/>
+            <result column="commitasnum" property="commitasnum"/>
+            <result column="checknum" property="checknum"/>
+            <result column="paperscore" property="paperscore"/>
+            <result column="stuscore" property="stuscore"/>
         </collection>
     </resultMap>
     <!--作业各类率统计——作业-->
     <select id="listRegionSchoolRatePaper" resultMap="rpaperMap">
         select s.schoolid,s.schoolname,s.shortname,pg.paperid,
-        count(ps.psid)stunum,sum(ps.userscore)stuscore,sum(ps.paperscore)paperscore,
-        count(case when ps.psstate!=0 then ps.psid else null end) commitnum,
-        count(case when ps.psstate=1 then ps.psid else null end) commitasnum,
-        count(case when ps.psstate!=0 and ps.pschecked=1 then ps.psid else null end) checknum
+        count(ps.psid)stunum,sum(ps.userscore) as stuscore,sum(ps.paperscore) as paperscore,
+        count(distinct if(ps.psstate in(1,2),ps.psid,null)) commitnum,
+        count(distinct if(ps.psstate=1,ps.psid,null)) commitasnum,
+        count(distinct if(ps.psstate in(1,2) and ps.pschecked=1,ps.psid,null)) checknum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -80,8 +85,8 @@
     <select id="listRegionSchoolRateRecite" resultMap="rpaperMap">
         select s.schoolid,s.schoolname,s.shortname,r.reciteid as paperid,
         count(rs.rsid)stunum,sum(rs.userscore)stuscore,
-        count(case when rs.rsstate!=0 then rs.rsid else null end)commitnum,
-        count(case when rs.rsstate=1 then rs.rsid else null end)commitasnum
+        count(distinct if(rs.rsstate!=0,rs.rsid,null))commitnum,
+        count(distinct if(rs.rsstate=1,rs.rsid,null))commitasnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
         left join t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
@@ -96,13 +101,14 @@
     <select id="listRegionSchoolRatePreview" resultMap="rpaperMap">
         select s.schoolid,s.schoolname,s.shortname, g.guideid,
         count(ggs.rgsid)stunum,
-        count(case when ggs.readtime>0 then ggs.rgsid else null end)commitnum
+        count(distinct if(ggs.readtime>0,ggs.rgsid,null))commitnum
         from t_guide g
         left join t_guide_group gg on gg.guideid=g.guideid
         left join t_guide_group_student ggs on ggs.guideid=g.guideid and ggs.classid=gg.classid
         left join t_school s on s.schoolid=g.schoolid and s.schoolid=gg.schoolid
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>
@@ -113,12 +119,14 @@
     <select id="listRegionSchoolUsetimePaper" resultType="java.util.Map">
         select s.schoolid,s.schoolname,s.shortname,
         count(ps.psid) as stunum,
-        ifnull(SUM(ps.costtime),0) costtime
+        ifnull(SUM(ps.costtime),0) as costtime
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
-        left join t_paper_student ps on pg.paperid=ps.paperid and pg.classid=ps.classid and ps.psstate!=0
+        left join t_paper_student ps on pg.paperid=ps.paperid and pg.classid=ps.classid and ps.psstate in(1,2)
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
+        and (d.disabled=0 or p.directorid is null)
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -128,12 +136,13 @@
     <select id="listRegionSchoolUsetimePreview" resultType="java.util.Map">
         select s.schoolid,s.schoolname,s.shortname,
         count(distinct gs.rgsid) as stunum,
-        sum(gs.costtime) costtime
+        sum(gs.costtime) as costtime
         from t_guide_group_student gs
         left join t_guide g on gs.guideid=g.guideid
         left join t_school s on g.schoolid=s.schoolid and gs.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and gs.readtime>0 and g.year=#{param.year}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and gs.readtime>0 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>

sapi/src/main/resources/mapper/region/RResourceAnalyzeMapper.xml

@@ -4,53 +4,74 @@
 
     <!--资源统计——资源数量-->
     <select id="getRResourceNum" resultType="java.util.Map">
-        select count(r.resourceid) resourcenum,sum(r.resourcesize)resourcesize,sum(r.downcount) downcount
-         from t_resource r where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        select count(r.resourceid) resourcenum,sum(r.resourcesize) as resourcesize,sum(r.downcount) as downcount
+        from (select distinct r.resourceid
+        from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4))r2
+        left join t_resource r on r2.resourceid=r.resourceid
     </select>
     <select id="getRResourceCollectNum" resultType="java.lang.Integer">
-        select count(*) from t_resource_collect rc
-        left join t_resource r on rc.resourceid=r.resourceid where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        select count(distinct rc.rcid) from t_resource_collect rc
+        left join t_resource r on rc.resourceid=r.resourceid
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
     </select>
     <!--资源统计——试题数量-->
     <select id="getRQuestionNum" resultType="java.lang.Integer">
-        select count(*) from t_question where qstate=1 and belong!=4
+        select count(distinct q.questionid)
+        from t_question q left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong!=4 and q.qlevel!=3
     </select>
 
     <!--学段资源占比-->
     <select id="listRResourceLevelTypeNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-         select s.level,r.resourcetype rtype,count(r.resourceid)rnum
-          from t_resource r left join t_subject s on r.subjectid=s.subjectid
-          where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
-          group by s.level,r.resourcetype order by s.level,r.resourcetype
+        select s.level,r.resourcetype rtype,count(distinct r.resourceid)rnum
+        from t_resource r left join t_subject s on r.subjectid=s.subjectid
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        group by s.level,r.resourcetype order by s.level,r.resourcetype
     </select>
     <!--资源格式统计-->
     <select id="listRResourceClassNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-         select r.resourceclass rtype,count(r.resourceid)rnum from t_resource r
-          where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
-          group by r.resourceclass order by r.resourceclass
+        select r.resourceclass rtype,count(distinct r.resourceid)rnum
+        from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        group by r.resourceclass order by r.resourceclass
     </select>
     <!--试题学段占比-->
     <select id="listRQuestionLevelNum" resultType="com.xhkjedu.sapi.vo.region.RLevelVo">
-        select s.level,count(q.questionid) levelnum
+        select s.level,count(distinct q.questionid) levelnum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
-        where q.qstate=1 and q.belong!=4 group by s.level order by s.level
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong!=4 and q.qlevel!=3
+        group by s.level order by s.level
     </select>
     <!--试题使用统计-->
     <select id="listRQuestionUse" resultType="com.xhkjedu.sapi.vo.region.RSchoolVo">
-        select count(distinct pqq.questionid) snum,pqq.schoolid,s.schoolname,s.shortname
+        select count(distinct pqq.questionpid) as snum,pqq.schoolid,s.schoolname,s.shortname
         from t_paper_qtype_question pqq left join t_paper p on pqq.paperid=p.paperid
         left join t_school s on pqq.schoolid=s.schoolid
         left join t_question q on pqq.questionid=q.questionid
-        where p.paperstate=22 and q.qstate=1 and q.belong!=4 and s.schoolstate=1
+        left join t_director d on p.directorid=d.directorid
+        where (d.disabled=0 or p.directorid is null) and p.paperstate=22 and q.qstate=1 and q.belong!=4 and s.schoolstate=1
          group by pqq.schoolid order by s.schoolid
     </select>
     <!--校本资源统计-->
     <select id="listRResourceXbType" resultType="com.xhkjedu.sapi.vo.region.RSResourceVo">
-         select ifnull(r.resourcetype,0) rtype,count(r.resourceid)rnum,s.schoolid,s.schoolname,s.shortname,s.schoollevel level
-          from t_resource r right join t_school s on r.schoolid=s.schoolid
-          and r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4)
-          where s.schoolstate=1
-          group by r.schoolid,r.resourcetype order by r.schoolid,r.resourcetype
+        select ifnull(r.resourcetype,0) rtype,count(distinct r.resourceid)rnum
+        ,s.schoolid,s.schoolname,s.shortname,s.schoollevel as level
+        from t_resource r right join t_school s on r.schoolid=s.schoolid
+        and r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1
+        group by r.schoolid,r.resourcetype order by r.schoolid,r.resourcetype
     </select>
 
 </mapper>

sapi/src/main/resources/mapper/region/RRoomAnalyzeMapper.xml

@@ -4,17 +4,17 @@
     <!--活跃度统计-->
     <select id="listRoom" resultType="com.xhkjedu.sapi.vo.region.RRoomVo">
         select r.schoolid,s.schoolname,s.shortname,count(distinct r.roomid)ktnum
-        ,count(distinct case when rt.asktype=20 then rt.asktid else null end)qdnum
-        ,count(distinct case when rt.asktype=21 then rt.asktid else null end)dmnum
-        ,count(distinct case when rt.asktype between 30 and 33 then rt.asktid else null end)twnum
-        ,count(distinct case when rt.asktype=40 then rt.asktid else null end)tcnum
+        ,count(distinct if(rt.asktype=20,rt.asktid,null))qdnum
+        ,count(distinct if(rt.asktype=21,rt.asktid,null))dmnum
+        ,count(distinct if(rt.asktype between 30 and 33,rt.asktid,null))twnum
+        ,count(distinct if(rt.asktype=40,rt.asktid,null))tcnum
         ,count(distinct rf.rfid)jtnum
-        ,count(distinct case when rt.asktype=20 and rs.asksid is not null then rs.asksid else null end)qdstunum
-        ,count(distinct case when rt.asktype between 30 and 33 and rs.asksid is not null then rs.asksid else null end)twstunum
-        ,count(distinct case when rt.asktype between 30 and 33 and rs.radiocorrect=1 then rs.asksid else null end)twzqnum
+        ,count(distinct if(rt.asktype=20 and rs.asksid is not null,rs.asksid,null))qdstunum
+        ,count(distinct if(rt.asktype between 30 and 33 and rs.asksid is not null,rs.asksid,null))twstunum
+        ,count(distinct if(rt.asktype between 30 and 33 and rs.radiocorrect=1,rs.asksid,null))twzqnum
         ,count(distinct pss.pssid)tcstunum
-        ,count(distinct case when pss.answered=1 then pss.pssid else null end)tctjnum
-        ,count(distinct case when pss.qscore!=0 and pss.qscore=pss.stuscore then pss.pssid else null end)tczqnum
+        ,count(distinct if(pss.answered=1,pss.pssid,null))tctjnum
+        ,count(distinct if(pss.qscore!=0 and pss.qscore=pss.stuscore,pss.pssid,null))tczqnum
         ,(r.endtime-r.createtime)totaltime,r.classnum,r.realstunum
         from t_school s right join t_classroom r on r.schoolid=s.schoolid
         left join t_class c on c.classid=r.classid
@@ -24,7 +24,8 @@
         left join t_classroom_paper p on p.paperid=rt.paperid
         left join t_classroom_paper_student ps on p.paperid=ps.paperid
         left join t_classroom_paper_student_scantron pss on ps.psid=pss.psid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.roomstate=2
+        left join t_director d on r.directorid=d.directorid
+        where d.disabled=0 and s.schoollevel=#{param.level} and s.schoolstate=1 and r.roomstate=2
         and r.year=#{param.year} and r.endtime is not null
         <if test="param.begintime!=null and param.begintime!=0">
             and r.createtime between #{param.begintime} and #{param.endtime}

sapi/src/main/resources/mapper/region/RegionAnalyzeMapper.xml

@@ -9,25 +9,35 @@
 
     <!--获取资源、试题总量-->
     <select id="getResourceQuestionNum" resultType="java.util.Map">
-        select (select count(*) from t_resource where resourcestate=1 and (level=1 or level=4) and belong!=4)resourcenum
-        ,(select count(*) from t_question where qstate=1 and belong!=4)questionnum
+        select (select count(distinct r.resourceid)
+        from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.level=1 or r.level=4) and r.belong!=4)resourcenum
+        ,(select count(distinct q.questionid)
+        from t_question q left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong!=4 and q.qlevel!=3)questionnum
     </select>
     <!--获取资源类型统计-->
     <select id="listResourceTypeNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select s.level,r.resourcetype rtype,count(r.resourceid)rnum
-        ,sum(case when r.belong in(1,2) then 1 else 0 end)ptnum
-        ,sum(case when r.belong=3 then 1 else 0 end)xbnum
+        select s.level,r.resourcetype rtype,count(distinct r.resourceid)rnum
+        ,count(distinct if(r.belong in (1,2),r.resourceid,null))ptnum
+        ,count(distinct if(r.belong=3,r.resourceid,null))xbnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-        where r.resourcestate=1 and (r.level=1 or r.level=4) and r.belong!=4
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.level=1 or r.level=4) and r.belong!=4
         group by s.level,r.resourcetype order by s.level
     </select>
     <!--获取试题科目统计-->
     <select id="listQuestionSubjectNum" resultType="com.xhkjedu.sapi.vo.region.RSubjectVo">
-        select s.level,s.subjectname,s.subjectid,count(q.questionid)snum
-        ,sum(case when q.belong in(1,2) then 1 else 0 end)ptnum
-        ,sum(case when q.belong=3 then 1 else 0 end)xbnum
+        select s.level,s.subjectname,s.subjectid,count(distinct q.questionid) as snum
+        ,count(distinct if(q.belong in(1,2),q.questionid,null))ptnum
+        ,count(distinct if(q.belong=3,q.questionid,null))xbnum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
-        where q.qstate=1 and q.belong!=4
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong!=4 and q.qlevel!=3
         group by q.subjectid order by s.level
     </select>
     <!--获取学校列表-->
@@ -64,30 +74,31 @@
 
     <!--教学统计-->
     <resultMap id="workMap" type="com.xhkjedu.sapi.vo.region.WorkVo">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
-        <result property="shortname" column="shortname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
+        <result property="shortname" column="shortname"/>
         <collection property="details" ofType="com.xhkjedu.sapi.vo.region.WorkDetailVo">
-            <result property="wid" column="wid"></result>
-            <result property="rid" column="rid"></result>
-            <result property="stunum" column="stunum"></result>
-            <result property="commitnum" column="commitnum"></result>
-            <result property="checknum" column="checknum"></result>
+            <result property="wid" column="wid"/>
+            <result property="rid" column="rid"/>
+            <result property="stunum" column="stunum"/>
+            <result property="commitnum" column="commitnum"/>
+            <result property="checknum" column="checknum"/>
         </collection>
     </resultMap>
     <!--作业提交批阅-->
     <select id="listPaperCommitMonth" resultMap="workMap">
         select s.schoolid,s.schoolname,s.shortname, pg.paperid as wid,
         count(distinct ps.psid)stunum,
-        count(distinct case when ps.psstate!=0 then ps.psid else null end)commitnum,
-        count(distinct case when ps.psstate!=0 and ps.pschecked=1 then ps.psid else null end)checknum
+        count(distinct if(ps.psstate in(1,2),ps.psid,null))commitnum,
+        count(distinct if(ps.psstate in(1,2) and ps.pschecked=1,ps.psid,null))checknum
         from t_paper p
         right join t_school s on p.schoolid=s.schoolid and p.paperstate=22
         left join t_paper_class pg on p.paperid = pg.paperid and pg.schoolid=s.schoolid
         and pg.starttime between #{param.begintime} and #{param.endtime}
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on c.classid=pg.classid
-        where s.schoolstate=1
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and s.schoolstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -100,12 +111,13 @@
     <select id="listGuideCommitMonth" resultMap="workMap">
         select s.schoolid,s.schoolname,s.shortname,g.guideid as rid,
         count(distinct gs.rgsid) stunum,
-        count(distinct case when gs.readtime>0 then gs.rgsid else null end) commitnum
+        count(distinct if(gs.readtime>0,gs.rgsid,null)) commitnum
         from t_guide g right join t_school s on g.schoolid=s.schoolid
         and g.createtime between #{param.begintime} and #{param.endtime}
         left join t_guide_group_student gs on gs.guideid=g.guideid and gs.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
-        where s.schoolstate=1
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -119,7 +131,7 @@
     <select id="listReciteCommitMonth" resultMap="workMap">
         select s.schoolid,s.schoolname,s.shortname,rg.reciteid as wid,
         count(distinct rs.rsid) stunum,
-        count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
+        count(distinct if(rs.rsstate!=0,rs.rsid,null)) commitnum
         from t_recite r right join t_school s on r.schoolid=s.schoolid
         left join t_recite_group rg on r.reciteid=rg.reciteid and rg.schoolid=s.schoolid
         and rg.starttime between #{param.begintime} and #{param.endtime}
@@ -140,7 +152,8 @@
         from t_classroom c left join t_class c2 on c.classid=c2.classid
         right join t_school s on c.schoolid=s.schoolid and c.roomstate=2
         and c.createtime between #{param.begintime} and #{param.endtime}
-        where s.schoolstate=1
+        left join t_director d on c.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
             and c2.year=#{param.year}
         </if>
@@ -158,7 +171,8 @@
         left join t_paper_class pg on p.paperid=pg.paperid and s.schoolid=pg.schoolid
         and pg.starttime between #{param.begintime} and #{param.endtime}
         left join t_class c on c.classid=pg.classid
-        where s.schoolstate=1
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and s.schoolstate=1 and (d.disabled=0 or p.directorid is null)
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -175,7 +189,8 @@
         right join t_school s on c.schoolid=s.schoolid
         and c.createtime between #{param.begintime} and #{param.endtime}
         left join t_class c2 on c.classid=c2.classid
-        where s.schoolstate=1
+        left join t_director d on c.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
             and c2.year=#{param.year}
         </if>
@@ -185,27 +200,28 @@
         group by s.schoolid order by s.schoolid
     </select>
     <resultMap id="roomAsk" type="com.xhkjedu.sapi.vo.region.WorkVo">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
-        <result property="shortname" column="shortname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
+        <result property="shortname" column="shortname"/>
         <collection property="asks" ofType="com.xhkjedu.sapi.vo.region.WorkTypeVo">
-            <result property="asktype" column="asktype"></result>
-            <result property="asknum" column="asknum"></result>
+            <result property="asktype" column="asktype"/>
+            <result property="asknum" column="asknum"/>
         </collection>
     </resultMap>
 
     <!--课堂使用情况统计——课堂互动-->
     <select id="listRoomAskNumMonth2" resultType="java.util.Map">
         select s.schoolname,s.shortname,count(distinct c.roomid)num
-        ,sum(case when ca.asktype between 30 and 33 then 1 else 0 end)twnum
-        ,sum(case when ca.asktype =40 then 1 else 0 end)tcnum
-        ,sum(case when ca.asktype =21 then 1 else 0 end)dmnum
-        ,sum(case when ca.asktype =20 then 1 else 0 end)qdnum
+        ,count(distinct if(ca.asktype between 30 and 33,ca.asktid,null))twnum
+        ,count(distinct if(ca.asktype=40,ca.asktid,null))tcnum
+        ,count(distinct if(ca.asktype=21,ca.asktid,null))dmnum
+        ,count(distinct if(ca.asktype=20,ca.asktid,null))qdnum
         from t_classroom c right join t_school s on c.schoolid=s.schoolid
         and c.createtime between #{param.begintime} and #{param.endtime}
         left join t_classroom_askteacher ca on ca.roomid=c.roomid
         left join t_class c2 on c.classid=c2.classid
-        where s.schoolstate=1
+        left join t_director d on c.directorid=d.directorid
+        where d.disabled=0 and s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
             and c2.year=#{param.year}
         </if>

sapi/src/main/resources/mapper/region/RegionResourceMapper.xml

@@ -4,57 +4,77 @@
 
     <!--资源统计——资源数量-->
     <select id="getResourceNum" resultType="java.util.Map">
-        select count(r.resourceid) resourcenum,sum(r.resourcesize)resourcesize,sum(r.downcount) downcount
-         from t_resource r where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        select count(r.resourceid) resourcenum,sum(r.resourcesize) as resourcesize,sum(r.downcount) as downcount
+        from (select distinct r.resourceid
+        from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4))r2
+        left join t_resource r on r2.resourceid=r.resourceid
     </select>
     <select id="getResourceCollectNum" resultType="java.lang.Integer">
-        select count(*) from t_resource_collect rc
-        left join t_resource r on rc.resourceid=r.resourceid where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        select count(distinct rc.rcid) from t_resource_collect rc
+        left join t_resource r on rc.resourceid=r.resourceid
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
     </select>
     <!--资源统计——资源学科统计-->
     <select id="listResourceSubjectTypenum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select s.level,r.subjectid,s.subjectname,r.resourcetype rtype,count(r.resourceid)rnum
+        select s.level,r.subjectid,s.subjectname,r.resourcetype rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-        where r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
         group by s.level,r.subjectid,r.resourcetype order by s.level,s.subjectorder,r.resourcetype
     </select>
     <!--资源统计——校本资源统计-->
     <select id="listResourceSchool" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select s.level,r.subjectid,s.subjectname,count(r.resourceid)rnum
+        select s.level,r.subjectid,s.subjectname,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-        where r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4)
         group by s.level,r.subjectid order by s.level,s.subjectorder
     </select>
 
     <!--试题统计-->
     <select id="listQuestionSubjectnum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-       select s.level,s.subjectname,count(q.questionid) rnum
+       select s.level,s.subjectname,count(distinct q.questionid) rnum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
-        where q.qstate=1 and q.belong!=4
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong!=4 and q.qlevel!=3
         group by s.level,q.subjectid order by s.level,s.subjectorder
     </select>
 
     <!--热门资源统计-->
     <select id="listResourceHot" resultType="java.util.Map">
-      select resourcename,readcount from t_resource where resourcestate=1 and belong!=4 and (level=1 or level=4)
-        order by readcount desc limit 40
+        select resourcename,readcount
+        from t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and resourcestate=1 and r.belong!=4 and (r.level=1 or r.level=4)
+        group by r.resourceid order by readcount desc limit 40
     </select>
 
     <!--资源统计——近一个月校本资源贡献统计-->
     <select id="listResourceForSchool" resultType="com.xhkjedu.sapi.vo.region.RSResourceVo">
-        select s.schoolid,s.schoolname,s.shortname,r.resourcetype rtype,count(r.resourceid)rnum
+        select s.schoolid,s.schoolname,s.shortname,r.resourcetype rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_school s on r.schoolid=s.schoolid
-        where r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4) and s.schoolstate=1
-				and r.createtime between #{begintime} and #{endtime}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong=3 and (r.level=1 or r.level=4) and s.schoolstate=1
+        and r.createtime between #{begintime} and #{endtime}
         group by s.schoolid,r.resourcetype order by schoolid,r.resourcetype
     </select>
 
     <!--试题统计——近一个月题库贡献统计-->
     <select id="listQuestionForSchool" resultType="com.xhkjedu.sapi.vo.region.RSchoolVo">
-       select q.schoolid,s.schoolname,s.shortname,count(q.questionid) snum
+        select q.schoolid,s.schoolname,s.shortname,count(distinct q.questionid) as snum
         from t_question q left join t_school s on q.schoolid=s.schoolid
-        where q.qstate=1 and q.belong=3 and s.schoolstate=1
-			and q.createtime between #{begintime} and #{endtime}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong=3 and q.qlevel!=3 and s.schoolstate=1
+        and q.createtime between #{begintime} and #{endtime}
         group by s.schoolid order by schoolid
     </select>
 

sapi/src/main/resources/mapper/region/SAnalyzeMapper.xml

@@ -3,46 +3,55 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.region.SAnalyzeMapper">
     <!--获取试题科目统计-->
     <select id="listQuestionSubjectNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select s.subjectname,count(q.questionid)rnum
-        ,sum(case when q.belong in(1,2) then 1 else 0 end)ptnum
-        ,sum(case when q.belong=3 then 1 else 0 end)xbnum
+        select s.subjectname,count(distinct q.questionid)rnum
+        ,count(distinct if(q.belong in(1,2),q.questionid,null))ptnum
+        ,count(distinct if(q.belong=3,q.questionid,null))xbnum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where q.qstate=1 and (q.belong in(1,2) or (q.belong=3 and q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.qlevel!=3
+        and (q.belong in(1,2) or (q.belong=3 and q.schoolid=#{schoolid})) and ts.schoolid=#{schoolid}
         group by q.subjectid order by s.subjectorder
     </select>
     <!--获取资源类型统计-->
     <select id="listResourceTypeNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select r.resourcetype rtype,count(r.resourceid)rnum
-        ,sum(case when r.belong in(1,2) then 1 else 0 end)ptnum
-        ,sum(case when r.belong=3 then 1 else 0 end)xbnum
+        select r.resourcetype rtype,count(distinct r.resourceid)rnum
+        ,count(distinct if(r.belong in(1,2),r.resourceid,null))ptnum
+        ,count(distinct if(r.belong=3,r.resourceid,null))xbnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
         and ts.schoolid=#{schoolid}
         group by r.resourcetype
     </select>
     <!--获取资源格式统计-->
     <select id="listResourceClassNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select r.resourceclass rtype,count(r.resourceid)rnum
+        select r.resourceclass rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
         and ts.schoolid=#{schoolid}
         group by r.resourceclass
     </select>
     <!--获取资源科目统计-->
     <select id="listResourceSubjectNum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select s.subjectname,count(r.resourceid)rnum
+        select s.subjectname,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
-        where r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.level=1 or r.level=4) and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{schoolid}))
         and ts.schoolid=#{schoolid}
         group by r.subjectid order by s.subjectorder
     </select>
     <!--获取班级、教师、学生总量-->
     <select id="listClassTeacherStudent" resultType="java.util.Map">
-        select c.classid,c.classname,c.gradeid,c.classorder,tu.userid teacherid,cs.studentid,ifnull(u.usersex,0)usersex
+        select c.classid,c.classname,c.gradeid,c.classorder,tu.userid as teacherid,cs.studentid,ifnull(u.usersex,0) as usersex
         from t_class c left join t_class_teacher ct on c.classid=ct.classid
         left join t_user tu on ct.teacherid=tu.userid and tu.usertype=1 and tu.userstate=1 and tu.schoolid=c.schoolid
         left join t_class_student cs on c.classid=cs.classid
@@ -51,7 +60,7 @@
     </select>
     <!--访问量统计-->
     <select id="listAccess" resultType="com.xhkjedu.sapi.vo.region.AccessVo">
-        select ifnull(l.ultype,0)ultype,from_unixtime(l.logtime,'%m-%d')logtime,count(*)num
+        select ifnull(l.ultype,0) as ultype,from_unixtime(l.logtime,'%m-%d') as logtime,count(*)num
         from t_user_log l
         where l.schoolid=#{schoolid} and l.logtime between #{begintime} and #{endtime}
         group by from_unixtime(l.logtime,'%m-%d'),l.ultype
@@ -67,32 +76,37 @@
     <!--作业提交率-->
     <select id="listPaperCommitMonth" resultType="com.xhkjedu.sapi.vo.region.SWorkVo">
         select c.gradeid,s.subjectname,count(distinct pg.paperid)num,s.subjectorder
-        ,truncate(count(distinct case when ps.psstate!=0 then ps.psid else null end)*100/count(distinct ps.psid),2)numrate
+        ,truncate(count(distinct if(ps.psstate in(1,2),ps.psid,null))*100/count(distinct ps.psid),2)numrate
         from t_paper_class pg right join t_paper p on pg.paperid=p.paperid
         left join t_subject s on p.subjectid=s.subjectid
         left join t_class c on pg.classid=c.classid
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
-        where c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22 and pg.schoolid=#{param.schoolid}
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22 and pg.schoolid=#{param.schoolid}
+        and (d.disabled=0 or p.directorid is null)
         and pg.starttime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,p.subjectid
     </select>
     <!--预习-->
     <select id="listGuideCommitMonth" resultType="com.xhkjedu.sapi.vo.region.SWorkVo">
         select c.gradeid,s.subjectname,count(distinct g.guideid)num,s.subjectorder
-        ,truncate(count(distinct case when gs.readtime>0 then gs.rgsid else null end)*100/count(distinct gs.rgsid),2)numrate
+        ,truncate(count(distinct if(gs.readtime>0,gs.rgsid,null))*100/count(distinct gs.rgsid),2)numrate
         from t_guide g left join t_subject s on g.subjectid=s.subjectid
         left join t_guide_group_student gs on gs.guideid=g.guideid
         left join t_class c on gs.classid=c.classid
-        where c.year=#{param.year} and g.schoolid=#{param.schoolid} and gs.schoolid=#{param.schoolid}
+        left join t_director d on g.directorid=d.directorid
+        where d.disabled=0 and c.year=#{param.year} and g.schoolid=#{param.schoolid} and gs.schoolid=#{param.schoolid}
         and g.createtime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,g.subjectid
     </select>
 
     <!--课堂使用情况统计——使用次数-->
     <select id="listRoomNumMonth" resultType="com.xhkjedu.sapi.vo.region.SWorkVo">
-        select s.classid,s.classname,s.gradeid,count(c.roomid) num from t_classroom c
+        select s.classid,s.classname,s.gradeid,count(distinct c.roomid) num
+        from t_classroom c
         left join t_class s on c.classid=s.classid
-        where c.schoolid=#{param.schoolid} and s.year=#{param.year}
+        left join t_director d on c.directorid=d.directorid
+        where d.disabled=0 and c.schoolid=#{param.schoolid} and s.year=#{param.year}
         and c.createtime between #{param.begintime} and #{param.endtime}
         group by c.classid order by s.gradeid,s.classorder
     </select>
@@ -100,13 +114,14 @@
     <!--课堂使用情况统计——课堂互动-->
     <select id="listRoomAskNumMonth" resultType="java.util.Map">
         select s.classid,s.classname,s.gradeid,count(distinct c.roomid)num
-        ,sum(case when ca.asktype between 30 and 33 then 1 else 0 end)twnum
-        ,sum(case when ca.asktype =40 then 1 else 0 end)tcnum
-        ,sum(case when ca.asktype =21 then 1 else 0 end)dmnum
-        ,sum(case when ca.asktype =20 then 1 else 0 end)qdnum
+        ,count(distinct if(ca.asktype between 30 and 33,ca.asktid,null))twnum
+        ,count(distinct if(ca.asktype =40,ca.asktid,null))tcnum
+        ,count(distinct if(ca.asktype =21,ca.asktid,null))dmnum
+        ,count(distinct if(ca.asktype =20,ca.asktid,null))qdnum
         from t_classroom c left join t_class s on c.classid=s.classid
         left join t_classroom_askteacher ca on ca.roomid=c.roomid
-        where c.schoolid=#{param.schoolid} and s.year=#{param.year}
+        left join t_director d on c.directorid=d.directorid
+        where d.disabled=0 and c.schoolid=#{param.schoolid} and s.year=#{param.year}
         and c.createtime between #{param.begintime} and #{param.endtime}
         group by c.classid order by s.gradeid,s.classorder
     </select>

sapi/src/main/resources/mapper/region/SResourceMapper.xml

@@ -4,67 +4,85 @@
 
     <!--资源统计——资源数量-->
     <select id="getSchoolResourceNum" resultType="java.util.Map">
-        select count(r.resourceid) resourcenum,sum(r.resourcesize)resourcesize,sum(r.downcount) downcount
-         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-         left join t_school l on s.level=l.schoollevel
-          where r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid}))
-          and l.schoolid=#{schoolid}
-          and (r.level=1 or r.level=4)
+        select count(r.resourceid) as resourcenum,sum(r.resourcesize) as resourcesize,sum(r.downcount) as downcount
+        from(select distinct r.resourceid from t_resource r left join t_subject s on r.subjectid=s.subjectid
+        left join t_school l on s.level=l.schoollevel
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid}))
+        and l.schoolid=#{schoolid}
+        and (r.level=1 or r.level=4))r2 left join t_resource r on r2.resourceid=r.resourceid
     </select>
+    <!--资源统计——收藏数量-->
     <select id="getSchoolResourceCollectNum" resultType="java.lang.Integer">
-        select count(distinct rc.resourceid) from t_resource_collect rc
+        select count(distinct rc.rcid) from t_resource_collect rc
         left join t_resource r on rc.resourceid=r.resourceid
         left join t_subject s on r.subjectid=s.subjectid
         left join t_school l on s.level=l.schoollevel
-        where r.resourcestate=1
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1
         and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4) and l.schoolid=#{schoolid}
     </select>
+    <!--资源统计——校本资源数量-->
     <select id="getSchoolResourceTotalNum" resultType="java.lang.Integer">
-        select count(*) from t_resource
-        where resourcestate=1 and belong=3 and schoolid=#{schoolid} and (level=1 or level=4)
+        select count(distinct r.resourceid) from t_resource r
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong=3 and r.schoolid=#{schoolid} and (r.level=1 or r.level=4)
     </select>
     <!--资源统计——资源分类统计-->
     <select id="listSchoolResourceSubjectTypenum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select r.subjectid,s.subjectname,r.resourcetype rtype,count(r.resourceid)rnum
+        select r.subjectid,s.subjectname,r.resourcetype rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school l on s.level=l.schoollevel
-        where r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4)
         and l.schoolid=#{schoolid}
         group by r.subjectid,r.resourcetype order by s.subjectorder,r.resourcetype
     </select>
     <!--资源统计——资源格式统计-->
     <select id="listSchoolResourceSubjectClassnum" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select r.resourceclass rtype,count(r.resourceid)rnum
+        select r.resourceclass rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
         left join t_school l on s.level=l.schoollevel
-        where r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4)
         and l.schoolid=#{schoolid}
         group by r.resourceclass order by r.resourceclass
     </select>
 
     <!--试题统计——学科数量-->
     <select id="listSchoolQuestionSubjectnum" resultType="com.xhkjedu.sapi.vo.region.RSubjectVo">
-       select s.subjectname,count(q.questionid) snum
+        select s.subjectname,count(distinct q.questionid) as snum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
         left join t_school l on s.level=l.schoollevel
-        where q.qstate=1 and (q.belong &lt; 3 or (q.belong=3 and q.schoolid=#{schoolid}))
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.qlevel!=3 and (q.belong &lt; 3 or (q.belong=3 and q.schoolid=#{schoolid}))
         and l.schoolid=#{schoolid}
         group by q.subjectid order by s.subjectorder
     </select>
     <!--试题统计——校本试题学科数量-->
     <select id="getSchoolQuestionXbSubjectnum" resultType="com.xhkjedu.sapi.vo.region.RSubjectVo">
-        select s.subjectname,count(q.questionid) snum
+        select s.subjectname,count(distinct q.questionid) as snum
         from t_question q left join t_subject s on q.subjectid=s.subjectid
-        where q.qstate=1 and q.belong=3 and q.schoolid=#{schoolid}
+        left join t_question_director qd on q.questionid=qd.questionid
+        left join t_director d on qd.directorid=d.directorid
+        where d.disabled=0 and q.qstate=1 and q.belong=3 and q.qlevel!=3 and q.schoolid=#{schoolid}
         group by q.subjectid order by snum
     </select>
 
 
     <!--资源统计——校本资源统计-->
     <select id="listSchoolResourceSchool" resultType="com.xhkjedu.sapi.vo.region.RSubjectVo">
-        select r.subjectid,s.subjectname,count(r.resourceid)snum
+        select r.subjectid,s.subjectname,count(distinct r.resourceid)snum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-        where r.resourcestate=1 and r.belong=3 and r.schoolid=#{schoolid} and (r.level=1 or r.level=4)
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong=3 and r.schoolid=#{schoolid} and (r.level=1 or r.level=4)
         group by r.subjectid order by s.subjectorder
     </select>
 
@@ -74,18 +92,22 @@
       select resourcename,readcount from t_resource r
       left join t_subject s on r.subjectid=s.subjectid
       left join t_school l on s.level=l.schoollevel
-      where r.resourcestate=1
+      left join t_resource_director rd on r.resourceid=rd.resourceid
+      left join t_director d on rd.directorid=d.directorid
+      where d.disabled=0 and r.resourcestate=1
       and (r.belong &lt; 3 or (r.belong=3 and r.schoolid=#{schoolid})) and (r.level=1 or r.level=4)
       and l.schoolid=#{schoolid}
-        order by readcount desc limit 40
+      group by r.resourceid order by readcount desc limit 40
     </select>
 
     <!--资源统计——近一个月校本资源贡献统计-->
     <select id="listSchoolResourceForSchool" resultType="com.xhkjedu.sapi.vo.region.ResourceTypeVo">
-        select r.subjectid,s.subjectname,r.resourcetype rtype,count(r.resourceid)rnum
+        select r.subjectid,s.subjectname,r.resourcetype rtype,count(distinct r.resourceid)rnum
         from t_resource r left join t_subject s on r.subjectid=s.subjectid
-        where r.resourcestate=1 and r.belong=3 and r.schoolid=#{schoolid} and (r.level=1 or r.level=4)
-				and r.createtime between #{begintime} and #{endtime}
+        left join t_resource_director rd on r.resourceid=rd.resourceid
+        left join t_director d on rd.directorid=d.directorid
+        where d.disabled=0 and r.resourcestate=1 and r.belong=3 and r.schoolid=#{schoolid} and (r.level=1 or r.level=4)
+        and r.createtime between #{begintime} and #{endtime}
         group by r.subjectid,r.resourcetype order by s.subjectorder,r.resourcetype
     </select>
 

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

@@ -18,7 +18,7 @@
         where f.fschoolid=#{schoolid}
     </select>
     <select id="findAll" resultType="java.util.Map">
-        select s.schoolid,s.schoolname,s.shortname,s.schoollevel,s.errorrate,s.`year`
+        select s.schoolid,s.schoolname,s.shortname,s.schoollevel,s.errorrate,s.`year`,s.docklc
         ,(select u.loginname from t_user u where u.schoolid=s.schoolid and u.usertype=0 and u.userstate=1
         ORDER BY u.userid LIMIT 1)loginname
         ,(select count(sf.schoolid) from t_school_friend sf where sf.fschoolid=s.schoolid)joinnum

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>
@@ -43,4 +42,15 @@
     <update id="delBindmac">
         update t_user set bindmac=0,mac=null where schoolid=#{schoolid}
     </update>
+
+    <!--获取用户信息-->
+    <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,17 +1,17 @@
 package com.xhkjedu.sclass;
 
+import com.xhkjedu.sclass.config.ConfigKey;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication(scanBasePackages = "com.xhkjedu")
 @MapperScan("com.xhkjedu.sclass.mapper")
-@EnableEurekaClient
 public class SclassApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SclassApplication.class, args);
+        System.out.println("构建号：" + ConfigKey.buildnum);
     }
 
 }

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

@@ -0,0 +1,208 @@
+package com.xhkjedu.sclass.aop;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.constant.PlatformConstant;
+import com.xhkjedu.model.slog.THandleLog;
+import com.xhkjedu.sclass.config.ConfigKey;
+import com.xhkjedu.sclass.mapper.system.UserMapper;
+import com.xhkjedu.sclass.mq.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.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();
+
+        try {
+            // 获取方法名字
+            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();
+                // 设置请求参数
+                handleLog.setHandleparas(JSON.toJSONString(args[0]));
+            }
+
+            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) {
+            log.error("操作日志doBefore执行异常：" + 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);
+    }
+
+    /*
+     * @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();
+    }
+
+    /*
+     * @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();
+    //     }
+    //     return null;
+    // }
+
+    /**
+     * 发送消息
+     */
+    public void sendOut() {
+        THandleLog logHandlelogNew = handleLog;
+        // log.info("记录操作日志,给rabbitmq发送消息：" + logHandlelogNew.toString());
+        handleLogSender.handleLogSend(logHandlelogNew);
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.xhkjedu.sclass.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ywx
+ * @classname ConfigKey
+ * @description 读取配置文件类
+ * @date 2020/10/16 9:19
+ **/
+@Component
+public class ConfigKey {
+    public static Integer buildnum;//构建号
+
+    @Value("${buildnum}")
+    public void setBuildnum(Integer buildnum){
+        this.buildnum = buildnum;
+    }
+
+    public static String ipregiondb;//解析ip地址归属地
+
+    @Value("${ipregiondb}")
+    public void setIpregiondb(String ipregiondb){
+        ConfigKey.ipregiondb = ipregiondb;
+    }
+
+}

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/controller/classroom/ClassroomController.java

@@ -3,6 +3,8 @@ package com.xhkjedu.sclass.controller.classroom;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.annotation.Action;
+import com.xhkjedu.sclass.mapper.system.UserMapper;
 import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
@@ -17,6 +19,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +42,8 @@ public class ClassroomController {
     private ClassroomService classroomService;
     @Resource
     private ClassroomPaperService classroomPaperService;
+    @Resource
+    private UserMapper userMapper;
 
     /**
      * 批量保存课堂数据
@@ -49,6 +54,7 @@ public class ClassroomController {
      * @Date 2022/6/29 10:31
      **/
     @PostMapping("/saveclass")
+    @Action("课堂管理-增加")
     public ResultVo saveClass(@RequestBody List<RoomPVo> rooms) {
         List<TClassroom> startclassList = new ArrayList<>();//开始课堂集合
         List<TClassroom> stopclassList = new ArrayList<>();//结束课堂集合
@@ -175,6 +181,7 @@ public class ClassroomController {
      * @Date 2022/6/30 11:23
      **/
     @PostMapping("/save_class")
+    @Action("课堂管理-增加")
     public ResultVo saveOneClass(@RequestBody RoomPVo r) {
         List<RoomParamVo> params = r.getParams();
         if(!classroomService.isSave(params, r.getRoomid())) return new ResultVo(0, "无需保存");
@@ -461,8 +468,9 @@ public class ClassroomController {
         Integer pageSize = room.getPageSize();
         N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
         try {
+            UserVo userVo = userMapper.getUserInfoForHandleLog(teacherid);
             PageHelper.startPage(page, pageSize);
-            List<Map> list = classroomService.listClassByDirectorId(room);
+            List<Map> list = classroomService.listClassByDirectorId(room, userVo);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
             return new ResultVo(0, "获取课堂回顾列表成功", pageResult);
         } catch (Exception e) {
@@ -471,6 +479,21 @@ public class ClassroomController {
         }
     }
 
+    /**
+     * @Description 删除
+     * @Date 2023/11/17 14:26
+     * @Author YWX
+     * @Param [room]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TClassroom room) {
+        Long roomid = room.getRoomid();
+        N_Utils.validation(new Object[]{roomid, "课堂id", 1});
+        classroomService.deleteById(roomid);
+        return new ResultVo(0, "删除成功");
+    }
+
     /**
      * 课堂回顾详情
      *

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sclass.controller.classroom;
 
+import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sclass.model.classroom.TClassroomVideo;
 import com.xhkjedu.sclass.service.classroom.ClassroomVideoService;
 import com.xhkjedu.utils.N_Utils;
@@ -34,6 +35,7 @@ public class ClassroomVideoController {
     }
 
     @PostMapping("/add")
+    @Action("课堂视频-增加")
     public ResultVo add(@RequestBody TClassroomVideo video) {
         N_Utils.validation(new Object[]{video.getRoomid(), "课堂id", 1});
         classroomVideoService.save(video);
@@ -41,6 +43,7 @@ public class ClassroomVideoController {
     }
 
     @PostMapping("/delete")
+    @Action("课堂视频-删除")
     public ResultVo delete(@RequestBody TClassroomVideo video) {
         Integer rvid = video.getRvid();
         N_Utils.validation(new Object[]{rvid, "课堂视频id", 1});
@@ -49,6 +52,7 @@ public class ClassroomVideoController {
     }
 
     @PostMapping("/update")
+    @Action("课堂视频-修改")
     public ResultVo update(@RequestBody TClassroomVideo video) {
         N_Utils.validation(new Object[]{video.getRvid(), "课堂视频id", 1});
         classroomVideoService.update(video);

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

@@ -1,35 +0,0 @@
-package com.xhkjedu.sclass.interceptors;
-
-import org.springframework.stereotype.Component;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * @author ywx
- * @classname HttpServletFilter
- * @description 过滤器 以便http post请求body输入流可多次读取
- * @date 2020/11/9 11:25
- **/
-@Component
-public class HttpServletFilter implements Filter {
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        ServletRequest requestWrapper = null;
-        if (request instanceof HttpServletRequest) {
-            requestWrapper = new RequestWrapper((HttpServletRequest) request);
-        }
-        if (requestWrapper == null) {
-            chain.doFilter(request, response);
-        } else {
-            chain.doFilter(requestWrapper, response);
-        }
-    }
-
-}