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:
zhangshilin
2018-03-28 08:42:32 +08:00
parent 91bad82aa4
commit 379d1e9011
18 changed files with 354 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions("sys:dict:view")
@RequiresPermissions("specific:service:view")
@RequestMapping(value = "list")
public String list(SpecificServiceCfg specificServiceCfg, HttpServletRequest request, HttpServletResponse response,
Model model) {
@@ -83,7 +83,7 @@ public class SpecificServiceCfgController extends BaseController {
page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize())));
}
model.addAttribute("page", page);
// 删除顶层数据、取出id 优化处理
// 删除顶层数据、取出id
List<Integer> intList = Lists.newArrayList();
for (SpecificServiceCfg tempSS : page.getList()) {
if (tempSS != null) {
@@ -118,6 +118,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param mulitId
* @return
*/
@RequiresPermissions("specific:service:edit")
@RequestMapping(value = { "form" })
public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction, String mulitId) {
@@ -150,7 +151,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param redirectAttributes
* @return
*/
@RequiresPermissions("sys:dict:edit")
@RequiresPermissions("specific:service:edit")
@RequestMapping(value="saveOrUpdate")
public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model,
RedirectAttributes redirectAttributes,Integer oldId) {
@@ -171,6 +172,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param mulitId
* @return
*/
@RequiresPermissions("specific:service:edit")
@RequestMapping(value="delete")
public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
try{

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

@@ -45,7 +45,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions("sys:dict:view")
@RequiresPermissions("specific:serviceIp:view")
@RequestMapping(value = "list")
public String list(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response,
Model model) {
@@ -67,7 +67,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param model
* @return
*/
@RequiresPermissions("sys:dict:view")
@RequiresPermissions("specific:serviceIp:edit")
@RequestMapping(value = "form")
public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) {
//查询协议id供下拉选择
@@ -84,6 +84,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param mulitId
* @return
*/
@RequiresPermissions("specific:serviceIp:edit")
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
try {
@@ -102,6 +103,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param mulitId
* @return
*/
@RequiresPermissions("specific:serviceIp:edit")
@RequestMapping(value="delete")
public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
try{