diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index dd560e564..f38414a09 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -26,6 +26,8 @@ import com.nis.web.service.OfficeService; import com.nis.web.service.RoleService; import com.nis.web.service.SystemService; import com.nis.web.service.UserService; +import com.nis.web.service.basics.ServiceDictInfoService; +import com.nis.web.service.basics.SysDictInfoService; import com.nis.web.service.configuration.AppCfgService; import com.nis.web.service.configuration.ComplexStringCfgService; import com.nis.web.service.configuration.FtpCfgService; @@ -34,10 +36,8 @@ import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.MediaCfgService; import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.RequestInfoService; -import com.nis.web.service.configuration.ServiceDictInfoService; import com.nis.web.service.configuration.SslCfgService; import com.nis.web.service.configuration.StringCfgService; -import com.nis.web.service.configuration.SysDictInfoService; import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.WebCfgService; import com.nis.web.service.systemService.ServiceConfigInfoService; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index e88634671..3ff4618c0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 948960738..b7dbb7414 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; -import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; @@ -41,8 +41,9 @@ public class IpCfgController extends BaseController{ } @RequestMapping(value = {"list"}) - public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(ipCfg!=null){ Integer serviceId=ipCfg.getServiceId(); logger.info("servcice id is "+serviceId); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 59fc12b10..32ad4c922 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index 5cba63859..e788bd1ee 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController;