From 4091e676d7c0c3fdbd1598c367b92d5d154cbf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 3 Feb 2025 13:53:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nflg-mobilebroken-admin/pom.xml | 4 ++-- .../admin/controller/AdminUserController.java | 2 +- .../admin/controller/AppUserController.java | 5 +++-- .../admin/controller/BaseAreaController.java | 2 +- .../admin/controller/ControllerBase.java | 10 ++++++++++ .../admin/controller/CustomerController.java | 2 +- .../admin/controller/DepartmentController.java | 5 +---- .../controller/DeviceComponentController.java | 2 +- .../admin/controller/DeviceController.java | 2 +- .../admin/controller/DeviceTypeController.java | 2 +- .../admin/controller/DictionaryController.java | 2 +- .../admin/controller/MenuController.java | 2 +- .../admin/controller/MessageController.java | 2 +- .../controller/MultilingualController.java | 2 +- .../admin/controller/ParamConfigController.java | 2 +- .../admin/controller/PositionController.java | 2 +- .../admin/controller/RequestLogController.java | 5 +---- .../admin/controller/RoleController.java | 2 +- .../admin/controller/TicketController.java | 2 +- nflg-mobilebroken-auth/pom.xml | 4 ++++ .../nflg/mobilebroken/auth/AuthApplication.java | 3 ++- .../auth/controller/AdminController.java | 12 ++++++------ .../auth/controller/AppController.java | 2 +- .../auth/controller/ControllerBase.java | 10 ++++++++++ .../auth/controller/TestController.java | 2 +- nflg-mobilebroken-cfs-app/pom.xml | 4 ++++ .../cfs/controller/AreaController.java | 2 +- .../cfs/controller/ControllerBase.java | 10 ++++++++++ .../cfs/controller/FileController.java | 2 +- .../cfs/controller/MessageController.java | 2 +- .../cfs/controller/SSEController.java | 2 +- .../cfs/controller/SystemController.java | 2 +- .../cfs/controller/TestController.java | 2 +- .../cfs/controller/TiketController.java | 2 +- .../cfs/controller/UserController.java | 2 +- .../advice/GlobalRestControllerAdvice.java | 17 ++++++++++++++--- 36 files changed, 91 insertions(+), 46 deletions(-) create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ControllerBase.java create mode 100644 nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/ControllerBase.java create mode 100644 nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/ControllerBase.java diff --git a/nflg-mobilebroken-admin/pom.xml b/nflg-mobilebroken-admin/pom.xml index 72cf281e..dde72087 100644 --- a/nflg-mobilebroken-admin/pom.xml +++ b/nflg-mobilebroken-admin/pom.xml @@ -58,8 +58,8 @@ test - jakarta.validation - jakarta.validation-api + org.springframework.boot + spring-boot-starter-validation diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java index aacaa32d..49745d55 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java @@ -28,7 +28,7 @@ import java.util.List; */ @RestController @RequestMapping("/adminuser") -public class AdminUserController { +public class AdminUserController extends ControllerBase { @Resource private IAdminUserService adminUserService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index c94ee4d5..80bbd10a 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -24,7 +25,7 @@ import java.util.List; */ @RestController @RequestMapping("/appuser") -public class AppUserController { +public class AppUserController extends ControllerBase { @Resource private IAppUserService appUserService; @@ -86,7 +87,7 @@ public class AppUserController { * @param id 审批id */ @GetMapping("getAppUserApplyfor") - public ApiResult getAppUserApplyfor(@Valid @RequestParam Integer id) { + public ApiResult getAppUserApplyfor(@Valid @NotNull(message = "审批id不能为空") @RequestParam Integer id) { return ApiResult.success(appUserApplyforService.getAppUserApplyfor(id)); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java index e2d1b419..3d2a3f75 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java @@ -28,7 +28,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/baseArea") -public class BaseAreaController { +public class BaseAreaController extends ControllerBase { @Resource ITBaseAreaService baseAreaService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ControllerBase.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ControllerBase.java new file mode 100644 index 00000000..2c3c3ad9 --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ControllerBase.java @@ -0,0 +1,10 @@ +package com.nflg.mobilebroken.admin.controller; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +@Validated +@RestController +public class ControllerBase { + +} \ No newline at end of file diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java index 5df931c2..f19d3dae 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java @@ -38,7 +38,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/customer") -public class CustomerController { +public class CustomerController extends ControllerBase { @Resource ITBaseCustomerService baseCustomerService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java index f375165f..9e5de5f6 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java @@ -5,13 +5,10 @@ import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.admin.pojo.dto.DepartmentDTO; import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery; -import com.nflg.mobilebroken.admin.pojo.query.DeviceComponentQuery; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.util.VUtils; -import com.nflg.mobilebroken.repository.entity.DeviceComponent; import com.nflg.mobilebroken.repository.entity.TBaseDepartment; -import com.nflg.mobilebroken.repository.service.IDeviceComponentService; import com.nflg.mobilebroken.repository.service.ITBaseDepartmentService; import com.nflg.mobilebroken.starter.annotation.MethodInfoMark; import org.springframework.web.bind.annotation.*; @@ -25,7 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/department") -public class DepartmentController { +public class DepartmentController extends ControllerBase { @Resource ITBaseDepartmentService departmentService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java index a8dcb6a7..9e55b0db 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java @@ -35,7 +35,7 @@ import java.util.List; */ @RestController @RequestMapping("/deviceComponent") -public class DeviceComponentController { +public class DeviceComponentController extends ControllerBase { @Resource IDeviceComponentService deviceComponentService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 1f71a562..dbc4fe38 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -32,7 +32,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/device") -public class DeviceController { +public class DeviceController extends ControllerBase { @Resource IDeviceService deviceService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java index d780075a..8362237e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java @@ -27,7 +27,7 @@ import java.util.List; */ @RestController @RequestMapping("/deviceType") -public class DeviceTypeController { +public class DeviceTypeController extends ControllerBase { @Resource ITBaseDeviceTypeService baseDeviceTypeService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java index 5c2b7ec2..c4a346f7 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java @@ -49,7 +49,7 @@ import java.util.Objects; @Slf4j @RestController @RequestMapping("/dictionary") -public class DictionaryController { +public class DictionaryController extends ControllerBase { @Resource private IDictionaryService dictionaryService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MenuController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MenuController.java index f1a5551e..25dc75b4 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MenuController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MenuController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/menu") -public class MenuController { +public class MenuController extends ControllerBase { @Resource private IAdminMenuService adminMenuService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java index fa7eb637..b85a79eb 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/message") -public class MessageController { +public class MessageController extends ControllerBase { @Resource private IAdminMessageService adminMessageService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java index cd92d1df..4918f6fb 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java @@ -40,7 +40,7 @@ import java.util.*; */ @RestController @RequestMapping("/multilingual") -public class MultilingualController { +public class MultilingualController extends ControllerBase { @Resource private ILanguageService languageService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ParamConfigController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ParamConfigController.java index 7435be8d..33f403db 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ParamConfigController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ParamConfigController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/paramconfig") -public class ParamConfigController { +public class ParamConfigController extends ControllerBase { @Resource private IParamConfigService paramConfigService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java index 669e29d1..bb87102a 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("/position") -public class PositionController { +public class PositionController extends ControllerBase { @Resource diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java index ecc4d856..4111e4a8 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java @@ -2,16 +2,13 @@ package com.nflg.mobilebroken.admin.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery; import com.nflg.mobilebroken.admin.pojo.query.RequestLogQuery; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; -import com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO; import com.nflg.mobilebroken.repository.entity.TBaseRequestLog; import com.nflg.mobilebroken.repository.entity.TBaseRequestLogDetail; import com.nflg.mobilebroken.repository.service.ITBaseRequestLogDetailService; import com.nflg.mobilebroken.repository.service.ITBaseRequestLogService; -import com.nflg.mobilebroken.starter.annotation.MethodInfoMark; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,7 +20,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/requestLog") -public class RequestLogController { +public class RequestLogController extends ControllerBase { @Resource ITBaseRequestLogService logService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RoleController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RoleController.java index 27ed7e87..367303bc 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RoleController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RoleController.java @@ -19,7 +19,7 @@ import java.util.List; */ @RestController @RequestMapping("/role") -public class RoleController { +public class RoleController extends ControllerBase { @Resource private IAdminRoleService adminRoleService; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 1eddd6f8..ce7925f2 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -28,7 +28,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/ticket") -public class TicketController { +public class TicketController extends ControllerBase { @Resource private ITicketService ticketService; diff --git a/nflg-mobilebroken-auth/pom.xml b/nflg-mobilebroken-auth/pom.xml index 57f73288..3e54fb45 100644 --- a/nflg-mobilebroken-auth/pom.xml +++ b/nflg-mobilebroken-auth/pom.xml @@ -64,6 +64,10 @@ junit-jupiter test + + org.springframework.boot + spring-boot-starter-validation + diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/AuthApplication.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/AuthApplication.java index c4e18683..c5d09c75 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/AuthApplication.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/AuthApplication.java @@ -10,7 +10,8 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication @MapperScan("com.nflg.mobilebroken.repository.mapper") -@ComponentScan(basePackages = {"com.nflg.mobilebroken"}) +@ComponentScan(basePackages = {"com.nflg.mobilebroken.repository.service", "com.nflg.mobilebroken.auth" + , "com.nflg.mobilebroken.starter"}) @EnableDiscoveryClient @Slf4j public class AuthApplication { diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java index 6893a662..9575c380 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java @@ -13,12 +13,11 @@ import com.nflg.mobilebroken.repository.entity.AdminUser; import com.nflg.mobilebroken.repository.service.IAdminRoleService; import com.nflg.mobilebroken.repository.service.IAdminUserRoleMapService; import com.nflg.mobilebroken.repository.service.IAdminUserService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Objects; @@ -28,7 +27,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/admin") -public class AdminController { +public class AdminController extends ControllerBase { @Resource private IAdminUserService adminUserService; @@ -46,7 +45,8 @@ public class AdminController { * @return token */ @GetMapping("login") - public ApiResult login(String userName, String password) { + public ApiResult login(@Valid @NotBlank(message = "用户名不能为空") @RequestParam("userName") String userName, + @Valid @NotBlank(message = "密码不能为空") @RequestParam("password") String password) { AdminUser user=adminUserService.getUser(userName,password); VUtils.trueThrow(Objects.isNull(user)).throwMessage(STATE.PassportErr,"用户名或密码错误"); VUtils.trueThrow(!user.getEnable()).throwMessage(STATE.PassportErr, "用户被禁用，请联系管理员"); diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java index 9dce83bf..8ff9a7ad 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java @@ -25,7 +25,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/app") -public class AppController { +public class AppController extends ControllerBase { @Resource IAppUserService appUserService; diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/ControllerBase.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/ControllerBase.java new file mode 100644 index 00000000..eefdae72 --- /dev/null +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/ControllerBase.java @@ -0,0 +1,10 @@ +package com.nflg.mobilebroken.auth.controller; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +@Validated +@RestController +public class ControllerBase { + +} diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/TestController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/TestController.java index c437e1e0..b4e6b789 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/TestController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/TestController.java @@ -21,7 +21,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/test") -public class TestController { +public class TestController extends ControllerBase { @Resource private IAppUserService appUserService; diff --git a/nflg-mobilebroken-cfs-app/pom.xml b/nflg-mobilebroken-cfs-app/pom.xml index a340d06b..ee485504 100644 --- a/nflg-mobilebroken-cfs-app/pom.xml +++ b/nflg-mobilebroken-cfs-app/pom.xml @@ -65,6 +65,10 @@ com.nflg nflg-mobilebroken-repository + + org.springframework.boot + spring-boot-starter-validation + diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AreaController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AreaController.java index a62186cf..b35873fb 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AreaController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AreaController.java @@ -26,7 +26,7 @@ import java.util.List; @RestController @RequestMapping("/area") //@SaUserCheckLogin -public class AreaController { +public class AreaController extends ControllerBase { @Resource private IAppAreaService appAreaService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/ControllerBase.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/ControllerBase.java new file mode 100644 index 00000000..7920106e --- /dev/null +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/ControllerBase.java @@ -0,0 +1,10 @@ +package com.nflg.mobilebroken.cfs.controller; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +@Validated +@RestController +public class ControllerBase { + +} \ No newline at end of file diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java index 2a87598c..10ea46bc 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @RequestMapping("/file") //@SaUserCheckLogin -public class FileController { +public class FileController extends ControllerBase { @Resource private FileUploadService fileUploadService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java index 22be573c..b2113d9c 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java @@ -27,7 +27,7 @@ import java.util.Map; @RestController @RequestMapping("/message") //@SaUserCheckLogin -public class MessageController { +public class MessageController extends ControllerBase { @Resource private RedisTemplate redisTemplate; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SSEController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SSEController.java index ead9bda0..6fecbcc8 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SSEController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SSEController.java @@ -22,7 +22,7 @@ import java.io.IOException; @Slf4j @RequestMapping("/sse") //@SaUserCheckLogin -public class SSEController { +public class SSEController extends ControllerBase { @Resource private APPSSEManagerService sseManagerService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SystemController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SystemController.java index 0016e72a..c9adc89d 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SystemController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/SystemController.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/system") //@SaUserCheckLogin -public class SystemController { +public class SystemController extends ControllerBase { @Resource private ILanguageService languageService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TestController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TestController.java index ba7070b7..b343df08 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TestController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TestController.java @@ -14,7 +14,7 @@ import java.io.IOException; @RestController @Slf4j @RequestMapping("/test") -public class TestController { +public class TestController extends ControllerBase { @Resource private APPSSEManagerService sseManagerService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index 2197404a..9e19bbe9 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/ticket") //@SaUserCheckLogin -public class TiketController { +public class TiketController extends ControllerBase { @Resource private IDeviceService deviceService; diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java index c8c2c584..e6a29117 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java @@ -37,7 +37,7 @@ import java.util.List; @RestController @RequestMapping("/user") //@SaUserCheckLogin -public class UserController { +public class UserController extends ControllerBase { @Resource private IAppUserService appUserService; diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java index 364e7daf..625c18f3 100644 --- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java +++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.starter.advice; +import cn.hutool.core.util.StrUtil; import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.exception.NflgException; import com.nflg.mobilebroken.common.pojo.ApiResult; @@ -7,19 +8,29 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import java.util.stream.Collectors; + @RestControllerAdvice @Slf4j public class GlobalRestControllerAdvice { @ExceptionHandler(Exception.class) - public ApiResult handleAllExceptions(Exception ex) { + public ApiResult handleAllExceptions(Exception ex) { log.error("服务器内部错误: ", ex); return ApiResult.error(STATE.BusinessError,"服务器内部错误: " + ex.getMessage()); } @ExceptionHandler(NflgException.class) - public ApiResult handleNflgException(NflgException ex) { + public ApiResult handleNflgException(NflgException ex) { log.error("业务错误: ", ex); return ApiResult.error(STATE.BusinessError,ex.getMessage()); } -} + + @ExceptionHandler(ConstraintViolationException.class) + public ApiResult handleConstraintViolationException(ConstraintViolationException ex) { + log.error("数据校验失败: ", ex); + return ApiResult.error(STATE.ParamErr, "数据校验失败: " + StrUtil.join(",", ex.getConstraintViolations().stream().map(ConstraintViolation::getMessage).collect(Collectors.toList()))); + } +} \ No newline at end of file