master
huanghai 5 years ago
parent c6acd05ae9
commit 2d0fd23d5b

@ -22,6 +22,7 @@ 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
@ -35,8 +36,7 @@ public class MenuController extends BaseController {
@Before({GET.class})
@IsSysAdminInterface({"1"})
@IsNumericInterface({"menu_id"})
public void selectSingle(int menu_id)
{
public void selectSingle(int menu_id) {
Map<String, Object> map = model.selectSingle(menu_id);
renderJson(map);
return;
@ -49,8 +49,7 @@ public class MenuController extends BaseController {
*/
@Before({GET.class})
@IsSysAdminInterface({"1"})
public void selectAll()
{
public void selectAll() {
List<Record> dt = model.selectAll();
renderJson(CommonUtil.renderJsonForLayUI(dt, dt.size()));
return;
@ -65,8 +64,7 @@ public class MenuController extends BaseController {
@IsNumericInterface({"parent_id"})
@IsSysAdminInterface({"1"})
@EmptyInterface({"parent_id"})
public void selectChildAsync(int parent_id)
{
public void selectChildAsync(int parent_id) {
List<Record> 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<Record> page = model.selectMenuByPerson(identity_id);
if(page!=null && page.getList().size()>0)
{
if (page != null && page.getList().size() > 0) {
List<IFayTreeNode> list = new ArrayList<>();
for(int i=0;i<page.getList().size();i++)
{
for (int i = 0; i < page.getList().size(); i++) {
Record r = page.getList().get(i);
MenuBean m = new MenuBean(r.getStr("menu_id"), r.getStr("parent_id"), r.getStr("menu_name"),
r.getStr("url"), r.getStr("type"));
list.add(m);
}
Object data = FayTreeUtil.getTreeInJsonObject(list);
//如果是超级管理员,那么应该有配置菜单的功能返回,或者默认就必须有这个返回
renderJson(data);
return;
}
else
{
if(identity_id==1)
{
String data="[{\"children\":[{\"children\":[{\"treeObject\":{\"nodeParentId\":\"71\",\"menu_name\":\"菜单管理\",\"menu_id\":\"73\",\"parentId\":\"71\",\"url\":\"./pages/Menu/menuList.html\"}}],\"treeObject\":{\"nodeParentId\":\"1\",\"menu_name\":\"菜单设置\",\"menu_id\":\"71\",\"parentId\":\"1\",\"url\":\"#\"}}],\"treeObject\":{\"nodeParentId\":\"-1\",\"menu_name\":\"管理员菜单\",\"menu_id\":\"1\",\"parentId\":\"-1\",\"url\":\"#\"}}]";
renderJson(data);
return;
}
else
{
List<Record> menu_list=model.selectMenuByPersonId(person_id);
List<IFayTreeNode> list = new ArrayList<>();
for(int i=0;i<menu_list.size();i++)
{
Record r=menu_list.get(i);
MenuBean m = new MenuBean(r.getStr("menu_id"),r.getStr("parent_id"),r.getStr("menu_name"),
r.getStr("url"),r.getStr("type"));
list.add(m);
}
Object data = FayTreeUtil.getTreeInJsonObject(list);
renderJson(data);
return;
}
}
}
/**
*
*
@ -134,17 +104,13 @@ public class MenuController extends BaseController {
@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)
{
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)
{
if (menu_id > 0) {
map.put("message", "增加成功!");
}
else
{
} else {
map.put("message", "增加失败!");
}
renderJson(CommonUtil.returnMessageJson(true, map));
@ -159,8 +125,7 @@ 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, "删除成功!"));
return;
@ -176,8 +141,7 @@ public class MenuController extends BaseController {
@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)
{
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;
@ -193,30 +157,23 @@ public class MenuController extends BaseController {
@IsSysAdminInterface({"1"})
@EmptyInterface({"id", "menu_ids"})
@IsNumericInterface({"id"})
public void saveMenuByDutyInCharge(String id,String menu_ids)
{
public void saveMenuByDutyInCharge(String id, String menu_ids) {
BaseModel baseModel = new BaseModel();
List<Record> list = baseModel.getOrgTypePrincipalshipById(id);
if(list==null || list.size()==0)
{
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)
{
if (level_id == 4) {
duties_id = record.getInt("id");
in_charge_id = -1;
}
else if(level_id==5)
{
} else if (level_id == 5) {
duties_id = record.getInt("pId");
in_charge_id = record.getInt("id");
}
else
{
} else {
renderJson(CommonUtil.returnMessageJson(false, "输入的ID级别不是4也不是5不是合法的职务+分管工作!"));
return;
}
@ -235,30 +192,23 @@ public class MenuController extends BaseController {
@IsSysAdminInterface({"1"})
@EmptyInterface({"id"})
@IsNumericInterface({"id"})
public void selectMenuByDutyInCharge(String id)
{
public void selectMenuByDutyInCharge(String id) {
BaseModel baseModel = new BaseModel();
List<Record> list = baseModel.getOrgTypePrincipalshipById(id);
if(list==null || list.size()==0)
{
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)
{
if (level_id == 4) {
duties_id = record.getInt("id");
in_charge_id = -1;
}
else if(level_id==5)
{
} else if (level_id == 5) {
duties_id = record.getInt("pId");
in_charge_id = record.getInt("id");
}
else
{
} else {
renderJson(CommonUtil.returnMessageJson(false, "输入的ID级别不是4也不是5不是合法的职务+分管工作!"));
return;
}

@ -76,26 +76,7 @@ public class MenuModel {
//2、这个角色有哪些菜单项目
String sql = Db.getSql("Menu.selectMenuByIdentityId");
List<Record> menuRecords = Db.find(sql, identity_id);
//根据人员的管理范围,去掉一些菜单 //1.5 过滤掉它不应该看到的菜单
List<Record> 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<Integer, Integer> map = new HashMap<>();
for (int i = 0; i < menuRecords.size(); i++) {

@ -42,6 +42,7 @@
-- 通过身份获取有哪些菜单ID
#sql("selectMenuByIdentityId")
select menu_id from t_base_menu_privilage where identity_id=?
union select 1
#end
-- 查询菜单的ids

Loading…
Cancel
Save