Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/ImageUtil.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.business;
+package cn.com.ty.lift.business.framework.util;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -878,12 +878,12 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             String zip = dir + ".zip";
             baseDir = new File(dir);
             zipFile = new File(zip);
-            log.info("dir: {}", dir);
-            log.info("zip: {}", zip);
+            log.info("dir路径: {}", dir);
+            log.info("zip路径: {}", zip);
 
             //生成excel文件
-            String excel = File.separator + dir + File.separator + generateCode + ".xlsx";
-            log.info("生成excel: {}", excel);
+            String excel = File.separator + dir + File.separator + "维保记录列表.xlsx";
+            log.info("维保记录列表生成excel: {}", excel);
             File excelFile = new File(excel);
             ExcelWriter writer = ExcelUtil.getBigWriter(excelFile, "维保记录表");
             //设置列别名
@@ -900,35 +900,35 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             String illegalChars = "\\/:*?\"<>|";
             for (int i = 0; i < mtRecordResponses.size(); i++) {
                 MtRecordResponse mtRecordResponse = mtRecordResponses.get(i);
-                List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
-                log.info("repair: {}", mtRecordResponse);
+                log.info("maintenance: {}", mtRecordResponse);
                 //处理文件夹路径
                 String projectName = mtRecordResponse.getProjectName();
                 String registrationCode = mtRecordResponse.getRegistrationCode();
                 projectName = StrUtil.isNotEmpty(projectName) ? projectName.replace(illegalChars, "-") : "[项目]";
                 registrationCode = StrUtil.isNotEmpty(registrationCode) ? registrationCode.replace(illegalChars, "-") : "[电梯注册代码]";
-                //图片文件夹 dir/i.AreaName-ProjectName-RegistrationCode/
-                String imgDir = StrUtil.format("{}{}{}.{}-{}{}", dir, File.separator, (i + 1), projectName, registrationCode, File.separator);
-
-                List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());
-                if (IterUtil.isNotEmpty(imgs)) {
-                    for (int n = 0; n < imgs.size(); n++) {
-                        String imgUrl = imgs.get(n).getImgUrl();
-                        if (StrUtil.isNotEmpty(imgUrl)) {
-                            log.info("imgUrl: {}", imgUrl);
-                            String filename = imgDir + StrUtil.format("维保图片{}.jpg", (n + 1));
-                            log.info("生成维保图片文件: {}", filename);
-                            HttpUtil.downloadFile(imgUrl, filename);
-                        }
-                    }
-                }
-                String maintenanceExcelDir = imgDir + "1.保养单.xlsx";
+                //保养单及图片文件夹 dir/i.ProjectName-RegistrationCode/
+//                String imgDir = StrUtil.format("{}{}{}.{}-{}{}", dir, File.separator, (i + 1), projectName, registrationCode, File.separator);
+                //生成维保图片
+//                List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
+//                List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());
+//                if (IterUtil.isNotEmpty(imgs)) {
+//                    for (int n = 0; n < imgs.size(); n++) {
+//                        String imgUrl = imgs.get(n).getImgUrl();
+//                        if (StrUtil.isNotEmpty(imgUrl)) {
+//                            log.info("imgUrl: {}", imgUrl);
+//                            String filename = imgDir + StrUtil.format("维保图片{}.jpg", (n + 1));
+//                            log.info("生成维保图片文件: {}", filename);
+//                            HttpUtil.downloadFile(imgUrl, filename);
+//                        }
+//                    }
+//                }
+                //生成保养单
+                String maintenanceExcelDir = StrUtil.format("{}{}{}.{}-{}{}", dir, File.separator, (i + 1), projectName, registrationCode, "保养单.xlsx");
                 log.info("生成保养单: {}", maintenanceExcelDir);
                 excelWriter(mtRecordResponse, maintenanceExcelDir);
             }
-
             //压缩文件夹
-            log.info("生成zipfile: {}", zip);
+            log.info("生成zipFile路径: {}", zip);
             ZipUtil.zip(dir, zip);
         } catch (Exception e) {
             FileUtil.del(zipFile);
@@ -1003,16 +1003,16 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         writer.merge(0, 0, 0, 5, mtRecordResponse.getProjectName(), false);
         writer.merge(1, 1, 0, 1, mtRecordResponse.getCategoryStr() + "保养单", false);
         writer.merge(1, 1, 2, 3, "单号：" + mtRecordResponse.getId(), false);
-        writer.merge(1, 1, 4, 5, "设备编号：" + mtRecordResponse.getUseCompanyCode(), false);
+        writer.merge(1, 1, 4, 5, "设备内部编号：" + (mtRecordResponse.getUseCompanyCode() != null ? mtRecordResponse.getUseCompanyCode() : "未设置"), false);
         writer.merge(2, 2, 0, 1, "注册代码：" + mtRecordResponse.getRegistrationCode(), false);
         writer.merge(2, 2, 2, 3, "电梯位置：" + mtRecordResponse.getDevicePosition(), false);
         writer.merge(2, 2, 4, 5, "保养类型：" + mtRecordResponse.getType(), false);
-        writer.merge(3, 3, 0, 1, "保养时间：" + mtRecordResponse.getWorkDate().toString().replace("T"," "), false);
+        writer.merge(3, 3, 0, 1, "保养时间：" + mtRecordResponse.getWorkDate().toString().replace("T", " "), false);
         writer.merge(3, 3, 2, 3, "项目编号：" + mtRecordResponse.getProjectCode(), false);
         writer.merge(3, 3, 4, 5, "项目名称：" + mtRecordResponse.getProjectName(), false);
         writer.merge(4, 4, 0, 1, "计划保养时间：" + mtRecordResponse.getPlanDate(), false);
-        writer.merge(4, 4, 2, 3, "停梯时间：" + mtRecordResponse.getStopDate().toString().replace("T"," "), false);
-        writer.merge(4, 4, 4, 5, "恢梯时间：" + mtRecordResponse.getRecoveryDate().toString().replace("T"," "), false);
+        writer.merge(4, 4, 2, 3, "停梯时间：" + mtRecordResponse.getStopDate().toString().replace("T", " "), false);
+        writer.merge(4, 4, 4, 5, "恢梯时间：" + mtRecordResponse.getRecoveryDate().toString().replace("T", " "), false);
         writer.writeCellValue(0, 5, "保养时长");
         writer.merge(5, 5, 1, 5, mtRecordResponse.getRepairDuration(), false);
         writer.writeCellValue(0, 6, "序号");