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&®ionIds.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/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index cedbdf3eb..9dbbe6dd3 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -429,7 +429,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg);
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -441,7 +441,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -600,7 +600,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg);
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -612,7 +612,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -789,7 +789,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg);
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -801,7 +801,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -959,7 +959,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg);
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -971,7 +971,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -1188,7 +1188,7 @@ public class ConfigSynchronizationService extends BaseService{
}
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1200,7 +1200,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -1396,7 +1396,7 @@ public class ConfigSynchronizationService extends BaseService{
}
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1408,7 +1408,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean);
//调用服务接口下发配置数据
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -1571,7 +1571,7 @@ public class ConfigSynchronizationService extends BaseService{
}
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1598,7 +1598,7 @@ public class ConfigSynchronizationService extends BaseService{
}
}else {//未下发过的compile直接走正常maat配置接口
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
@@ -1741,14 +1741,14 @@ public class ConfigSynchronizationService extends BaseService{
}
page.setList(list);
- if(page.isLastPage()){
+ if(page.getLast()==page.getPageNo()){
hasData = false;
}
if(newList.size()>0){
//调用服务接口下发配置数据
String json=gsonToJson(newList);
if(isUpdateCfg) {
- logger.info("配置批量下发："+json);
+// logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){
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 @@
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
index dbc2d3c2b..8374c3152 100644
--- a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
@@ -34,7 +34,16 @@
// });
// ajaxConnPercent();
});
-
+ /** 打印预览，弹出新页面 **/
+ function printPreview(path, title, content){
+ var options = {
+ popTitle : title+'打印预览',
+ mode : 'popup',
+ popClose : false,
+ extraCss : path+'/css/table.css'
+ };
+ $("div#"+content+"").printArea(options);
+ }