asn模板修改

asn导出界面优化

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;

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<DnsResStrategy> 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{

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. 
+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

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
+http_keyword_reject=Website Keyword Reject
+asn_no=ASN

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.
+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

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -93,7 +93,13 @@
 							</div>
 							<div for="action"></div>
 						</div>
-						<div class="row">
+						<!-- 600 asn ip -->
+						<c:if test="${cfg.functionId eq 600 }">
+							<div class="row hidden">
+						</c:if>
+						<c:if test="${cfg.functionId ne 600 }">
+							<div class="row">
+						</c:if>
 					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
 					           <div class="col-md-6">
 					               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
@@ -164,20 +170,6 @@
 								</div>
 						</br>
 						</c:if>
-						<!-- 600 ASNIP导入 -->
-						<c:if test="${cfg.functionId eq 600 }">
-							<div class="row">
-					    	 	<label class="control-label col-md-3"><spring:message code="group"/></label>
-					    	 	 <div class="col-md-6">
-						    	 	 <select name="asnGroupId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
-		               					<c:forEach items="${policyGroups }" var="policyGroup" varStatus="status">
-											<option value="${policyGroup.serviceGroupId}" <c:if test="${status.index eq 1 }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
-				              			</c:forEach>
-					                </select>
-					    	 	 </div>
-							</div>
-						</br>	
-						</c:if>						
 						<div class="col-md-12">
 							<div class="form-group">
 								<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message
@@ -217,7 +209,12 @@
 							</div>
 						</div>
 				</div>
-				<div class="modal-footer">
+				<c:if test="${cfg.functionId eq 600 }">
+					<div class="modal-footer" style="border-top:0px">
+				</c:if>
+				<c:if test="${cfg.functionId ne 600 }">
+					<div class="modal-footer">
+				</c:if>
 					<button type="button" class="btn red" onclick="importCfg()">
 						<spring:message code="ok" />
 					</button>