提交一把

jiangping

2024-05-17 fb7eaacbfbbcc9ac376735586c0ee0aae32f5384

提交一把

 .gitignore

@@ -4,7 +4,7 @@
.mtj.tmp/

# Package Files #
*.jar
#*.jar
*.war
*.ear


 company/.env.development

@@ -11,5 +11,5 @@


#VUE_APP_API = 'http://localhost:10030/'
#VUE_APP_API = 'http://192.168.0.143:10030/'
VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
VUE_APP_API = 'http://192.168.0.143:10030/'
#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'

 company/src/api/system/menu.js

@@ -7,7 +7,7 @@

// 鏌ヨ----浼佷笟鑿滃崟
export function fetchTree1 (type) {
  type = type || 1;
  type = type==null?1:type;
  return request.post(`/system/menu/treeList/${type}`)
}


 company/src/components/system/role/MenuConfigWindow.vue

@@ -25,7 +25,7 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import { createRoleMenu } from '@/api/system/role'
import { fetchTree as fetchMenuList, fetchTree1 } from '@/api/system/menu'
import {   fetchTree1 } from '@/api/system/menu'
import { mapState } from 'vuex'
export default {
  name: 'MenuConfigWindow',

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -919,8 +919,8 @@
            InputStream     in = new ByteArrayInputStream(bookByteAry);
            String tempExcel = saveIsToFile(in);
            String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
//            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1148,8 +1148,8 @@
            InputStream     in = new ByteArrayInputStream(bookByteAry);
            String tempExcel = saveIsToFile(in);
            String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
//            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1272,8 +1272,8 @@
            InputStream     in = new ByteArrayInputStream(bookByteAry);
            String tempExcel = saveIsToFile(in);
            String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
//            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1573,8 +1573,8 @@
            InputStream     in = new ByteArrayInputStream(bookByteAry);
            String tempExcel = saveIsToFile(in);
            String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
//            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1777,8 +1777,8 @@
            InputStream     in = new ByteArrayInputStream(bookByteAry);
            String tempExcel = saveIsToFile(in);
            String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
//            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelToPdfToolNew.java

文件名从 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelToPdfToolNewSev.java 修改
@@ -1,25 +1,19 @@
package com.doumee.core.annotation.excel;import java.io.*;
package com.doumee.core.annotation.excel;

import com.jacob.activeX.ActiveXComponent;
import com.jacob.com.ComThread;
import com.jacob.com.Dispatch;
import com.jacob.com.Variant;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import com.itextpdf.text.Document;
import com.itextpdf.text.DocumentException;
import com.itextpdf.text.pdf.PdfWriter;


public class ExcelToPdfToolNewSev {
public class ExcelToPdfToolNew {

        /**
         * 浣跨敤jacob瀹炵幇excel杞琍DF
         *
         * @param inputFilePath 瀵煎叆Excel鏂囦欢璺緞
         * @param outputFilePath 瀵煎嚭PDF鏂囦欢璺緞
         */
        public static void jacobExcelToPDF(String inputFilePath, String outputFilePath) {

    public static void excelToPdf(String inputFilePath, String outputFilePath) {
            ActiveXComponent ax = null;
            Dispatch excel = null;
            try {
@@ -83,9 +77,9 @@
        }

    public static void main(String[] args) {
        String inputExcelPath = "D:\\2.xlsx";
        String outputPdfPath = "D:\\22.pdf";
        String inputExcelPath = "D:\\3.xlsx";
        String outputPdfPath = "D:\\33.pdf";

        jacobExcelToPDF(inputExcelPath, outputPdfPath);
        excelToPdf(inputExcelPath, outputPdfPath);
    }
}