diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index 6dd57b95..e3142273 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -1,6 +1,7 @@ package org.jeecg.common.exception; import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.UnauthorizedException; import org.jeecg.common.api.vo.Result; @@ -15,19 +16,18 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MaxUploadSizeExceededException; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.NoHandlerFoundException; -import lombok.extern.slf4j.Slf4j; - +import javax.servlet.http.HttpServletRequest; import java.sql.SQLException; import java.sql.SQLNonTransientException; import java.sql.SQLSyntaxErrorException; +import java.util.Iterator; /** * 异常处理器 - * - * @Author scott - * @Date 2019 */ @RestControllerAdvice @Slf4j @@ -37,8 +37,9 @@ public class JeecgBootExceptionHandler { * 处理自定义异常 */ @ExceptionHandler(JeecgBootException.class) - public Result handleJeecgBootException(JeecgBootException e){ - log.error(e.getMessage(), e); + public Result handleJeecgBootException(JeecgBootException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error(e.getMessage()); } @@ -46,110 +47,126 @@ public class JeecgBootExceptionHandler { * 处理自定义微服务异常 */ @ExceptionHandler(JeecgCloudException.class) - public Result handleJeecgCloudException(JeecgCloudException e){ - log.error(e.getMessage(), e); + public Result handleJeecgCloudException(JeecgCloudException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error(e.getMessage()); } /** - * 处理自定义异常 + * 处理自定义401异常 */ @ExceptionHandler(JeecgBoot401Exception.class) @ResponseStatus(HttpStatus.UNAUTHORIZED) - public Result handleJeecgBoot401Exception(JeecgBoot401Exception e){ - log.error(e.getMessage(), e); - return new Result(401,e.getMessage()); + public Result handleJeecgBoot401Exception(JeecgBoot401Exception e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); + return new Result<>(401, e.getMessage()); } @ExceptionHandler(NoHandlerFoundException.class) - public Result handlerNoFoundException(Exception e) { - log.error(e.getMessage(), e); + public Result handlerNoFoundException(Exception e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error(404, "路径不存在，请检查路径是否正确"); } @ExceptionHandler(DuplicateKeyException.class) - public Result handleDuplicateKeyException(DuplicateKeyException e){ - log.error(e.getMessage(), e); + public Result handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error("数据库中已存在该记录"); } @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class}) - public Result handleAuthorizationException(AuthorizationException e){ - log.error(e.getMessage(), e); + public Result handleAuthorizationException(AuthorizationException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.noauth("没有权限，请联系管理员授权"); } - @ExceptionHandler(Exception.class) - public Result handleException(Exception e){ - log.error(e.getMessage(), e); - //update-begin---author:zyf ---date:20220411 for：处理Sentinel限流自定义异常 - Throwable throwable = e.getCause(); - SentinelErrorInfoEnum errorInfoEnum = SentinelErrorInfoEnum.getErrorByException(throwable); - if (ObjectUtil.isNotEmpty(errorInfoEnum)) { - return Result.error(errorInfoEnum.getError()); - } - //update-end---author:zyf ---date:20220411 for：处理Sentinel限流自定义异常 -// return Result.error("操作失败"+e.getMessage()); - return Result.error("操作失败"); - } - - /** - * @Author 政辉 - * @param e - * @return - */ @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - public Result httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){ + public Result httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e, HttpServletRequest request) { StringBuffer sb = new StringBuffer(); sb.append("不支持"); sb.append(e.getMethod()); sb.append("请求方法，"); sb.append("支持以下"); - String [] methods = e.getSupportedMethods(); - if(methods!=null){ - for(String str:methods){ + + String[] methods = e.getSupportedMethods(); + if (methods != null) { + for (String str : methods) { sb.append(str); sb.append("、"); } } + + log.error("Intercepted unsupported HTTP method request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), e.getMethod(), request.getParameterMap()); + log.error(sb.toString(), e); - //return Result.error("没有权限，请联系管理员授权"); - return Result.error(405,sb.toString()); + + return Result.error(405, sb.toString()); } - - /** - * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException - */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { - log.error(e.getMessage(), e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); - } - @ExceptionHandler(DataIntegrityViolationException.class) - public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { - log.error(e.getMessage(), e); - //【issues/3624】数据库执行异常handleDataIntegrityViolationException提示有误 #3624 - return Result.error("执行数据库异常,违反了完整性例如：违反惟一约束、违反非空限制、字段内容超出长度等"); - } + @ExceptionHandler(MaxUploadSizeExceededException.class) + public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e, HttpServletRequest request) { + if (request instanceof MultipartHttpServletRequest) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Iterator fileNames = multipartRequest.getFileNames(); - @ExceptionHandler(PoolException.class) - public Result handlePoolException(PoolException e) { - log.error(e.getMessage(), e); - return Result.error("Redis 连接异常!"); - } + while (fileNames.hasNext()) { + String fileName = fileNames.next(); + MultipartFile file = multipartRequest.getFile(fileName); + log.error("File upload exceeded max size: File name={}, Size={} bytes, Content type={}", + file.getOriginalFilename(), file.getSize(), file.getContentType()); + } + } - @ExceptionHandler({ SQLSyntaxErrorException.class, SQLNonTransientException.class, SQLException.class }) - public Result handleSQLSyntaxErrorException(SQLException e) { - log.error(e.getMessage(), e); + return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量!"); + } + + @ExceptionHandler(DataIntegrityViolationException.class) + public Result handleDataIntegrityViolationException(DataIntegrityViolationException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); + //【issues/3624】数据库执行异常handleDataIntegrityViolationException提示有误 #3624 + return Result.error("执行数据库异常,违反了完整性例如：违反惟一约束、违反非空限制、字段内容超出长度等"); + } + + @ExceptionHandler(PoolException.class) + public Result handlePoolException(PoolException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); + return Result.error("Redis 连接异常!"); + } + + @ExceptionHandler({SQLSyntaxErrorException.class, SQLNonTransientException.class, SQLException.class}) + public Result handleSQLSyntaxErrorException(SQLException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error("SQL语法错误！"); } - @ExceptionHandler({ BadSqlGrammarException.class, InvalidDataAccessResourceUsageException.class, NonTransientDataAccessException.class, DataAccessException.class }) - public Result handleBadSqlGrammarException(DataAccessException e) { - log.error(e.getMessage(), e); + @ExceptionHandler({BadSqlGrammarException.class, InvalidDataAccessResourceUsageException.class, NonTransientDataAccessException.class, DataAccessException.class}) + public Result handleBadSqlGrammarException(DataAccessException e, HttpServletRequest request) { + log.error("Intercepted exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); return Result.error("SQL语法错误！"); } + @ExceptionHandler(Exception.class) + public Result handleException(Exception e, HttpServletRequest request) { + log.error("Intercepted an exception for request: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap(), e); + // 处理Sentinel限流自定义异常 + Throwable throwable = e.getCause(); + SentinelErrorInfoEnum errorInfoEnum = SentinelErrorInfoEnum.getErrorByException(throwable); + if (ObjectUtil.isNotEmpty(errorInfoEnum)) { + return Result.error(errorInfoEnum.getError()); + } + + return Result.error("操作失败"); + } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandlerbk.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandlerbk.java new file mode 100644 index 00000000..dbb0d274 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandlerbk.java @@ -0,0 +1,153 @@ +package org.jeecg.common.exception; + +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.AuthorizationException; +import org.apache.shiro.authz.UnauthorizedException; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.enums.SentinelErrorInfoEnum; +import org.springframework.dao.*; +import org.springframework.data.redis.connection.PoolException; +import org.springframework.http.HttpStatus; +import org.springframework.jdbc.BadSqlGrammarException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.multipart.MaxUploadSizeExceededException; +import org.springframework.web.servlet.NoHandlerFoundException; + +import java.sql.SQLException; +import java.sql.SQLNonTransientException; +import java.sql.SQLSyntaxErrorException; + +/** + * 异常处理器 + * + * @Author scott + * @Date 2019 + */ +@RestControllerAdvice +@Slf4j +public class JeecgBootExceptionHandlerbk { + + /** + * 处理自定义异常 + */ + @ExceptionHandler(JeecgBootException.class) + public Result handleJeecgBootException(JeecgBootException e){ + log.error(e.getMessage(), e); + return Result.error(e.getMessage()); + } + + /** + * 处理自定义微服务异常 + */ + @ExceptionHandler(JeecgCloudException.class) + public Result handleJeecgCloudException(JeecgCloudException e){ + log.error(e.getMessage(), e); + return Result.error(e.getMessage()); + } + + /** + * 处理自定义异常 + */ + @ExceptionHandler(JeecgBoot401Exception.class) + @ResponseStatus(HttpStatus.UNAUTHORIZED) + public Result handleJeecgBoot401Exception(JeecgBoot401Exception e){ + log.error(e.getMessage(), e); + return new Result(401,e.getMessage()); + } + + @ExceptionHandler(NoHandlerFoundException.class) + public Result handlerNoFoundException(Exception e) { + log.error(e.getMessage(), e); + return Result.error(404, "路径不存在，请检查路径是否正确"); + } + + @ExceptionHandler(DuplicateKeyException.class) + public Result handleDuplicateKeyException(DuplicateKeyException e){ + log.error(e.getMessage(), e); + return Result.error("数据库中已存在该记录"); + } + + @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class}) + public Result handleAuthorizationException(AuthorizationException e){ + log.error(e.getMessage(), e); + return Result.noauth("没有权限，请联系管理员授权"); + } + + @ExceptionHandler(Exception.class) + public Result handleException(Exception e){ + log.error(e.getMessage(), e); + //update-begin---author:zyf ---date:20220411 for：处理Sentinel限流自定义异常 + Throwable throwable = e.getCause(); + SentinelErrorInfoEnum errorInfoEnum = SentinelErrorInfoEnum.getErrorByException(throwable); + if (ObjectUtil.isNotEmpty(errorInfoEnum)) { + return Result.error(errorInfoEnum.getError()); + } + //update-end---author:zyf ---date:20220411 for：处理Sentinel限流自定义异常 +// return Result.error("操作失败"+e.getMessage()); + return Result.error("操作失败"); + } + + /** + * @Author 政辉 + * @param e + * @return + */ + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public Result httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){ + StringBuffer sb = new StringBuffer(); + sb.append("不支持"); + sb.append(e.getMethod()); + sb.append("请求方法，"); + sb.append("支持以下"); + String [] methods = e.getSupportedMethods(); + if(methods!=null){ + for(String str:methods){ + sb.append(str); + sb.append("、"); + } + } + log.error(sb.toString(), e); + //return Result.error("没有权限，请联系管理员授权"); + return Result.error(405,sb.toString()); + } + + /** + * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException + */ + @ExceptionHandler(MaxUploadSizeExceededException.class) + public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { + log.error(e.getMessage(), e); + return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + } + + @ExceptionHandler(DataIntegrityViolationException.class) + public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { + log.error(e.getMessage(), e); + //【issues/3624】数据库执行异常handleDataIntegrityViolationException提示有误 #3624 + return Result.error("执行数据库异常,违反了完整性例如：违反惟一约束、违反非空限制、字段内容超出长度等"); + } + + @ExceptionHandler(PoolException.class) + public Result handlePoolException(PoolException e) { + log.error(e.getMessage(), e); + return Result.error("Redis 连接异常!"); + } + + @ExceptionHandler({ SQLSyntaxErrorException.class, SQLNonTransientException.class, SQLException.class }) + public Result handleSQLSyntaxErrorException(SQLException e) { + log.error(e.getMessage(), e); + return Result.error("SQL语法错误！"); + } + + @ExceptionHandler({ BadSqlGrammarException.class, InvalidDataAccessResourceUsageException.class, NonTransientDataAccessException.class, DataAccessException.class }) + public Result handleBadSqlGrammarException(DataAccessException e) { + log.error(e.getMessage(), e); + return Result.error("SQL语法错误！"); + } + + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/LoggingInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/LoggingInterceptor.java new file mode 100644 index 00000000..923cbfc4 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/LoggingInterceptor.java @@ -0,0 +1,50 @@ +package org.jeecg.common.exception; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +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.Iterator; + +@Component +@Slf4j +public class LoggingInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + // 记录普通请求信息 + log.info("Request intercepted: URL={}, Method={}, Parameters={}", + request.getRequestURI(), request.getMethod(), request.getParameterMap()); + + // 如果是多部分请求（文件上传），记录文件元数据 + if (request instanceof MultipartHttpServletRequest) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Iterator fileNames = multipartRequest.getFileNames(); + + while (fileNames.hasNext()) { + String fileName = fileNames.next(); + MultipartFile file = multipartRequest.getFile(fileName); + log.info("Intercepted file upload: URL={}, File name={}, Size={} bytes, Content type={}", + request.getRequestURI(), file.getOriginalFilename(), file.getSize(), file.getContentType()); + } + } + + return true; // 继续处理链 + } + + // 可选：实现postHandle和afterCompletion方法... + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + // 可以在这里添加处理后的行为 + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + // 可以在这里添加请求完成后的行为 + } +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/WebConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/WebConfig.java new file mode 100644 index 00000000..8b1f6bd3 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/WebConfig.java @@ -0,0 +1,19 @@ +package org.jeecg.common.exception; + +import org.jeecg.common.exception.LoggingInterceptor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Autowired + private LoggingInterceptor loggingInterceptor; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(loggingInterceptor).addPathPatterns("/**"); + } +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index bbc5c1ba..38c68633 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -112,7 +112,7 @@ public class KcKechengbiaoController extends JeecgController pageList = kcKechengbiaoService.listGroupBy(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -127,7 +127,7 @@ public class KcKechengbiaoController extends JeecgController kcKechengbiaoQueryWrapper = new QueryWrapper<>(); kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); kcKechengbiaoQueryWrapper.eq("xqxn",xqxn); + kcKechengbiaoQueryWrapper.eq("flag","0"); kcKechengbiaoQueryWrapper.last("limit 1"); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); return Result.OK(kcKechengbiao); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 1c40bbf5..54a1b67a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -758,7 +758,7 @@ public class ZyInfoController extends JeecgController { //删除老师留过的作业，重新生成新的 QueryWrapper query = new QueryWrapper<>(); query.eq("rwbh", zyInfo.getRwbh()); -// query.eq("create_by",zyInfo.getCreateBy()); + query.eq("create_by",zyInfo.getCreateBy()); query.eq("zy_leixing","0"); List oldList = zyInfoService.list(query); zyInfoService.remove(query); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java index e9e442bc..dfc6291b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfoSys.java @@ -26,6 +26,7 @@ public class ZyInfoSys implements Serializable { private String xqxn; @Excel(name = "学院", width = 15) private String kkdw; + private String dwh;//学院号 @Excel(name = "课程名称", width = 15) private String kcmc; @Excel(name = "课程性质", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java index 2d3d168e..1563a375 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java @@ -36,10 +36,26 @@ public interface ZyInfoMapper extends BaseMapper { List getZyStaticNo(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List getXyZyList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List getZyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List getZyList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List getCyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + List getCyList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getXYCyList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getKcTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getXnKcList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getJsTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + + List getXnJsList(@Param("zyInfoSys") ZyInfoSys zyInfoSys); + IPage sysStaticZyList(Page page,@Param("zyInfoSys") ZyInfoSys zyInfoSys); IPage sysStaticCyList(Page page, @Param("zyInfoSys") CyInfoSys cyInfoSys); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml index 34fd4855..d6c13d06 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml @@ -244,6 +244,26 @@ select count(distinct ww.id) as count,'10' as type from wjx_wjxx ww join kc_kechengbiao kk on kk.jgh = ww.create_by AND kk.rwbh = ww.rwbh AND kk.xqxn = ww.xqxn where (ww.update_time = DATE_FORMAT(NOW(),'%Y-%m-%d') or ww.create_time = DATE_FORMAT(NOW(),'%Y-%m-%d') ) and ww.qpublish in (2) union all select count(distinct zi.id) as count,'11' as type from zy_info zi join kc_kechengbiao kk on kk.jgh = zi.create_by AND kk.rwbh = zi.rwbh AND kk.xqxn = zi.xnxq where zi.zy_status in ('1','2') and zi.xnxq = #{zyInfoSys.xqxn} and zi.sfcc in ('1','2') and kk.flag = 0 + union all + select count(*) as count,'12' as type from zy_info where file_path is not null and xnxq = #{zyInfoSys.xqxn} + union all + select count(*) as count,'13' as type from zy_info where file_path is not null and xnxq = #{zyInfoSys.xqxn} and xshpkg = '1' + union all + select count(*) as count,'14' as type from zy_info where file_path is not null and xnxq = #{zyInfoSys.xqxn} and sfcc = '1' + union all + SELECT COUNT(*) as count,'16' as type FROM wjx_djxx WHERE create_time BETWEEN (SELECT bxqkssj FROM kc_sys_config WHERE flag1=#{zyInfoSys.xqxn} LIMIT 1) AND (SELECT bxqjssj FROM kc_sys_config WHERE flag1=#{zyInfoSys.xqxn} LIMIT 1); + + + + + + + + + + + + + + +