msb_6557
/
opsli-boot
mirror of https://github.com/hiparker/opsli-boot.git
1
1
Code Issues Projects Releases Wiki Activity

优化代码

Browse Source
v1.4.1
Parker 4 years ago
parent 65c188d0a1
commit 2ec1daaa2c
19 changed files with 84 additions and 72 deletions
Show Stats Download Patch File Download Diff File

56
opsli-api/src/main/java/org/opsli/api/utils/ValidationUtil.java
Unescape View File

@ -15,6 +15,7 @@
*/
package org.opsli.api.utils;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.ApiModelProperty;
@ -29,6 +30,7 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.common.exception.ServiceException;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
/**
* @BelongsProject: opsli-boot
@ -40,12 +42,6 @@ import java.lang.reflect.Field;
@Slf4j
public final class ValidationUtil {
/** 编码格式 */
private static final String CHARSET_NAME = "utf-8";
/** NULL */
private static final String NULL = "null";
/**
* 验证对象
* @param obj
@ -97,7 +93,7 @@ public final class ValidationUtil {
fieldName = annotation.value();
}
String value = String.valueOf(fieldValue);
String value = Convert.toStr(fieldValue);
// 循环验证
for (ValiArgsType type : types) {
@ -114,7 +110,7 @@ public final class ValidationUtil {
break;
// 字母，数字和下划线
case IS_GENERAL:
if(StringUtils.isEmpty(value) || NULL.equals(value)) {
if(StringUtils.isEmpty(value)) {
break;
}
boolean general = Validator.isGeneral(value);
@ -126,7 +122,7 @@ public final class ValidationUtil {
break;
// 数字
case IS_NUMBER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean number = Validator.isNumber(value);
@ -138,7 +134,7 @@ public final class ValidationUtil {
break;
// 纯字母
case IS_LETTER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean letter = Validator.isLetter(value);
@ -150,7 +146,7 @@ public final class ValidationUtil {
break;
// 大写
case IS_UPPER_CASE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean upperCase = Validator.isUpperCase(value);
@ -162,7 +158,7 @@ public final class ValidationUtil {
break;
// 小写
case IS_LOWER_CASE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean lowerCase = Validator.isLowerCase(value);
@ -174,7 +170,7 @@ public final class ValidationUtil {
break;
// IPV4
case IS_IPV4:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean ipv4 = Validator.isIpv4(value);
@ -186,7 +182,7 @@ public final class ValidationUtil {
break;
// 金额
case IS_MONEY:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean money = Validator.isMoney(value);
@ -198,7 +194,7 @@ public final class ValidationUtil {
break;
// 邮箱
case IS_EMAIL:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean email = Validator.isEmail(value);
@ -210,7 +206,7 @@ public final class ValidationUtil {
break;
// 手机号
case IS_MOBILE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean mobile = Validator.isMobile(value);
@ -222,7 +218,7 @@ public final class ValidationUtil {
break;
// 18位身份证
case IS_CITIZENID:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean citizenId = Validator.isCitizenId(value);
@ -234,7 +230,7 @@ public final class ValidationUtil {
break;
// 邮编
case IS_ZIPCODE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean zipCode = Validator.isZipCode(value);
@ -246,7 +242,7 @@ public final class ValidationUtil {
break;
// URL
case IS_URL:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean url = Validator.isUrl(value);
@ -258,7 +254,7 @@ public final class ValidationUtil {
break;
// 汉字
case IS_CHINESE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean chinese = Validator.isChinese(value);
@ -270,7 +266,7 @@ public final class ValidationUtil {
break;
// 汉字，字母，数字和下划线
case IS_GENERAL_WITH_CHINESE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean generalWithChinese = Validator.isGeneralWithChinese(value);
@ -282,7 +278,7 @@ public final class ValidationUtil {
break;
// MAC地址
case IS_MAC:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean mac = Validator.isMac(value);
@ -294,7 +290,7 @@ public final class ValidationUtil {
break;
// 中国车牌
case IS_PLATE_NUMBER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){
if(StringUtils.isEmpty(value)){
break;
}
boolean plateNumber = Validator.isPlateNumber(value);
@ -332,10 +328,10 @@ public final class ValidationUtil {
// 循环验证
try {
String value = String.valueOf(fieldValue);
if(value != null && !NULL.equals(value)){
String value = Convert.toStr(fieldValue);
if(StringUtils.isNotEmpty(value)){
// 转换为 数据库真实 长度
int strLength = value.getBytes(CHARSET_NAME).length;
int strLength = value.getBytes(StandardCharsets.UTF_8).length;
if(strLength > maxLength){
ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MAX;
msg.setFieldName(fieldName);
@ -365,10 +361,10 @@ public final class ValidationUtil {
// 循环验证
try {
String value = String.valueOf(fieldValue);
if(value != null && !NULL.equals(value)){
String value = Convert.toStr(fieldValue);
if(StringUtils.isNotEmpty(value)){
// 转换为 数据库真实 长度
int strLength = value.getBytes(CHARSET_NAME).length;
int strLength = value.getBytes(StandardCharsets.UTF_8).length;
if(strLength < minLength){
ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MIN;
msg.setFieldName(fieldName);
@ -394,5 +390,7 @@ public final class ValidationUtil {
// ================
private ValidationUtil(){}
}

2
opsli-base-support/opsli-core/src/main/java/org/opsli/core/conf/SwaggerConfig.java
Unescape View File

@ -93,7 +93,7 @@ public class SwaggerConfig {
// 描述
.description("后台API接口")
// 作者
.contact("Parker")
.contact(new Contact("Parker", "https://opsli.com", "meet.parker@foxmail.com"))
.license("The Apache License, Version 2.0")
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
.build();

23
opsli-base-support/opsli-core/src/main/java/org/opsli/core/general/StartPrint.java
Unescape View File

@ -20,6 +20,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.thread.ThreadUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@ -44,7 +45,7 @@ public class StartPrint {
/** 服务根地址 */
private static String serverContextPath;
/** 系统启动时间 */
private static Date starterDate;
private static String starterDate;
/**
@ -97,7 +98,7 @@ public class StartPrint {
*/
public String getRunTime(){
//Level.MINUTE表示精确到分
return DateUtil.formatBetween(starterDate, DateUtil.date(), BetweenFormatter.Level.MINUTE);
return DateUtil.formatBetween(DateUtil.parseDateTime(starterDate), DateUtil.date(), BetweenFormatter.Level.MINUTE);
}
// ======================
@ -125,11 +126,23 @@ public class StartPrint {
}
@Value("${opsli.system-starter-time}")
public void setStarterDate(Date starterDate) {
if(starterDate == null){
StartPrint.starterDate = DateUtil.date();
public void setStarterDate(String starterDate) {
// 非空验证
if(StringUtils.isEmpty(starterDate)){
StartPrint.starterDate = DateUtil.date().toString();
return;
}
// 非法时间参数验证
Date tmp = null;
try {
tmp = DateUtil.parseDateTime(starterDate);
}catch (Exception ignored){}
if(tmp == null){
StartPrint.starterDate = DateUtil.date().toString();
return;
}
StartPrint.starterDate = starterDate;
}

2
opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/WebQueryBuilder.java
Unescape View File

@ -179,6 +179,8 @@ public class WebQueryBuilder<T extends BaseEntity> implements QueryBuilder<T>{
queryWrapper.orderByAsc(key);
}
break;
default:
break;
}
}

