From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java | 36 ++-
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java | 3
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java | 2
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java | 3
oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java | 2
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java | 2
oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java | 8
oying-system/src/main/java/com/oying/modules/system/rest/JobController.java | 26 +-
oying-system/src/main/java/com/oying/AppRun.java | 1
oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java | 3
oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java | 30 +-
oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java | 42 ++--
oying-common/src/main/java/com/oying/utils/ConstantsKey.java | 5
oying-tools/src/main/java/com/oying/rest/LocalStorageController.java | 28 +-
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java | 2
oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java | 43 ++--
oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java | 37 ++-
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java | 12
oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java | 3
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java | 3
oying-system/src/main/java/com/oying/modules/system/rest/UserController.java | 67 +++---
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java | 2
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java | 3
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java | 2
oying-generator/src/main/java/com/oying/rest/GenConfigController.java | 9
oying-common/src/main/java/com/oying/utils/R.java | 2
oying-system/src/main/java/com/oying/modules/system/rest/DictController.java | 30 +-
oying-tools/src/main/java/com/oying/rest/EmailController.java | 14
oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java | 7
oying-system/pom.xml | 1
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java | 2
oying-generator/src/main/java/com/oying/rest/GeneratorController.java | 42 ++--
oying-logging/src/main/java/com/oying/rest/SysLogController.java | 27 +-
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java | 2
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java | 4
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java | 2
oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java | 18 -
37 files changed, 278 insertions(+), 247 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/ConstantsKey.java b/oying-common/src/main/java/com/oying/utils/ConstantsKey.java
new file mode 100644
index 0000000..b40936b
--- /dev/null
+++ b/oying-common/src/main/java/com/oying/utils/ConstantsKey.java
@@ -0,0 +1,5 @@
+package com.oying.utils;
+
+public interface ConstantsKey {
+
+}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java b/oying-common/src/main/java/com/oying/utils/R.java
similarity index 97%
rename from oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
rename to oying-common/src/main/java/com/oying/utils/R.java
index e85df96..79c3cfb 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
+++ b/oying-common/src/main/java/com/oying/utils/R.java
@@ -1,4 +1,4 @@
-package com.oying.modules.pc.common.core.domain;
+package com.oying.utils;
import java.io.Serializable;
diff --git a/oying-generator/src/main/java/com/oying/rest/GenConfigController.java b/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
index 65a788e..f4ff590 100644
--- a/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
+++ b/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
@@ -2,6 +2,7 @@
import com.oying.domain.GenConfig;
import com.oying.service.GenConfigService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -24,13 +25,13 @@
@ApiOperation("查询")
@GetMapping(value = "/{tableName}")
- public ResponseEntity<GenConfig> queryGenConfig(@PathVariable String tableName){
- return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK);
+ public ResponseEntity<Object> queryGenConfig(@PathVariable String tableName) {
+ return new ResponseEntity<>(R.success(genConfigService.find(tableName)), HttpStatus.OK);
}
@PutMapping
@ApiOperation("修改")
- public ResponseEntity<GenConfig> updateGenConfig(@Validated @RequestBody GenConfig genConfig){
- return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK);
+ public ResponseEntity<Object> updateGenConfig(@Validated @RequestBody GenConfig genConfig) {
+ return new ResponseEntity<>(R.success(genConfigService.update(genConfig.getTableName(), genConfig)), HttpStatus.OK);
}
}
diff --git a/oying-generator/src/main/java/com/oying/rest/GeneratorController.java b/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
index 6435ace..a693983 100644
--- a/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
+++ b/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
@@ -5,6 +5,7 @@
import com.oying.domain.dto.TableInfo;
import com.oying.service.GenConfigService;
import com.oying.service.GeneratorService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -15,6 +16,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -37,50 +39,54 @@
@ApiOperation("查询数据库数据")
@GetMapping(value = "/tables")
- public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size){
- return new ResponseEntity<>(generatorService.getTables(name, new Page<>(page, size)), HttpStatus.OK);
+ public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+ return new ResponseEntity<>(R.success(generatorService.getTables(name, new Page<>(page, size))), HttpStatus.OK);
}
@ApiOperation("查询字段数据")
@GetMapping(value = "/columns")
- public ResponseEntity<PageResult<ColumnInfo>> queryColumns(@RequestParam String tableName){
+ public ResponseEntity<Object> queryColumns(@RequestParam String tableName) {
List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
- return new ResponseEntity<>(PageUtil.toPage(columnInfos), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(PageUtil.toPage(columnInfos)), HttpStatus.OK);
}
@ApiOperation("保存字段数据")
@PutMapping
- public ResponseEntity<HttpStatus> saveColumn(@RequestBody List<ColumnInfo> columnInfos){
+ public ResponseEntity<Object> saveColumn(@RequestBody List<ColumnInfo> columnInfos) {
generatorService.save(columnInfos);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@ApiOperation("同步字段数据")
@PostMapping(value = "sync")
- public ResponseEntity<HttpStatus> syncColumn(@RequestBody List<String> tables){
+ public ResponseEntity<Object> syncColumn(@RequestBody List<String> tables) {
for (String table : tables) {
generatorService.sync(generatorService.getColumns(table), generatorService.query(table));
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@ApiOperation("生成代码")
@PostMapping(value = "/{tableName}/{type}")
- public ResponseEntity<Object> generatorCode(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){
- if(!generatorEnabled && type == 0){
+ public ResponseEntity<Object> generatorCode(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response) {
+ if (!generatorEnabled && type == 0) {
throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！");
}
- switch (type){
+ switch (type) {
// 生成代码
- case 0: generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName));
- break;
+ case 0:
+ generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName));
+ break;
// 预览
- case 1: return generatorService.preview(genConfigService.find(tableName), generatorService.getColumns(tableName));
+ case 1:
+ return generatorService.preview(genConfigService.find(tableName), generatorService.getColumns(tableName));
// 打包
- case 2: generatorService.download(genConfigService.find(tableName), generatorService.getColumns(tableName), request, response);
- break;
- default: throw new BadRequestException("没有这个选项");
+ case 2:
+ generatorService.download(genConfigService.find(tableName), generatorService.getColumns(tableName), request, response);
+ break;
+ default:
+ throw new BadRequestException("没有这个选项");
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-logging/src/main/java/com/oying/rest/SysLogController.java b/oying-logging/src/main/java/com/oying/rest/SysLogController.java
index 968c67a..fe3754a 100644
--- a/oying-logging/src/main/java/com/oying/rest/SysLogController.java
+++ b/oying-logging/src/main/java/com/oying/rest/SysLogController.java
@@ -5,6 +5,7 @@
import com.oying.domain.SysLog;
import com.oying.domain.dto.SysLogQueryCriteria;
import com.oying.service.SysLogService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -50,51 +52,52 @@
@GetMapping
@ApiOperation("日志查询")
@PreAuthorize("@el.check()")
- public ResponseEntity<PageResult<SysLog>> queryLog(SysLogQueryCriteria criteria){
+ public ResponseEntity<Object> queryLog(SysLogQueryCriteria criteria) {
criteria.setLogType("INFO");
Page<SysLog> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(sysLogService.queryAll(criteria, page)), HttpStatus.OK);
}
@GetMapping(value = "/user")
@ApiOperation("用户日志查询")
- public ResponseEntity<PageResult<SysLog>> queryUserLog(SysLogQueryCriteria criteria){
+ public ResponseEntity<Object> queryUserLog(SysLogQueryCriteria criteria) {
criteria.setLogType("INFO");
criteria.setUsername(SecurityUtils.getCurrentUsername());
Page<SysLog> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(sysLogService.queryAllByUser(criteria,page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(sysLogService.queryAllByUser(criteria, page)), HttpStatus.OK);
}
@GetMapping(value = "/error")
@ApiOperation("错误日志查询")
@PreAuthorize("@el.check()")
- public ResponseEntity<PageResult<SysLog>> queryErrorLog(SysLogQueryCriteria criteria){
+ public ResponseEntity<Object> queryErrorLog(SysLogQueryCriteria criteria) {
criteria.setLogType("ERROR");
Page<SysLog> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(sysLogService.queryAll(criteria, page)), HttpStatus.OK);
}
@GetMapping(value = "/error/{id}")
@ApiOperation("日志异常详情查询")
@PreAuthorize("@el.check()")
- public ResponseEntity<Object> queryErrorLogDetail(@PathVariable Long id){
- return new ResponseEntity<>(sysLogService.findByErrDetail(id), HttpStatus.OK);
+ public ResponseEntity<Object> queryErrorLogDetail(@PathVariable Long id) {
+ return new ResponseEntity<>(R.success(sysLogService.findByErrDetail(id)), HttpStatus.OK);
}
+
@DeleteMapping(value = "/del/error")
@Log("删除所有ERROR日志")
@ApiOperation("删除所有ERROR日志")
@PreAuthorize("@el.check()")
- public ResponseEntity<Object> delAllErrorLog(){
+ public ResponseEntity<Object> delAllErrorLog() {
sysLogService.delAllByError();
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@DeleteMapping(value = "/del/info")
@Log("删除所有INFO日志")
@ApiOperation("删除所有INFO日志")
@PreAuthorize("@el.check()")
- public ResponseEntity<Object> delAllInfoLog(){
+ public ResponseEntity<Object> delAllInfoLog() {
sysLogService.delAllByInfo();
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/pom.xml b/oying-system/pom.xml
index f3e399e..0eab0b3 100644
--- a/oying-system/pom.xml
+++ b/oying-system/pom.xml
@@ -82,6 +82,7 @@
<!-- 打包 -->
<build>
+ <finalName>oying</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/oying-system/src/main/java/com/oying/AppRun.java b/oying-system/src/main/java/com/oying/AppRun.java
index d040eaf..1616dd6 100644
--- a/oying-system/src/main/java/com/oying/AppRun.java
+++ b/oying-system/src/main/java/com/oying/AppRun.java
@@ -5,7 +5,6 @@
import lombok.extern.slf4j.Slf4j;
import com.oying.annotation.rest.AnonymousGetMapping;
import com.oying.utils.SpringBeanHolder;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.ApplicationPidFileWriter;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
index 2dd0278..fd2668e 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
@@ -10,7 +10,7 @@
import com.oying.modules.pc.category.domain.dto.PlatformCategoryUpdateRequest;
import com.oying.modules.pc.category.service.PlatformCategoryService;
import com.oying.modules.pc.category.view.PlatformCategoryView;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.utils.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
index d6105be..fff0767 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java
@@ -5,7 +5,7 @@
import com.oying.modules.pc.category.view.PlatformCategoryCustomerView;
import com.oying.modules.pc.category.domain.dto.PlatformCategoryQueryCriteria;
import com.oying.modules.pc.category.service.PlatformCategoryService;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
index fed2f9c..6d47589 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
@@ -1,7 +1,7 @@
package com.oying.modules.pc.product.rest;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.service.ProductService;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
index 95d701d..c778cf8 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
@@ -2,19 +2,17 @@
import cn.hutool.core.collection.ListUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
import com.oying.modules.pc.product.service.ProductService;
import com.oying.modules.pc.product.view.ProductCustomerView;
-import com.oying.modules.pc.product.view.ProductMerchantSimpleView;
import com.oying.utils.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java
index fe7a50b..cf88760 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java
@@ -3,7 +3,7 @@
import cn.hutool.core.collection.ListUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductMerchantCreateRequest;
import com.oying.modules.pc.product.domain.dto.ProductMerchantUpdateRequest;
@@ -19,7 +19,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java b/oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java
index e659545..557a76e 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java
@@ -1,7 +1,7 @@
package com.oying.modules.pc.search.rest;
import cn.hutool.core.collection.CollUtil;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.search.domain.dto.NearbyStoreQueryCriteria;
import com.oying.modules.pc.search.domain.dto.StoreSearchDto;
import com.oying.modules.pc.search.view.StoreSearchView;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
index 9e04ce0..65462c7 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
@@ -1,7 +1,7 @@
package com.oying.modules.pc.store.rest;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.service.StoreCategoryService;
import com.oying.modules.pc.store.domain.dto.StoreCategoryQueryCriteria;
@@ -15,7 +15,6 @@
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
/**
* @author lzp
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
index 348f729..deb8507 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java
@@ -5,7 +5,7 @@
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.BooleanUtil;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.domain.dto.StoreCategoryQueryCriteria;
import com.oying.modules.pc.store.service.StoreCategoryService;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
index 3e52c0a..f576684 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
@@ -5,9 +5,8 @@
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.BooleanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.domain.dto.*;
import com.oying.modules.pc.store.service.StoreCategoryService;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
index 36a5a1d..a53cf9c 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
@@ -1,6 +1,6 @@
package com.oying.modules.pc.store.rest;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.common.id.StoreIdGenerator;
import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.domain.dto.*;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
index dbf828d..0dfd954 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
@@ -1,6 +1,6 @@
package com.oying.modules.pc.store.rest;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.dto.StoreCustomerDetailDto;
import com.oying.modules.pc.store.domain.dto.StoreCustomerQueryCriteria;
import com.oying.modules.pc.store.service.StoreQueryService;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
index aa332cc..6e5d928 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
@@ -1,7 +1,7 @@
package com.oying.modules.pc.store.rest;
import cn.hutool.core.collection.ListUtil;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.domain.dto.StoreCreateRequest;
import com.oying.modules.pc.store.domain.dto.StoreFieldUpdateRequest;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
index 3ae4ed7..2d5cff5 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
@@ -5,7 +5,7 @@
import com.oying.modules.pc.store.domain.StoreQualification;
import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
import com.oying.modules.pc.store.service.StoreQualificationService;
-import com.oying.utils.PageResult;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -33,9 +33,9 @@
@GetMapping
@ApiOperation("查询店铺资质")
@PreAuthorize("@el.check('storeQualification:list')")
- public ResponseEntity<PageResult<StoreQualification>> queryStoreQualification(StoreQualificationQueryCriteria criteria) {
+ public ResponseEntity<Object> queryStoreQualification(StoreQualificationQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(storeQualificationService.queryAll(criteria, page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(storeQualificationService.queryAll(criteria, page)), HttpStatus.OK);
}
@PostMapping
@@ -44,7 +44,7 @@
@PreAuthorize("@el.check('storeQualification:add')")
public ResponseEntity<Object> createStoreQualification(@Validated @RequestBody StoreQualification resources) {
storeQualificationService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
}
@PutMapping
@@ -53,7 +53,7 @@
@PreAuthorize("@el.check('storeQualification:edit')")
public ResponseEntity<Object> updateStoreQualification(@Validated @RequestBody StoreQualification resources) {
storeQualificationService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
}
@DeleteMapping
@@ -62,6 +62,6 @@
@PreAuthorize("@el.check('storeQualification:del')")
public ResponseEntity<Object> deleteStoreQualification(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
storeQualificationService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
index 87718ea..7d24181 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
@@ -2,7 +2,7 @@
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjUtil;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreQualification;
import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
import com.oying.modules.pc.store.service.StoreQualificationService;
@@ -12,7 +12,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java
index fe4d46e..6bae2fa 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java
@@ -2,7 +2,7 @@
import cn.hutool.core.collection.ListUtil;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreQualification;
import com.oying.modules.pc.store.domain.dto.StoreQualificationCreateRequest;
import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
diff --git a/oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java b/oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java
index 9636273..a3ed98a 100644
--- a/oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java
+++ b/oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.quartz.domain.QuartzJob;
import com.oying.modules.quartz.domain.QuartzLog;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -18,6 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
@@ -39,9 +41,9 @@
@ApiOperation("查询定时任务")
@GetMapping
@PreAuthorize("@el.check('timing:list')")
- public ResponseEntity<PageResult<QuartzJob>> queryQuartzJob(QuartzJobQueryCriteria criteria){
+ public ResponseEntity<Object> queryQuartzJob(QuartzJobQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(quartzJobService.queryAll(criteria,page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(quartzJobService.queryAll(criteria, page)), HttpStatus.OK);
}
@ApiOperation("导出任务数据")
@@ -61,71 +63,72 @@
@ApiOperation("查询任务执行日志")
@GetMapping(value = "/logs")
@PreAuthorize("@el.check('timing:list')")
- public ResponseEntity<PageResult<QuartzLog>> queryQuartzJobLog(QuartzJobQueryCriteria criteria){
+ public ResponseEntity<Object> queryQuartzJobLog(QuartzJobQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(quartzJobService.queryAllLog(criteria,page), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(quartzJobService.queryAllLog(criteria, page)), HttpStatus.OK);
}
@Log("新增定时任务")
@ApiOperation("新增定时任务")
@PostMapping
@PreAuthorize("@el.check('timing:add')")
- public ResponseEntity<Object> createQuartzJob(@Validated @RequestBody QuartzJob resources){
+ public ResponseEntity<Object> createQuartzJob(@Validated @RequestBody QuartzJob resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
// 验证Bean是不是合法的，合法的定时任务 Bean 需要用 @Service 定义
checkBean(resources.getBeanName());
quartzJobService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改定时任务")
@ApiOperation("修改定时任务")
@PutMapping
@PreAuthorize("@el.check('timing:edit')")
- public ResponseEntity<Object> updateQuartzJob(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources){
+ public ResponseEntity<Object> updateQuartzJob(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources) {
// 验证Bean是不是合法的，合法的定时任务 Bean 需要用 @Service 定义
checkBean(resources.getBeanName());
quartzJobService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("更改定时任务状态")
@ApiOperation("更改定时任务状态")
@PutMapping(value = "/{id}")
@PreAuthorize("@el.check('timing:edit')")
- public ResponseEntity<Object> updateQuartzJobStatus(@PathVariable Long id){
+ public ResponseEntity<Object> updateQuartzJobStatus(@PathVariable Long id) {
quartzJobService.updateIsPause(quartzJobService.getById(id));
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("执行定时任务")
@ApiOperation("执行定时任务")
@PutMapping(value = "/exec/{id}")
@PreAuthorize("@el.check('timing:edit')")
- public ResponseEntity<Object> executionQuartzJob(@PathVariable Long id){
+ public ResponseEntity<Object> executionQuartzJob(@PathVariable Long id) {
quartzJobService.execution(quartzJobService.getById(id));
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除定时任务")
@ApiOperation("删除定时任务")
@DeleteMapping
@PreAuthorize("@el.check('timing:del')")
- public ResponseEntity<Object> deleteQuartzJob(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteQuartzJob(@RequestBody Set<Long> ids) {
quartzJobService.delete(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
/**
* 验证Bean是不是合法的，合法的定时任务 Bean 需要用 @Service 定义
+ *
* @param beanName Bean名称
*/
- private void checkBean(String beanName){
+ private void checkBean(String beanName) {
// 避免调用攻击者可以从SpringContextHolder获得控制jdbcTemplate类
// 并使用getDeclaredMethod调用jdbcTemplate的queryForMap函数，执行任意sql命令。
- if(!SpringBeanHolder.getAllServiceBeanName().contains(beanName)){
+ if (!SpringBeanHolder.getAllServiceBeanName().contains(beanName)) {
throw new BadRequestException("非法的 Bean，请重新输入！");
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
index fed5323..da9d9b8 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -10,6 +10,7 @@
import com.oying.modules.security.service.UserDetailsServiceImpl;
import com.oying.modules.security.service.dto.AuthUserDto;
import com.oying.modules.security.service.dto.JwtUserDto;
+import com.oying.utils.*;
import com.wf.captcha.base.Captcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,10 +22,6 @@
import com.oying.annotation.rest.AnonymousPostMapping;
import com.oying.config.properties.RsaProperties;
import com.oying.exception.BadRequestException;
-import com.oying.utils.RsaUtils;
-import com.oying.utils.RedisUtils;
-import com.oying.utils.SecurityUtils;
-import com.oying.utils.StringUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -34,6 +31,7 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -98,7 +96,7 @@
// 保存在线信息
onlineUserService.save(jwtUser, token, request);
// 返回登录信息
- return ResponseEntity.ok(authInfo);
+ return ResponseEntity.ok(R.success(authInfo));
}
@ApiOperation("临时授权")
@@ -118,14 +116,14 @@
// 保存在线信息
onlineUserService.save(jwtUser, token, request);
// 返回登录信息
- return ResponseEntity.ok(authInfo);
+ return ResponseEntity.ok(R.success(authInfo));
}
@ApiOperation("获取用户信息")
@GetMapping(value = "/info")
- public ResponseEntity<UserDetails> getUserInfo() {
+ public ResponseEntity<Object> getUserInfo() {
JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
- return ResponseEntity.ok(jwtUser);
+ return ResponseEntity.ok(R.success(jwtUser));
}
@ApiOperation("获取验证码")
@@ -146,7 +144,7 @@
put("img", captcha.toBase64());
put("uuid", uuid);
}};
- return ResponseEntity.ok(imgResult);
+ return ResponseEntity.ok(R.success(imgResult));
}
@ApiOperation("退出登录")
@@ -154,6 +152,6 @@
public ResponseEntity<Object> logout(HttpServletRequest request) {
String token = tokenProvider.getToken(request);
onlineUserService.logout(token);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java b/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java
index c3b988c..174ffdf 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java
@@ -2,6 +2,7 @@
import com.oying.modules.security.service.OnlineUserService;
import com.oying.modules.security.service.dto.OnlineUserDto;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -12,6 +13,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
@@ -30,8 +32,8 @@
@ApiOperation("查询在线用户")
@GetMapping
@PreAuthorize("@el.check()")
- public ResponseEntity<PageResult<OnlineUserDto>> queryOnlineUser(String username, Pageable pageable){
- return new ResponseEntity<>(onlineUserService.getAll(username, pageable),HttpStatus.OK);
+ public ResponseEntity<Object> queryOnlineUser(String username, Pageable pageable) {
+ return new ResponseEntity<>(R.success(onlineUserService.getAll(username, pageable)), HttpStatus.OK);
}
@ApiOperation("导出数据")
@@ -50,6 +52,6 @@
token = EncryptUtils.desDecrypt(token);
onlineUserService.logout(token);
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java b/oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java
index c4012cf..20fdd29 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.IdUtil;
import com.oying.annotation.rest.AnonymousGetMapping;
+import com.oying.utils.R;
import com.oying.utils.RedisUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -39,6 +40,6 @@
//创建验证码
String verification = (int) ((Math.random() * 9 + 1) * 100000) + "";
redisUtils.set(uuid, verification, time);
- return ResponseEntity.ok(uuid);
+ return ResponseEntity.ok(R.success(uuid));
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java b/oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java
index 3245954..68314fd 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.oying.modules.system.domain.Dept;
import com.oying.modules.system.domain.dto.DeptQueryCriteria;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -16,14 +17,15 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
/**
-* @author Z
-* @date 2019-03-25
-*/
+ * @author Z
+ * @date 2019-03-25
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：机构管理")
@@ -43,22 +45,22 @@
@ApiOperation("查询机构")
@GetMapping
@PreAuthorize("@el.check('user:list','dept:list')")
- public ResponseEntity<PageResult<Dept>> queryDept(DeptQueryCriteria criteria) throws Exception {
+ public ResponseEntity<Object> queryDept(DeptQueryCriteria criteria) throws Exception {
List<Dept> depts = deptService.queryAll(criteria, true);
- return new ResponseEntity<>(PageUtil.toPage(depts),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(PageUtil.toPage(depts)), HttpStatus.OK);
}
@ApiOperation("查询机构:根据ID获取同级与上级数据")
@PostMapping("/superior")
@PreAuthorize("@el.check('user:list','dept:list')")
public ResponseEntity<Object> getDeptSuperior(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
- Set<Dept> deptSet = new LinkedHashSet<>();
+ Set<Dept> deptSet = new LinkedHashSet<>();
for (Long id : ids) {
Dept dept = deptService.findById(id);
List<Dept> depts = deptService.getSuperior(dept, new ArrayList<>());
- if(exclude){
+ if (exclude) {
for (Dept data : depts) {
- if(data.getId().equals(dept.getPid())) {
+ if (data.getId().equals(dept.getPid())) {
data.setSubCount(data.getSubCount() - 1);
}
}
@@ -67,46 +69,46 @@
}
deptSet.addAll(depts);
}
- return new ResponseEntity<>(deptService.buildTree(new ArrayList<>(deptSet)),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(deptService.buildTree(new ArrayList<>(deptSet))), HttpStatus.OK);
}
@Log("新增机构")
@ApiOperation("新增机构")
@PostMapping
@PreAuthorize("@el.check('dept:add')")
- public ResponseEntity<Object> createDept(@Validated @RequestBody Dept resources){
+ public ResponseEntity<Object> createDept(@Validated @RequestBody Dept resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
deptService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改机构")
@ApiOperation("修改机构")
@PutMapping
@PreAuthorize("@el.check('dept:edit')")
- public ResponseEntity<Object> updateDept(@Validated(Dept.Update.class) @RequestBody Dept resources){
+ public ResponseEntity<Object> updateDept(@Validated(Dept.Update.class) @RequestBody Dept resources) {
deptService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除机构")
@ApiOperation("删除机构")
@DeleteMapping
@PreAuthorize("@el.check('dept:del')")
- public ResponseEntity<Object> deleteDept(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteDept(@RequestBody Set<Long> ids) {
Set<Dept> depts = new HashSet<>();
for (Long id : ids) {
List<Dept> deptList = deptService.findByPid(id);
depts.add(deptService.findById(id));
- if(CollectionUtil.isNotEmpty(deptList)){
+ if (CollectionUtil.isNotEmpty(deptList)) {
depts = deptService.getDeleteDepts(deptList, depts);
}
}
// 验证是否被角色或用户关联
deptService.verification(depts);
deptService.delete(depts);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/DictController.java b/oying-system/src/main/java/com/oying/modules/system/rest/DictController.java
index 48685d8..bd863b0 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/DictController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/DictController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.system.domain.Dict;
import com.oying.modules.system.domain.dto.DictQueryCriteria;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -15,15 +16,16 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
/**
-* @author Z
-* @date 2019-04-10
-*/
+ * @author Z
+ * @date 2019-04-10
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：字典管理")
@@ -43,45 +45,45 @@
@ApiOperation("查询字典")
@GetMapping(value = "/all")
@PreAuthorize("@el.check('dict:list')")
- public ResponseEntity<List<Dict>> queryAllDict(){
- return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK);
+ public ResponseEntity<Object> queryAllDict() {
+ return new ResponseEntity<>(R.success(dictService.queryAll(new DictQueryCriteria())), HttpStatus.OK);
}
@ApiOperation("查询字典")
@GetMapping
@PreAuthorize("@el.check('dict:list')")
- public ResponseEntity<PageResult<Dict>> queryDict(DictQueryCriteria criteria){
+ public ResponseEntity<Object> queryDict(DictQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(dictService.queryAll(criteria, page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(dictService.queryAll(criteria, page)), HttpStatus.OK);
}
@Log("新增字典")
@ApiOperation("新增字典")
@PostMapping
@PreAuthorize("@el.check('dict:add')")
- public ResponseEntity<Object> createDict(@Validated @RequestBody Dict resources){
+ public ResponseEntity<Object> createDict(@Validated @RequestBody Dict resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
dictService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改字典")
@ApiOperation("修改字典")
@PutMapping
@PreAuthorize("@el.check('dict:edit')")
- public ResponseEntity<Object> updateDict(@Validated(Dict.Update.class) @RequestBody Dict resources){
+ public ResponseEntity<Object> updateDict(@Validated(Dict.Update.class) @RequestBody Dict resources) {
dictService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除字典")
@ApiOperation("删除字典")
@DeleteMapping
@PreAuthorize("@el.check('dict:del')")
- public ResponseEntity<Object> deleteDict(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteDict(@RequestBody Set<Long> ids) {
dictService.delete(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java b/oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java
index 693aaed..90640b6 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.system.domain.DictDetail;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -15,14 +16,15 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
-* @author Z
-* @date 2019-04-10
-*/
+ * @author Z
+ * @date 2019-04-10
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：字典详情管理")
@@ -34,49 +36,49 @@
@ApiOperation("查询字典详情")
@GetMapping
- public ResponseEntity<PageResult<DictDetail>> queryDictDetail(DictDetailQueryCriteria criteria){
+ public ResponseEntity<Object> queryDictDetail(DictDetailQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(dictDetailService.queryAll(criteria, page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(dictDetailService.queryAll(criteria, page)), HttpStatus.OK);
}
@ApiOperation("查询多个字典详情")
@GetMapping(value = "/map")
- public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName){
+ public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName) {
String[] names = dictName.split("[,，]");
Map<String, List<DictDetail>> dictMap = new HashMap<>(16);
for (String name : names) {
dictMap.put(name, dictDetailService.getDictByName(name));
}
- return new ResponseEntity<>(dictMap, HttpStatus.OK);
+ return new ResponseEntity<>(R.success(dictMap), HttpStatus.OK);
}
@Log("新增字典详情")
@ApiOperation("新增字典详情")
@PostMapping
@PreAuthorize("@el.check('dict:add')")
- public ResponseEntity<Object> createDictDetail(@Validated @RequestBody DictDetail resources){
+ public ResponseEntity<Object> createDictDetail(@Validated @RequestBody DictDetail resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
dictDetailService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改字典详情")
@ApiOperation("修改字典详情")
@PutMapping
@PreAuthorize("@el.check('dict:edit')")
- public ResponseEntity<Object> updateDictDetail(@Validated(DictDetail.Update.class) @RequestBody DictDetail resources){
+ public ResponseEntity<Object> updateDictDetail(@Validated(DictDetail.Update.class) @RequestBody DictDetail resources) {
dictDetailService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除字典详情")
@ApiOperation("删除字典详情")
@DeleteMapping(value = "/{id}")
@PreAuthorize("@el.check('dict:del')")
- public ResponseEntity<Object> deleteDictDetail(@PathVariable Long id){
+ public ResponseEntity<Object> deleteDictDetail(@PathVariable Long id) {
dictDetailService.delete(id);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/JobController.java b/oying-system/src/main/java/com/oying/modules/system/rest/JobController.java
index 1638bee..1ce8bce 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/JobController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/JobController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.system.domain.Job;
import com.oying.modules.system.domain.dto.JobQueryCriteria;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -15,14 +16,15 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
/**
-* @author Z
-* @date 2019-03-29
-*/
+ * @author Z
+ * @date 2019-03-29
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：岗位管理")
@@ -42,40 +44,40 @@
@ApiOperation("查询岗位")
@GetMapping
@PreAuthorize("@el.check('job:list','user:list')")
- public ResponseEntity<PageResult<Job>> queryJob(JobQueryCriteria criteria){
+ public ResponseEntity<Object> queryJob(JobQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(jobService.queryAll(criteria, page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(jobService.queryAll(criteria, page)), HttpStatus.OK);
}
@Log("新增岗位")
@ApiOperation("新增岗位")
@PostMapping
@PreAuthorize("@el.check('job:add')")
- public ResponseEntity<Object> createJob(@Validated @RequestBody Job resources){
+ public ResponseEntity<Object> createJob(@Validated @RequestBody Job resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
jobService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改岗位")
@ApiOperation("修改岗位")
@PutMapping
@PreAuthorize("@el.check('job:edit')")
- public ResponseEntity<Object> updateJob(@Validated(Job.Update.class) @RequestBody Job resources){
+ public ResponseEntity<Object> updateJob(@Validated(Job.Update.class) @RequestBody Job resources) {
jobService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除岗位")
@ApiOperation("删除岗位")
@DeleteMapping
@PreAuthorize("@el.check('job:del')")
- public ResponseEntity<Object> deleteJob(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteJob(@RequestBody Set<Long> ids) {
// 验证是否被用户关联
jobService.verification(ids);
jobService.delete(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
index 3ee9b2a..09ee649 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
@@ -4,6 +4,7 @@
import com.oying.modules.system.domain.Menu;
import com.oying.modules.system.domain.dto.MenuQueryCriteria;
import com.oying.modules.system.domain.dto.MenuVo;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -18,6 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,50 +46,50 @@
@GetMapping(value = "/build")
@ApiOperation("获取前端所需菜单")
- public ResponseEntity<List<MenuVo>> buildMenus(){
+ public ResponseEntity<Object> buildMenus() {
List<Menu> menuList = menuService.findByUser(SecurityUtils.getCurrentUserId());
List<Menu> menus = menuService.buildTree(menuList);
- return new ResponseEntity<>(menuService.buildMenus(menus),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.buildMenus(menus)), HttpStatus.OK);
}
@ApiOperation("返回全部的菜单")
@GetMapping(value = "/lazy")
@PreAuthorize("@el.check('menu:list','roles:list')")
- public ResponseEntity<List<Menu>> queryAllMenu(@RequestParam Long pid){
- return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK);
+ public ResponseEntity<Object> queryAllMenu(@RequestParam Long pid) {
+ return new ResponseEntity<>(R.success(menuService.getMenus(pid)), HttpStatus.OK);
}
@ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID")
@GetMapping(value = "/child")
@PreAuthorize("@el.check('menu:list','roles:list')")
- public ResponseEntity<Object> childMenu(@RequestParam Long id){
+ public ResponseEntity<Object> childMenu(@RequestParam Long id) {
Set<Menu> menuSet = new HashSet<>();
List<Menu> menuList = menuService.getMenus(id);
menuSet.add(menuService.getById(id));
menuSet = menuService.getChildMenus(menuList, menuSet);
Set<Long> ids = menuSet.stream().map(Menu::getId).collect(Collectors.toSet());
- return new ResponseEntity<>(ids,HttpStatus.OK);
+ return new ResponseEntity<>(R.success(ids), HttpStatus.OK);
}
@GetMapping
@ApiOperation("查询菜单")
@PreAuthorize("@el.check('menu:list')")
- public ResponseEntity<PageResult<Menu>> queryMenu(MenuQueryCriteria criteria) throws Exception {
+ public ResponseEntity<Object> queryMenu(MenuQueryCriteria criteria) throws Exception {
List<Menu> menuList = menuService.queryAll(criteria, true);
- return new ResponseEntity<>(PageUtil.toPage(menuList),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(PageUtil.toPage(menuList)), HttpStatus.OK);
}
@ApiOperation("查询菜单:根据ID获取同级与上级数据")
@PostMapping("/superior")
@PreAuthorize("@el.check('menu:list')")
- public ResponseEntity<List<Menu>> getMenuSuperior(@RequestBody List<Long> ids) {
+ public ResponseEntity<Object> getMenuSuperior(@RequestBody List<Long> ids) {
Set<Menu> menus = new LinkedHashSet<>();
- if(CollectionUtil.isNotEmpty(ids)){
+ if (CollectionUtil.isNotEmpty(ids)) {
for (Long id : ids) {
Menu menu = menuService.findById(id);
List<Menu> menuList = menuService.getSuperior(menu, new ArrayList<>());
for (Menu data : menuList) {
- if(data.getId().equals(menu.getPid())) {
+ if (data.getId().equals(menu.getPid())) {
data.setSubCount(data.getSubCount() - 1);
}
}
@@ -95,37 +97,37 @@
}
// 编辑菜单时不显示自己以及自己下级的数据，避免出现PID数据环形问题
menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet());
- return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menus)),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.buildTree(new ArrayList<>(menus))), HttpStatus.OK);
}
- return new ResponseEntity<>(menuService.getMenus(null),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.getMenus(null)), HttpStatus.OK);
}
@Log("新增菜单")
@ApiOperation("新增菜单")
@PostMapping
@PreAuthorize("@el.check('menu:add')")
- public ResponseEntity<Object> createMenu(@Validated @RequestBody Menu resources){
+ public ResponseEntity<Object> createMenu(@Validated @RequestBody Menu resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
menuService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改菜单")
@ApiOperation("修改菜单")
@PutMapping
@PreAuthorize("@el.check('menu:edit')")
- public ResponseEntity<Object> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources){
+ public ResponseEntity<Object> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources) {
menuService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除菜单")
@ApiOperation("删除菜单")
@DeleteMapping
@PreAuthorize("@el.check('menu:del')")
- public ResponseEntity<Object> deleteMenu(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteMenu(@RequestBody Set<Long> ids) {
Set<Menu> menuSet = new HashSet<>();
for (Long id : ids) {
List<Menu> menuList = menuService.getMenus(id);
@@ -133,6 +135,6 @@
menuSet = menuService.getChildMenus(menuList, menuSet);
}
menuService.delete(menuSet);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
index 27eaf86..f780bc1 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
@@ -1,5 +1,6 @@
package com.oying.modules.system.rest;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -25,6 +26,6 @@
@ApiOperation("查询服务监控")
@PreAuthorize("@el.check('monitor:list')")
public ResponseEntity<Object> queryMonitor(){
- return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(serverService.getServers()),HttpStatus.OK);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java b/oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java
index fd62232..c002f31 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.lang.Dict;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.system.domain.Role;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -17,6 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collections;
@@ -41,8 +43,8 @@
@ApiOperation("获取单个role")
@GetMapping(value = "/{id}")
@PreAuthorize("@el.check('roles:list')")
- public ResponseEntity<Role> findRoleById(@PathVariable Long id){
- return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
+ public ResponseEntity<Object> findRoleById(@PathVariable Long id) {
+ return new ResponseEntity<>(R.success(roleService.findById(id)), HttpStatus.OK);
}
@ApiOperation("导出角色数据")
@@ -55,63 +57,63 @@
@ApiOperation("返回全部的角色")
@GetMapping(value = "/all")
@PreAuthorize("@el.check('roles:list','user:add','user:edit')")
- public ResponseEntity<List<Role>> queryAllRole(){
- return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK);
+ public ResponseEntity<Object> queryAllRole() {
+ return new ResponseEntity<>(R.success(roleService.queryAll()), HttpStatus.OK);
}
@ApiOperation("查询角色")
@GetMapping
@PreAuthorize("@el.check('roles:list')")
- public ResponseEntity<PageResult<Role>> queryRole(RoleQueryCriteria criteria){
+ public ResponseEntity<Object> queryRole(RoleQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(roleService.queryAll(criteria, page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(roleService.queryAll(criteria, page)), HttpStatus.OK);
}
@ApiOperation("获取用户级别")
@GetMapping(value = "/level")
- public ResponseEntity<Object> getRoleLevel(){
- return new ResponseEntity<>(Dict.create().set("level", getLevels(null)),HttpStatus.OK);
+ public ResponseEntity<Object> getRoleLevel() {
+ return new ResponseEntity<>(R.success(Dict.create().set("level", getLevels(null))), HttpStatus.OK);
}
@Log("新增角色")
@ApiOperation("新增角色")
@PostMapping
@PreAuthorize("@el.check('roles:add')")
- public ResponseEntity<Object> createRole(@Validated @RequestBody Role resources){
+ public ResponseEntity<Object> createRole(@Validated @RequestBody Role resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
getLevels(resources.getLevel());
roleService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改角色")
@ApiOperation("修改角色")
@PutMapping
@PreAuthorize("@el.check('roles:edit')")
- public ResponseEntity<Object> updateRole(@Validated(Role.Update.class) @RequestBody Role resources){
+ public ResponseEntity<Object> updateRole(@Validated(Role.Update.class) @RequestBody Role resources) {
getLevels(resources.getLevel());
roleService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("修改角色菜单")
@ApiOperation("修改角色菜单")
@PutMapping(value = "/menu")
@PreAuthorize("@el.check('roles:edit')")
- public ResponseEntity<Object> updateRoleMenu(@RequestBody Role resources){
+ public ResponseEntity<Object> updateRoleMenu(@RequestBody Role resources) {
Role role = roleService.getById(resources.getId());
getLevels(role.getLevel());
roleService.updateMenu(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除角色")
@ApiOperation("删除角色")
@DeleteMapping
@PreAuthorize("@el.check('roles:del')")
- public ResponseEntity<Object> deleteRole(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteRole(@RequestBody Set<Long> ids) {
for (Long id : ids) {
Role role = roleService.getById(id);
getLevels(role.getLevel());
@@ -119,18 +121,19 @@
// 验证是否被用户关联
roleService.verification(ids);
roleService.delete(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
/**
* 获取用户的角色级别
+ *
* @return /
*/
- private int getLevels(Integer level){
+ private int getLevels(Integer level) {
List<Integer> levels = roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList());
int min = Collections.min(levels);
- if(level != null){
- if(level < min){
+ if (level != null) {
+ if (level < min) {
throw new BadRequestException("权限不足，你的角色级别：" + min + "，低于操作的角色级别：" + level);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/UserController.java b/oying-system/src/main/java/com/oying/modules/system/rest/UserController.java
index a1ce620..29c06fe 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/UserController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/UserController.java
@@ -6,13 +6,10 @@
import com.oying.modules.system.domain.Role;
import com.oying.modules.system.domain.User;
import com.oying.modules.system.domain.dto.UserPassVo;
+import com.oying.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import com.oying.utils.PageResult;
-import com.oying.utils.PageUtil;
-import com.oying.utils.RsaUtils;
-import com.oying.utils.SecurityUtils;
import com.oying.annotation.Log;
import com.oying.config.properties.RsaProperties;
import com.oying.modules.system.service.DataService;
@@ -32,6 +29,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
@@ -64,7 +62,7 @@
@ApiOperation("查询用户")
@GetMapping
@PreAuthorize("@el.check('user:list')")
- public ResponseEntity<PageResult<User>> queryUser(UserQueryCriteria criteria){
+ public ResponseEntity<Object> queryUser(UserQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
criteria.getDeptIds().add(criteria.getDeptId());
@@ -76,30 +74,30 @@
// 数据权限
List<Long> dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername()));
// criteria.getDeptIds() 不为空并且数据权限不为空则取交集
- if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){
+ if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
// 取交集
criteria.getDeptIds().retainAll(dataScopes);
- if(!CollectionUtil.isEmpty(criteria.getDeptIds())){
- return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK);
+ if (!CollectionUtil.isEmpty(criteria.getDeptIds())) {
+ return new ResponseEntity<>(R.success(userService.queryAll(criteria, page)), HttpStatus.OK);
}
} else {
// 否则取并集
criteria.getDeptIds().addAll(dataScopes);
- return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(userService.queryAll(criteria, page)), HttpStatus.OK);
}
- return new ResponseEntity<>(PageUtil.noData(),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@Log("新增用户")
@ApiOperation("新增用户")
@PostMapping
@PreAuthorize("@el.check('user:add')")
- public ResponseEntity<Object> createUser(@Validated @RequestBody User resources){
+ public ResponseEntity<Object> createUser(@Validated @RequestBody User resources) {
checkLevel(resources);
// 默认密码 123456
resources.setPassword(passwordEncoder.encode("123456"));
userService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
}
@Log("修改用户")
@@ -109,50 +107,50 @@
public ResponseEntity<Object> updateUser(@Validated(User.Update.class) @RequestBody User resources) throws Exception {
checkLevel(resources);
userService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
}
@Log("修改用户：个人中心")
@ApiOperation("修改用户：个人中心")
@PutMapping(value = "center")
- public ResponseEntity<Object> centerUser(@Validated(User.Update.class) @RequestBody User resources){
- if(!resources.getId().equals(SecurityUtils.getCurrentUserId())){
+ public ResponseEntity<Object> centerUser(@Validated(User.Update.class) @RequestBody User resources) {
+ if (!resources.getId().equals(SecurityUtils.getCurrentUserId())) {
throw new BadRequestException("不能修改他人资料");
}
userService.updateCenter(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
}
@Log("删除用户")
@ApiOperation("删除用户")
@DeleteMapping
@PreAuthorize("@el.check('user:del')")
- public ResponseEntity<Object> deleteUser(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteUser(@RequestBody Set<Long> ids) {
for (Long id : ids) {
- Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()));
- Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(Role::getLevel).collect(Collectors.toList()));
+ Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()));
+ Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(Role::getLevel).collect(Collectors.toList()));
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足，不能删除：" + userService.findById(id).getUsername());
}
}
userService.delete(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@ApiOperation("修改密码")
@PostMapping(value = "/updatePass")
public ResponseEntity<Object> updateUserPass(@RequestBody UserPassVo passVo) throws Exception {
- String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass());
- String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass());
+ String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass());
+ String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass());
User user = userService.findByName(SecurityUtils.getCurrentUsername());
- if(!passwordEncoder.matches(oldPass, user.getPassword())){
+ if (!passwordEncoder.matches(oldPass, user.getPassword())) {
throw new BadRequestException("修改失败，旧密码错误");
}
- if(passwordEncoder.matches(newPass, user.getPassword())){
+ if (passwordEncoder.matches(newPass, user.getPassword())) {
throw new BadRequestException("新密码不能与旧密码相同");
}
- userService.updatePass(user.getUsername(),passwordEncoder.encode(newPass));
- return new ResponseEntity<>(HttpStatus.OK);
+ userService.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@ApiOperation("重置密码")
@@ -160,35 +158,36 @@
public ResponseEntity<Object> resetPwd(@RequestBody Set<Long> ids) {
String pwd = passwordEncoder.encode("123456");
userService.resetPwd(ids, pwd);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@ApiOperation("修改头像")
@PostMapping(value = "/updateAvatar")
- public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar){
- return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
+ public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar) {
+ return new ResponseEntity<>(R.success(userService.updateAvatar(avatar)), HttpStatus.OK);
}
@Log("修改邮箱")
@ApiOperation("修改邮箱")
@PostMapping(value = "/updateEmail/{code}")
public ResponseEntity<Object> updateUserEmail(@PathVariable String code, @RequestBody User resources) throws Exception {
- String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword());
+ String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, resources.getPassword());
User user = userService.findByName(SecurityUtils.getCurrentUsername());
- if(!passwordEncoder.matches(password, user.getPassword())){
+ if (!passwordEncoder.matches(password, user.getPassword())) {
throw new BadRequestException("密码错误");
}
verificationCodeService.validated(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey() + resources.getEmail(), code);
- userService.updateEmail(user.getUsername(),resources.getEmail());
- return new ResponseEntity<>(HttpStatus.OK);
+ userService.updateEmail(user.getUsername(), resources.getEmail());
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
/**
* 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
+ *
* @param resources /
*/
private void checkLevel(User resources) {
- Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()));
+ Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(Role::getLevel).collect(Collectors.toList()));
Integer optLevel = roleService.findByRoles(resources.getRoles());
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足");
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java b/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
index ca1b4e9..8eb4df8 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java
@@ -1,5 +1,6 @@
package com.oying.modules.system.rest;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -31,7 +32,7 @@
public ResponseEntity<Object> resetEmail(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey());
emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@PostMapping(value = "/email/resetPass")
@@ -39,7 +40,7 @@
public ResponseEntity<Object> resetPass(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey());
emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
@GetMapping(value = "/validated")
@@ -56,6 +57,6 @@
default:
break;
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(),HttpStatus.OK);
}
}
diff --git a/oying-tools/src/main/java/com/oying/rest/EmailController.java b/oying-tools/src/main/java/com/oying/rest/EmailController.java
index 6d45449..dca9078 100644
--- a/oying-tools/src/main/java/com/oying/rest/EmailController.java
+++ b/oying-tools/src/main/java/com/oying/rest/EmailController.java
@@ -1,6 +1,7 @@
package com.oying.rest;
import com.oying.service.EmailService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@
/**
* 发送邮件
+ *
* @author Z
* @date 2018/09/28 6:55:53
*/
@@ -26,8 +28,8 @@
private final EmailService emailService;
@GetMapping
- public ResponseEntity<EmailConfig> queryEmailConfig(){
- return new ResponseEntity<>(emailService.find(),HttpStatus.OK);
+ public ResponseEntity<Object> queryEmailConfig() {
+ return new ResponseEntity<>(R.success(emailService.find()), HttpStatus.OK);
}
@Log("配置邮件")
@@ -35,14 +37,14 @@
@ApiOperation("配置邮件")
public ResponseEntity<Object> updateEmailConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception {
emailService.config(emailConfig, emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@Log("发送邮件")
@PostMapping
@ApiOperation("发送邮件")
- public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto){
- emailService.send(emailDto,emailService.find());
- return new ResponseEntity<>(HttpStatus.OK);
+ public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto) {
+ emailService.send(emailDto, emailService.find());
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
diff --git a/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java b/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
index 47ffe3b..9db5c12 100644
--- a/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
+++ b/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.service.LocalStorageService;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import com.oying.annotation.Log;
import com.oying.domain.LocalStorage;
@@ -16,13 +17,14 @@
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
-* @author Z
-* @date 2019-09-05
-*/
+ * @author Z
+ * @date 2019-09-05
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "工具：本地存储管理")
@@ -34,9 +36,9 @@
@GetMapping
@ApiOperation("查询文件")
@PreAuthorize("@el.check('storage:list')")
- public ResponseEntity<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria){
+ public ResponseEntity<Object> queryFile(LocalStorageQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(localStorageService.queryAll(criteria, page)), HttpStatus.OK);
}
@ApiOperation("导出数据")
@@ -49,30 +51,30 @@
@PostMapping
@ApiOperation("上传文件")
@PreAuthorize("@el.check('storage:add')")
- public ResponseEntity<Object> createFile(@RequestParam String name, @RequestParam("file") MultipartFile file){
+ public ResponseEntity<Object> createFile(@RequestParam String name, @RequestParam("file") MultipartFile file) {
localStorageService.create(name, file);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@ApiOperation("上传图片")
@PostMapping("/pictures")
- public ResponseEntity<LocalStorage> uploadPicture(@RequestParam MultipartFile file){
+ public ResponseEntity<Object> uploadPicture(@RequestParam MultipartFile file) {
// 判断文件是否为图片
String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
- if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){
+ if (!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))) {
throw new BadRequestException("只能上传图片");
}
LocalStorage localStorage = localStorageService.create(null, file);
- return new ResponseEntity<>(localStorage, HttpStatus.OK);
+ return new ResponseEntity<>(R.success(localStorage), HttpStatus.OK);
}
@PutMapping
@Log("修改文件")
@ApiOperation("修改文件")
@PreAuthorize("@el.check('storage:edit')")
- public ResponseEntity<Object> updateFile(@Validated @RequestBody LocalStorage resources){
+ public ResponseEntity<Object> updateFile(@Validated @RequestBody LocalStorage resources) {
localStorageService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除文件")
@@ -80,6 +82,6 @@
@ApiOperation("多选删除")
public ResponseEntity<Object> deleteFile(@RequestBody Long[] ids) {
localStorageService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3