20200422-lc-1
增加教师管理功能
This commit is contained in:
sk1551
@ -1,109 +1,108 @@
|
|||||||
package com.ruoyi.project.common;
|
package com.ruoyi.project.common;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import com.ruoyi.common.constant.Constants;
|
import com.ruoyi.common.constant.Constants;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.common.utils.file.FileUploadUtils;
|
import com.ruoyi.common.utils.file.FileUploadUtils;
|
||||||
import com.ruoyi.common.utils.file.FileUtils;
|
import com.ruoyi.common.utils.file.FileUtils;
|
||||||
import com.ruoyi.framework.config.RuoYiConfig;
|
import com.ruoyi.framework.config.RuoYiConfig;
|
||||||
import com.ruoyi.framework.config.ServerConfig;
|
import com.ruoyi.framework.config.ServerConfig;
|
||||||
import com.ruoyi.framework.web.domain.AjaxResult;
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用请求处理
|
* 通用请求处理
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
public class CommonController
|
public class CommonController
|
||||||
{
|
{
|
||||||
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
|
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ServerConfig serverConfig;
|
private ServerConfig serverConfig;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用下载请求
|
* 通用下载请求
|
||||||
*
|
*
|
||||||
* @param fileName 文件名称
|
* @param fileName 文件名称
|
||||||
* @param delete 是否删除
|
* @param delete 是否删除
|
||||||
*/
|
*/
|
||||||
@GetMapping("common/download")
|
@GetMapping("common/download")
|
||||||
public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
|
public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!FileUtils.isValidFilename(fileName))
|
if (!FileUtils.isValidFilename(fileName))
|
||||||
{
|
{
|
||||||
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
|
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
|
||||||
}
|
}
|
||||||
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
|
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
|
||||||
String filePath = RuoYiConfig.getDownloadPath() + fileName;
|
String filePath = RuoYiConfig.getDownloadPath() + fileName;
|
||||||
|
|
||||||
response.setCharacterEncoding("utf-8");
|
response.setCharacterEncoding("utf-8");
|
||||||
response.setContentType("multipart/form-data");
|
response.setContentType("multipart/form-data");
|
||||||
response.setHeader("Content-Disposition",
|
response.setHeader("Content-Disposition",
|
||||||
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
|
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
|
||||||
FileUtils.writeBytes(filePath, response.getOutputStream());
|
FileUtils.writeBytes(filePath, response.getOutputStream());
|
||||||
if (delete)
|
if (delete)
|
||||||
{
|
{
|
||||||
FileUtils.deleteFile(filePath);
|
FileUtils.deleteFile(filePath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
log.error("下载文件失败", e);
|
log.error("下载文件失败", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
/**
|
* 通用上传请求
|
||||||
* 通用上传请求
|
*/
|
||||||
*/
|
@PostMapping("/common/upload")
|
||||||
@PostMapping("/common/upload")
|
public AjaxResult uploadFile(MultipartFile file) throws Exception
|
||||||
public AjaxResult uploadFile(MultipartFile file) throws Exception
|
{
|
||||||
{
|
try
|
||||||
try
|
{
|
||||||
{
|
// 上传文件路径
|
||||||
// 上传文件路径
|
String filePath = RuoYiConfig.getUploadPath();
|
||||||
String filePath = RuoYiConfig.getUploadPath();
|
// 上传并返回新文件名称
|
||||||
// 上传并返回新文件名称
|
String fileName = FileUploadUtils.upload(filePath, file);
|
||||||
String fileName = FileUploadUtils.upload(filePath, file);
|
String url = serverConfig.getUrl() + fileName;
|
||||||
String url = serverConfig.getUrl() + fileName;
|
AjaxResult ajax = AjaxResult.success();
|
||||||
AjaxResult ajax = AjaxResult.success();
|
ajax.put("fileName", fileName);
|
||||||
ajax.put("fileName", fileName);
|
ajax.put("url", url);
|
||||||
ajax.put("url", url);
|
return ajax;
|
||||||
return ajax;
|
}
|
||||||
}
|
catch (Exception e)
|
||||||
catch (Exception e)
|
{
|
||||||
{
|
return AjaxResult.error(e.getMessage());
|
||||||
return AjaxResult.error(e.getMessage());
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* 本地资源通用下载
|
||||||
* 本地资源通用下载
|
*/
|
||||||
*/
|
@GetMapping("/common/download/resource")
|
||||||
@GetMapping("/common/download/resource")
|
public void resourceDownload(String name, HttpServletRequest request, HttpServletResponse response) throws Exception
|
||||||
public void resourceDownload(String name, HttpServletRequest request, HttpServletResponse response) throws Exception
|
{
|
||||||
{
|
// 本地资源路径
|
||||||
// 本地资源路径
|
String localPath = RuoYiConfig.getProfile();
|
||||||
String localPath = RuoYiConfig.getProfile();
|
// 数据库资源地址
|
||||||
// 数据库资源地址
|
String downloadPath = localPath + StringUtils.substringAfter(name, Constants.RESOURCE_PREFIX);
|
||||||
String downloadPath = localPath + StringUtils.substringAfter(name, Constants.RESOURCE_PREFIX);
|
// 下载名称
|
||||||
// 下载名称
|
String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
|
||||||
String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
|
response.setCharacterEncoding("utf-8");
|
||||||
response.setCharacterEncoding("utf-8");
|
response.setContentType("multipart/form-data");
|
||||||
response.setContentType("multipart/form-data");
|
response.setHeader("Content-Disposition",
|
||||||
response.setHeader("Content-Disposition",
|
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
|
||||||
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
|
FileUtils.writeBytes(downloadPath, response.getOutputStream());
|
||||||
FileUtils.writeBytes(downloadPath, response.getOutputStream());
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@ -49,8 +49,6 @@ public class BySchoolController extends BaseController
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ISysDeptService deptService;
|
private ISysDeptService deptService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询幼儿园机构列表
|
* 查询幼儿园机构列表
|
||||||
*/
|
*/
|
||||||
@ -86,8 +84,6 @@ public class BySchoolController extends BaseController
|
|||||||
return AjaxResult.success(bySchoolService.selectBySchoolById(id));
|
return AjaxResult.success(bySchoolService.selectBySchoolById(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增幼儿园机构
|
* 新增幼儿园机构
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user