5
opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/Base64ConvertUtil.java
Unescape View File

@ -1,6 +1,7 @@
package org.opsli.core.utils;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
/**
@ -15,7 +16,7 @@ public final class Base64ConvertUtil {
* @return java.lang.String
*/
public static String encode(String str) throws UnsupportedEncodingException {
byte[] encodeBytes = Base64.getEncoder().encode(str.getBytes("utf-8"));
byte[] encodeBytes = Base64.getEncoder().encode(str.getBytes(StandardCharsets.UTF_8));
return new String(encodeBytes);
}
@ -25,7 +26,7 @@ public final class Base64ConvertUtil {
* @return java.lang.String
*/
public static String decode(String str) throws UnsupportedEncodingException {
byte[] decodeBytes = Base64.getDecoder().decode(str.getBytes("utf-8"));
byte[] decodeBytes = Base64.getDecoder().decode(str.getBytes(StandardCharsets.UTF_8));
return new String(decodeBytes);
}

4
opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/web/TemplateRestController.html
Unescape View File

@ -107,7 +107,7 @@ public class #(data.model.tableName)RestController extends BaseRestController<#(
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(#(data.model.tableName).class, request.getParameterMap());
QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<#(data.model.tableName), #(data.model.tableName)Model> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -218,7 +218,7 @@ public class #(data.model.tableName)RestController extends BaseRestController<#(
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(#(data.model.tableName).class, request.getParameterMap());
QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(#(data.model.tableName)RestApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/web/SysAreaRestController.java
Unescape View File

@ -251,7 +251,7 @@ public class SysAreaRestController extends BaseRestController<SysArea, SysAreaMo
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysArea> queryBuilder = new WebQueryBuilder<>(SysArea.class, request.getParameterMap());
QueryBuilder<SysArea> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(SysAreaRestApi.TITLE, queryBuilder.build(), response, method);
}

4
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java
Unescape View File

@ -89,7 +89,7 @@ public class DictDetailRestController extends BaseRestController<SysDictDetail,
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysDictDetail> queryBuilder = new WebQueryBuilder<>(SysDictDetail.class, request.getParameterMap());
QueryBuilder<SysDictDetail> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysDictDetail, DictDetailModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -214,7 +214,7 @@ public class DictDetailRestController extends BaseRestController<SysDictDetail,
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysDictDetail> queryBuilder = new WebQueryBuilder<>(SysDictDetail.class, request.getParameterMap());
QueryBuilder<SysDictDetail> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(DictDetailApi.TITLE, queryBuilder.build(), response, method);
}

4
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java
Unescape View File

@ -91,7 +91,7 @@ public class DictRestController extends BaseRestController<SysDict, DictModel, I
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysDict> queryBuilder = new WebQueryBuilder<>(SysDict.class, request.getParameterMap());
QueryBuilder<SysDict> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysDict, DictModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -216,7 +216,7 @@ public class DictRestController extends BaseRestController<SysDict, DictModel, I
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysDict> queryBuilder = new WebQueryBuilder<>(SysDict.class, request.getParameterMap());
QueryBuilder<SysDict> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(DictApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java
Unescape View File

@ -74,7 +74,7 @@ public class LogsRestController extends BaseRestController<SysLogs, LogsModel, I
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysLogs> queryBuilder = new WebQueryBuilder<>(SysLogs.class, request.getParameterMap());
QueryBuilder<SysLogs> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysLogs, LogsModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);

14
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
Unescape View File

@ -84,13 +84,13 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
// 获得全量数据
if(UserUtil.SUPER_ADMIN.equals(user.getUsername())){
List<SysMenu> menuList = IService.findList(queryBuilder.build());
menuModelList = WrapperUtil.transformInstance(menuList, MenuModel.class);
menuModelList = WrapperUtil.transformInstance(menuList, modelClazz);
}else {
List<MenuModel> menuListByUserId = UserUtil.getMenuListByUserId(user.getId());
if(menuListByUserId != null){
// 这里有 ehcache的坑 需要深克隆再操作
menuModelList = WrapperUtil.cloneTransformInstance(menuListByUserId
,MenuModel.class);
,modelClazz);
}
List<String> perms = UserUtil.getUserAllPermsByUserId(user.getId());
@ -98,7 +98,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
QueryWrapper<SysMenu> wrapper = queryBuilder.build();
wrapper.in("menu_code", perms);
List<SysMenu> sysMenus = IService.findList(wrapper);
List<MenuModel> menuModels = WrapperUtil.transformInstance(sysMenus, MenuModel.class);
List<MenuModel> menuModels = WrapperUtil.transformInstance(sysMenus, modelClazz);
if(menuModelList != null){
menuModelList.addAll(menuModels);
}
@ -224,7 +224,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
@Override
public ResultVo<?> findMenuTreePage(HttpServletRequest request) {
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(SysMenu.class,
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(entityClazz,
request.getParameterMap());
@ -272,7 +272,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
QueryBuilder<SysMenu> queryBuilder = new GenQueryBuilder<>();
// 菜单集合
List<SysMenu> menuList = IService.findList(queryBuilder.build());
List<MenuModel> menuModelList = WrapperUtil.transformInstance(menuList, MenuModel.class);
List<MenuModel> menuModelList = WrapperUtil.transformInstance(menuList, modelClazz);
return ResultVo.success(menuModelList);
}
@ -304,7 +304,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(SysMenu.class, request.getParameterMap());
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysMenu, MenuModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -400,7 +400,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(SysMenu.class, request.getParameterMap());
QueryBuilder<SysMenu> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(MenuApi.TITLE, queryBuilder.build(), response, method);
}

10
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
Unescape View File

@ -85,7 +85,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
// 获得用户 对应菜单
List<SysOrg> dataList = IService.findList(wrapper);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, SysOrgModel.class);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, modelClazz);
// 0 为初始值
if(PARENT_ID.equals(parentId)){
// 显示全部
@ -173,7 +173,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
// 获得用户 对应菜单
List<SysOrg> dataList = IService.findList(wrapper);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, SysOrgModel.class);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, modelClazz);
//配置
@ -239,7 +239,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
// 获得用户 对应菜单
List<SysOrg> dataList = IService.findList(wrapper);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, SysOrgModel.class);
List<SysOrgModel> orgModelList = WrapperUtil.transformInstance(dataList, modelClazz);
//配置
@ -295,7 +295,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
@Override
public ResultVo<?> findTree(HttpServletRequest request) {
QueryBuilder<SysOrg> queryBuilder = new WebQueryBuilder<>(SysOrg.class,
QueryBuilder<SysOrg> queryBuilder = new WebQueryBuilder<>(entityClazz,
request.getParameterMap());
@ -415,7 +415,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysOrg> queryBuilder = new WebQueryBuilder<>(SysOrg.class, request.getParameterMap());
QueryBuilder<SysOrg> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(SysOrgRestApi.TITLE, queryBuilder.build(), response, method);
}

4
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java
Unescape View File

@ -90,7 +90,7 @@ public class RoleRestController extends BaseRestController<SysRole, RoleModel, I
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysRole> queryBuilder = new WebQueryBuilder<>(SysRole.class, request.getParameterMap());
QueryBuilder<SysRole> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysRole, RoleModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -222,7 +222,7 @@ public class RoleRestController extends BaseRestController<SysRole, RoleModel, I
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysRole> queryBuilder = new WebQueryBuilder<>(SysRole.class, request.getParameterMap());
QueryBuilder<SysRole> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(RoleApi.TITLE, queryBuilder.build(), response, method);
}

