diff --git a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java index 03029e7c4..bef39c55b 100644 --- a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java @@ -14,6 +14,7 @@ public class AsnIpTemplate { */ private String cfgDesc; + private String asnNo; private String destIpAddress; @ExcelField(title="config_describe",align=2,sort=1) @@ -23,6 +24,13 @@ public class AsnIpTemplate { public void setCfgDesc(String cfgDesc) { this.cfgDesc = cfgDesc; } + @ExcelField(title="asn_no",align=2,sort=11) + public String getAsnNo() { + return asnNo; + } + public void setAsnNo(String asnNo) { + this.asnNo = asnNo; + } @ExcelField(title="server_ip",align=2,sort=12) public String getDestIpAddress() { return destIpAddress; diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 253b37c11..aee24aee9 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -74,7 +74,6 @@ public class ExportExcel { private static Logger log = LoggerFactory.getLogger(ExportExcel.class); private static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class); - private static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class); /** * 工作薄对象 @@ -240,6 +239,10 @@ public class ExportExcel { } } + if("asn_no".equals(headerStr)){ + commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr; + index++; + } if("policy_name".equals(headerStr)){ List resStrategys=dnsResStrategyDao.findList(null, 1,1); @@ -1320,7 +1323,7 @@ public class ExportExcel { if (!StringUtil.isEmpty(commentStr)){ cell.setCellValue(headerList.get(i)); Comment comment = this.sheet.createDrawingPatriarch().createCellComment( - new XSSFClientAnchor(0, 0, 0, 0, (short) i, 0, (short) i+3, commentRow)); + new XSSFClientAnchor(0, 0, 0, 0, (short) i, 0, (short) i+4, commentRow)); comment.setString(new XSSFRichTextString(commentStr)); cell.setCellComment(comment); }else{ diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index df671021b..bfd0b38cf 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1288,4 +1288,5 @@ http_keyword_monit=Website Keyword Monit http_keyword_reject=Website Keyword Block has_invisible_char=%s has invisible characters not_multiple=%s do not support multiple keywords -template_error=The import template is incorrect. Pleace choose a proper template which has the same language with the system and the same configure type. \ No newline at end of file +template_error=The import template is incorrect. Pleace choose a proper template which has the same language with the system and the same configure type. +asn_no=ASN \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 9ef072407..7b63db904 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1305,4 +1305,5 @@ letter_cancel_info=Cancel Letter Info import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import. http_keyword=Website Keyword http_keyword_monit=Website Keyword Monit -http_keyword_reject=Website Keyword Reject \ No newline at end of file +http_keyword_reject=Website Keyword Reject +asn_no=ASN \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 9fc5c0a6d..518464ee9 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1283,4 +1283,5 @@ http_keyword_monit=\u7F51\u9875\u5173\u952E\u5B57\u76D1\u6D4B http_keyword_reject=\u7F51\u9875\u5173\u952E\u5B57\u963B\u65AD has_invisible_char=%s\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26 not_multiple=%s\u4E0D\u652F\u6301\u591A\u4E2A\u5173\u952E\u5B57 -template_error=\u5BFC\u5165\u6A21\u677F\u9519\u8BEF.\u8BF7\u9009\u62E9\u4E0E\u7CFB\u7EDF\u8BED\u8A00\u4E00\u81F4\uFF0C\u5E76\u4E14\u914D\u7F6E\u7C7B\u578B\u4E00\u81F4\u7684\u6A21\u677F\u5BFC\u5165. \ No newline at end of file +template_error=\u5BFC\u5165\u6A21\u677F\u9519\u8BEF.\u8BF7\u9009\u62E9\u4E0E\u7CFB\u7EDF\u8BED\u8A00\u4E00\u81F4\uFF0C\u5E76\u4E14\u914D\u7F6E\u7C7B\u578B\u4E00\u81F4\u7684\u6A21\u677F\u5BFC\u5165. +asn_no=ASN \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp index bad16fa64..da45f0bd2 100644 --- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp +++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp @@ -93,7 +93,13 @@
-
+ + +