fix del group relation group_id

ansj · ansj · commit 7da25fbe8a4f · 2016-11-23T19:03:33.000+08:00
diff --git a/src/main/java/org/nlpcn/jcoder/controller/GroupAction.java b/src/main/java/org/nlpcn/jcoder/controller/GroupAction.java
@@ -1,14 +1,18 @@
 package org.nlpcn.jcoder.controller;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.nlpcn.jcoder.domain.Task;
 import org.nlpcn.jcoder.domain.UserGroup;
 import org.nlpcn.jcoder.filter.AuthoritiesManager;
+import org.nlpcn.jcoder.service.TaskService;
 import org.nlpcn.jcoder.util.StaticValue;
 import org.nlpcn.jcoder.util.dao.BasicDao;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Condition;
+import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.By;
@@ -20,60 +24,71 @@
 import org.slf4j.LoggerFactory;
 
 @IocBean
-@Filters(@By(type = AuthoritiesManager.class, args = {"userType", "1", "/login.jsp"}))
+@Filters(@By(type = AuthoritiesManager.class, args = { "userType", "1", "/login.jsp" }))
 public class GroupAction {
 
-	private static final Logger LOG = LoggerFactory.getLogger(GroupAction.class) ;
+	private static final Logger LOG = LoggerFactory.getLogger(GroupAction.class);
 
-    public BasicDao basicDao = StaticValue.systemDao;
+	public BasicDao basicDao = StaticValue.systemDao;
 
-    @At("/auth/delUserGroup")
-    @Ok("raw")
-    @Fail("jsp:/fail.jsp")
-    public boolean delUserGroup(@Param("id") long id) throws Exception {
-        boolean flag = basicDao.delById(id, UserGroup.class);
-        if (flag) {
-            LOG.info("add userGroup which id:" + id);
-        }
-        return flag;
-    }
+	@Inject
+	private TaskService taskService;
 
-    @At("/auth/updateUserGroup")
-    @Ok("raw")
-    public boolean updateUserGroup(@Param("groupId") Long groupId, @Param("auth") Integer auth, @Param("userId") Long userId) throws Exception {
-        Condition con = Cnd.where("groupId", "=", groupId).and("userId", "=", userId);
-        UserGroup userGroup = basicDao.findByCondition(UserGroup.class, con);
-        if (userGroup == null) {
-            userGroup = new UserGroup();
-            userGroup.setUserId(userId);
-            userGroup.setGroupId(groupId);
-            userGroup.setCreateTime(new Date());
-        }
+	@At("/auth/delUserGroup")
+	@Ok("raw")
+	@Fail("jsp:/fail.jsp")
+	public boolean delUserGroup(@Param("id") long id) throws Exception {
 
-        if (auth == 0) {
-            basicDao.delById(userGroup.getId(), UserGroup.class);
-        } else {
-            userGroup.setAuth(auth);
-            if (userGroup.getId() == null) {
-                basicDao.save(userGroup);
-            } else {
-                basicDao.update(userGroup);
-            }
-        }
+		List<Task> tasksList = taskService.tasksList(id); // 从数据库中查出，不污染内存中的task
 
-        return true;
-    }
+		for (Task task : tasksList) {
+			taskService.delete(task);
+			taskService.delByDB(task);
+		}
 
-    /**
-     * 列出用户的所有权限
-     *
-     * @param userId
-     * @return
-     * @throws Exception
-     */
-    @At("/auth/authUser")
-    @Ok("json")
-    public List<UserGroup> authUser(@Param("userId") long userId) throws Exception {
-        return basicDao.search(UserGroup.class, Cnd.where("userId", "=", userId));
-    }
+		boolean flag = basicDao.delById(id, UserGroup.class);
+		if (flag) {
+			LOG.info("add userGroup which id:" + id);
+		}
+		return flag;
+	}
+
+	@At("/auth/updateUserGroup")
+	@Ok("raw")
+	public boolean updateUserGroup(@Param("groupId") Long groupId, @Param("auth") Integer auth, @Param("userId") Long userId) throws Exception {
+		Condition con = Cnd.where("groupId", "=", groupId).and("userId", "=", userId);
+		UserGroup userGroup = basicDao.findByCondition(UserGroup.class, con);
+		if (userGroup == null) {
+			userGroup = new UserGroup();
+			userGroup.setUserId(userId);
+			userGroup.setGroupId(groupId);
+			userGroup.setCreateTime(new Date());
+		}
+
+		if (auth == 0) {
+			basicDao.delById(userGroup.getId(), UserGroup.class);
+		} else {
+			userGroup.setAuth(auth);
+			if (userGroup.getId() == null) {
+				basicDao.save(userGroup);
+			} else {
+				basicDao.update(userGroup);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * 列出用户的所有权限
+	 *
+	 * @param userId
+	 * @return
+	 * @throws Exception
+	 */
+	@At("/auth/authUser")
+	@Ok("json")
+	public List<UserGroup> authUser(@Param("userId") long userId) throws Exception {
+		return basicDao.search(UserGroup.class, Cnd.where("userId", "=", userId));
+	}
 }
