diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java index 472990f..c844ccb 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java @@ -92,6 +92,7 @@ // && this.installtime.getTime()>=DateUtil.parseDate("2023-04-01").getTime() if (StringUtils.isNotEmpty(photoPath) ) { this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); + this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); this.photopath2 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath2()) ? photoPath + appDeviceAdd.getPhotopath2() : appDeviceAdd.getPhotopath2(); this.photopath3 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath3()) ? photoPath + appDeviceAdd.getPhotopath3() : appDeviceAdd.getPhotopath3(); this.photopath4 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath4()) ? photoPath + appDeviceAdd.getPhotopath4() : appDeviceAdd.getPhotopath4(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java index 472990f..c844ccb 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java @@ -92,6 +92,7 @@ // && this.installtime.getTime()>=DateUtil.parseDate("2023-04-01").getTime() if (StringUtils.isNotEmpty(photoPath) ) { this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); + this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); this.photopath2 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath2()) ? photoPath + appDeviceAdd.getPhotopath2() : appDeviceAdd.getPhotopath2(); this.photopath3 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath3()) ? photoPath + appDeviceAdd.getPhotopath3() : appDeviceAdd.getPhotopath3(); this.photopath4 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath4()) ? photoPath + appDeviceAdd.getPhotopath4() : appDeviceAdd.getPhotopath4(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java index d9bc1f9..b64f8cf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java @@ -2,14 +2,12 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.handler.inter.IExcelExportServer; import com.casic.missiles.modular.app.dto.AppDevicAddDTO; import com.casic.missiles.modular.app.model.AppDeviceAdd; import org.apache.poi.ss.usermodel.Workbook; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.List; public class ExportExcelUtil { @@ -17,67 +15,19 @@ * 导出文件主要内容 */ public static void fileExport(List appDeviceBatchList, String currentFileName,String photoPath) { - - FileOutputStream fileOutputStream = null; - Workbook workbook=null; - ExportParams params = new ExportParams(); - params.setSheetName("aaaa"); - - - try { fileOutputStream = new FileOutputStream(currentFileName); - - - - workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, new IExcelExportServer() { - /** - * obj 就是下面的10，限制条件 - * page 是页数，他是在分页进行文件转换，page每次+1 - */ - @Override - public List selectListForExcelExport(Object obj, int page) { - //page每次加一，当等于obj的值时返回空，代码结束； - //特别注意，最好每次10000条，否则，可能有内存溢出风险 - if (((int) obj) == page) { - return null; - } - //不是空时：一直循环运行selectListForExcelExport。每次返回1万条数据。 - List list = new ArrayList(); -// List appDevicAddDTOS = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// list.add(appDevicAddDTOS); - for (int i = 0; i < 100; i++) { - AppDevicAddDTO client = new AppDevicAddDTO(); - client.setDevcode("小明" + i); - client.setArea("地域" + i); - client.setPhotopath1("D:\\cc.png"); - client.setPhotopath2("D:\\cc.png"); - client.setPhotopath3("D:\\cc.png"); - client.setPhotopath4("D:\\cc.png"); - client.setPhotopath5("D:\\cc.png"); - client.setPhotopath6("D:\\cc.png"); - client.setDevicetype(i+""); - client.setLatitude84(i*100+""); - client.setProject(i+""); - list.add(client); - } - return list; - } - }, 10); - - - -// //设置excel参数 -// ExportParams params = new ExportParams(); -// //设置sheet名名称 -// params.setSheetName("设备安装信息"); -// //设置标题 -// params.setTitle("设备安装信息"); -// //转成对应的类型;要不然会报错，虽然也可以导出成功 -// List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// //导入excel -// Workbook workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); + //设置excel参数 + ExportParams params = new ExportParams(); + //设置sheet名名称 + params.setSheetName("设备安装信息"); + //设置标题 + params.setTitle("设备安装信息"); + //转成对应的类型;要不然会报错，虽然也可以导出成功 + List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); + //导入excel + Workbook workbook = ExcelExportUtil.exportExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); workbook.write(fileOutputStream); fileOutputStream.flush(); } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java index 472990f..c844ccb 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java @@ -92,6 +92,7 @@ // && this.installtime.getTime()>=DateUtil.parseDate("2023-04-01").getTime() if (StringUtils.isNotEmpty(photoPath) ) { this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); + this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); this.photopath2 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath2()) ? photoPath + appDeviceAdd.getPhotopath2() : appDeviceAdd.getPhotopath2(); this.photopath3 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath3()) ? photoPath + appDeviceAdd.getPhotopath3() : appDeviceAdd.getPhotopath3(); this.photopath4 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath4()) ? photoPath + appDeviceAdd.getPhotopath4() : appDeviceAdd.getPhotopath4(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java index d9bc1f9..b64f8cf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java @@ -2,14 +2,12 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.handler.inter.IExcelExportServer; import com.casic.missiles.modular.app.dto.AppDevicAddDTO; import com.casic.missiles.modular.app.model.AppDeviceAdd; import org.apache.poi.ss.usermodel.Workbook; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.List; public class ExportExcelUtil { @@ -17,67 +15,19 @@ * 导出文件主要内容 */ public static void fileExport(List appDeviceBatchList, String currentFileName,String photoPath) { - - FileOutputStream fileOutputStream = null; - Workbook workbook=null; - ExportParams params = new ExportParams(); - params.setSheetName("aaaa"); - - - try { fileOutputStream = new FileOutputStream(currentFileName); - - - - workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, new IExcelExportServer() { - /** - * obj 就是下面的10，限制条件 - * page 是页数，他是在分页进行文件转换，page每次+1 - */ - @Override - public List selectListForExcelExport(Object obj, int page) { - //page每次加一，当等于obj的值时返回空，代码结束； - //特别注意，最好每次10000条，否则，可能有内存溢出风险 - if (((int) obj) == page) { - return null; - } - //不是空时：一直循环运行selectListForExcelExport。每次返回1万条数据。 - List list = new ArrayList(); -// List appDevicAddDTOS = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// list.add(appDevicAddDTOS); - for (int i = 0; i < 100; i++) { - AppDevicAddDTO client = new AppDevicAddDTO(); - client.setDevcode("小明" + i); - client.setArea("地域" + i); - client.setPhotopath1("D:\\cc.png"); - client.setPhotopath2("D:\\cc.png"); - client.setPhotopath3("D:\\cc.png"); - client.setPhotopath4("D:\\cc.png"); - client.setPhotopath5("D:\\cc.png"); - client.setPhotopath6("D:\\cc.png"); - client.setDevicetype(i+""); - client.setLatitude84(i*100+""); - client.setProject(i+""); - list.add(client); - } - return list; - } - }, 10); - - - -// //设置excel参数 -// ExportParams params = new ExportParams(); -// //设置sheet名名称 -// params.setSheetName("设备安装信息"); -// //设置标题 -// params.setTitle("设备安装信息"); -// //转成对应的类型;要不然会报错，虽然也可以导出成功 -// List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// //导入excel -// Workbook workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); + //设置excel参数 + ExportParams params = new ExportParams(); + //设置sheet名名称 + params.setSheetName("设备安装信息"); + //设置标题 + params.setTitle("设备安装信息"); + //转成对应的类型;要不然会报错，虽然也可以导出成功 + List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); + //导入excel + Workbook workbook = ExcelExportUtil.exportExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); workbook.write(fileOutputStream); fileOutputStream.flush(); } catch (Exception e) { diff --git a/casic-web/src/main/resources/application-dev.yml b/casic-web/src/main/resources/application-dev.yml index 1f21cd8..640d618 100644 --- a/casic-web/src/main/resources/application-dev.yml +++ b/casic-web/src/main/resources/application-dev.yml @@ -22,7 +22,7 @@ wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid appid: wx8f4b331065a9ac2e #微信小程序开发appid secret: 335847f265b3875804c8f8de4231730b #微信小程序开发密钥 - photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录 + photoPath: C:\casic\ #导出照片位置存放目录 logging: level.root: info level.com.casic: debug diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java index 472990f..c844ccb 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/AppDevicAddDTO.java @@ -92,6 +92,7 @@ // && this.installtime.getTime()>=DateUtil.parseDate("2023-04-01").getTime() if (StringUtils.isNotEmpty(photoPath) ) { this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); + this.photopath1 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath1()) ? photoPath + appDeviceAdd.getPhotopath1() : appDeviceAdd.getPhotopath1(); this.photopath2 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath2()) ? photoPath + appDeviceAdd.getPhotopath2() : appDeviceAdd.getPhotopath2(); this.photopath3 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath3()) ? photoPath + appDeviceAdd.getPhotopath3() : appDeviceAdd.getPhotopath3(); this.photopath4 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath4()) ? photoPath + appDeviceAdd.getPhotopath4() : appDeviceAdd.getPhotopath4(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java index d9bc1f9..b64f8cf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/util/ExportExcelUtil.java @@ -2,14 +2,12 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.handler.inter.IExcelExportServer; import com.casic.missiles.modular.app.dto.AppDevicAddDTO; import com.casic.missiles.modular.app.model.AppDeviceAdd; import org.apache.poi.ss.usermodel.Workbook; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.List; public class ExportExcelUtil { @@ -17,67 +15,19 @@ * 导出文件主要内容 */ public static void fileExport(List appDeviceBatchList, String currentFileName,String photoPath) { - - FileOutputStream fileOutputStream = null; - Workbook workbook=null; - ExportParams params = new ExportParams(); - params.setSheetName("aaaa"); - - - try { fileOutputStream = new FileOutputStream(currentFileName); - - - - workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, new IExcelExportServer() { - /** - * obj 就是下面的10，限制条件 - * page 是页数，他是在分页进行文件转换，page每次+1 - */ - @Override - public List selectListForExcelExport(Object obj, int page) { - //page每次加一，当等于obj的值时返回空，代码结束； - //特别注意，最好每次10000条，否则，可能有内存溢出风险 - if (((int) obj) == page) { - return null; - } - //不是空时：一直循环运行selectListForExcelExport。每次返回1万条数据。 - List list = new ArrayList(); -// List appDevicAddDTOS = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// list.add(appDevicAddDTOS); - for (int i = 0; i < 100; i++) { - AppDevicAddDTO client = new AppDevicAddDTO(); - client.setDevcode("小明" + i); - client.setArea("地域" + i); - client.setPhotopath1("D:\\cc.png"); - client.setPhotopath2("D:\\cc.png"); - client.setPhotopath3("D:\\cc.png"); - client.setPhotopath4("D:\\cc.png"); - client.setPhotopath5("D:\\cc.png"); - client.setPhotopath6("D:\\cc.png"); - client.setDevicetype(i+""); - client.setLatitude84(i*100+""); - client.setProject(i+""); - list.add(client); - } - return list; - } - }, 10); - - - -// //设置excel参数 -// ExportParams params = new ExportParams(); -// //设置sheet名名称 -// params.setSheetName("设备安装信息"); -// //设置标题 -// params.setTitle("设备安装信息"); -// //转成对应的类型;要不然会报错，虽然也可以导出成功 -// List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); -// //导入excel -// Workbook workbook = ExcelExportUtil.exportBigExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); + //设置excel参数 + ExportParams params = new ExportParams(); + //设置sheet名名称 + params.setSheetName("设备安装信息"); + //设置标题 + params.setTitle("设备安装信息"); + //转成对应的类型;要不然会报错，虽然也可以导出成功 + List AppDeviceAddDTOs = AppDevicAddDTO.convert(appDeviceBatchList, photoPath); + //导入excel + Workbook workbook = ExcelExportUtil.exportExcel(params, AppDevicAddDTO.class, AppDeviceAddDTOs); workbook.write(fileOutputStream); fileOutputStream.flush(); } catch (Exception e) { diff --git a/casic-web/src/main/resources/application-dev.yml b/casic-web/src/main/resources/application-dev.yml index 1f21cd8..640d618 100644 --- a/casic-web/src/main/resources/application-dev.yml +++ b/casic-web/src/main/resources/application-dev.yml @@ -22,7 +22,7 @@ wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid appid: wx8f4b331065a9ac2e #微信小程序开发appid secret: 335847f265b3875804c8f8de4231730b #微信小程序开发密钥 - photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录 + photoPath: C:\casic\ #导出照片位置存放目录 logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 4943ac2..cf5b4e4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,7 +22,7 @@ wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid appid: wx8f4b331065a9ac2e #微信小程序开发appid secret: 6c22ca8bca0b239c0cb152f9230e9c52 #微信小程序开发密钥 - photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录 + photoPath: C:\casic\ #导出照片位置存放目录 export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间（现为一天扫描一次） file-valid-days: -1 #日志文件有效天数 logging: