From 7cca77addf8c0a871d6d1074fd20b03aa4739b7d Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Tue, 18 Dec 2018 14:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=80=A7?=
 =?UTF-8?q?=E8=B4=A8=E3=80=81=E5=88=86=E7=B1=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/BaseController.java    | 24 ++++++++++---------
 .../configuration/ntc/IpController.java       |  4 +++-
 .../WEB-INF/include/excel/importModal.jsp     | 20 ++++++++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 098860ccd..fa4d4b3d7 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -1222,9 +1222,11 @@ public class BaseController {
 	 * @param serviceDictId
 	 * @param regionDictIds
 	 * @param requestId
+	 * @param classify 
+	 * @param attribute 
 	 */
 	public void _import(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes,
-			MultipartFile[] files, Integer serviceDictId, String regionDictIds, Integer requestId) {
+			MultipartFile[] files, Integer serviceDictId, String regionDictIds, Integer requestId, String attribute, String classify) {
 		logger.warn("import start...");
 		long start=System.currentTimeMillis();
 		ImportBigExcel ei=null;
@@ -1484,10 +1486,10 @@ public class BaseController {
 										_cfg.setIsValid(Constants.VALID_NO);
 									}
 									_cfg.setIsAreaEffective(0);
-									_cfg.setAttribute("0");
-									_cfg.setClassify("0");
 									_cfg.setLable("0");
 									_cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
+									_cfg.setAttribute(attribute);
+									_cfg.setClassify(classify);
 									_cfg.setServiceId(0);
 									//设置region id
 									if(regionIds!=null&&regionIds.size()==_ipPortCfgs.size()) {
@@ -1584,10 +1586,10 @@ public class BaseController {
 										cfg.setIsValid(Constants.VALID_NO);
 									}
 									cfg.setIsAreaEffective(0);
-									cfg.setAttribute("0");
-									cfg.setClassify("0");
 									cfg.setLable("0");
 									cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
+									cfg.setAttribute(attribute);
+									cfg.setClassify(classify);
 									cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
 									cfg.setTableName("ip_port_cfg");
 									if(compileIds.size()==_ipPortCfgs.size()) {
@@ -1711,10 +1713,10 @@ public class BaseController {
 									cfg.setIsValid(Constants.VALID_NO);
 								}
 								cfg.setIsAreaEffective(0);
-								cfg.setAttribute("0");
-								cfg.setClassify("0");
 								cfg.setLable("0");
 								cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
+								cfg.setAttribute(attribute);
+								cfg.setClassify(classify);
 								cfg.setServiceId(serviceDict.getServiceId());
 								if(compileIds!=null&&compileIds.size()==_stringCfgs.size()) {
 									cfg.setCompileId(compileIds.get(ind));
@@ -1793,10 +1795,10 @@ public class BaseController {
 								cfg.setIsAudit(0);
 								cfg.setIsValid(0);
 								cfg.setIsAreaEffective(0);
-								cfg.setAttribute("0");
-								cfg.setClassify("0");
 								cfg.setLable("0");
 								cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
+								cfg.setAttribute(attribute);
+								cfg.setClassify(classify);
 								cfg.setServiceId(serviceDict.getServiceId());
 								if(compileIds!=null&&compileIds.size()==_complexkeywordCfgs.size()) {
 									cfg.setCompileId(compileIds.get(ind));
@@ -1872,10 +1874,10 @@ public class BaseController {
 									cfg.setIsAudit(0);
 									cfg.setIsValid(0);
 									cfg.setIsAreaEffective(0);
-									cfg.setAttribute("0");
-									cfg.setClassify("0");
 									cfg.setLable("0");
 									cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
+									cfg.setAttribute(attribute);
+									cfg.setClassify(classify);
 									cfg.setServiceId(serviceDict.getServiceId());
 									cfg.setCompileId(compileIds.get(ind));
 									ind++;
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
index 29f557025..f2644af23 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
@@ -418,9 +418,11 @@ public class IpController extends BaseController{
 				@RequestParam("files") MultipartFile[] files
 				,Integer serviceDictId
 				,Integer requestId
+				,String attribute
+				,String classify
 				,String regionDictIds
 				,String importPath) {
-				this._import(request,response,redirectAttributes, files,serviceDictId,regionDictIds,requestId);
+				this._import(request,response,redirectAttributes, files,serviceDictId,regionDictIds,requestId,attribute,classify);
 				return "redirect:" + adminPath+ importPath;
 		}
 		//ip配置导出
diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 1424d1955..80eea6d79 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -114,6 +114,26 @@
 					               </select>
 					           </div>
 					           <div for="requestId"></div>
+					    </div>
+						</br>
+						<div class="row">
+				           <label class="control-label col-md-3"><spring:message code="attribute"/></label>
+				           <div class="col-md-6">
+				            	<sys:treeselect id="attribute" name="attribute" value="0" labelName="attributeName" extId="0"
+									labelValue="" labelEmptyValue="0"
+									title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
+									checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s" />
+				            </div>
+						</div>
+						</br>
+						<div class="row">
+							<label class="control-label col-md-3"><spring:message code="classification"/></label>
+				           <div class="col-md-6">
+				           		<sys:treeselect id="classify" name="classify" value="0" labelName="classifyName" extId="0"
+									labelValue="" labelEmptyValue="0"
+									title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
+									checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
+				           </div>
 						</div>
 						</br>
 						<!-- 63 app -->