diff --git a/kn-common/src/main/java/org/springblade/common/utils/ExcelCellUtil.java b/kn-common/src/main/java/org/springblade/common/utils/ExcelCellUtil.java
new file mode 100644
index 0000000..3edf91d
--- /dev/null
+++ b/kn-common/src/main/java/org/springblade/common/utils/ExcelCellUtil.java
@@ -0,0 +1,52 @@
+
+package org.springblade.common.utils;
+
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+public class ExcelCellUtil {
+ public ExcelCellUtil() {
+ }
+
+ public static String strHandle(Object obj) {
+ return obj == null ? "" : obj.toString().trim();
+ }
+
+ public static XSSFCellStyle cellBorder(XSSFWorkbook workbook) {
+ XSSFCellStyle borderStyle = workbook.createCellStyle();
+ borderStyle.setBorderBottom(BorderStyle.THIN);
+ borderStyle.setBorderLeft(BorderStyle.THIN);
+ borderStyle.setBorderTop(BorderStyle.THIN);
+ borderStyle.setBorderRight(BorderStyle.THIN);
+ return borderStyle;
+ }
+
+ public static XSSFCellStyle cellFontAndBorder(XSSFWorkbook wb, String fontName, short fontSize) {
+ XSSFCellStyle fontAndBorderStyle = wb.createCellStyle();
+ XSSFFont font = wb.createFont();
+ font.setFontName(fontName);
+ font.setFontHeightInPoints(fontSize);
+ fontAndBorderStyle.setFont(font);
+ fontAndBorderStyle.setBorderBottom(BorderStyle.THIN);
+ fontAndBorderStyle.setBorderLeft(BorderStyle.THIN);
+ fontAndBorderStyle.setBorderTop(BorderStyle.THIN);
+ fontAndBorderStyle.setBorderRight(BorderStyle.THIN);
+ fontAndBorderStyle.setAlignment(HorizontalAlignment.CENTER);
+ fontAndBorderStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ return fontAndBorderStyle;
+ }
+
+ public static void setRegionBorder(CellRangeAddress region, XSSFSheet sheet) {
+ RegionUtil.setBorderBottom(BorderStyle.THIN, region, sheet);
+ RegionUtil.setBorderLeft(BorderStyle.THIN, region, sheet);
+ RegionUtil.setBorderRight(BorderStyle.THIN, region, sheet);
+ RegionUtil.setBorderTop(BorderStyle.THIN, region, sheet);
+ }
+}
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
index 7492d2a..ff95e2f 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
@@ -17,4 +17,8 @@ public class HotspotArea {
* 频次
*/
private Integer value;
+ /**
+ * 名称
+ */
+ private String nameNew;
}
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java
index 9b71af2..63b5e29 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java
@@ -83,6 +83,11 @@ public class News implements Serializable {
@ExcelIgnore
private Date reviewTime;
+ /**
+ * 审核时间
+ */
+ private String Time;
+
@ExcelIgnore
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
index c8a3340..f52d2ab 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
@@ -49,7 +49,7 @@ public class Websites implements Serializable {
/**
* 网站灾害对应id
*/
- private Long websiteId;
+ private String websiteId;
/**
* 上传的管理人员
diff --git a/kn-service/biz-vordm/pom.xml b/kn-service/biz-vordm/pom.xml
index e41a563..4533b47 100644
--- a/kn-service/biz-vordm/pom.xml
+++ b/kn-service/biz-vordm/pom.xml
@@ -98,6 +98,21 @@
org.springframework.boot
spring-boot-starter-thymeleaf
+
+ org.apache.poi
+ poi
+ 4.0.0
+
+
+ org.apache.poi
+ poi-ooxml
+ 4.0.0
+
+
+ org.apache.poi
+ poi-ooxml-schemas
+ 4.0.0
+
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
index 8f4fcd2..4b63263 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
@@ -16,6 +16,7 @@ import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -87,4 +88,14 @@ public class NewsController {
Boolean flag=newsService.update(updateWrapper);
return R.data(flag);
}
+
+ /**
+ * 导入供应商模板
+ * @param file
+ * @return
+ */
+ @PostMapping({"/importTemplate"})
+ public R fileExcelUpload(@RequestParam("fileData") MultipartFile file,@RequestParam("type") Integer type,@RequestParam("disasterId") Long disasterId) {
+ return R.data(newsService.importTemplate(file,type,disasterId));
+ }
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
index fc9c1fb..8c9e2a4 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
@@ -25,6 +25,7 @@