菜单细节微调

marker · marker · commit 8940eb50c19d · 2017-05-19T11:42:18.000+08:00
diff --git a/database/update.sql b/database/update.sql
@@ -31,3 +31,6 @@ ALTER TABLE `mr_taolu`
 
 
 
+-- 20170519
+ALTER TABLE `db_mrcms`.`mr_user_menu` ADD COLUMN `end` int AFTER `type`;
+
diff --git a/src/main/java/org/marker/mushroom/beans/Menu.java b/src/main/java/org/marker/mushroom/beans/Menu.java
@@ -20,6 +20,8 @@ public class Menu implements Serializable {
 	/** UUID唯一码 */
 	private String type;
 	private int sort = 0;
+	/** 是否是同级节点的结尾 */
+	private int end = 0;
 	private String description;
 	 
 	public String getName() {
@@ -71,7 +73,13 @@ public String getType() {
 	public void setType(String type) {
 		this.type = type;
 	}
-	
-	
-	
+
+
+	public int getEnd() {
+		return end;
+	}
+
+	public void setEnd(int end) {
+		this.end = end;
+	}
 }
diff --git a/src/main/java/org/marker/mushroom/controller/MenuController.java b/src/main/java/org/marker/mushroom/controller/MenuController.java
@@ -11,6 +11,9 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * 菜单管理
@@ -20,6 +23,10 @@
 @RequestMapping("/admin/menu")
 public class MenuController extends SupportController {
 
+	@Autowired private IMenuDao menuDao;
+
+
+
 	public MenuController() {
 		this.viewPath = "/admin/menu/";
 	}
@@ -45,7 +52,15 @@ public ModelAndView edit(@RequestParam("id") long id){
 	@ResponseBody
 	@RequestMapping("/update")
 	public Object update(Menu menu,@RequestParam("id") int id){
-		menu.setId(id);// 不能注入  
+		menu.setId(id);// 不能注入
+
+		int parentId = menu.getPid();
+
+		Menu maxMenu = menuDao.findChildMaxSortMenuByPId(parentId);
+		if(maxMenu != null && (maxMenu.getSort() <= menu.getSort())){
+			menu.setEnd(1);
+		}
+
 		if(commonDao.update(menu)){
 			return new ResultMessage(true, "更新成功!");
 		}else{
@@ -63,9 +78,6 @@ public Object save(Menu menu){
 			return new ResultMessage(false,"保存失败!"); 
 		}
 	}
-	@Autowired private IMenuDao menuDao;
-	
-	
 	//删除文章
 	@ResponseBody
 	@RequestMapping("/delete")
@@ -93,16 +105,22 @@ public Object delete(@RequestParam("rid") String rid){
 	
 	/**
 	 * 用户组列表
-	 * 
-	 * @param request
+	 *
 	 * @return
 	 */
 	@RequestMapping("/list")
 	public ModelAndView list( ) {
 		ModelAndView view = new ModelAndView(this.viewPath + "list");
 		StringBuilder sql = new StringBuilder();
 		sql.append("select * from ").append(getPrefix()).append("user_menu order by sort");
-		view.addObject("menus", commonDao.queryForList(sql.toString()));
+		List<Map<String,Object>> list = commonDao.queryForList(sql.toString());
+
+
+
+
+
+
+		view.addObject("menus", list );
 		return view;
 	}
 	
diff --git a/src/main/java/org/marker/mushroom/dao/IMenuDao.java b/src/main/java/org/marker/mushroom/dao/IMenuDao.java
@@ -66,5 +66,11 @@ public interface IMenuDao  extends ISupportDao{
 	 * @return
 	 */
 	boolean checkType(String type);
-	
+
+	/**
+	 * 查询最大排序的
+	 * @param parentId
+	 * @return
+	 */
+	Menu findChildMaxSortMenuByPId(int parentId);
 }
diff --git a/src/main/java/org/marker/mushroom/dao/impl/MenuDaoImpl.java b/src/main/java/org/marker/mushroom/dao/impl/MenuDaoImpl.java
@@ -125,8 +125,17 @@ public boolean checkType(String type) {
 		return false;
 	}
 
-	
-	
- 
-	
+	@Override
+	public Menu findChildMaxSortMenuByPId(int parentId) {
+		StringBuilder sql = new StringBuilder();
+		sql.append("select * from ").append(dbConfig.getPrefix()).append("user_menu where pid=? order by sort desc limit 1");
+		try{
+			return this.jdbcTemplate.queryForObject(sql.toString(), new RowMapperMenu(), parentId);
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return null;
+	}
+
+
 }
diff --git a/src/main/java/org/marker/mushroom/dao/mapper/ObjectRowMapper.java b/src/main/java/org/marker/mushroom/dao/mapper/ObjectRowMapper.java
@@ -54,6 +54,9 @@ public Menu mapRow(ResultSet rs, int arg1) throws SQLException {
 			menu.setIcon(rs.getString("icon"));
 			menu.setSort(rs.getInt("sort"));
 			menu.setUrl(rs.getString("url"));
+			menu.setEnd(rs.getInt("end"));
+			menu.setDescription(rs.getString("description"));
+			menu.setType(rs.getString("type"));
 			return menu;
 		}
 	}
diff --git a/src/main/webapp/WEB-INF/content/admin/menu/list.html b/src/main/webapp/WEB-INF/content/admin/menu/list.html
@@ -31,7 +31,11 @@
 		  	<#if id = menu.pid>
 				<tr>
 			        <td>
-			        	<#if temp gt 0 ><#list 1..temp as x>&nbsp; &nbsp;</#list>├</#if> <i class="fa ${menu.icon!}"></i> ${menu.name!} 
+			        	<#if temp gt 0 ><#list 1..temp as x>&nbsp; &nbsp;</#list>
+<#if menu.end == 1> └ <#else>  ├</#if>
+
+
+					  </#if> <i class="fa ${menu.icon!}"></i> ${menu.name!}
 			        </td>
 			        <td>${menu.url!} </td>
 			        <td class="tac">${menu.sort?c} </td>
diff --git a/src/main/webapp/WEB-INF/content/admin/system/dbinfo.html b/src/main/webapp/WEB-INF/content/admin/system/dbinfo.html
@@ -4,7 +4,7 @@
 			<li class="tab_index" onclick="setTabContent(this);"><h3>数据库配置</h3></li>
 			<li onclick="setTabContent(this);"><h3>连接池配置</h3></li>
 		</ul>
-		<button class="btn_tabbar" onclick="submitActionForm(this);" return="system/dbinfo.do">保 存</button>
+		<!--<button class="btn_tabbar" onclick="submitActionForm(this);" return="system/dbinfo.do">保 存</button>-->
 	</div>
 	<form id="myForm" action="system/savedbinfo.do" method="post">
 	<div class="tab_content">

Original file line number	Diff line number	Diff line change
@@ -31,3 +31,6 @@ ALTER TABLE `mr_taolu`
`31`	`31`
`32`	`32`
`33`	`33`
	`34`	`+-- 20170519`
	`35`	+ALTER TABLE `db_mrcms`.`mr_user_menu` ADD COLUMN `end` int AFTER `type`;
	`36`	`+`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ public Menu mapRow(ResultSet rs, int arg1) throws SQLException {`
`54`	`54`	`menu.setIcon(rs.getString("icon"));`
`55`	`55`	`menu.setSort(rs.getInt("sort"));`
`56`	`56`	`menu.setUrl(rs.getString("url"));`
	`57`	`+ menu.setEnd(rs.getInt("end"));`
	`58`	`+ menu.setDescription(rs.getString("description"));`
	`59`	`+ menu.setType(rs.getString("type"));`
`57`	`60`	`return menu;`
`58`	`61`	`}`
`59`	`62`	`}`