wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 更改所有业务excel导出

This commit is contained in:
疯狂的狮子li 2021-08-04 19:03:25 +08:00
parent ffed5a09cb
commit 08db4a5f53
20 changed files with 189 additions and 1131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,7 +40,7 @@ public class SysLogininforController extends BaseController
public void export(SysLogininfor logininfor, HttpServletResponse response)
{
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtils.exportExcel(list, "登录日志", SysLogininfor.class, response);
ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,7 +40,7 @@ public class SysOperlogController extends BaseController
public void export(SysOperLog operLog, HttpServletResponse response)
{
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
ExcelUtils.exportExcel(list, "操作日志", SysOperLog.class, response);
ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
}
@Log(title = "操作日志", businessType = BusinessType.DELETE)

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
@ -47,7 +47,7 @@ public class SysConfigController extends BaseController
public void export(SysConfig config, HttpServletResponse response)
{
List<SysConfig> list = configService.selectConfigList(config);
ExcelUtils.exportExcel(list, "参数数据", SysConfig.class, response);
ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response);
}
/**

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
@ -48,7 +48,7 @@ public class SysDictDataController extends BaseController
public void export(SysDictData dictData, HttpServletResponse response)
{
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtils.exportExcel(list, "字典数据", SysDictData.class, response);
ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
}
/**

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -43,7 +43,7 @@ public class SysDictTypeController extends BaseController
public void export(SysDictType dictType, HttpServletResponse response)
{
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
ExcelUtils.exportExcel(list, "字典类型", SysDictType.class, response);
ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
}
/**

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,7 +46,7 @@ public class SysPostController extends BaseController
public void export(SysPost post, HttpServletResponse response)
{
List<SysPost> list = postService.selectPostList(post);
ExcelUtils.exportExcel(list, "岗位数据", SysPost.class, response);
ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response);
}
/**

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@ -12,7 +12,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
@ -60,7 +60,7 @@ public class SysRoleController extends BaseController
public void export(SysRole role, HttpServletResponse response)
{
List<SysRole> list = roleService.selectRoleList(role);
ExcelUtils.exportExcel(list, "角色数据", SysRole.class, response);
ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
}
/**

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -15,7 +15,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.vo.SysUserExportVo;
import com.ruoyi.system.domain.vo.SysUserImportVo;
@ -81,7 +81,7 @@ public class SysUserController extends BaseController
vo.setLeader(dept.getLeader());
}
}
ExcelUtils.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
}
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
@ -89,7 +89,7 @@ public class SysUserController extends BaseController
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
List<SysUserImportVo> userListVo = ExcelUtils.importExcel(file.getInputStream(), SysUserImportVo.class);
List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
String operName = loginUser.getUsername();
@ -100,7 +100,7 @@ public class SysUserController extends BaseController
@GetMapping("/importTemplate")
public void importTemplate(HttpServletResponse response)
{
ExcelUtils.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
}
/**

10
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
View File

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
@ -39,9 +39,9 @@ public class ExcelDictConvert implements Converter<Object> {
String label = cellData.getStringValue();
String value;
if (StringUtils.isBlank(type)) {
value = ExcelUtils.reverseByExp(label, anno.readConverterExp(), anno.separator());
value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
} else {
value = ExcelUtils.reverseDictByExp(label, type, anno.separator());
value = ExcelUtil.reverseDictByExp(label, type, anno.separator());
}
return Convert.convert(contentProperty.getField().getType(), value);
}
@ -56,9 +56,9 @@ public class ExcelDictConvert implements Converter<Object> {
String value = Convert.toStr(object);
String label;
if (StringUtils.isBlank(type)) {
label = ExcelUtils.convertByExp(value, anno.readConverterExp(), anno.separator());
label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
} else {
label = ExcelUtils.convertDictByExp(value, type, anno.separator());
label = ExcelUtil.convertDictByExp(value, type, anno.separator());
}
return new CellData<>(label);
}

1181
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

File diff suppressed because it is too large Load Diff

6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

@ -20,6 +20,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
@ -68,10 +69,9 @@ public class TestDemoController extends BaseController {
@PreAuthorize("@ss.hasPermi('demo:demo:export')")
@Log(title = "测试单表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<TestDemoVo> export(@Validated TestDemoBo bo) {
public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
List<TestDemoVo> list = iTestDemoService.queryList(bo);
ExcelUtil<TestDemoVo> util = new ExcelUtil<TestDemoVo>(TestDemoVo.class);
return util.exportExcel(list, "测试单表");
ExcelUtil.exportExcel(list, "测试单表", TestDemoVo.class, response);
}
/**

6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
View File

@ -19,6 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
@ -57,10 +58,9 @@ public class TestTreeController extends BaseController {
@PreAuthorize("@ss.hasPermi('demo:tree:export')")
@Log(title = "测试树表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<TestTreeVo> export(@Validated TestTreeBo bo) {
public void export(@Validated TestTreeBo bo, HttpServletResponse response) {
List<TestTreeVo> list = iTestTreeService.queryList(bo);
ExcelUtil<TestTreeVo> util = new ExcelUtil<TestTreeVo>(TestTreeVo.class);
return util.exportExcel(list, "测试树表");
ExcelUtil.exportExcel(list, "测试树表", TestTreeVo.class, response);
}
/**

23
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
View File

@ -1,9 +1,11 @@
package com.ruoyi.demo.domain.vo;
import com.ruoyi.common.annotation.Excel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -16,6 +18,7 @@ import java.util.Date;
*/
@Data
@ApiModel("测试单表视图对象")
@ExcelIgnoreUnannotated
public class TestDemoVo {
private static final long serialVersionUID = 1L;
@ -29,63 +32,63 @@ public class TestDemoVo {
/**
* 部门id
*/
@Excel(name = "部门id")
@ExcelProperty(value = "部门id")
@ApiModelProperty("部门id")
private Long deptId;
/**
* 用户id
*/
@Excel(name = "用户id")
@ExcelProperty(value = "用户id")
@ApiModelProperty("用户id")
private Long userId;
/**
* 排序号
*/
@Excel(name = "排序号")
@ExcelProperty(value = "排序号")
@ApiModelProperty("排序号")
private Long orderNum;
/**
* key键
*/
@Excel(name = "key键")
@ExcelProperty(value = "key键")
@ApiModelProperty("key键")
private String testKey;
/**
* 值
*/
@Excel(name = "值")
@ExcelProperty(value = "值")
@ApiModelProperty("值")
private String value;
/**
* 创建时间
*/
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
@ExcelProperty(value = "创建时间")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 创建人
*/
@Excel(name = "创建人")
@ExcelProperty(value = "创建人")
@ApiModelProperty("创建人")
private String createBy;
/**
* 更新时间
*/
@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd")
@ExcelProperty(value = "更新时间")
@ApiModelProperty("更新时间")
private Date updateTime;
/**
* 更新人
*/
@Excel(name = "更新人")
@ExcelProperty(value = "更新人")
@ApiModelProperty("更新人")
private String updateBy;

15
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
View File

@ -1,9 +1,11 @@
package com.ruoyi.demo.domain.vo;
import com.ruoyi.common.annotation.Excel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -16,6 +18,7 @@ import java.util.Date;
*/
@Data
@ApiModel("测试树表视图对象")
@ExcelIgnoreUnannotated
public class TestTreeVo {
private static final long serialVersionUID = 1L;
@ -29,35 +32,35 @@ public class TestTreeVo {
/**
* 父id
*/
@Excel(name = "父id")
@ExcelProperty(value = "父id")
@ApiModelProperty("父id")
private Long parentId;
/**
* 部门id
*/
@Excel(name = "部门id")
@ExcelProperty(value = "部门id")
@ApiModelProperty("部门id")
private Long deptId;
/**
* 用户id
*/
@Excel(name = "用户id")
@ExcelProperty(value = "用户id")
@ApiModelProperty("用户id")
private Long userId;
/**
* 树节点名
*/
@Excel(name = "树节点名")
@ExcelProperty(value = "树节点名")
@ApiModelProperty("树节点名")
private String treeName;
/**
* 创建时间
*/
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
@ExcelProperty(value = "创建时间")
@ApiModelProperty("创建时间")
private Date createTime;

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View File

@ -9,7 +9,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.quartz.util.CronUtils;
@ -52,7 +52,7 @@ public class SysJobController extends BaseController
public void export(SysJob sysJob, HttpServletResponse response)
{
List<SysJob> list = jobService.selectJobList(sysJob);
ExcelUtils.exportExcel(list, "定时任务", SysJob.class, response);
ExcelUtil.exportExcel(list, "定时任务", SysJob.class, response);
}
/**

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,7 +46,7 @@ public class SysJobLogController extends BaseController
public void export(SysJobLog sysJobLog, HttpServletResponse response)
{
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
ExcelUtils.exportExcel(list, "调度日志", SysJobLog.class, response);
ExcelUtil.exportExcel(list, "调度日志", SysJobLog.class, response);
}
/**

8
ruoyi-ui/src/api/demo/demo.js
View File

@ -52,11 +52,3 @@ export function delDemo(id) {
})
}
// 导出测试单表
export function exportDemo(query) {
return request({
url: '/demo/demo/export',
method: 'get',
params: query
})
}

9
ruoyi-ui/src/api/demo/tree.js
View File

@ -42,12 +42,3 @@ export function delTree(id) {
method: 'delete'
})
}
// 导出测试树表
export function exportTree(query) {
return request({
url: '/demo/tree/export',
method: 'get',
params: query
})
}

16
ruoyi-ui/src/views/demo/demo/index.vue
View File

@ -169,7 +169,8 @@
</template>
<script>
import { listDemo, pageDemo, getDemo, delDemo, addDemo, updateDemo, exportDemo } from "@/api/demo/demo";
import { listDemo, pageDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
import { downLoadExcel } from "@/utils/download";
export default {
name: "Demo",
@ -360,18 +361,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有测试单表数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportDemo(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
})
downLoadExcel('/demo/demo/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/demo/tree/index.vue
View File

@ -110,7 +110,7 @@
</template>
<script>
import { listTree, getTree, delTree, addTree, updateTree, exportTree } from "@/api/demo/tree";
import { listTree, getTree, delTree, addTree, updateTree } from "@/api/demo/tree";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";