增加 delete/byCodes 接口

kanban-auth/src/main/java/com/uas/kanban/controller/UserController.java

@@ -1,7 +1,5 @@
 package com.uas.kanban.controller;
 
-import java.util.Arrays;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -91,17 +89,4 @@ public class UserController extends BaseController<User> {
 		return userService.resetPassword(password, newPassword);
 	}
 
-	/**
-	 * Delete the given entity (by code)
-	 * 
-	 * @param codes
-	 *            the code to delete
-	 * @param request
-	 * @return results of the delete
-	 */
-	@RequestMapping("/delete/byCodes")
-	@ResponseBody
-	public int deleteByCodes(@NotEmpty("codes") String[] codes, HttpServletRequest request) {
-		return userService.deleteByCodes(Arrays.asList(codes));
-	}
 }

kanban-auth/src/main/java/com/uas/kanban/service/UserService.java

@@ -1,7 +1,5 @@
 package com.uas.kanban.service;
 
-import java.util.List;
-
 import com.uas.kanban.annotation.NotEmpty;
 import com.uas.kanban.model.User;
 
@@ -35,13 +33,4 @@ public interface UserService {
 	 */
 	boolean resetPassword(@NotEmpty("password") String password, @NotEmpty("newPassword") String newPassword);
 
-	/**
-	 * Delete the given entity (by code)
-	 * 
-	 * @param codes
-	 *            the code to delete
-	 * @return results of the delete
-	 */
-	int deleteByCodes(@NotEmpty("codes") List<String> codes);
-
 }

kanban-auth/src/main/java/com/uas/kanban/service/impl/UserServiceImpl.java

@@ -168,10 +168,4 @@ public class UserServiceImpl extends BaseService<User> implements UserService {
 		return query.count() > 0;
 	}
 
-	@Override
-	public int deleteByCodes(@NotEmpty("codes") List<String> codes) {
-		Query<User> query = userDao.createQuery();
-		query.field("code").in(codes);
-		return userDao.delete(query);
-	}
 }

kanban-common/src/main/java/com/uas/kanban/base/BaseController.java

@@ -1,5 +1,6 @@
 package com.uas.kanban.base;
 
+import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -78,6 +79,20 @@ public abstract class BaseController<T extends BaseEntity> {
 		return baseService.deleteOne(code);
 	}
 
