syh пре 5 година
родитељ
комит
b739d07fbc

+ 3 - 87
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.wps.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +9,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wps.entity.WpsFile;
 import org.jeecg.modules.wps.service.IWpsFileService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
  /**
  * wps文件
@@ -64,7 +48,7 @@ public class WpsFileController {
 												HttpServletRequest req) {
 		Result<IPage<WpsFile>> result = new Result<>();
 		QueryWrapper<WpsFile> queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, req.getParameterMap());
-		Page<WpsFile> page = new Page<WpsFile>(pageNo, pageSize);
+		Page<WpsFile> page = new Page<>(pageNo, pageSize);
 		IPage<WpsFile> pageList = wpsFileService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -100,7 +84,7 @@ public class WpsFileController {
 	@ApiOperation(value="wps文件-编辑", notes="wps文件-编辑")
 	@PutMapping(value = "/edit")
 	public Result<WpsFile> edit(@RequestBody WpsFile wpsFile) {
-		Result<WpsFile> result = new Result<WpsFile>();
+		Result<WpsFile> result = new Result<>();
 		WpsFile wpsFileEntity = wpsFileService.getById(wpsFile.getId());
 		if(wpsFileEntity==null) {
 			result.error500("未找到对应实体");
@@ -122,7 +106,7 @@ public class WpsFileController {
 	@AutoLog(value = "wps文件-通过id删除")
 	@ApiOperation(value="wps文件-通过id删除", notes="wps文件-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 			wpsFileService.removeById(id);
 		} catch (Exception e) {
@@ -170,72 +154,4 @@ public class WpsFileController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<WpsFile> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              WpsFile wpsFile = JSON.parseObject(deString, WpsFile.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<WpsFile> pageList = wpsFileService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "wps文件列表");
-      mv.addObject(NormalExcelConstants.CLASS, WpsFile.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("wps文件列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<WpsFile> listWpsFiles = ExcelImportUtil.importExcel(file.getInputStream(), WpsFile.class, params);
-              wpsFileService.saveBatch(listWpsFiles);
-              return Result.ok("文件导入成功!数据行数:" + listWpsFiles.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }

+ 3 - 87
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileVersionController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.wps.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +9,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wps.entity.WpsFileVersion;
 import org.jeecg.modules.wps.service.IWpsFileVersionService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
  /**
  * wps文件版本号
@@ -64,7 +48,7 @@ public class WpsFileVersionController {
 													   HttpServletRequest req) {
 		Result<IPage<WpsFileVersion>> result = new Result<>();
 		QueryWrapper<WpsFileVersion> queryWrapper = QueryGenerator.initQueryWrapper(wpsFileVersion, req.getParameterMap());
-		Page<WpsFileVersion> page = new Page<WpsFileVersion>(pageNo, pageSize);
+		Page<WpsFileVersion> page = new Page<>(pageNo, pageSize);
 		IPage<WpsFileVersion> pageList = wpsFileVersionService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -100,7 +84,7 @@ public class WpsFileVersionController {
 	@ApiOperation(value="wps文件版本号-编辑", notes="wps文件版本号-编辑")
 	@PutMapping(value = "/edit")
 	public Result<WpsFileVersion> edit(@RequestBody WpsFileVersion wpsFileVersion) {
-		Result<WpsFileVersion> result = new Result<WpsFileVersion>();
+		Result<WpsFileVersion> result = new Result<>();
 		WpsFileVersion wpsFileVersionEntity = wpsFileVersionService.getById(wpsFileVersion.getId());
 		if(wpsFileVersionEntity==null) {
 			result.error500("未找到对应实体");
@@ -122,7 +106,7 @@ public class WpsFileVersionController {
 	@AutoLog(value = "wps文件版本号-通过id删除")
 	@ApiOperation(value="wps文件版本号-通过id删除", notes="wps文件版本号-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 			wpsFileVersionService.removeById(id);
 		} catch (Exception e) {
@@ -170,72 +154,4 @@ public class WpsFileVersionController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<WpsFileVersion> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              WpsFileVersion wpsFileVersion = JSON.parseObject(deString, WpsFileVersion.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(wpsFileVersion, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<WpsFileVersion> pageList = wpsFileVersionService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "wps文件版本号列表");
-      mv.addObject(NormalExcelConstants.CLASS, WpsFileVersion.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("wps文件版本号列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<WpsFileVersion> listWpsFileVersions = ExcelImportUtil.importExcel(file.getInputStream(), WpsFileVersion.class, params);
-              wpsFileVersionService.saveBatch(listWpsFileVersions);
-              return Result.ok("文件导入成功!数据行数:" + listWpsFileVersions.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }

+ 2 - 86
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileWatermarkController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.wps.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +9,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wps.entity.WpsFileWatermark;
 import org.jeecg.modules.wps.service.IWpsFileWatermarkService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
  /**
  * wps文件水印
@@ -100,7 +84,7 @@ public class WpsFileWatermarkController {
 	@ApiOperation(value="wps文件水印-编辑", notes="wps文件水印-编辑")
 	@PutMapping(value = "/edit")
 	public Result<WpsFileWatermark> edit(@RequestBody WpsFileWatermark wpsFileWatermark) {
-		Result<WpsFileWatermark> result = new Result<WpsFileWatermark>();
+		Result<WpsFileWatermark> result = new Result<>();
 		WpsFileWatermark wpsFileWatermarkEntity = wpsFileWatermarkService.getById(wpsFileWatermark.getId());
 		if(wpsFileWatermarkEntity==null) {
 			result.error500("未找到对应实体");
@@ -122,7 +106,7 @@ public class WpsFileWatermarkController {
 	@AutoLog(value = "wps文件水印-通过id删除")
 	@ApiOperation(value="wps文件水印-通过id删除", notes="wps文件水印-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 			wpsFileWatermarkService.removeById(id);
 		} catch (Exception e) {
@@ -170,72 +154,4 @@ public class WpsFileWatermarkController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<WpsFileWatermark> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              WpsFileWatermark wpsFileWatermark = JSON.parseObject(deString, WpsFileWatermark.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(wpsFileWatermark, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<WpsFileWatermark> pageList = wpsFileWatermarkService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "wps文件水印列表");
-      mv.addObject(NormalExcelConstants.CLASS, WpsFileWatermark.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("wps文件水印列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<WpsFileWatermark> listWpsFileWatermarks = ExcelImportUtil.importExcel(file.getInputStream(), WpsFileWatermark.class, params);
-              wpsFileWatermarkService.saveBatch(listWpsFileWatermarks);
-              return Result.ok("文件导入成功!数据行数:" + listWpsFileWatermarks.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }

+ 3 - 87
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserAclController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.wps.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +9,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wps.entity.WpsUserAcl;
 import org.jeecg.modules.wps.service.IWpsUserAclService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
  /**
  * wps用户权限
@@ -64,7 +48,7 @@ public class WpsUserAclController {
 												   HttpServletRequest req) {
 		Result<IPage<WpsUserAcl>> result = new Result<>();
 		QueryWrapper<WpsUserAcl> queryWrapper = QueryGenerator.initQueryWrapper(wpsUserAcl, req.getParameterMap());
-		Page<WpsUserAcl> page = new Page<WpsUserAcl>(pageNo, pageSize);
+		Page<WpsUserAcl> page = new Page<>(pageNo, pageSize);
 		IPage<WpsUserAcl> pageList = wpsUserAclService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -100,7 +84,7 @@ public class WpsUserAclController {
 	@ApiOperation(value="wps用户权限-编辑", notes="wps用户权限-编辑")
 	@PutMapping(value = "/edit")
 	public Result<WpsUserAcl> edit(@RequestBody WpsUserAcl wpsUserAcl) {
-		Result<WpsUserAcl> result = new Result<WpsUserAcl>();
+		Result<WpsUserAcl> result = new Result<>();
 		WpsUserAcl wpsUserAclEntity = wpsUserAclService.getById(wpsUserAcl.getId());
 		if(wpsUserAclEntity==null) {
 			result.error500("未找到对应实体");
@@ -122,7 +106,7 @@ public class WpsUserAclController {
 	@AutoLog(value = "wps用户权限-通过id删除")
 	@ApiOperation(value="wps用户权限-通过id删除", notes="wps用户权限-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 			wpsUserAclService.removeById(id);
 		} catch (Exception e) {
@@ -170,72 +154,4 @@ public class WpsUserAclController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<WpsUserAcl> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              WpsUserAcl wpsUserAcl = JSON.parseObject(deString, WpsUserAcl.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(wpsUserAcl, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<WpsUserAcl> pageList = wpsUserAclService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "wps用户权限列表");
-      mv.addObject(NormalExcelConstants.CLASS, WpsUserAcl.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("wps用户权限列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<WpsUserAcl> listWpsUserAcls = ExcelImportUtil.importExcel(file.getInputStream(), WpsUserAcl.class, params);
-              wpsUserAclService.saveBatch(listWpsUserAcls);
-              return Result.ok("文件导入成功!数据行数:" + listWpsUserAcls.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }

+ 3 - 87
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsUserController.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.wps.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +9,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wps.entity.WpsUser;
 import org.jeecg.modules.wps.service.IWpsUserService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
  /**
  * wps用户
@@ -64,7 +48,7 @@ public class WpsUserController {
 												HttpServletRequest req) {
 		Result<IPage<WpsUser>> result = new Result<>();
 		QueryWrapper<WpsUser> queryWrapper = QueryGenerator.initQueryWrapper(wpsUser, req.getParameterMap());
-		Page<WpsUser> page = new Page<WpsUser>(pageNo, pageSize);
+		Page<WpsUser> page = new Page<>(pageNo, pageSize);
 		IPage<WpsUser> pageList = wpsUserService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -100,7 +84,7 @@ public class WpsUserController {
 	@ApiOperation(value="wps用户-编辑", notes="wps用户-编辑")
 	@PutMapping(value = "/edit")
 	public Result<WpsUser> edit(@RequestBody WpsUser wpsUser) {
-		Result<WpsUser> result = new Result<WpsUser>();
+		Result<WpsUser> result = new Result<>();
 		WpsUser wpsUserEntity = wpsUserService.getById(wpsUser.getId());
 		if(wpsUserEntity==null) {
 			result.error500("未找到对应实体");
@@ -122,7 +106,7 @@ public class WpsUserController {
 	@AutoLog(value = "wps用户-通过id删除")
 	@ApiOperation(value="wps用户-通过id删除", notes="wps用户-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		try {
 			wpsUserService.removeById(id);
 		} catch (Exception e) {
@@ -170,72 +154,4 @@ public class WpsUserController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<WpsUser> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              WpsUser wpsUser = JSON.parseObject(deString, WpsUser.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(wpsUser, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<WpsUser> pageList = wpsUserService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "wps用户列表");
-      mv.addObject(NormalExcelConstants.CLASS, WpsUser.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("wps用户列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<WpsUser> listWpsUsers = ExcelImportUtil.importExcel(file.getInputStream(), WpsUser.class, params);
-              wpsUserService.saveBatch(listWpsUsers);
-              return Result.ok("文件导入成功!数据行数:" + listWpsUsers.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }