huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!744 【新增】ureport2 集成

Browse Source 
Merge pull request !744 from souvc/master
This commit is contained in:
芋道源码 2023-11-24 12:41:21 +00:00 committed by Gitee
commit 8bcc732c33
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
24 changed files with 1071 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
sql/mysql/Ureport.sql Normal file
View File

File diff suppressed because one or more lines are too long

9
yudao-dependencies/pom.xml
View File

@ -74,6 +74,7 @@
<jimureport.version>1.6.1</jimureport.version>
<xercesImpl.version>2.12.2</xercesImpl.version>
<weixin-java.version>4.5.0</weixin-java.version>
<ureport2.version>2.2.9</ureport2.version>
</properties>
<dependencyManagement>
@ -651,6 +652,14 @@
<artifactId>spring-boot-starter-websocket</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<!--ureport2 报表-->
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-console</artifactId>
<version>${ureport2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

2
yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.java
View File

@ -12,4 +12,6 @@ public interface ErrorCodeConstants {
// ========== AUTH 模块 1-003-000-000 ==========
ErrorCode GO_VIEW_PROJECT_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在");
ErrorCode UREPORT_FILE_NOT_EXISTS = new ErrorCode(1_003_001_000, "打印文件不存在,请检查Ureport报表文件");
ErrorCode UREPORT_FILE_EXISTS = new ErrorCode(1_003_001_001, "报表名字已存在，请修改后再保存");
}

10
yudao-module-report/yudao-module-report-biz/pom.xml
View File

@ -74,5 +74,15 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-console</artifactId>
</dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-excel</artifactId>
</dependency>
</dependencies>
</project>

95
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UreportFileController.java Normal file
View File

@ -0,0 +1,95 @@
package cn.iocoder.yudao.module.report.controller.admin.ureport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.*;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import cn.iocoder.yudao.module.report.service.ureport.UreportFileService;
@Tag(name = "管理后台 - Ureport2报表")
@RestController
@RequestMapping("/report/ureport-file")
@Validated
public class UreportFileController {
@Resource
private UreportFileService ureportFileService;
@PostMapping("/create")
@Operation(summary = "创建Ureport2报表")
@PreAuthorize("@ss.hasPermission('report:ureport-file:create')")
public CommonResult<Long> createUreportFile(@Valid @RequestBody UreportFileSaveReqVO createReqVO) {
return success(ureportFileService.createUreportFile(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新Ureport2报表")
@PreAuthorize("@ss.hasPermission('report:ureport-file:update')")
public CommonResult<Boolean> updateUreportFile(@Valid @RequestBody UreportFileSaveReqVO updateReqVO) {
ureportFileService.updateUreportFile(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除Ureport2报表")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('report:ureport-file:delete')")
public CommonResult<Boolean> deleteUreportFile(@RequestParam("id") Long id) {
ureportFileService.deleteUreportFile(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得Ureport2报表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('report:ureport-file:query')")
public CommonResult<UreportFileRespVO> getUreportFile(@RequestParam("id") Long id) {
UreportFileDO ureportFile = ureportFileService.getUreportFile(id);
return success(BeanUtils.toBean(ureportFile, UreportFileRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得Ureport2报表分页")
@PreAuthorize("@ss.hasPermission('report:ureport-file:query')")
public CommonResult<PageResult<UreportFileRespVO>> getUreportFilePage(@Valid UreportFilePageReqVO pageReqVO) {
PageResult<UreportFileDO> pageResult = ureportFileService.getUreportFilePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, UreportFileRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出Ureport2报表 Excel")
@PreAuthorize("@ss.hasPermission('report:ureport-file:export')")
@OperateLog(type = EXPORT)
public void exportUreportFileExcel(@Valid UreportFilePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<UreportFileDO> list = ureportFileService.getUreportFilePage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "Ureport2报表.xls", "数据", UreportFileRespVO.class,
BeanUtils.toBean(list, UreportFileRespVO.class));
}
}

31
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UreportFilePageReqVO.java Normal file
View File

@ -0,0 +1,31 @@
package cn.iocoder.yudao.module.report.controller.admin.ureport.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - Ureport2报表分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class UreportFilePageReqVO extends PageParam {
@Schema(description = "文件名称", example = "赵六")
private String fileName;
@Schema(description = "状态", example = "1")
private Integer status;
@Schema(description = "备注", example = "随便")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

36
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UreportFileRespVO.java Normal file
View File

@ -0,0 +1,36 @@
package cn.iocoder.yudao.module.report.controller.admin.ureport.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - Ureport2报表 Response VO")
@Data
@ExcelIgnoreUnannotated
public class UreportFileRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9948")
@ExcelProperty("ID")
private Long id;
@Schema(description = "文件名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("文件名称")
private String fileName;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态")
private Integer status;
@Schema(description = "备注", example = "随便")
@ExcelProperty("备注")
private String remark;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

30
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UreportFileSaveReqVO.java Normal file
View File

@ -0,0 +1,30 @@
package cn.iocoder.yudao.module.report.controller.admin.ureport.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.util.*;
@Schema(description = "管理后台 - Ureport2报表新增/修改 Request VO")
@Data
public class UreportFileSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9948")
private Long id;
@Schema(description = "文件名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "文件名称不能为空")
private String fileName;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空")
private Integer status;
@Schema(description = "文件内容")
private String fileContent;
@Schema(description = "备注", example = "随便")
private String remark;
}

47
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ureport/UreportFileDO.java Normal file
View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.report.dal.dataobject.ureport;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* Ureport2报表 DO
*
* @author 芋道源码
*/
@TableName("ureport_file")
@KeySequence("ureport_file_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UreportFileDO extends BaseDO {
/**
* ID
*/
@TableId
private Long id;
/**
* 文件名称
*/
private String fileName;
/**
* 状态
*/
private Integer status;
/**
* 文件内容
*/
private byte[] fileContent;
/**
* 备注
*/
private String remark;
}

29
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ureport/UreportFileMapper.java Normal file
View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.report.dal.mysql.ureport;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.*;
/**
* Ureport2报表 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface UreportFileMapper extends BaseMapperX<UreportFileDO> {
default PageResult<UreportFileDO> selectPage(UreportFilePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<UreportFileDO>()
.likeIfPresent(UreportFileDO::getFileName, reqVO.getFileName())
.eqIfPresent(UreportFileDO::getStatus, reqVO.getStatus())
.eqIfPresent(UreportFileDO::getRemark, reqVO.getRemark())
.betweenIfPresent(UreportFileDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(UreportFileDO::getId));
}
}

1
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
View File

@ -20,6 +20,7 @@ public class SecurityConfiguration {
public void customize(ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry) {
//积木报表
registry.antMatchers("/jmreport/**").permitAll();
registry.antMatchers("/ureport/**").permitAll();
}
};

27
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UreportConfiguration.java Normal file
View File

@ -0,0 +1,27 @@
package cn.iocoder.yudao.module.report.framework.ureport.config;
import com.bstek.ureport.console.UReportServlet;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
import javax.servlet.Servlet;
/**
* Ureport 配置类
* 加载ureport对应的xml配置文件
* @author 赤焰
*/
@Configuration
@ImportResource({"classpath:ureport-console-context.xml"})
@PropertySource(value = {"classpath:ureport.properties"})
public class UreportConfiguration {
@Bean
public ServletRegistrationBean<Servlet> registrationBean() {
return new ServletRegistrationBean<>(new UReportServlet(), "/ureport/*");
}
}

48
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UreportDataSource.java Normal file
View File

@ -0,0 +1,48 @@
package cn.iocoder.yudao.module.report.framework.ureport.config;
import com.bstek.ureport.definition.datasource.BuildinDatasource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
/**
* ureport内置数据源
*/
@Slf4j
@Component
public class UreportDataSource implements BuildinDatasource {
private static final String NAME = "UreportDataSource";
@Resource
private DataSource dataSource;
/**
* 数据源名称
*
**/
@Override
public String name() {
return NAME;
}
/**
* * 获取连接
*
**/
@Override
public Connection getConnection() {
try {
return dataSource.getConnection();
} catch (SQLException e) {
log.error("Ureport 数据源 获取连接失败！");
e.printStackTrace();
}
return null;
}
}

128
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/provider/UreportDatabaseProvider.java Normal file
View File

@ -0,0 +1,128 @@
package cn.iocoder.yudao.module.report.framework.ureport.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFileSaveReqVO;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import cn.iocoder.yudao.module.report.service.ureport.UreportFileService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.bstek.ureport.provider.report.ReportFile;
import com.bstek.ureport.provider.report.ReportProvider;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.UREPORT_FILE_EXISTS;
import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.UREPORT_FILE_NOT_EXISTS;
/**
* 提供数据库的存储方式
* @author 赤焰
*/
@Slf4j
@Setter
@Component
@ConfigurationProperties(prefix = "ureport.provider.database")
public class UreportDatabaseProvider implements ReportProvider{
private static final String NAME = "mysql-provider";
private String prefix = "mysql:";
private boolean disabled = false;
@Resource
private UreportFileService ureportFileService;
@Override
public InputStream loadReport(String file) {
Long reportDo = ureportFileService.checkExistByName(getCorrectName(file));
if (reportDo <=0) {
throw exception(UREPORT_FILE_NOT_EXISTS);
}
UreportFileDO ureportFileDO = ureportFileService.queryUreportFileDoByName(getCorrectName(file));
byte[] content = ureportFileDO.getFileContent();
return new ByteArrayInputStream(content);
}
@Override
public void deleteReport(String file) {
ureportFileService.deleteReportFileByName(getCorrectName(file));
}
@Override
public List<ReportFile> getReportFiles() {
List<UreportFileDO> list = ureportFileService.queryReportFileList();
List<ReportFile> reportList = new ArrayList<>();
if(CollUtil.isEmpty(list)){
return reportList;
}
for (UreportFileDO reportFile : list) {
LocalDateTime updateTime = reportFile.getUpdateTime();
ZonedDateTime zdt = updateTime.atZone(ZoneId.systemDefault());
Date date = Date.from(zdt.toInstant());
reportList.add(new ReportFile(reportFile.getFileName(),date));
}
return reportList;
}
@Override
public void saveReport(String file, String content) {
file = getCorrectName(file);
LambdaQueryWrapper<UreportFileDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(UreportFileDO::getFileName, file);
Long count = ureportFileService.checkExistByName(file);
if(count>1){
throw exception(UREPORT_FILE_EXISTS);
}
UreportFileDO ureportFileDO = ureportFileService.queryUreportFileDoByName(file);
UreportFileSaveReqVO saveReqVO = new UreportFileSaveReqVO();
if (ureportFileDO == null) {
saveReqVO.setFileName(file);
saveReqVO.setFileContent(content);
saveReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
ureportFileService.createUreportFile(saveReqVO);
} else {
saveReqVO.setId(ureportFileDO.getId());
saveReqVO.setFileName(file);
saveReqVO.setFileContent(content);
saveReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
ureportFileService.updateUreportFile(saveReqVO);
}
}
@Override
public String getName() {
return NAME;
}
@Override
public boolean disabled() {
return disabled;
}
@Override
public String getPrefix() {
return prefix;
}
private String getCorrectName(String name) {
if (name.startsWith(getPrefix())) {
name = name.substring(getPrefix().length());
}
return name;
}
}

119
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/provider/UreportFileReportProvider.java Normal file
View File

@ -0,0 +1,119 @@
/*
package cn.iocoder.yudao.module.report.framework.ureport.provider;
import com.bstek.ureport.exception.ReportException;
import com.bstek.ureport.provider.report.ReportFile;
import com.bstek.ureport.provider.report.ReportProvider;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import java.io.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Objects;
*/
/**
* 自定义文件存储，可接入oss等
* @author 赤焰
*//*
@Slf4j
@Component
@ConfigurationProperties(prefix = "ureport.provider.file")
public class UreportFileReportProvider implements ReportProvider{
private String prefix="reportFile:";
private String fileStoreDir;
private boolean disabled;
@Override
public InputStream loadReport(String file) {
if(file.startsWith(prefix)){
file=file.substring(prefix.length(),file.length());
}
String fullPath=fileStoreDir+"/"+file;
try {
return new FileInputStream(fullPath);
} catch (FileNotFoundException e) {
throw new ReportException(e);
}
}
@Override
public void deleteReport(String file) {
if(file.startsWith(prefix)){
file=file.substring(prefix.length(),file.length());
}
String fullPath=fileStoreDir+"/"+file;
File f=new File(fullPath);
if(f.exists()){
f.delete();
}
}
@Override
public List<ReportFile> getReportFiles() {
File file=new File(fileStoreDir);
List<ReportFile> list= new ArrayList<>();
for(File f: Objects.requireNonNull(file.listFiles())){
Calendar calendar=Calendar.getInstance();
calendar.setTimeInMillis(f.lastModified());
list.add(new ReportFile(f.getName(),calendar.getTime()));
}
list.sort((f1, f2) -> f2.getUpdateDate().compareTo(f1.getUpdateDate()));
return list;
}
@Override
public String getName() {
return "文件存储系统";
}
@Override
public void saveReport(String file,String content) {
if(file.startsWith(prefix)){
file=file.substring(prefix.length(),file.length());
}
String fullPath=fileStoreDir+"/"+file;
FileOutputStream outStream=null;
try{
outStream=new FileOutputStream(new File(fullPath));
IOUtils.write(content, outStream,"utf-8");
}catch(Exception ex){
throw new ReportException(ex);
}finally{
if(outStream!=null){
try {
outStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@Override
public boolean disabled() {
return disabled;
}
public void setDisabled(boolean disabled) {
this.disabled = disabled;
}
public void setFileStoreDir(String fileStoreDir) {
this.fileStoreDir = fileStoreDir;
}
@Override
public String getPrefix() {
return prefix;
}
}
*/

86
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UreportFileService.java Normal file
View File

@ -0,0 +1,86 @@
package cn.iocoder.yudao.module.report.service.ureport;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFilePageReqVO;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFileSaveReqVO;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import javax.validation.Valid;
import java.util.List;
/**
* Ureport2报表 Service 接口
*
* @author 芋道源码
*/
public interface UreportFileService {
/**
* 创建Ureport2报表
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createUreportFile(@Valid UreportFileSaveReqVO createReqVO);
/**
* 更新Ureport2报表
*
* @param updateReqVO 更新信息
*/
void updateUreportFile(@Valid UreportFileSaveReqVO updateReqVO);
/**
* 删除Ureport2报表
*
* @param id 编号
*/
void deleteUreportFile(Long id);
/**
* 获得Ureport2报表
*
* @param id 编号
* @return Ureport2报表
*/
UreportFileDO getUreportFile(Long id);
/**
* 获得Ureport2报表分页
*
* @param pageReqVO 分页查询
* @return Ureport2报表分页
*/
PageResult<UreportFileDO> getUreportFilePage(UreportFilePageReqVO pageReqVO);
/**
* 根据报表名称检查报表是否存在
* @param name 报表名称
* @return
*/
Long checkExistByName(String name);
/**
* 根据报表名称查询报表
* @param name 报表名称
* @return
*/
UreportFileDO queryUreportFileDoByName(String name);
/**
* 查询全部报表
* @return
*/
List<UreportFileDO> queryReportFileList();
/**
* 根据报表名称删除报表
* @param name
* @return
*/
int deleteReportFileByName(String name);
}

104
yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UreportFileServiceImpl.java Normal file
View File

@ -0,0 +1,104 @@
package cn.iocoder.yudao.module.report.service.ureport;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFilePageReqVO;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFileSaveReqVO;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import cn.iocoder.yudao.module.report.dal.mysql.ureport.UreportFileMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.UREPORT_FILE_NOT_EXISTS;
/**
* Ureport2报表 Service 实现类
*
* @author 芋道源码
*/
@Service
@Validated
public class UreportFileServiceImpl implements UreportFileService {
@Resource
private UreportFileMapper ureportFileMapper;
@Override
public Long createUreportFile(UreportFileSaveReqVO createReqVO) {
// 插入
UreportFileDO ureportFile = BeanUtils.toBean(createReqVO, UreportFileDO.class);
ureportFileMapper.insert(ureportFile);
// 返回
return ureportFile.getId();
}
@Override
public void updateUreportFile(UreportFileSaveReqVO updateReqVO) {
// 校验存在
validateUreportFileExists(updateReqVO.getId());
// 更新
UreportFileDO updateObj = BeanUtils.toBean(updateReqVO, UreportFileDO.class);
ureportFileMapper.updateById(updateObj);
}
@Override
public void deleteUreportFile(Long id) {
// 校验存在
validateUreportFileExists(id);
// 删除
ureportFileMapper.deleteById(id);
}
private void validateUreportFileExists(Long id) {
if (ureportFileMapper.selectById(id) == null) {
throw exception(UREPORT_FILE_NOT_EXISTS);
}
}
@Override
public UreportFileDO getUreportFile(Long id) {
return ureportFileMapper.selectById(id);
}
@Override
public PageResult<UreportFileDO> getUreportFilePage(UreportFilePageReqVO pageReqVO) {
return ureportFileMapper.selectPage(pageReqVO);
}
@Override
public Long checkExistByName(String name) {
LambdaQueryWrapper<UreportFileDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(UreportFileDO::getFileName,name);
return ureportFileMapper.selectCount(queryWrapper);
}
@Override
public UreportFileDO queryUreportFileDoByName(String name) {
LambdaQueryWrapper<UreportFileDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(UreportFileDO::getFileName,name);
List<UreportFileDO> list = ureportFileMapper.selectList(queryWrapper);
if(CollectionUtil.isNotEmpty(list)){
return list.get(0);
}
return null;
}
@Override
public List<UreportFileDO> queryReportFileList() {
LambdaQueryWrapper<UreportFileDO> queryWrapper = new LambdaQueryWrapper<>();
return ureportFileMapper.selectList(queryWrapper);
}
@Override
public int deleteReportFileByName(String name) {
LambdaQueryWrapper<UreportFileDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(UreportFileDO::getFileName,name);
return ureportFileMapper.delete(queryWrapper);
}
}

12
yudao-module-report/yudao-module-report-biz/src/main/resources/mapper/ureport/UreportFileMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.report.dal.mysql.ureport.UreportFileMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

4
yudao-module-report/yudao-module-report-biz/src/main/resources/ureport.properties Normal file
View File

@ -0,0 +1,4 @@
ureport.disableHttpSessionReportCache=true
ureport.disableFileProvider=true
ureport.fileStoreDir=/WEB-INF/ureportfiles
ureport.debug=true

142
yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UreportFileServiceImplTest.java Normal file
View File

@ -0,0 +1,142 @@
package cn.iocoder.yudao.module.report.service.ureport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import javax.annotation.Resource;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.*;
import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
import cn.iocoder.yudao.module.report.dal.mysql.ureport.UreportFileMapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import javax.annotation.Resource;
import org.springframework.context.annotation.Import;
import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
* {@link UreportFileServiceImpl} 的单元测试类
*
* @author 芋道源码
*/
@Import(UreportFileServiceImpl.class)
public class UreportFileServiceImplTest extends BaseDbUnitTest {
@Resource
private UreportFileServiceImpl ureportFileService;
@Resource
private UreportFileMapper ureportFileMapper;
@Test
public void testCreateUreportFile_success() {
// 准备参数
UreportFileSaveReqVO createReqVO = randomPojo(UreportFileSaveReqVO.class).setId(null);
// 调用
Long ureportFileId = ureportFileService.createUreportFile(createReqVO);
// 断言
assertNotNull(ureportFileId);
// 校验记录的属性是否正确
UreportFileDO ureportFile = ureportFileMapper.selectById(ureportFileId);
assertPojoEquals(createReqVO, ureportFile, "id");
}
@Test
public void testUpdateUreportFile_success() {
// mock 数据
UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class);
ureportFileMapper.insert(dbUreportFile);// @Sql: 先插入出一条存在的数据
// 准备参数
UreportFileSaveReqVO updateReqVO = randomPojo(UreportFileSaveReqVO.class, o -> {
o.setId(dbUreportFile.getId()); // 设置更新的 ID
});
// 调用
ureportFileService.updateUreportFile(updateReqVO);
// 校验是否更新正确
UreportFileDO ureportFile = ureportFileMapper.selectById(updateReqVO.getId()); // 获取最新的
assertPojoEquals(updateReqVO, ureportFile);
}
@Test
public void testUpdateUreportFile_notExists() {
// 准备参数
UreportFileSaveReqVO updateReqVO = randomPojo(UreportFileSaveReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> ureportFileService.updateUreportFile(updateReqVO), UREPORT_FILE_NOT_EXISTS);
}
@Test
public void testDeleteUreportFile_success() {
// mock 数据
UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class);
ureportFileMapper.insert(dbUreportFile);// @Sql: 先插入出一条存在的数据
// 准备参数
Long id = dbUreportFile.getId();
// 调用
ureportFileService.deleteUreportFile(id);
// 校验数据不存在了
assertNull(ureportFileMapper.selectById(id));
}
@Test
public void testDeleteUreportFile_notExists() {
// 准备参数
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> ureportFileService.deleteUreportFile(id), UREPORT_FILE_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetUreportFilePage() {
// mock 数据
UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class, o -> { // 等会查询到
o.setFileName(null);
o.setStatus(null);
o.setRemark(null);
o.setCreateTime(null);
});
ureportFileMapper.insert(dbUreportFile);
// 测试 fileName 不匹配
ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setFileName(null)));
// 测试 status 不匹配
ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setStatus(null)));
// 测试 remark 不匹配
ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setRemark(null)));
// 测试 createTime 不匹配
ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setCreateTime(null)));
// 准备参数
UreportFilePageReqVO reqVO = new UreportFilePageReqVO();
reqVO.setFileName(null);
reqVO.setStatus(null);
reqVO.setRemark(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<UreportFileDO> pageResult = ureportFileService.getUreportFilePage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
assertPojoEquals(dbUreportFile, pageResult.getList().get(0));
}
}

1
yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql
View File

@ -1 +1,2 @@
DELETE FROM "report_go_view_project";
DELETE FROM "ureport_file";

13
yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql
View File

@ -12,3 +12,16 @@ CREATE TABLE IF NOT EXISTS "report_go_view_project" (
"deleted" bit NOT NULL DEFAULT FALSE,
PRIMARY KEY ("id")
) COMMENT 'GoView 项目表';
CREATE TABLE IF NOT EXISTS "ureport_file" (
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"file_name" varchar NOT NULL,
"status" int NOT NULL,
"file_content" varchar,
"remark" varchar,
"creator" varchar DEFAULT '',
"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updater" varchar DEFAULT '',
"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
"deleted" bit NOT NULL DEFAULT FALSE,
PRIMARY KEY ("id")
) COMMENT 'Ureport2报表';

13
yudao-server/src/main/resources/application-local.yaml
View File

@ -264,3 +264,16 @@ justauth:
prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
#ureport配置
#ureport:
# disableHttpSessionReportCache: true #是否禁用
# disableFileProvider: true #是否禁用
# debug: true
# fileStoreDir: D://ureport//files
# provider:
# database:
# disabled: true
# file:
# disabled: true

7
yudao-server/src/main/resources/application.yaml
View File

@ -182,6 +182,7 @@ yudao:
- /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号
- /admin-api/pay/notify/** # 支付回调通知，不携带租户编号
- /jmreport/* # 积木报表，无法携带租户编号
- /ureport/* # ureport报表，无法携带租户编号
- /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，无法携带租户编号
ignore-tables:
- system_tenant
@ -220,6 +221,7 @@ yudao:
- jimu_report_link
- jimu_report_map
- jimu_report_share
- ureport_file
- rep_demo_dxtj
- rep_demo_employee
- rep_demo_gongsi
@ -253,3 +255,8 @@ debug: false
minidao :
base-package: org.jeecg.modules.jmreport.desreport.dao*
db-type: mysql
#ureport配置
ureport:
provider:
database:
disabled: false