+	/**
+	 * Delete the given entity (by code)
+	 * 
+	 * @param codes
+	 *            the code to delete
+	 * @param request
+	 * @return results of the delete
+	 */
+	@RequestMapping("/delete/byCodes")
+	@ResponseBody
+	public int delete(@NotEmpty("codes") String[] codes, HttpServletRequest request) {
+		return baseService.delete(Arrays.asList(codes));
+	}
+
 	/**
 	 * 根据 code 更新数据
 	 * 

kanban-common/src/main/java/com/uas/kanban/base/BaseDao.java

@@ -340,6 +340,19 @@ public class BaseDao<T extends BaseEntity> {
 		return delete(query);
 	}
 
+	/**
+	 * Delete the given entity (by code)
+	 * 
+	 * @param codes
+	 *            the code to delete
+	 * @return results of the delete
+	 */
+	public int delete(@NotEmpty("codes") Iterable<String> codes) {
+		Query<T> query = createQuery();
+		query.field("code").in(codes);
+		return delete(query);
+	}
+
 	/**
 	 * 根据指定的条件删除数据
 	 * 

kanban-common/src/main/java/com/uas/kanban/base/BaseService.java

@@ -63,6 +63,17 @@ public abstract class BaseService<T extends BaseEntity> {
 		return baseDao.deleteOne(code);
 	}
 
+	/**
+	 * Delete the given entity (by code)
+	 * 
+	 * @param codes
+	 *            the code to delete
+	 * @return results of the delete
+	 */
+	public int delete(@NotEmpty("codes") List<String> codes) {
+		return baseDao.delete(codes);
+	}
+
 	/**
 	 * 根据 code 更新数据
 	 * 

kanban-console/src/main/webapp/WEB-INF/views/console.html

@@ -15,6 +15,7 @@
 				<li><a target="_blank">user/update?json={"code":"4EC2735D343","name": "name","password": "password","resourcePointCodes":["4EC2735D343"]}</a></li>
 				<li><a target="_blank">user/updatePart?json={"code":"4EC2735D343","name": "name","password": "password"}</a></li>
 				<li><a target="_blank">user/delete/4EC2735D343</a></li>
+				<li><a target="_blank">user/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">user/get/all</a></li>
 				<li><a target="_blank">user/get/4EC2735D343</a></li>
 				<li><a target="_blank">user/get?page=1&size=10</a></li>
@@ -22,7 +23,6 @@
 				<li><a target="_blank">user/login?name=name&password=123</a></li>
 				<li><a target="_blank">user/logout</a></li>
 				<li><a target="_blank">user/resetPwd?password=12&newPassword=34</a></li>
-				<li><a target="_blank">user/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 			</ol>
 			<strong><li class="title">资源点</li></strong>
 			<ol>
@@ -31,6 +31,7 @@
 				<li><a target="_blank">resourcePoint/update?json={"code":"4EC2735D343","name": "name","templateCodes":["4EC2735D343"]}</a></li>
 				<li><a target="_blank">resourcePoint/updatePart?json={"code":"4EC2735D343","name": "name"}</a></li>
 				<li><a target="_blank">resourcePoint/delete/4EC2735D343</a></li>
+				<li><a target="_blank">resourcePoint/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">resourcePoint/get/all</a></li>
 				<li><a target="_blank">resourcePoint/get/4EC2735D343</a></li>
 				<li><a target="_blank">resourcePoint/get?page=1&size=10</a></li>
@@ -42,6 +43,7 @@
 				<li><a target="_blank">datasource/update?json={"name": "UAS标准版", "driverClassName":"oracle.jdbc.driver.OracleDriver","code":"4EC3C69D011","password":"select!%23%25*(","url":"jdbc:oracle:thin:@192.168.253.6:1521:orcl","username":"UAS"}</a></li>
 				<li><a target="_blank">datasource/updatePart?json={"name": "UAS标准版", "driverClassName":"oracle.jdbc.driver.OracleDriver","code":"4EC3C69D011","password":"select!%23%25*(","url":"jdbc:oracle:thin:@192.168.253.6:1521:orcl","username":"UAS"}</a></li>
 				<li><a target="_blank">datasource/delete/4EC2735D343</a></li>
+				<li><a target="_blank">datasource/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">datasource/get/all</a></li>
 				<li><a target="_blank">datasource/get/4EC2735D343</a></li>
 				<li><a target="_blank">datasource/get?page=1&size=10</a></li>
@@ -53,6 +55,7 @@
 				<li><a target="_blank">globalParameters/update?json={"code":"5061EE73213", "name": "公共参数3","type": "Number", "inputMode": "DropDownBox", "optionalValues":[21,3.8,12.12], "defaultOptionalValueIndex": 1}</a></li>
 				<li><a target="_blank">globalParameters/updatePart?json={"code":"5061EE73213", "name": "公共参数3","type": "Number", "inputMode": "DropDownBox", "optionalValues":[21,3.8,12.12], "defaultOptionalValueIndex": 1}</a></li>
 				<li><a target="_blank">globalParameters/delete/4EC2735D343</a></li>
+				<li><a target="_blank">globalParameters/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">globalParameters/get/all</a></li>
 				<li><a target="_blank">globalParameters/get/4EC2735D343</a></li>
 				<li><a target="_blank">globalParameters/get?page=1&size=10</a></li>
@@ -64,6 +67,7 @@
 				<li><a target="_blank">template/update?json={"code":"4EC2735D343","name": "name","content": "&lt;content&gt;&lt;/content&gt;","dataSourceCode":"4EC3C69D011", "globalParameterCodes": ["5061DFD0811", "5061E8A3812"]}</a></li>
 				<li><a target="_blank">template/updatePart?json={"code":"4EC2735D343","name": "name","content": "&lt;content&gt;&lt;/content&gt;","dataSourceCode":"4EC3C69D011", "globalParameterCodes": ["5061DFD0811", "5061E8A3812"]}</a></li>
 				<li><a target="_blank">template/delete/4EC2735D343</a></li>
+				<li><a target="_blank">template/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">template/get/all</a></li>
 				<li><a target="_blank">template/get/4EC2735D343</a></li>
 				<li><a target="_blank">template/get?page=1&size=10</a></li>
@@ -80,6 +84,7 @@
 				<li><a target="_blank">kanban/update?json={"code":"506C9FB0311","name": "name","templateCodes":["4FF1AD1C411","4FF1F024412"],"display":"SplitScreen", "iconCls":"grid-shortcut"}</a></li>
 				<li><a target="_blank">kanban/updatePart?json={"code":"506C9FB0311","name": "name","templateCodes":["4FF1AD1C411","4FF1F024412"],"display":"SplitScreen", "iconCls":"grid-shortcut"}</a></li>
 				<li><a target="_blank">kanban/delete/4EC2735D343</a></li>
+				<li><a target="_blank">kanban/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">kanban/get/all</a></li>
 				<li><a target="_blank">kanban/get/4EC2735D343</a></li>
 				<li><a target="_blank">kanban/get?page=1&size=10</a></li>
@@ -91,6 +96,7 @@
 				<li><a target="_blank">kanbanInstance/update?json={"code":"50C2C15A411","globalParameters":[{"code":"5061DFD0811","type":"String","defaultOptionalValueIndex":1,"inputMode":"Radio","name":"公共参数1","optionalValues":["值1","值2"],"value":"值2"},{"code":"5061E8A3812","type":"Number","defaultOptionalValueIndex":1,"inputMode":"Radio","name":"公共参数2","optionalValues":[12,32],"value":12.0}],"kanbanCode":"50C01D61F19","parameters":{"4FF1F024412":[{"code":"50C00E19815","name":"pq_av","type":"Number","value":2},{"code":"50C010D1716","name":"ma_ad","type":"Date","value":2},{"code":"50C012E1817","name":"afd_ad","type":"String","value":2}],"4FF1AD1C411":[{"code":"50BFED83B13","name":"PU_NAME","type":"String","value":2},{"code":"50C00990C14","name":"as_type","type":"Number","value":2}]},"switchFrequency":5000,"refreshFrequency":5000}</a></li>
 				<li><a target="_blank">kanbanInstance/updatePart?json={"code":"50C2C15A411","globalParameters":[{"code":"5061DFD0811","type":"String","defaultOptionalValueIndex":1,"inputMode":"Radio","name":"公共参数1","optionalValues":["值1","值2"],"value":"值2"},{"code":"5061E8A3812","type":"Number","defaultOptionalValueIndex":1,"inputMode":"Radio","name":"公共参数2","optionalValues":[12,32],"value":12.0}],"kanbanCode":"50C01D61F19","parameters":{"4FF1F024412":[{"code":"50C00E19815","name":"pq_av","type":"Number","value":2},{"code":"50C010D1716","name":"ma_ad","type":"Date","value":2},{"code":"50C012E1817","name":"afd_ad","type":"String","value":2}],"4FF1AD1C411":[{"code":"50BFED83B13","name":"PU_NAME","type":"String","value":2},{"code":"50C00990C14","name":"as_type","type":"Number","value":2}]},"refreshFrequency":5000}</a></li>
 				<li><a target="_blank">kanbanInstance/delete/4EC2735D343</a></li>
+				<li><a target="_blank">kanbanInstance/delete/byCodes?codes=53E04542411&codes=53E04631812</a></li>
 				<li><a target="_blank">kanbanInstance/get/all</a></li>
 				<li><a target="_blank">kanbanInstance/get/4EC2735D343</a></li>
 				<li><a target="_blank">kanbanInstance/get?page=1&size=10</a></li>