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-29 14:27:20 +08:00
parent 63f3ebc0b6
commit e169585f25
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,11 +300,16 @@ public class IpController extends BaseController{
,FunctionServiceDict serviceDict ,FunctionServiceDict serviceDict
,Integer requestId) throws Exception{ ,Integer requestId) throws Exception{
Properties pro=getMsgProp(); Properties pro=getMsgProp();
//String serviceName=pro.getProperty(serviceDict.getServiceName()); String menuCode = menuService.getMenuCodeByFunctionId(serviceDict.getFunctionId());
String regionName=pro.getProperty(regionDict.getConfigRegionValue()); String menuName = pro.getProperty(menuCode);
//serviceName=StringUtil.isEmpty(serviceName) ?serviceDict.getServiceName():serviceName; String regionName = pro.getProperty(regionDict.getConfigRegionValue());
regionName=StringUtil.isEmpty(regionName) ?regionDict.getConfigRegionValue():regionName; menuName = StringUtil.isEmpty(menuName) ? menuCode : menuName;
String fileName = regionName+"_Template.xlsx"; regionName = StringUtil.isEmpty(regionName) ? regionDict.getConfigRegionValue() : regionName;
String fileName = regionName + "_Template.xlsx";
if(!menuName.equalsIgnoreCase(regionName)) {
fileName = menuName +"_"+ fileName;
}
//ip类模板 //ip类模板
if(regionDict.getRegionType().equals(1)){ if(regionDict.getRegionType().equals(1)){
if(regionDict.getFunctionId().equals(5)){// IP Address if(regionDict.getFunctionId().equals(5)){// IP Address

2
src/main/java/com/nis/web/dao/SysMenuDao.java
View File

@@ -26,4 +26,6 @@ public interface SysMenuDao extends CrudDao<SysMenu>{
List<SysMenu> findAllCfgList(@Param("policiesMenuId")String policiesMenuId); List<SysMenu> findAllCfgList(@Param("policiesMenuId")String policiesMenuId);
String getMenuCodeByFunctionId(@Param("functionId")Integer functionId, @Param("parentId")String id);
} }

9
src/main/java/com/nis/web/dao/SysMenuDao.xml
View File

@@ -218,4 +218,13 @@
WHERE WHERE
s.function_id = #{functionId} AND s.action = #{action} AND s.is_valid = 1 s.function_id = #{functionId} AND s.action = #{action} AND s.is_valid = 1
</select> </select>
<select id="getMenuCodeByFunctionId" resultType="java.lang.String">
SELECT
m.code
FROM
sys_menu m
WHERE
m.function_id = #{functionId} AND m.parent_ids LIKE concat(concat('%',#{parentId,jdbcType=VARCHAR}),'%') AND del_flag = 1
</select>
</mapper> </mapper>

4
src/main/java/com/nis/web/service/MenuService.java
View File

@@ -108,4 +108,8 @@ public class MenuService extends BaseService {
return menuDao.getServiceId(functionId,action); return menuDao.getServiceId(functionId,action);
} }
// 获取菜单code
public String getMenuCodeByFunctionId(Integer functionId) {
return menuDao.getMenuCodeByFunctionId(functionId,",86,");
}
} }