diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index 9981c3d29..686ea22eb 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -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 list,List resultList){ + public void allTreeNode(Integer levelNo, List list,List resultList){ if(list!=null&&list.size()>0){ for(ServiceDictInfo se:list){ se.setLevelNo(levelNo+1); diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index 82c6471e0..db6d8de25 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -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("-"); diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index 3b31db9fe..607705b77 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -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); diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index fea170b84..1bc9e15df 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -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"; diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index b41500f86..1a37268d0 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -191,7 +191,7 @@ task_time=task time #==========message begin===================== -required=This field is required! +required=This field is required? select=Please select date_list=Date List confirm_message=Are you sure? @@ -219,11 +219,11 @@ hasnot_approved=It has not been approved and can not be operated on ! check_one=choose one please ! one_more=please choose at least one ! custom_columns=custom columns -maxlength_64=The maxlength is 64! -maxlength_128=The maxlength is 128! -maxlength_256=The maxlength is 256! -maxlength_512=The maxlength is 512! -maxlength_4000=The maxlength is 4000! +maxlength_64=The maxlength is 64? +maxlength_128=The maxlength is 128? +maxlength_256=The maxlength is 256? +maxlength_512=The maxlength is 512? +maxlength_4000=The maxlength is 4000? #==========message end===================== #==========yewuliexingguanli begin===================== @@ -333,6 +333,6 @@ protocol_id=protocol ID protocol_name=protocol name group_id=group ID input_protocol_id=please enter protocol ID -input_integer=please enter integer +input_integer=please enter right integer protocol_desc=protocol description #==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 16e4e4119..7f75871ae 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -368,4 +368,6 @@ group_id=maat\u7aef\u914d\u7f6e\u5206\u7ec4ID input_protocol_id=\u8bf7\u8f93\u5165\u534f\u8baeID input_integer=\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u6574\u6570\u503c protocol_desc=\u534f\u8bae\u63cf\u8ff0 +max_value=\u6700\u5927\u503c\u4e0d\u5f97\u8d85\u8fc7 +min_value=\u6700\u5c0f\u503c\u4e0d\u5f97\u5c0f\u4e8e #==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 1affa6256..9aa48dae6 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -242,7 +242,7 @@
-
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index d2737afc4..4176f5a38 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -6,7 +6,7 @@ -