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 34773f3a7..79daef1d3 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 @@ -300,11 +300,16 @@ public class IpController extends BaseController{ ,FunctionServiceDict serviceDict ,Integer requestId) throws Exception{ Properties pro=getMsgProp(); - //String serviceName=pro.getProperty(serviceDict.getServiceName()); - String regionName=pro.getProperty(regionDict.getConfigRegionValue()); - //serviceName=StringUtil.isEmpty(serviceName) ?serviceDict.getServiceName():serviceName; - regionName=StringUtil.isEmpty(regionName) ?regionDict.getConfigRegionValue():regionName; - String fileName = regionName+"_Template.xlsx"; + String menuCode = menuService.getMenuCodeByFunctionId(serviceDict.getFunctionId()); + String menuName = pro.getProperty(menuCode); + String regionName = pro.getProperty(regionDict.getConfigRegionValue()); + menuName = StringUtil.isEmpty(menuName) ? menuCode : menuName; + regionName = StringUtil.isEmpty(regionName) ? regionDict.getConfigRegionValue() : regionName; + + String fileName = regionName + "_Template.xlsx"; + if(!menuName.equalsIgnoreCase(regionName)) { + fileName = menuName +"_"+ fileName; + } //ip类模板 if(regionDict.getRegionType().equals(1)){ if(regionDict.getFunctionId().equals(5)){// IP Address diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.java b/src/main/java/com/nis/web/dao/SysMenuDao.java index 76dff1bb4..87af932e3 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.java +++ b/src/main/java/com/nis/web/dao/SysMenuDao.java @@ -25,5 +25,7 @@ public interface SysMenuDao extends CrudDao{ Integer getServiceId(@Param("functionId")Integer functionId, @Param("action")Integer action); List findAllCfgList(@Param("policiesMenuId")String policiesMenuId); + + String getMenuCodeByFunctionId(@Param("functionId")Integer functionId, @Param("parentId")String id); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.xml b/src/main/java/com/nis/web/dao/SysMenuDao.xml index 3d4114539..28ff2734f 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.xml +++ b/src/main/java/com/nis/web/dao/SysMenuDao.xml @@ -218,4 +218,13 @@ WHERE s.function_id = #{functionId} AND s.action = #{action} AND s.is_valid = 1 + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/MenuService.java b/src/main/java/com/nis/web/service/MenuService.java index 4b5bec9a0..d8313e250 100644 --- a/src/main/java/com/nis/web/service/MenuService.java +++ b/src/main/java/com/nis/web/service/MenuService.java @@ -107,5 +107,9 @@ public class MenuService extends BaseService { public Integer getServiceId(Integer functionId, Integer action) { return menuDao.getServiceId(functionId,action); } - + + // 获取菜单code + public String getMenuCodeByFunctionId(Integer functionId) { + return menuDao.getMenuCodeByFunctionId(functionId,",86,"); + } }