|
@@ -1,6 +1,5 @@
|
|
package org.jeecg.modules.wps.controller;
|
|
package org.jeecg.modules.wps.controller;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
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.api.vo.Result;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
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.entity.WpsFileVersion;
|
|
import org.jeecg.modules.wps.service.IWpsFileVersionService;
|
|
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.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
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.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.Arrays;
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* wps文件版本号
|
|
* wps文件版本号
|
|
@@ -64,7 +48,7 @@ public class WpsFileVersionController {
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
Result<IPage<WpsFileVersion>> result = new Result<>();
|
|
Result<IPage<WpsFileVersion>> result = new Result<>();
|
|
QueryWrapper<WpsFileVersion> queryWrapper = QueryGenerator.initQueryWrapper(wpsFileVersion, req.getParameterMap());
|
|
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);
|
|
IPage<WpsFileVersion> pageList = wpsFileVersionService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
@@ -100,7 +84,7 @@ public class WpsFileVersionController {
|
|
@ApiOperation(value="wps文件版本号-编辑", notes="wps文件版本号-编辑")
|
|
@ApiOperation(value="wps文件版本号-编辑", notes="wps文件版本号-编辑")
|
|
@PutMapping(value = "/edit")
|
|
@PutMapping(value = "/edit")
|
|
public Result<WpsFileVersion> edit(@RequestBody WpsFileVersion wpsFileVersion) {
|
|
public Result<WpsFileVersion> edit(@RequestBody WpsFileVersion wpsFileVersion) {
|
|
- Result<WpsFileVersion> result = new Result<WpsFileVersion>();
|
|
|
|
|
|
+ Result<WpsFileVersion> result = new Result<>();
|
|
WpsFileVersion wpsFileVersionEntity = wpsFileVersionService.getById(wpsFileVersion.getId());
|
|
WpsFileVersion wpsFileVersionEntity = wpsFileVersionService.getById(wpsFileVersion.getId());
|
|
if(wpsFileVersionEntity==null) {
|
|
if(wpsFileVersionEntity==null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
@@ -122,7 +106,7 @@ public class WpsFileVersionController {
|
|
@AutoLog(value = "wps文件版本号-通过id删除")
|
|
@AutoLog(value = "wps文件版本号-通过id删除")
|
|
@ApiOperation(value="wps文件版本号-通过id删除", notes="wps文件版本号-通过id删除")
|
|
@ApiOperation(value="wps文件版本号-通过id删除", notes="wps文件版本号-通过id删除")
|
|
@DeleteMapping(value = "/delete")
|
|
@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 {
|
|
try {
|
|
wpsFileVersionService.removeById(id);
|
|
wpsFileVersionService.removeById(id);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -170,72 +154,4 @@ public class WpsFileVersionController {
|
|
}
|
|
}
|
|
return result;
|
|
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("文件导入失败!");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
}
|
|
}
|