8
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java
Unescape View File

@ -86,7 +86,7 @@ public class TenantRestController extends BaseRestController<SysTenant, TenantMo
@Override
public ResultVo<?> findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryBuilder<SysTenant> queryBuilder = new WebQueryBuilder<>(SysTenant.class, request.getParameterMap());
QueryBuilder<SysTenant> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
Page<SysTenant, TenantModel> page = new Page<>(pageNo, pageSize);
page.setQueryWrapper(queryBuilder.build());
page = IService.findPage(page);
@ -178,7 +178,7 @@ public class TenantRestController extends BaseRestController<SysTenant, TenantMo
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysTenant> queryBuilder = new WebQueryBuilder<>(SysTenant.class, request.getParameterMap());
QueryBuilder<SysTenant> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(RoleApi.TITLE, queryBuilder.build(), response, method);
}
@ -188,7 +188,7 @@ public class TenantRestController extends BaseRestController<SysTenant, TenantMo
* @return ResultVo
*/
@ApiOperation(value = "导入Excel", notes = "导入Excel")
@RequiresPermissionsCus("system_tenant_import")
@RequiresPermissions("system_tenant_import")
@EnableLog
@Override
public ResultVo<?> importExcel(MultipartHttpServletRequest request) {
@ -226,7 +226,7 @@ public class TenantRestController extends BaseRestController<SysTenant, TenantMo
SysTenant entity = IService.getOne(queryWrapper);
return ResultVo.success(
WrapperUtil.transformInstance(entity, TenantModel.class)
WrapperUtil.transformInstance(entity, modelClazz)
);
}

