|
@@ -47,9 +47,7 @@ import com.uas.report.jasperreports.engine.export.CustomJRXlsExporter;
|
|
|
import com.uas.report.model.Master;
|
|
import com.uas.report.model.Master;
|
|
|
import com.uas.report.service.FileService;
|
|
import com.uas.report.service.FileService;
|
|
|
import com.uas.report.service.PrintService;
|
|
import com.uas.report.service.PrintService;
|
|
|
-import com.uas.report.util.ArrayUtils;
|
|
|
|
|
import com.uas.report.util.CollectionUtils;
|
|
import com.uas.report.util.CollectionUtils;
|
|
|
-import com.uas.report.util.FileUtils;
|
|
|
|
|
import com.uas.report.util.MasterManager;
|
|
import com.uas.report.util.MasterManager;
|
|
|
import com.uas.report.util.Platform;
|
|
import com.uas.report.util.Platform;
|
|
|
import com.uas.report.util.ReportConstants;
|
|
import com.uas.report.util.ReportConstants;
|
|
@@ -593,24 +591,6 @@ public class PrintServiceImpl implements PrintService {
|
|
|
jasperDesign.setRightMargin(0);
|
|
jasperDesign.setRightMargin(0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Override
|
|
|
|
|
- public Integer createPdfFile(String userName, String profile, String reportName, String whereCondition,
|
|
|
|
|
- String otherParameters, String pdfFilePath, Integer pageIndex) {
|
|
|
|
|
- File file = new File(pdfFilePath);
|
|
|
|
|
- Map<String, Object> result = preview(userName, profile, reportName, whereCondition, otherParameters, pageIndex);
|
|
|
|
|
- byte[] data = null;
|
|
|
|
|
- Integer pageSize = null;
|
|
|
|
|
- if (result != null && result.containsKey("data") && result.containsKey("pageSize")) {
|
|
|
|
|
- data = (byte[]) result.remove("data");
|
|
|
|
|
- pageSize = (Integer) result.remove("pageSize");
|
|
|
|
|
- }
|
|
|
|
|
- if (ArrayUtils.isEmpty(data) || pageSize == null) {
|
|
|
|
|
- throw new ReportException("获取预览数据失败");
|
|
|
|
|
- }
|
|
|
|
|
- FileUtils.write(file.getPath(), data);
|
|
|
|
|
- return pageSize;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public String getMasterOfJrxml(String userName, String reportName) {
|
|
public String getMasterOfJrxml(String userName, String reportName) {
|
|
|
ReportUtils.checkParameters(userName, reportName);
|
|
ReportUtils.checkParameters(userName, reportName);
|