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

协议IP表结构变更,修改协议IP管理功能。

Browse Source
This commit is contained in:
zhangwei
2018-06-21 18:10:07 +08:00
parent 16b4b22504
commit 7b32502349
8 changed files with 197 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -181,14 +181,16 @@ public class SpecificServiceCfgController extends BaseController {
/**
* 父节点选择树形结构
* @param extId
* @param extId排除节点id
* @param isShowHide
* @param isLeafShow:叶子节点是否显示
* @param response
* @return
*/
@ResponseBody
@RequestMapping(value = "treeData")
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response){
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide,
@RequestParam(required=false)boolean isLeafShow,HttpServletResponse response){
List<Map<String, Object>> mapList = Lists.newArrayList();
Map<String, Object> map2 = Maps.newHashMap();
map2.put("id", 0);
@@ -200,7 +202,8 @@ public class SpecificServiceCfgController extends BaseController {
for (int i=0; i<list.size(); i++){
SpecificServiceCfg specificServiceCfg = list.get(i);
if(StringUtils.isBlank(extId)||(extId!=null&&!extId.equals(specificServiceCfg.getSpecServiceId().toString()))){
if(specificServiceCfg.getIsValid().equals(0)||specificServiceCfg.getIsLeaf().equals(1)){
if(specificServiceCfg.getIsValid().equals(0)||
(!isLeafShow && specificServiceCfg.getIsLeaf().equals(1))){
continue;
}
Map<String, Object> map = Maps.newHashMap();