From 2d0fd23d5b103d7f631acb1d7d44c3ee1aa2907e Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Mon, 23 Nov 2020 13:31:47 +0800 Subject: [PATCH] 'commit' --- .../Menu/controller/MenuController.java | 210 +++++++----------- .../baseService/Menu/model/MenuModel.java | 21 +- .../src/main/resources/Sql/menu.sql | 1 + 3 files changed, 82 insertions(+), 150 deletions(-) diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/controller/MenuController.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/controller/MenuController.java index affcb5c..663b26f 100644 --- a/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/controller/MenuController.java +++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/controller/MenuController.java @@ -22,10 +22,11 @@ import com.jfinal.plugin.activerecord.Record; import java.util.ArrayList; import java.util.List; import java.util.Map; + @SuppressWarnings("unchecked") public class MenuController extends BaseController { - //实例化model - MenuModel model =new MenuModel(); + //实例化model + MenuModel model = new MenuModel(); /** * 功能：获取指定节点ID的信息 @@ -35,9 +36,8 @@ public class MenuController extends BaseController { @Before({GET.class}) @IsSysAdminInterface({"1"}) @IsNumericInterface({"menu_id"}) - public void selectSingle(int menu_id) - { - Map map= model.selectSingle(menu_id); + public void selectSingle(int menu_id) { + Map map = model.selectSingle(menu_id); renderJson(map); return; } @@ -49,10 +49,9 @@ public class MenuController extends BaseController { */ @Before({GET.class}) @IsSysAdminInterface({"1"}) - public void selectAll() - { - List dt= model.selectAll(); - renderJson(CommonUtil.renderJsonForLayUI(dt,dt.size())); + public void selectAll() { + List dt = model.selectAll(); + renderJson(CommonUtil.renderJsonForLayUI(dt, dt.size())); return; } @@ -65,10 +64,9 @@ public class MenuController extends BaseController { @IsNumericInterface({"parent_id"}) @IsSysAdminInterface({"1"}) @EmptyInterface({"parent_id"}) - public void selectChildAsync(int parent_id) - { - List dt= model.selectChildAsync(parent_id); - renderJson(CommonUtil.renderJsonForLayUI(dt,dt.size())); + public void selectChildAsync(int parent_id) { + List dt = model.selectChildAsync(parent_id); + renderJson(CommonUtil.renderJsonForLayUI(dt, dt.size())); return; } @@ -78,52 +76,24 @@ public class MenuController extends BaseController { * 时间：2018-12-22 */ @Before({GET.class}) - public void selectMenuByPerson() - { + public void selectMenuByPerson() { //当前登录的人员 - int identity_id=Integer.parseInt(getCookie("identity_id").trim()); - String person_id=getCookie("person_id").trim(); - Page page= model.selectMenuByPerson(identity_id); - if(page!=null && page.getList().size()>0) - { + int identity_id = Integer.parseInt(getCookie("identity_id").trim()); + Page page = model.selectMenuByPerson(identity_id); + if (page != null && page.getList().size() > 0) { List list = new ArrayList<>(); - for(int i=0;i menu_list=model.selectMenuByPersonId(person_id); - List list = new ArrayList<>(); - for(int i=0;i0) - { - map.put("message","增加成功！"); - } - else - { - map.put("message","增加失败！"); + @EmptyInterface({"menu_name", "url", "memo", "identity_ids"}) + @IsNumericInterface({"parent_id", "sort_id", "for_school", "for_bureau"}) + @LengthInterface({"menu_name,1,32", "memo,1,255"}) + public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau) { + int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau); + JSONObject map = new JSONObject(); + map.put("menu_id", menu_id); + if (menu_id > 0) { + map.put("message", "增加成功！"); + } else { + map.put("message", "增加失败！"); } - renderJson(CommonUtil.returnMessageJson(true,map)); + renderJson(CommonUtil.returnMessageJson(true, map)); return; } @@ -159,10 +125,9 @@ public class MenuController extends BaseController { @Before({POST.class}) @IsSysAdminInterface({"1"}) @IsNumericInterface({"menu_id"}) - public void DeleteMenu(int menu_id) - { + public void DeleteMenu(int menu_id) { model.DeleteMenu(menu_id); - renderJson(CommonUtil.returnMessageJson(true,"删除成功！")); + renderJson(CommonUtil.returnMessageJson(true, "删除成功！")); return; } @@ -173,13 +138,12 @@ public class MenuController extends BaseController { */ @Before({POST.class}) @IsSysAdminInterface({"1"}) - @EmptyInterface({"menu_name","url","memo","identity_ids"}) - @IsNumericInterface({"menu_id","sort_id","for_school","for_bureau"}) - @LengthInterface({"menu_name,1,32","memo,1,255"}) - public void UpdateMenu(int menu_id,int sort_id,String menu_name,String identity_ids,String url,String memo,int for_school,int for_bureau) - { - model.UpdateMenu(menu_id,menu_name,sort_id,url,memo,identity_ids,for_school,for_bureau); - renderJson(CommonUtil.returnMessageJson(true,"修改成功！")); + @EmptyInterface({"menu_name", "url", "memo", "identity_ids"}) + @IsNumericInterface({"menu_id", "sort_id", "for_school", "for_bureau"}) + @LengthInterface({"menu_name,1,32", "memo,1,255"}) + public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo, int for_school, int for_bureau) { + model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau); + renderJson(CommonUtil.returnMessageJson(true, "修改成功！")); return; } @@ -191,38 +155,31 @@ public class MenuController extends BaseController { */ @Before({POST.class}) @IsSysAdminInterface({"1"}) - @EmptyInterface({"id","menu_ids"}) + @EmptyInterface({"id", "menu_ids"}) @IsNumericInterface({"id"}) - public void saveMenuByDutyInCharge(String id,String menu_ids) - { - BaseModel baseModel=new BaseModel(); - List list=baseModel.getOrgTypePrincipalshipById(id); - if(list==null || list.size()==0) - { - renderJson(CommonUtil.returnMessageJson(false,"无法获取指定ID的信息！")); + public void saveMenuByDutyInCharge(String id, String menu_ids) { + BaseModel baseModel = new BaseModel(); + List list = baseModel.getOrgTypePrincipalshipById(id); + if (list == null || list.size() == 0) { + renderJson(CommonUtil.returnMessageJson(false, "无法获取指定ID的信息！")); return; } - Record record=list.get(0); - int duties_id,in_charge_id; - int level_id=record.getInt("level"); - if(level_id==4) - { - duties_id=record.getInt("id"); - in_charge_id=-1; - } - else if(level_id==5) - { - duties_id=record.getInt("pId"); - in_charge_id=record.getInt("id"); - } - else - { - renderJson(CommonUtil.returnMessageJson(false,"输入的ID级别不是4也不是5，不是合法的职务+分管工作！")); + Record record = list.get(0); + int duties_id, in_charge_id; + int level_id = record.getInt("level"); + if (level_id == 4) { + duties_id = record.getInt("id"); + in_charge_id = -1; + } else if (level_id == 5) { + duties_id = record.getInt("pId"); + in_charge_id = record.getInt("id"); + } else { + renderJson(CommonUtil.returnMessageJson(false, "输入的ID级别不是4也不是5，不是合法的职务+分管工作！")); return; } - model.deleteMenuByDutyInCharge(duties_id,in_charge_id); - model.saveMenuByDutyInCharge(duties_id,in_charge_id,menu_ids); - renderJson(CommonUtil.returnMessageJson(true,"保存成功!")); + model.deleteMenuByDutyInCharge(duties_id, in_charge_id); + model.saveMenuByDutyInCharge(duties_id, in_charge_id, menu_ids); + renderJson(CommonUtil.returnMessageJson(true, "保存成功!")); return; } @@ -235,36 +192,29 @@ public class MenuController extends BaseController { @IsSysAdminInterface({"1"}) @EmptyInterface({"id"}) @IsNumericInterface({"id"}) - public void selectMenuByDutyInCharge(String id) - { - BaseModel baseModel=new BaseModel(); - List list=baseModel.getOrgTypePrincipalshipById(id); - if(list==null || list.size()==0) - { - renderJson(CommonUtil.returnMessageJson(false,"无法获取指定ID的信息！")); + public void selectMenuByDutyInCharge(String id) { + BaseModel baseModel = new BaseModel(); + List list = baseModel.getOrgTypePrincipalshipById(id); + if (list == null || list.size() == 0) { + renderJson(CommonUtil.returnMessageJson(false, "无法获取指定ID的信息！")); return; } - Record record=list.get(0); - int duties_id,in_charge_id; - int level_id=record.getInt("level"); - if(level_id==4) - { - duties_id=record.getInt("id"); - in_charge_id=-1; - } - else if(level_id==5) - { - duties_id=record.getInt("pId"); - in_charge_id=record.getInt("id"); - } - else - { - renderJson(CommonUtil.returnMessageJson(false,"输入的ID级别不是4也不是5，不是合法的职务+分管工作！")); + Record record = list.get(0); + int duties_id, in_charge_id; + int level_id = record.getInt("level"); + if (level_id == 4) { + duties_id = record.getInt("id"); + in_charge_id = -1; + } else if (level_id == 5) { + duties_id = record.getInt("pId"); + in_charge_id = record.getInt("id"); + } else { + renderJson(CommonUtil.returnMessageJson(false, "输入的ID级别不是4也不是5，不是合法的职务+分管工作！")); return; } - list= model.selectMenuByDutyInCharge(duties_id,in_charge_id); - Kv kv=Kv.by("success",true).set("list",list); - renderJson(kv); - return; + list = model.selectMenuByDutyInCharge(duties_id, in_charge_id); + Kv kv = Kv.by("success", true).set("list", list); + renderJson(kv); + return; } } \ No newline at end of file diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/model/MenuModel.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/model/MenuModel.java index b7c3852..d320437 100644 --- a/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/model/MenuModel.java +++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Menu/model/MenuModel.java @@ -76,26 +76,7 @@ public class MenuModel { //2、这个角色有哪些菜单项目？ String sql = Db.getSql("Menu.selectMenuByIdentityId"); List menuRecords = Db.find(sql, identity_id); - //根据人员的管理范围，去掉一些菜单 //1.5 过滤掉它不应该看到的菜单 - List deleteMenuIdRecords = null; - if (identity_id == 4) { - //去掉 for_school=0 - sql = Db.getSql("Menu.selectNotForSchool"); - deleteMenuIdRecords = Db.find(sql); - } - List delList = new ArrayList(); - for (Record r : menuRecords) { - if (deleteMenuIdRecords != null && deleteMenuIdRecords.size() > 0) { - for (Record deleteR : deleteMenuIdRecords) { - if (r.getInt("menu_id") == deleteR.getInt("menu_id")) { - delList.add(r); - } - } - } - } - if (delList != null && delList.size() > 0) { - menuRecords.removeAll(delList); - } + if (menuRecords != null && menuRecords.size() > 0) { Map map = new HashMap<>(); for (int i = 0; i < menuRecords.size(); i++) { diff --git a/baseServiceJava/src/main/resources/Sql/menu.sql b/baseServiceJava/src/main/resources/Sql/menu.sql index bad02cf..ae8e9ed 100644 --- a/baseServiceJava/src/main/resources/Sql/menu.sql +++ b/baseServiceJava/src/main/resources/Sql/menu.sql @@ -42,6 +42,7 @@ -- 通过身份获取有哪些菜单ID #sql("selectMenuByIdentityId") select menu_id from t_base_menu_privilage where identity_id=? + union select 1 #end -- 查询菜单的ids