Model改为ModelMap

zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/UserController.java

@@ -8,7 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/HelloController.java

@@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -50,10 +50,10 @@ public class HelloController extends BaseController {
 
 	// 本方法将处理 /hello/view?courseId=123 形式的URL
 	@RequestMapping(value = "/view", method = RequestMethod.GET)
-	public String viewCourse(@RequestParam("courseId") Integer courseId, Model model) {
+	public String viewCourse(@RequestParam("courseId") Integer courseId, ModelMap modelMap) {
 
 		User user = userService.selectByPrimaryKey(courseId);
-		model.addAttribute(user);
+		modelMap.put("user", user);
 		return "course_overview";
 	}
 

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/UserController.java

@@ -8,7 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;
@@ -61,7 +61,7 @@ public class UserController extends BaseController {
 	public String list(
 			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
 			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
-			HttpServletRequest request, Model model) {
+			HttpServletRequest request, ModelMap modelMap) {
 
 		UserExample userExample = new UserExample();
 		userExample.createCriteria()
@@ -71,7 +71,7 @@ public class UserController extends BaseController {
 		userExample.setDistinct(false);
 		userExample.setOrderByClause(" user_id asc ");
 		List<User> users = userService.selectByExample(userExample);
-		model.addAttribute("users", users);
+		modelMap.put("users", users);
 
 		// 创建分页对象
 		long total = userService.countByExample(userExample);
@@ -82,7 +82,7 @@ public class UserController extends BaseController {
 		paginator.setParam("page");
 		paginator.setUrl(request.getRequestURI());
 		paginator.setQuery(request.getQueryString());
-		model.addAttribute("paginator", paginator);
+		modelMap.put("paginator", paginator);
 
 		return "/user/list";
 	}
@@ -133,12 +133,12 @@ public class UserController extends BaseController {
 	/**
 	 * 修改get
 	 * @param id
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
-	public String update(@PathVariable("id") int id, Model model) {
-		model.addAttribute("user", userService.selectByPrimaryKey(id));
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
+		modelMap.put("user", userService.selectByPrimaryKey(id));
 		return "/user/update";
 	}
 	
@@ -147,13 +147,13 @@ public class UserController extends BaseController {
 	 * @param id
 	 * @param user
 	 * @param binding
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
-	public String update(@PathVariable("id") int id, @Valid User user, BindingResult binding, Model model) {
+	public String update(@PathVariable("id") int id, @Valid User user, BindingResult binding, ModelMap modelMap) {
 		if (binding.hasErrors()) {
-			model.addAttribute("errors", binding.getAllErrors());
+			modelMap.put("errors", binding.getAllErrors());
 			return "user/update/" + id;
 		}
 		userService.updateByPrimaryKeySelective(user);

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/manage/CmsArticleController.java

@@ -9,7 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,7 +37,7 @@ public class CmsArticleController extends BaseController {
 	 * @param rows 每页条数
 	 * @param desc 降序排序
 	 * @param request
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping("/list")
@@ -45,7 +45,7 @@ public class CmsArticleController extends BaseController {
 			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
 			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
 			@RequestParam(required = false, defaultValue = "true", value = "desc") boolean desc,
-			HttpServletRequest request, Model model) {
+			HttpServletRequest request, ModelMap modelMap) {
 
 		// 数据列表
 		CmsArticleExample cmsArticleExample = new CmsArticleExample();
@@ -58,8 +58,8 @@ public class CmsArticleController extends BaseController {
 		long total = cmsArticleService.countByExample(cmsArticleExample);
 		Paginator paginator = new Paginator(total, page, rows, request);
 
-		model.addAttribute("articles", articles);
-		model.addAttribute("paginator", paginator);
+		modelMap.put("articles", articles);
+		modelMap.put("paginator", paginator);
 		return "/manage/article/list";
 	}
 	
@@ -75,16 +75,16 @@ public class CmsArticleController extends BaseController {
 	/**
 	 * 新增post
 	 * @param cmsArticle
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public String add(CmsArticle cmsArticle, Model model) {
+	public String add(CmsArticle cmsArticle, ModelMap modelMap) {
 		long time = System.currentTimeMillis();
 		cmsArticle.setCtime(time);
 		cmsArticle.setOrders(time);
 		int count = cmsArticleService.insertSelective(cmsArticle);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		_log.info("新增记录id为：{}", cmsArticle.getArticleId());
 		return "redirect:/manage/article/list";
 	}
@@ -92,26 +92,26 @@ public class CmsArticleController extends BaseController {
 	/**
 	 * 删除
 	 * @param ids
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
-	public String delete(@PathVariable("ids") String ids, Model model) {
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
 		int count = cmsArticleService.deleteByPrimaryKeys(ids);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		return "redirect:/manage/article/list";
 	}
 	
 	/**
 	 * 修改get
 	 * @param id
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
-	public String update(@PathVariable("id") int id, Model model) {
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
 		CmsArticle article = cmsArticleService.selectByPrimaryKey(id);
-		model.addAttribute("article", article);
+		modelMap.put("article", article);
 		return "/manage/article/update";
 	}
 	
@@ -119,14 +119,14 @@ public class CmsArticleController extends BaseController {
 	 * 修改post
 	 * @param id
 	 * @param cmsArticle
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
-	public String update(@PathVariable("id") int id, CmsArticle cmsArticle, Model model) {
+	public String update(@PathVariable("id") int id, CmsArticle cmsArticle, ModelMap modelMap) {
 		int count = cmsArticleService.updateByPrimaryKeySelective(cmsArticle);
-		model.addAttribute("count", count);
-		model.addAttribute("id", id);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
 		return "redirect:/manage/article/list";
 	}
 

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/manage/CmsCategoryController.java

@@ -9,7 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,7 +37,7 @@ public class CmsCategoryController extends BaseController {
 	 * @param rows 每页条数
 	 * @param desc 降序排序
 	 * @param request
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping("/list")
@@ -45,7 +45,7 @@ public class CmsCategoryController extends BaseController {
 			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
 			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
 			@RequestParam(required = false, defaultValue = "false", value = "desc") boolean desc,
-			HttpServletRequest request, Model model) {
+			HttpServletRequest request, ModelMap modelMap) {
 
 		// 数据列表
 		CmsCategoryExample cmsCategoryExample = new CmsCategoryExample();
@@ -58,8 +58,8 @@ public class CmsCategoryController extends BaseController {
 		long total = cmsCategoryService.countByExample(cmsCategoryExample);
 		Paginator paginator = new Paginator(total, page, rows, request);
 
-		model.addAttribute("categorys", categorys);
-		model.addAttribute("paginator", paginator);
+		modelMap.put("categorys", categorys);
+		modelMap.put("paginator", paginator);
 		return "/manage/category/list";
 	}
 	
@@ -75,16 +75,16 @@ public class CmsCategoryController extends BaseController {
 	/**
 	 * 新增post
 	 * @param cmsCategory
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public String add(CmsCategory cmsCategory, Model model) {
+	public String add(CmsCategory cmsCategory, ModelMap modelMap) {
 		long time = System.currentTimeMillis();
 		cmsCategory.setCtime(time);
 		cmsCategory.setOrders(time);
 		int count = cmsCategoryService.insertSelective(cmsCategory);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		_log.info("新增记录id为：{}", cmsCategory.getCategoryId());
 		return "redirect:/manage/category/list";
 	}
@@ -92,26 +92,26 @@ public class CmsCategoryController extends BaseController {
 	/**
 	 * 删除
 	 * @param ids
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
-	public String delete(@PathVariable("ids") String ids, Model model) {
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
 		int count = cmsCategoryService.deleteByPrimaryKeys(ids);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		return "redirect:/manage/category/list";
 	}
 	
 	/**
 	 * 修改get
 	 * @param id
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
-	public String update(@PathVariable("id") int id, Model model) {
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
 		CmsCategory category = cmsCategoryService.selectByPrimaryKey(id);
-		model.addAttribute("category", category);
+		modelMap.put("category", category);
 		return "/manage/category/update";
 	}
 	
@@ -119,14 +119,14 @@ public class CmsCategoryController extends BaseController {
 	 * 修改post
 	 * @param id
 	 * @param cmsCategory
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
-	public String update(@PathVariable("id") int id, CmsCategory cmsCategory, Model model) {
+	public String update(@PathVariable("id") int id, CmsCategory cmsCategory, ModelMap modelMap) {
 		int count = cmsCategoryService.updateByPrimaryKeySelective(cmsCategory);
-		model.addAttribute("count", count);
-		model.addAttribute("id", id);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
 		return "redirect:/manage/category/list";
 	}
 

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/manage/CmsCommentController.java

@@ -9,7 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,7 +37,7 @@ public class CmsCommentController extends BaseController {
 	 * @param rows 每页条数
 	 * @param desc 降序排序
 	 * @param request
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping("/list")
@@ -45,7 +45,7 @@ public class CmsCommentController extends BaseController {
 			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
 			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
 			@RequestParam(required = false, defaultValue = "true", value = "desc") boolean desc,
-			HttpServletRequest request, Model model) {
+			HttpServletRequest request, ModelMap modelMap) {
 
 		// 数据列表
 		CmsCommentExample cmsCommentExample = new CmsCommentExample();
@@ -58,8 +58,8 @@ public class CmsCommentController extends BaseController {
 		long total = cmsCommentService.countByExample(cmsCommentExample);
 		Paginator paginator = new Paginator(total, page, rows, request);
 
-		model.addAttribute("comments", comments);
-		model.addAttribute("paginator", paginator);
+		modelMap.put("comments", comments);
+		modelMap.put("paginator", paginator);
 		return "/manage/comment/list";
 	}
 	
@@ -75,14 +75,14 @@ public class CmsCommentController extends BaseController {
 	/**
 	 * 新增post
 	 * @param cmsComment
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public String add(CmsComment cmsComment, Model model) {
+	public String add(CmsComment cmsComment, ModelMap modelMap) {
 		cmsComment.setCtime(System.currentTimeMillis());
 		int count = cmsCommentService.insertSelective(cmsComment);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		_log.info("新增记录id为：{}", cmsComment.getArticleId());
 		return "redirect:/manage/comment/list";
 	}
@@ -90,26 +90,26 @@ public class CmsCommentController extends BaseController {
 	/**
 	 * 删除
 	 * @param ids
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
-	public String delete(@PathVariable("ids") String ids, Model model) {
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
 		int count = cmsCommentService.deleteByPrimaryKeys(ids);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		return "redirect:/manage/comment/list";
 	}
 	
 	/**
 	 * 修改get
 	 * @param id
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
-	public String update(@PathVariable("id") int id, Model model) {
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
 		CmsComment comment = cmsCommentService.selectByPrimaryKey(id);
-		model.addAttribute("comment", comment);
+		modelMap.put("comment", comment);
 		return "/manage/comment/update";
 	}
 	
@@ -117,14 +117,14 @@ public class CmsCommentController extends BaseController {
 	 * 修改post
 	 * @param id
 	 * @param cmsComment
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
-	public String update(@PathVariable("id") int id, CmsComment cmsComment, Model model) {
+	public String update(@PathVariable("id") int id, CmsComment cmsComment, ModelMap modelMap) {
 		int count = cmsCommentService.updateByPrimaryKeySelective(cmsComment);
-		model.addAttribute("count", count);
-		model.addAttribute("id", id);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
 		return "redirect:/manage/comment/list";
 	}
 

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/manage/CmsTagController.java

@@ -9,7 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,7 +37,7 @@ public class CmsTagController extends BaseController {
 	 * @param rows 每页条数
 	 * @param desc 降序排序
 	 * @param request
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping("/list")
@@ -45,7 +45,7 @@ public class CmsTagController extends BaseController {
 			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
 			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
 			@RequestParam(required = false, defaultValue = "false", value = "desc") boolean desc,
-			HttpServletRequest request, Model model) {
+			HttpServletRequest request, ModelMap modelMap) {
 
 		// 数据列表
 		CmsTagExample cmsTagExample = new CmsTagExample();
@@ -58,8 +58,8 @@ public class CmsTagController extends BaseController {
 		long total = cmsTagService.countByExample(cmsTagExample);
 		Paginator paginator = new Paginator(total, page, rows, request);
 
-		model.addAttribute("tags", tags);
-		model.addAttribute("paginator", paginator);
+		modelMap.put("tags", tags);
+		modelMap.put("paginator", paginator);
 		return "/manage/tag/list";
 	}
 	
@@ -75,16 +75,16 @@ public class CmsTagController extends BaseController {
 	/**
 	 * 新增post
 	 * @param cmsTag
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public String add(CmsTag cmsTag, Model model) {
+	public String add(CmsTag cmsTag, ModelMap modelMap) {
 		long time = System.currentTimeMillis();
 		cmsTag.setCtime(time);
 		cmsTag.setOrders(time);
 		int count = cmsTagService.insertSelective(cmsTag);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		_log.info("新增记录id为：{}", cmsTag.getTagId());
 		return "redirect:/manage/tag/list";
 	}
@@ -92,26 +92,26 @@ public class CmsTagController extends BaseController {
 	/**
 	 * 删除
 	 * @param ids
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
-	public String delete(@PathVariable("ids") String ids, Model model) {
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
 		int count = cmsTagService.deleteByPrimaryKeys(ids);
-		model.addAttribute("count", count);
+		modelMap.put("count", count);
 		return "redirect:/manage/tag/list";
 	}
 	
 	/**
 	 * 修改get
 	 * @param id
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
-	public String update(@PathVariable("id") int id, Model model) {
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
 		CmsTag tag = cmsTagService.selectByPrimaryKey(id);
-		model.addAttribute("tag", tag);
+		modelMap.put("tag", tag);
 		return "/manage/tag/update";
 	}
 	
@@ -119,14 +119,14 @@ public class CmsTagController extends BaseController {
 	 * 修改post
 	 * @param id
 	 * @param cmsTag
-	 * @param model
+	 * @param modelMap
 	 * @return
 	 */
 	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
-	public String update(@PathVariable("id") int id, CmsTag cmsTag, Model model) {
+	public String update(@PathVariable("id") int id, CmsTag cmsTag, ModelMap modelMap) {
 		int count = cmsTagService.updateByPrimaryKeySelective(cmsTag);
-		model.addAttribute("count", count);
-		model.addAttribute("id", id);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
 		return "redirect:/manage/tag/list";
 	}
 

zheng-common/src/main/java/com/zheng/common/base/BaseServiceImpl.java

@@ -192,10 +192,11 @@ public abstract class BaseServiceImpl<Mapper, Record, Example> implements BaseSe
 			}
 			String[] idArray = ids.split("-");
 			int count = 0;
-			for (String id : idArray) {
-				if (StringUtils.isBlank(id)) {
+			for (String idStr : idArray) {
+				if (StringUtils.isBlank(idStr)) {
 					continue;
 				}
+				Integer id = Integer.parseInt(idStr);
 				Method deleteByPrimaryKey = mapper.getClass().getDeclaredMethod("deleteByPrimaryKey", id.getClass());
 				Object result = deleteByPrimaryKey.invoke(mapper, id);
 				count += Integer.parseInt(String.valueOf(result));