修改文件上传大小限制;删除教师逻辑优化
This commit is contained in:
parent
27e22efbb6
commit
f3316fc400
|
@ -75,9 +75,9 @@ spring:
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
# 单个文件大小
|
# 单个文件大小
|
||||||
max-file-size: 10MB
|
max-file-size: 1024MB
|
||||||
# 设置总上传的文件大小
|
# 设置总上传的文件大小
|
||||||
max-request-size: 20MB
|
max-request-size: 1024MB
|
||||||
mvc:
|
mvc:
|
||||||
# 设置静态资源路径 防止所有请求都去查静态资源
|
# 设置静态资源路径 防止所有请求都去查静态资源
|
||||||
static-path-pattern: /static/**
|
static-path-pattern: /static/**
|
||||||
|
|
|
@ -196,6 +196,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
|
||||||
if (size == 0) {
|
if (size == 0) {
|
||||||
throw new ServiceException("上传的文件内容为空");
|
throw new ServiceException("上传的文件内容为空");
|
||||||
}
|
}
|
||||||
|
if (size > 1024 * 1024 * 1024) {
|
||||||
|
throw new ServiceException("上传的文件限制为1G以下");
|
||||||
|
}
|
||||||
String format = DataSizeUtil.format(size);
|
String format = DataSizeUtil.format(size);
|
||||||
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
|
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
|
||||||
OssClient storage = OssFactory.instance();
|
OssClient storage = OssFactory.instance();
|
||||||
|
@ -225,7 +228,14 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
|
||||||
@Override
|
@Override
|
||||||
public SysOssVo upload(File file) {
|
public SysOssVo upload(File file) {
|
||||||
String originalfileName = file.getName();
|
String originalfileName = file.getName();
|
||||||
String format = DataSizeUtil.format(file.length());
|
long size = file.length();
|
||||||
|
if (size == 0) {
|
||||||
|
throw new ServiceException("上传的文件内容为空");
|
||||||
|
}
|
||||||
|
if (size > 1024 * 1024 * 1024) {
|
||||||
|
throw new ServiceException("上传的文件限制为1G以下");
|
||||||
|
}
|
||||||
|
String format = DataSizeUtil.format(size);
|
||||||
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
|
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
|
||||||
OssClient storage = OssFactory.instance();
|
OssClient storage = OssFactory.instance();
|
||||||
String md5;
|
String md5;
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package org.dromara.system.service.impl;
|
package org.dromara.system.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.ArrayUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
@ -14,13 +16,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||||
import org.dromara.common.mybatis.helper.DataBaseHelper;
|
import org.dromara.common.mybatis.helper.DataBaseHelper;
|
||||||
import org.dromara.system.domain.SysDept;
|
import org.dromara.system.domain.SysDept;
|
||||||
import org.dromara.system.domain.SysTeacher;
|
import org.dromara.system.domain.SysTeacher;
|
||||||
|
import org.dromara.system.domain.SysUser;
|
||||||
import org.dromara.system.domain.bo.SysTeacherBo;
|
import org.dromara.system.domain.bo.SysTeacherBo;
|
||||||
import org.dromara.system.domain.vo.SysTeacherVo;
|
import org.dromara.system.domain.vo.SysTeacherVo;
|
||||||
|
import org.dromara.system.domain.vo.SysUserVo;
|
||||||
import org.dromara.system.mapper.SysDeptMapper;
|
import org.dromara.system.mapper.SysDeptMapper;
|
||||||
import org.dromara.system.mapper.SysTeacherMapper;
|
import org.dromara.system.mapper.SysTeacherMapper;
|
||||||
|
import org.dromara.system.mapper.SysUserMapper;
|
||||||
import org.dromara.system.service.ISysTeacherService;
|
import org.dromara.system.service.ISysTeacherService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -37,6 +43,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
|
||||||
|
|
||||||
private final SysTeacherMapper baseMapper;
|
private final SysTeacherMapper baseMapper;
|
||||||
private final SysDeptMapper deptMapper;
|
private final SysDeptMapper deptMapper;
|
||||||
|
private final SysUserMapper userMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询教职工信息
|
* 查询教职工信息
|
||||||
|
@ -152,6 +159,17 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
|
||||||
if (isValid) {
|
if (isValid) {
|
||||||
//TODO 做一些业务上的校验,判断是否需要校验
|
//TODO 做一些业务上的校验,判断是否需要校验
|
||||||
}
|
}
|
||||||
|
List<String> nameList = new ArrayList<>();
|
||||||
|
for (Long id : ids) {
|
||||||
|
SysUserVo sysUserVo = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getTeacherId, id));
|
||||||
|
if(ObjectUtil.isNotEmpty(sysUserVo)){
|
||||||
|
nameList.add(sysUserVo.getNickName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(ArrayUtil.isNotEmpty(nameList)){
|
||||||
|
String join = StrUtil.join(",", nameList);
|
||||||
|
throw new ServiceException(join+"等教师已绑定系统用户,暂无法删除");
|
||||||
|
}
|
||||||
return baseMapper.deleteBatchIds(ids) > 0;
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue