Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-24 32cd4a4b69fbfda5f077d84f95037771509d9428

Merge branch 'zhaozhengjie1104' into test

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java

@@ -603,8 +603,8 @@
                        if (photo.size() != 0 && null != photo) {
                            List<Object> list=new ArrayList<>();
                            for (int i = 0; i < photo.size(); i++) {
                                downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                list.add(getImageStr("d:/dangerReport/file/" + comSwSafetyWorkRecordVO.getId() + "_find_" + i + ".jpg"));
                                downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwSafetyWorkRecordVO.getId() + "_find_" + i + ".jpg"));
                            }
                            dataMap.put("imgList",list);
                        }
@@ -793,8 +793,8 @@
                        if (photo.size() != 0 && null != photo) {
                            List<Object> list=new ArrayList<>();
                            for (int i = 0; i < photo.size(); i++) {
                                downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                list.add(getImageStr("d:/dangerReport/file/" + comSwPatrolRecordVO.getId() + "_find_" + i + ".jpg"));
                                downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwPatrolRecordVO.getId() + "_find_" + i + ".jpg"));
                            }
                            dataMap.put("imgList",list);
                        }
@@ -942,7 +942,7 @@
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                File file0=new File("d:/dangerReport/file");
                File file0=new File("/mnt/data/web/file");
                if(!file0.isDirectory()&&!file0.exists()){
                    file0.mkdirs();
                }
@@ -950,8 +950,8 @@
                if(!file0.isDirectory()&&!file0.exists()){
                    file0.mkdirs();
                }
                sftp.download("/mnt/data/web/excel/", "隐患报告.ftl", "d:/dangerReport/file/隐患报告.ftl");
                sftp.download("/mnt/data/web/excel/", "blank.jpg", "d:/dangerReport/file/blank.jpg");
                sftp.download("/mnt/data/web/excel/", "隐患报告.ftl", "/mnt/data/web/file/隐患报告.ftl");
                sftp.download("/mnt/data/web/excel/", "blank.jpg", "/mnt/data/web/file/blank.jpg");
                try {
                    // 日期
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getCheckTime())) {
@@ -1027,8 +1027,8 @@
                    if (photo1.size() != 0 && null != photo1) {
                        List<Object> list=new ArrayList<>();
                        for (int i = 0; i < photo1.size(); i++) {
                            downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_step_" + i, "d:/dangerReport/file/");
                            list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_step_" + i + ".jpg"));
                            downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_step_" + i, "/mnt/data/web/file/");
                            list.add(getImageStr("/mnt/data/web/file/" + comSwDangerReportVO.getId() + "_step_" + i + ".jpg"));
                        }
                        dataMap.put("imgList",list);
                    }
@@ -1076,8 +1076,8 @@
                    if (photo2.size() != 0 && null != photo2) {
                        List<Object> list=new ArrayList<>();
                        for (int i = 0; i < photo2.size(); i++) {
                                downloadPicture(photo2.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                downloadPicture(photo2.get(i), comSwDangerReportVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                        }
                        dataMap.put("imgList2",list);
                    }
@@ -1131,7 +1131,7 @@
                    // configuration.setClassForTemplateLoading(this.getClass(), "");

                    // 指定路径的第二种方式，我的路径是C：/a.ftl
                    configuration.setDirectoryForTemplateLoading(new File("d:/dangerReport/file/"));
                    configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/file/"));

                    // 输出文档路径及名称
                    // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +