新增license分页接口及实现

2022-08-06 19:34:40 +08:00
parent 2b8c538a7b
commit bc7ecaac6e
15 changed files with 322 additions and 17 deletions
@@ -29,14 +29,14 @@ package fun.asgc.neutrino.proxy.server.controller;

 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.web.annotation.*;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseCreateReq;
+import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateEnableStatusReq;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateReq;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseCreateRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseDetailRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseUpdateEnableStatusRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseUpdateRes;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.service.LicenseService;

@NonIntercept
@@ -47,6 +47,12 @@ public class LicenseController {
 	@Autowired
 	private LicenseService licenseService;

+	@GetMapping("page")
+	public Page<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
+		// TODO 参数校验
+		return licenseService.page(pageQuery, req);
+	}
+
 	@PostMapping("create")
 	public LicenseCreateRes create(@RequestBody LicenseCreateReq req) {
 		// TODO 参数校验
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/8/6
+ */
+@Data
+public class LicenseListReq {
+
+}
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.proxy.server.base.rest.constant.OnlineStatusEnum;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/8/6
+ */
+@Accessors(chain = true)
+@Data
+public class LicenseListRes {
+	@Id
+	private Integer id;
+	/**
+	 * 名称
+	 */
+	private String name;
+	/**
+	 * licenseKey
+	 */
+	private String key;
+	/**
+	 * 用户ID
+	 */
+	private Integer userId;
+	/**
+	 * 用户名
+	 */
+	private String userName;
+	/**
+	 * 是否在线
+	 * {@link OnlineStatusEnum}
+	 */
+	private Integer isOnline;
+	/**
+	 * 启用状态
+	 * {@link fun.asgc.neutrino.proxy.server.base.rest.constant.EnableStatusEnum}
+	 */
+	private Integer enable;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+}
@@ -27,6 +27,9 @@ import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.annotation.Update;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;

 import java.util.Date;
@@ -39,6 +42,13 @@ import java.util.Date;
@Component
 public interface LicenseMapper extends SqlMapper {

+	/**
+	 * 查询license分页
+	 * @param page
+	 * @param req
+	 */
+	void page(Page page, LicenseListReq req);
+
 	/**
 	 * 新增license
 	 * @param license
@@ -22,10 +22,14 @@
 package fun.asgc.neutrino.proxy.server.dal;

 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
 import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;

+import java.util.List;
+import java.util.Set;
+
 /**
 *
 * @author: aoshiguchen
@@ -50,4 +54,7 @@ public interface UserMapper extends SqlMapper {
 	@Select("select * from user where id = ?")
 	UserDO findById(Integer id);

+	@ResultType(UserDO.class)
+	@Select("select * from user where id in (?)")
+	List<UserDO> findByIds(Set<Integer> ids);
 }
@@ -23,22 +23,24 @@ package fun.asgc.neutrino.proxy.server.service;

 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.proxy.server.base.rest.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.base.rest.constant.OnlineStatusEnum;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseCreateReq;
+import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateEnableStatusReq;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseUpdateReq;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseCreateRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseDetailRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseUpdateEnableStatusRes;
-import fun.asgc.neutrino.proxy.server.controller.res.LicenseUpdateRes;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
 import fun.asgc.neutrino.proxy.server.dal.UserMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;

-import java.util.Date;
-import java.util.UUID;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;

 /**
 * license服务
@@ -53,6 +55,23 @@ public class LicenseService {
 	@Autowired
 	private UserMapper userMapper;

+	public Page<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
+		Page<LicenseListRes> page = Page.create(pageQuery);
+		licenseMapper.page(page, req);
+		if (!CollectionUtil.isEmpty(page.getRecords())) {
+			Set<Integer> userIds = page.getRecords().stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
+			List<UserDO> userList = userMapper.findByIds(userIds);
+			Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
+			for (LicenseListRes item : page.getRecords()) {
+				UserDO userDO = userMap.get(item.getUserId());
+				if (null != userDO) {
+					item.setUserName(userDO.getName());
+				}
+			}
+		}
+		return page;
+	}
+
 	/**
 	 * 创建license
 	 * @param req