完成分类性质菜单,地域运营商特征作用域,特定服务管理权限控制,
修订分类性质菜单,地域运营商特征作用域国际化错误及特定服务管理国际化
This commit is contained in:
@@ -223,7 +223,6 @@ public class ServiceDictInfoController extends BaseController {
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequiresPermissions("user")
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "treeData")
|
||||
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
|
||||
|
||||
@@ -221,7 +221,6 @@ public class SysDictInfoController extends BaseController {
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequiresPermissions("user")
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "treeData")
|
||||
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
|
||||
|
||||
@@ -134,7 +134,7 @@ public class SpecificServiceCfgController extends BaseController {
|
||||
|| specificServiceCfg.getParent().getSpecServiceId() == 0) {
|
||||
SpecificServiceCfg parent = new SpecificServiceCfg();
|
||||
parent.setSpecServiceId(0);
|
||||
parent.setSpecServiceName("根节点");
|
||||
parent.setSpecServiceName("root_node");
|
||||
specificServiceCfg.setParent(parent);
|
||||
}
|
||||
model.addAttribute("specificServiceCfg", specificServiceCfg);
|
||||
@@ -157,10 +157,10 @@ public class SpecificServiceCfgController extends BaseController {
|
||||
RedirectAttributes redirectAttributes,Integer oldId) {
|
||||
try {
|
||||
specificServiceCfgService.saveOrUpdate(specificServiceCfg,oldId);
|
||||
addMessage(redirectAttributes, "保存成功");
|
||||
addMessage(redirectAttributes, "save_success");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
addMessage(redirectAttributes, "保存失败!");
|
||||
addMessage(redirectAttributes, "save_failed");
|
||||
}
|
||||
return "redirect:" + adminPath + "/specific/specificServiceCfg/list";
|
||||
}
|
||||
@@ -177,10 +177,10 @@ public class SpecificServiceCfgController extends BaseController {
|
||||
public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
|
||||
try{
|
||||
specificServiceCfgService.delete(mulitId);
|
||||
addMessage(redirectAttributes,"删除成功");
|
||||
addMessage(redirectAttributes,"delete_success");
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
addMessage(redirectAttributes,"删除失败");
|
||||
addMessage(redirectAttributes,"delete_failed");
|
||||
}
|
||||
|
||||
return "redirect:"+adminPath+"/specific/specificServiceCfg/list";
|
||||
@@ -193,7 +193,6 @@ public class SpecificServiceCfgController extends BaseController {
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequiresPermissions("user")
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "treeData")
|
||||
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response){
|
||||
@@ -201,7 +200,7 @@ public class SpecificServiceCfgController extends BaseController {
|
||||
Map<String, Object> map2 = Maps.newHashMap();
|
||||
map2.put("id", 0);
|
||||
map2.put("pId", 0);
|
||||
map2.put("name","根节点");
|
||||
map2.put("name","root_node");
|
||||
//map2.put("placeholder","0");
|
||||
mapList.add(map2);
|
||||
List<SpecificServiceCfg> list = specificServiceCfgService.findAllSpecificServiceCfg(new SpecificServiceCfg(),"");
|
||||
|
||||
@@ -170,7 +170,7 @@ public class ServiceDictInfoService extends BaseService{
|
||||
* 新增或修改业务字典表(添加层级改变)
|
||||
* @param serviceDictInfo
|
||||
*/
|
||||
@Transactional
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(ServiceDictInfo serviceDictInfo) {
|
||||
if(serviceDictInfo.getParent()==null
|
||||
||(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()==null)
|
||||
@@ -237,7 +237,7 @@ public class ServiceDictInfoService extends BaseService{
|
||||
* 删除
|
||||
* @param serviceDictInfo
|
||||
*/
|
||||
@Transactional(readOnly = false)
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void deleteDict(String mulitId) {
|
||||
|
||||
String[] ids = mulitId.split(",");
|
||||
|
||||
@@ -145,6 +145,7 @@ public class SysDictInfoService extends BaseService{
|
||||
* 新增或修改生效范围字典表
|
||||
* @param sysDictInfo
|
||||
*/
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(SysDictInfo sysDictInfo) {
|
||||
if(sysDictInfo.getParent()==null
|
||||
||(sysDictInfo.getParent()!=null&&sysDictInfo.getParent().getSysDictId()==null)
|
||||
@@ -215,7 +216,7 @@ public class SysDictInfoService extends BaseService{
|
||||
* 删除
|
||||
* @param sysDictInfo
|
||||
*/
|
||||
@Transactional(readOnly = false)
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void deleteDict(String mulitId) {
|
||||
String[] ids = mulitId.split(",");
|
||||
for(String id:ids){
|
||||
|
||||
@@ -3,8 +3,10 @@ package com.nis.web.service.specific;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.beust.jcommander.internal.Lists;
|
||||
import com.nis.domain.Page;
|
||||
@@ -59,6 +61,7 @@ public class SpecificServiceCfgService extends BaseService{
|
||||
* 保存或修改
|
||||
* @param specificServiceCfg
|
||||
*/
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(SpecificServiceCfg specificServiceCfg, Integer oldId) {
|
||||
if(specificServiceCfg.getGroupId()==null){
|
||||
specificServiceCfg.setGroupId(0);
|
||||
@@ -88,8 +91,10 @@ public class SpecificServiceCfgService extends BaseService{
|
||||
/**
|
||||
* 删除
|
||||
* @param specificServiceCfg
|
||||
* @throws Exception
|
||||
*/
|
||||
public void delete(String mulitId) {
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void delete(String mulitId){
|
||||
String[] ids = mulitId.split(",");
|
||||
for(String id:ids){
|
||||
if (!id.equals("")) {
|
||||
|
||||
@@ -3,9 +3,11 @@ package com.nis.web.service.specific;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.SysUser;
|
||||
@@ -47,6 +49,7 @@ public class SpecificServiceHostCfgService extends BaseService{
|
||||
* 新增或修改
|
||||
* @param specificServiceHostCfg
|
||||
*/
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) {
|
||||
SysUser user = UserUtils.getUser();
|
||||
String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
|
||||
@@ -112,6 +115,7 @@ public class SpecificServiceHostCfgService extends BaseService{
|
||||
* 删除
|
||||
* @param mulitId
|
||||
*/
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void delete(String mulitId) {
|
||||
String[] ids = mulitId.split(",");
|
||||
for(String hostId:ids){
|
||||
|
||||
Reference in New Issue
Block a user