gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导入增加性质、分类.

Browse Source
This commit is contained in:
zhangwenqing
2018-12-18 14:17:35 +08:00
parent 9355918750
commit 7cca77addf
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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++;

4
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -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配置导出

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

@@ -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 -->