8
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
Unescape View File

@ -19,7 +19,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ReflectUtil;
import com.alibaba.excel.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -33,7 +33,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.opsli.api.base.result.ResultVo;
import org.opsli.api.web.system.user.UserApi;
import org.opsli.api.wrapper.system.menu.MenuModel;
import org.opsli.api.wrapper.system.org.SysOrgModel;
import org.opsli.api.wrapper.system.user.*;
import org.opsli.common.annotation.ApiRestController;
import org.opsli.common.annotation.EnableLog;
@ -59,7 +58,6 @@ import org.opsli.modulars.system.user.entity.SysUserAndOrg;
import org.opsli.modulars.system.user.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -210,7 +208,7 @@ public class UserRestController extends BaseRestController<SysUser, UserModel, I
String date = DateUtil.format(DateUtil.date(), "yyyyMMdd");
String dateTime = DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss");
String packageName = basedir + staticPath+"/"+date;
String fileName = dateTime+"-"+ RandomUtil.simpleUUID() +".jpg";
String fileName = dateTime+"-"+ IdUtil.simpleUUID() +".jpg";
File file = new File(packageName+"/"+fileName);
MultipartFile multipartFile = files.get(0);
FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), file);
@ -436,7 +434,7 @@ public class UserRestController extends BaseRestController<SysUser, UserModel, I
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<SysUser> queryBuilder = new WebQueryBuilder<>(SysUser.class, request.getParameterMap());
QueryBuilder<SysUser> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(UserApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/carinfo/web/TestCarRestController.java
Unescape View File

@ -171,7 +171,7 @@ public class TestCarRestController extends BaseRestController<TestCar, TestCarMo
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<TestCar> queryBuilder = new WebQueryBuilder<>(TestCar.class, request.getParameterMap());
QueryBuilder<TestCar> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(TestCarRestApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/web/TestUserRestController.java
Unescape View File

@ -163,7 +163,7 @@ public class TestUserRestController extends BaseRestController<TestUser, TestUse
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<TestUser> queryBuilder = new WebQueryBuilder<>(TestUser.class, request.getParameterMap());
QueryBuilder<TestUser> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(TestUserRestApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/web/TestRestController.java
Unescape View File

@ -147,7 +147,7 @@ public class TestRestController extends BaseRestController<TestEntity, TestModel
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<TestEntity> queryBuilder = new WebQueryBuilder<>(TestEntity.class, request.getParameterMap());
QueryBuilder<TestEntity> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport(TestRestApi.TITLE, queryBuilder.build(), response, method);
}

2
opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/web/TestRestRestController.java
Unescape View File

@ -280,7 +280,7 @@ public class TestRestRestController extends BaseRestController<TestEntity, TestM
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
// 当前方法
Method method = ReflectUtil.getMethodByName(this.getClass(), "exportExcel");
QueryBuilder<TestEntity> queryBuilder = new WebQueryBuilder<>(TestEntity.class, request.getParameterMap());
QueryBuilder<TestEntity> queryBuilder = new WebQueryBuilder<>(entityClazz, request.getParameterMap());
super.excelExport("测试", queryBuilder.build(), response, method);
}

Write Preview
Loading…
Cancel
Save