diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java index b7c8f73..31939d8 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -14,6 +14,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.util.LonlatConver; +import lombok.Data; import java.io.Serializable; import java.util.List; @@ -80,6 +81,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -360,6 +376,30 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java index b7c8f73..31939d8 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -14,6 +14,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.util.LonlatConver; +import lombok.Data; import java.io.Serializable; import java.util.List; @@ -80,6 +81,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -360,6 +376,30 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java index 4f01b9f..c615d8a 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -74,6 +74,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -344,6 +359,31 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; @@ -389,6 +429,9 @@ this.photopath1 = appDeviceAdd.getPhotopath1(); this.photopath2 = appDeviceAdd.getPhotopath2(); this.photopath3 = appDeviceAdd.getPhotopath3(); + this.photopath4 = appDeviceAdd.getPhotopath4(); + this.photopath5 = appDeviceAdd.getPhotopath5(); + this.photopath6 = appDeviceAdd.getPhotopath6(); this.factory = appDeviceAdd.getFactory(); this.project = appDeviceAdd.getProject(); this.workmsg = appDeviceAdd.getWorkmsg(); diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java index b7c8f73..31939d8 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -14,6 +14,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.util.LonlatConver; +import lombok.Data; import java.io.Serializable; import java.util.List; @@ -80,6 +81,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -360,6 +376,30 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java index 4f01b9f..c615d8a 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -74,6 +74,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -344,6 +359,31 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; @@ -389,6 +429,9 @@ this.photopath1 = appDeviceAdd.getPhotopath1(); this.photopath2 = appDeviceAdd.getPhotopath2(); this.photopath3 = appDeviceAdd.getPhotopath3(); + this.photopath4 = appDeviceAdd.getPhotopath4(); + this.photopath5 = appDeviceAdd.getPhotopath5(); + this.photopath6 = appDeviceAdd.getPhotopath6(); this.factory = appDeviceAdd.getFactory(); this.project = appDeviceAdd.getProject(); this.workmsg = appDeviceAdd.getWorkmsg(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index f05df2c..a05ce31 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -218,8 +218,7 @@ Runnable task = new Runnable() { @Override public void run() { - ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); - exportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); + ExportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); } }; executor.submit(task); diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java index b7c8f73..31939d8 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -14,6 +14,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.util.LonlatConver; +import lombok.Data; import java.io.Serializable; import java.util.List; @@ -80,6 +81,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -360,6 +376,30 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java index 4f01b9f..c615d8a 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -74,6 +74,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -344,6 +359,31 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; @@ -389,6 +429,9 @@ this.photopath1 = appDeviceAdd.getPhotopath1(); this.photopath2 = appDeviceAdd.getPhotopath2(); this.photopath3 = appDeviceAdd.getPhotopath3(); + this.photopath4 = appDeviceAdd.getPhotopath4(); + this.photopath5 = appDeviceAdd.getPhotopath5(); + this.photopath6 = appDeviceAdd.getPhotopath6(); this.factory = appDeviceAdd.getFactory(); this.project = appDeviceAdd.getProject(); this.workmsg = appDeviceAdd.getWorkmsg(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index f05df2c..a05ce31 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -218,8 +218,7 @@ Runnable task = new Runnable() { @Override public void run() { - ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); - exportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); + ExportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); } }; executor.submit(task); 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 cf9307c..d9bc1f9 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,32 +2,82 @@ 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 { /** * 导出文件主要内容 */ - public void fileExport(List appDeviceBatchList, String currentFileName,String photoPath) { + 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); - //设置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 = 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); workbook.write(fileOutputStream); fileOutputStream.flush(); } catch (Exception e) { diff --git a/casic-app/pom.xml b/casic-app/pom.xml index ad85283..1f96107 100644 --- a/casic-app/pom.xml +++ b/casic-app/pom.xml @@ -83,6 +83,14 @@ 4.3.0 + + + + + + + + com.casic casic-admin-core diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java index 5ee39c5..2d9a83d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -179,6 +179,9 @@ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1()); appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2()); appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3()); + appDeviceAdd.setPhotopath4(appDeviceLogList.get(0).getPhotopath4()); + appDeviceAdd.setPhotopath5(appDeviceLogList.get(0).getPhotopath5()); + appDeviceAdd.setPhotopath6(appDeviceLogList.get(0).getPhotopath6()); } return new SuccessResponseData(appDeviceAdd); } @@ -198,6 +201,12 @@ appDeviceLog.setPhotopath2(""); } else if ("2".equals(pathIndex)) { appDeviceLog.setPhotopath3(""); + }else if ("3".equals(pathIndex)) { + appDeviceLog.setPhotopath4(""); + } else if ("4".equals(pathIndex)) { + appDeviceLog.setPhotopath5(""); + } else if ("5".equals(pathIndex)) { + appDeviceLog.setPhotopath6(""); } appDeviceLogService.updateById(appDeviceLog); } 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 89f6e61..472990f 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 @@ -41,6 +41,12 @@ private String photopath2; @Excel(name = "照片3", type = 2, width = 20.0, height = 60.0, imageType = 1) private String photopath3; + @Excel(name = "照片4", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath4; + @Excel(name = "照片5", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath5; + @Excel(name = "照片6", type = 2, width = 20.0, height = 60.0, imageType = 1) + private String photopath6; @Excel(name = "所属项目", width = 10.0) private String project; @Excel(name = "安装位置", width = 10.0) @@ -70,6 +76,9 @@ } + public AppDevicAddDTO() { + } + public AppDevicAddDTO(AppDeviceAdd appDeviceAdd, String photoPath) { this.devcode = appDeviceAdd.getDevcode(); this.devicetype = appDeviceAdd.getDevicetype(); @@ -85,6 +94,9 @@ 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(); + this.photopath5 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath5()) ? photoPath + appDeviceAdd.getPhotopath5() : appDeviceAdd.getPhotopath5(); + this.photopath6 = ToolUtil.isNotEmpty(appDeviceAdd.getPhotopath6()) ? photoPath + appDeviceAdd.getPhotopath6() : appDeviceAdd.getPhotopath6(); } this.project = appDeviceAdd.getProject(); this.position = appDeviceAdd.getPosition(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java index b7c8f73..31939d8 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -14,6 +14,7 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.app.util.LonlatConver; +import lombok.Data; import java.io.Serializable; import java.util.List; @@ -80,6 +81,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -360,6 +376,30 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java index 4f01b9f..c615d8a 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -74,6 +74,21 @@ */ private String photopath3; /** + * + * 照片路径4 + */ + private String photopath4; + /** + * + * 照片路径5 + */ + private String photopath5; + /** + * + * 照片路径6 + */ + private String photopath6; + /** * 权属单位 */ private String factory; @@ -344,6 +359,31 @@ this.latitude84 = latitude84; } + public String getPhotopath4() { + + return photopath4; + } + + public void setPhotopath4(String photopath4) { + this.photopath4 = photopath4; + } + + public String getPhotopath5() { + return photopath5; + } + + public void setPhotopath5(String photopath5) { + this.photopath5 = photopath5; + } + + public String getPhotopath6() { + return photopath6; + } + + public void setPhotopath6(String photopath6) { + this.photopath6 = photopath6; + } + @Override protected Serializable pkVal() { return this.id; @@ -389,6 +429,9 @@ this.photopath1 = appDeviceAdd.getPhotopath1(); this.photopath2 = appDeviceAdd.getPhotopath2(); this.photopath3 = appDeviceAdd.getPhotopath3(); + this.photopath4 = appDeviceAdd.getPhotopath4(); + this.photopath5 = appDeviceAdd.getPhotopath5(); + this.photopath6 = appDeviceAdd.getPhotopath6(); this.factory = appDeviceAdd.getFactory(); this.project = appDeviceAdd.getProject(); this.workmsg = appDeviceAdd.getWorkmsg(); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index f05df2c..a05ce31 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -218,8 +218,7 @@ Runnable task = new Runnable() { @Override public void run() { - ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); - exportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); + ExportExcelUtil.fileExport(appDeviceBatchList, currentFileName, photoPath); } }; executor.submit(task); 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 cf9307c..d9bc1f9 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,32 +2,82 @@ 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 { /** * 导出文件主要内容 */ - public void fileExport(List appDeviceBatchList, String currentFileName,String photoPath) { + 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); - //设置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 = 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); workbook.write(fileOutputStream); fileOutputStream.flush(); } catch (Exception e) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 0b2a040..4943ac2 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8083 + port: 5905 maxPostSize: -1 maxHttpHeaderSize: 102400 ################### spring配置 ###################