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

完成协议ip国际化，权限控制

Browse Source 
更改分类/性质/标签，地域/运营商/作用域 ，特定服务，协议ip 修改操作由可选多项仅只修改第一项改为 只能选择一条数据，修订校验国际化
This commit is contained in:
zhangshilin
2018-03-29 18:45:37 +08:00
parent 99175da3f2
commit 0633a74024
15 changed files with 228 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -143,22 +143,13 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value={"form"})
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType, String mulitId) {
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) {
if(doAction!=null&&doAction.equals("0")){
return "/basics/serviceDictInfo";
}
Integer id=0;
if(mulitId!=null){
String[] ids = mulitId.split(",");
id = Integer.valueOf(ids[0]);
}
if(id!=0){
serviceDictInfo = serviceDictInfoService.getDictById(id);
}
if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null||serviceDictInfo.getParent().getServiceDictId() == 0) {
if (serviceDictInfo==null||serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null) {
ServiceDictInfo parent = new ServiceDictInfo();
parent.setServiceDictId(0);
parent.setItemValue("root_node");
serviceDictInfo.setParent(parent);
}
String[] strArr = itType.split("-");
@@ -422,7 +413,7 @@ public class ServiceDictInfoController extends BaseController {
* 查出所该节点下有树形子节点
*/
void allTreeNode(Integer levelNo, List<ServiceDictInfo> list,List<ServiceDictInfo> resultList){
public void allTreeNode(Integer levelNo, List<ServiceDictInfo> list,List<ServiceDictInfo> resultList){
if(list!=null&&list.size()>0){
for(ServiceDictInfo se:list){
se.setLevelNo(levelNo+1);

13
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -140,23 +140,14 @@ public class SysDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR)
@RequestMapping(value={"form"})
public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType, String mulitId) {
public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) {
if(doAction!=null&&doAction.equals("0")){
model.addAttribute("specType", sysDictInfo.getItemType());
return "/basics/sysDictInfo";
}
Integer id=0;
if(mulitId!=null){
String[] ids = mulitId.split(",");
id = Integer.valueOf(ids[0]);
}
if(id!=0){
sysDictInfo = sysDictInfoService.getDictById(id);
}
if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null||sysDictInfo.getParent().getSysDictId() == 0) {
if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null) {
SysDictInfo parent = new SysDictInfo();
parent.setSysDictId(0);
parent.setItemValue("root_node");
sysDictInfo.setParent(parent);
}
String[] strArr = itType.split("-");

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

@@ -120,21 +120,13 @@ public class SpecificServiceCfgController extends BaseController {
*/
@RequiresPermissions("specific:service:edit")
@RequestMapping(value = { "form" })
public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction, String mulitId) {
Integer id = 0;
if (mulitId != null) {
String[] ids = mulitId.split(",");
id = Integer.valueOf(ids[0]);
public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction) {
if(specificServiceCfg!=null&&specificServiceCfg.getSpecServiceId()!=null){
specificServiceCfg = specificServiceCfgService.getBySpecServiceId(specificServiceCfg.getSpecServiceId());
}
if (id != 0) {
specificServiceCfg = specificServiceCfgService.getBySpecServiceId(id);
}
if (specificServiceCfg == null || specificServiceCfg.getParent() == null
|| specificServiceCfg.getParent().getSpecServiceId() == 0) {
if (specificServiceCfg == null || specificServiceCfg.getSpecServiceId()==null) {
SpecificServiceCfg parent = new SpecificServiceCfg();
parent.setSpecServiceId(0);
parent.setSpecServiceName("root_node");
specificServiceCfg.setParent(parent);
}
model.addAttribute("specificServiceCfg", specificServiceCfg);

8
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -89,10 +89,10 @@ public class SpecificServiceHostCfgController extends BaseController {
public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
try {
specificServiceHostCfgService.saveOrUpdate(specificServiceHostCfg);
addMessage(redirectAttributes, "保存成功");
addMessage(redirectAttributes, "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "保存失败！");
addMessage(redirectAttributes, "save_failed");
}
return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
}
@@ -108,10 +108,10 @@ public class SpecificServiceHostCfgController extends BaseController {
public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
try{
specificServiceHostCfgService.delete(mulitId);
addMessage(redirectAttributes,"删除成功");
addMessage(redirectAttributes,"delete_success");
}catch (Exception e){
e.printStackTrace();
addMessage(redirectAttributes,"删除失败");
addMessage(redirectAttributes,"delete_failed");
}
return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";