From 95a4bf8b4edd53b820a647ded0b730dc69320267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Fri, 23 Aug 2024 15:53:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/v1/ManagerV1Controller.java | 21 ++++++++++--------- .../manager/v1/data/ManagerListData.java | 8 +++++++ .../controller/user/v1/UserV1Controller.java | 6 ------ .../xuqm/server/appmanager/data/PageData.java | 11 ++++++++++ .../sys/v1/ApplicationRepository.java | 9 ++++++-- 5 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/xuqm/server/appmanager/controller/manager/v1/data/ManagerListData.java create mode 100644 src/main/java/com/xuqm/server/appmanager/data/PageData.java diff --git a/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/ManagerV1Controller.java b/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/ManagerV1Controller.java index 42a4258..f654572 100644 --- a/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/ManagerV1Controller.java +++ b/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/ManagerV1Controller.java @@ -2,17 +2,16 @@ package com.xuqm.server.appmanager.controller.manager.v1; import com.xuqm.server.appmanager.common.CommonHelper; import com.xuqm.server.appmanager.common.JWTHelper; -import com.xuqm.server.appmanager.common.TimeHelper; +import com.xuqm.server.appmanager.controller.manager.v1.data.ManagerListData; import com.xuqm.server.appmanager.entitys.UserInfo; import com.xuqm.server.appmanager.entitys.sys.v1.ApplicationEntity; import com.xuqm.server.appmanager.http.HttpResult; import com.xuqm.server.appmanager.repository.sys.v1.ApplicationRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Random; - @RestController @RequestMapping("manager/v1") public class ManagerV1Controller { @@ -22,13 +21,13 @@ public class ManagerV1Controller { @PostMapping("/manager/create") public HttpResult appCreate(@RequestBody ApplicationEntity application, @RequestHeader(name = "token") String token) throws Exception { + UserInfo userInfo = JWTHelper.getUser(token); + if (null == userInfo) { + return new HttpResult<>(401, "登录失效", null); + } if (null == application.getAppName() || null == application.getPackageName()) { return new HttpResult<>(201, "参数错误", null); } else { - UserInfo userInfo = JWTHelper.getUser(token); - if (null == userInfo) { - return new HttpResult<>(401, "登录失效", null); - } ApplicationEntity app = applicationRepository.findFirstByAppNameAndTenantNo(application.getAppName(), userInfo.getTenantNo()); if (null != app) return new HttpResult<>(201, "已创建相关类型的同名应用", null); app = new ApplicationEntity(); @@ -45,15 +44,17 @@ public class ManagerV1Controller { } @PostMapping("/manager/list") - public HttpResult> appList(@RequestBody ApplicationEntity application, @RequestHeader(name = "token") String token) throws Exception { + public HttpResult> appList(@RequestBody ManagerListData data, @RequestHeader(name = "token") String token) throws Exception { UserInfo userInfo = JWTHelper.getUser(token); if (null == userInfo) { return new HttpResult<>(401, "登录失效", null); } + if (data.getPageNumber() < 0) return new HttpResult<>(201, "参数错误", null); + if (data.getPageSize() < 0) return new HttpResult<>(201, "参数错误", null); - List apps = applicationRepository.findAllByTenantNo(userInfo.getTenantNo()); + Page apps = applicationRepository.findAllByTenantNo(userInfo.getTenantNo(), PageRequest.of(data.getPageNumber(), data.getPageSize())); return new HttpResult<>(200, "成功", apps); } diff --git a/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/data/ManagerListData.java b/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/data/ManagerListData.java new file mode 100644 index 0000000..91d65ac --- /dev/null +++ b/src/main/java/com/xuqm/server/appmanager/controller/manager/v1/data/ManagerListData.java @@ -0,0 +1,8 @@ +package com.xuqm.server.appmanager.controller.manager.v1.data; + +import com.xuqm.server.appmanager.data.PageData; +import lombok.Data; + +@Data +public class ManagerListData extends PageData { +} diff --git a/src/main/java/com/xuqm/server/appmanager/controller/user/v1/UserV1Controller.java b/src/main/java/com/xuqm/server/appmanager/controller/user/v1/UserV1Controller.java index c4880c7..2f0d5af 100644 --- a/src/main/java/com/xuqm/server/appmanager/controller/user/v1/UserV1Controller.java +++ b/src/main/java/com/xuqm/server/appmanager/controller/user/v1/UserV1Controller.java @@ -4,8 +4,6 @@ import com.xuqm.server.appmanager.common.JWTHelper; import com.xuqm.server.appmanager.entitys.UserLogin; import com.xuqm.server.appmanager.entitys.sys.v1.TenantUserEntity; import com.xuqm.server.appmanager.http.HttpResult; -import com.xuqm.server.appmanager.repository.sys.v1.ApplicationRepository; -import com.xuqm.server.appmanager.repository.sys.v1.TenantRepository; import com.xuqm.server.appmanager.repository.sys.v1.TenantUserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -17,12 +15,8 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("user/v1") public class UserV1Controller { - @Autowired - private TenantRepository tenantRepository; @Autowired private TenantUserRepository tenantUserRepository; - @Autowired - private ApplicationRepository applicationRepository; @PostMapping("/login") public HttpResult userLogin(@RequestBody UserLogin user) throws Exception { diff --git a/src/main/java/com/xuqm/server/appmanager/data/PageData.java b/src/main/java/com/xuqm/server/appmanager/data/PageData.java new file mode 100644 index 0000000..d25ca02 --- /dev/null +++ b/src/main/java/com/xuqm/server/appmanager/data/PageData.java @@ -0,0 +1,11 @@ +package com.xuqm.server.appmanager.data; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class PageData { + private int pageNumber; + private int pageSize; +} diff --git a/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/ApplicationRepository.java b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/ApplicationRepository.java index 3d6b14d..415e69d 100644 --- a/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/ApplicationRepository.java +++ b/src/main/java/com/xuqm/server/appmanager/repository/sys/v1/ApplicationRepository.java @@ -1,7 +1,8 @@ package com.xuqm.server.appmanager.repository.sys.v1; import com.xuqm.server.appmanager.entitys.sys.v1.ApplicationEntity; -import com.xuqm.server.appmanager.enums.AppType; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -10,6 +11,10 @@ import java.util.List; @Repository public interface ApplicationRepository extends JpaRepository { ApplicationEntity findFirstByAppNameAndTenantNo(String appName, String tenantNo); - List findAllByTenantNo(String tenantNo); + + ApplicationEntity findFirstByTenantNoAndPackageNameOrAppName(String tenantNo, String packageName, String appName); + + Page findAllByTenantNo(String tenantNo, Pageable pageable); + boolean existsByAppId(String appId); }