Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git

src/main/java/com/govmade/modules/system/controller/DepartController.java

@@ -69,15 +69,15 @@ public class DepartController extends AbstractController{
 	 * @param ids
 	 * @return
 	 */
+
 	@DeleteMapping("/delete")
 	public R deleteDepart(@RequestBody DepartEntity depart) {
 		Assert.isNull(depart.getId(), "删除项不能为空");
-        if(this.userService.userCount(depart.getId())>0) {
+        if(this.userService.userCount(depart.getId())>0) {
            return R.error("选中部门下有用户！！");
         }
 		departService.deleteBatch(depart);
 		return R.ok();
 	}
 	
-	
 }

src/main/java/com/govmade/modules/system/controller/MenuController.java

 package com.govmade.modules.system.controller;
 
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
+import com.govmade.common.utils.R;
 import com.govmade.modules.basic.controller.AbstractController;
+import com.govmade.modules.system.entity.MenuEntity;
+import com.govmade.modules.system.service.MenuService;
 
 /**
  * 系统管理 - 菜单设置
@@ -16,5 +24,41 @@ import com.govmade.modules.basic.controller.AbstractController;
 @RequestMapping("/system/menu")
 public class MenuController extends AbstractController {
 
+	@Autowired
+	private MenuService menuService;
+
+	/**
+	 * 菜单列表
+	 */
+	@GetMapping("/list")
+	public R list(Map<String, Object> params) {
+
+		menuService.queryPage(params);
+		return null;
+	}
 	
+	/**
+	 * 保存或更新用户
+	 */
+	@PostMapping("/save")
+	public R save(MenuEntity menu) {
+
+		if (null == menu.getId()) {
+			if (this.menuService.checkMenu(menu.getName()) > 0) {
+				return R.error(menu.getName() + " 已存在!");
+			}
+		}
+		return R.ok();
+	}
+
+	/**
+	 * 根据ID查询菜单
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("info/{id}")
+	public R info(@PathVariable("id") Long id) {
+		return R.ok().put("menu", menuService.queryById(id));
+	}
 }

src/main/java/com/govmade/modules/system/dao/MenuDao.java

+package com.govmade.modules.system.dao;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.govmade.modules.system.entity.MenuEntity;
+
+/**
+ * 系统管理 - 菜单设置
+ * 
+ * @author Fred
+ * @email fangtaosh@qq.com
+ * @date 2018年8月9日
+ */
+@Mapper
+public interface MenuDao extends BaseMapper<MenuEntity> {
+	
+}

src/main/java/com/govmade/modules/system/entity/MenuEntiity.java → src/main/java/com/govmade/modules/system/entity/MenuEntity.java

@@ -8,10 +8,10 @@ import com.govmade.modules.basic.entity.BaseEntity;
  * 
  * @author Fred
  * @email fangtaosh@qq.com
- * @date 2018年8月7日
+ * @date 2018年8月9日
  */
 @TableName("system_menus")
-public class MenuEntiity extends BaseEntity<Long> {
+public class MenuEntity extends BaseEntity<Long> {
 
 	private static final long serialVersionUID = 1L;
 

src/main/java/com/govmade/modules/system/service/MenuService.java

+package com.govmade.modules.system.service;
+
+
+import java.util.Map;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.govmade.common.utils.PageUtils;
+import com.govmade.modules.system.entity.MenuEntity;
+
+/**
+ * 系统管理 - 菜单设置
+ * 
+ * @author Fred
+ * @email fangtaosh@qq.com
+ * @date 2018年8月3日
+ */
+public interface MenuService extends IService<MenuEntity> {
+
+	
+	PageUtils queryPage(Map<String, Object> params);
+	
+	/**
+	 * 保存或修改菜单
+	 */
+	void save(MenuEntity menu);
+	
+	/**
+	 * 检测是否重名
+	 */
+	Integer checkMenu(String name);
+	
+	MenuEntity queryById(Long id);
+}

src/main/java/com/govmade/modules/system/service/impl/MenuServiceImpl.java

+package com.govmade.modules.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.govmade.common.utils.PageUtils;
+import com.govmade.modules.system.dao.MenuDao;
+import com.govmade.modules.system.entity.MenuEntity;
+import com.govmade.modules.system.service.MenuService;
+
+/**
+ * 系统管理 - 菜单设置
+ * 
+ * @author Fred
+ * @email fangtaosh@qq.com
+ * @date 2018年8月7日
+ */
+@Service("MenuService")
+public class MenuServiceImpl extends ServiceImpl<MenuDao, MenuEntity> implements MenuService {
+
+	
+	@Override
+	public PageUtils queryPage(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		//this.baseMapper.selectPage();
+		return null;
+	}
+	
+	/**
+	 * 获取所有菜单列表
+	 */
+	private List<MenuEntity> queryAll(List<Long> menuIdList){
+		//查询根菜单列表
+		//List<MenuEntity> menuList = queryListParentId(0L, menuIdList);
+		//递归获取子菜单
+	//	getMenuTreeList(menuList, menuIdList);
+		
+		return null;
+	}
+	
+	@Override
+	public void save(MenuEntity menu) {
+		super.insertOrUpdate(menu);
+	}
+
+	@Override
+	public Integer checkMenu(String name) {
+		return super.selectCount(new EntityWrapper<MenuEntity>().eq("name", name));
+	}
+
+	@Override
+	public MenuEntity queryById(Long id) {
+		return super.selectById(id);
+	}
+
+}

src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java

@@ -13,7 +13,6 @@ import com.govmade.modules.system.dao.UserDao;
 import com.govmade.modules.system.entity.UserEntity;
 import com.govmade.modules.system.service.UserService;
 
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**