1.cloneEntity移至BeanUtils 2. 优化import
This commit is contained in:
mazhicheng
parent
b32fa6cb14
commit
8f330f624d
|
|
@ -1,13 +1,10 @@
|
|||
package com.diboot.components.msg.config;
|
||||
|
||||
import com.diboot.core.util.Encryptor;
|
||||
import com.diboot.core.util.V;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author : wangyongliang@dibo.ltd
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import com.diboot.core.vo.JsonResult;
|
|||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.core.vo.Status;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import com.diboot.core.vo.JsonResult;
|
|||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.core.vo.Status;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.diboot.components.msg.entity;
|
||||
|
||||
import com.diboot.components.msg.config.MsgCons;
|
||||
import lombok.Data;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
|
|||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* QueryWrapper构建器 - Entity，DTO -> 注解绑定查询条件 并转换为QueryWrapper对象
|
||||
|
|
@ -177,5 +177,4 @@ public class QueryBuilder {
|
|||
return V.notEmpty(columnName) ? columnName : S.toSnakeCase(field.getName());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
package com.diboot.core.binding;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.diboot.core.binding.binder.BaseBinder;
|
||||
import com.diboot.core.binding.binder.EntityBinder;
|
||||
import com.diboot.core.binding.binder.EntityListBinder;
|
||||
import com.diboot.core.binding.binder.FieldBinder;
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.core.binding.annotation.BindEntity;
|
||||
import com.diboot.core.binding.annotation.BindEntityList;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.core.binding.binder.BaseBinder;
|
||||
import com.diboot.core.binding.binder.EntityBinder;
|
||||
import com.diboot.core.binding.binder.EntityListBinder;
|
||||
import com.diboot.core.binding.binder.FieldBinder;
|
||||
import com.diboot.core.binding.parser.BindAnnotationGroup;
|
||||
import com.diboot.core.binding.parser.BindAnnotationGroupCache;
|
||||
import com.diboot.core.binding.parser.ConditionManager;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,10 @@ package com.diboot.core.binding.binder;
|
|||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.diboot.core.util.*;
|
||||
import com.diboot.core.util.BeanUtils;
|
||||
import com.diboot.core.util.ISetter;
|
||||
import com.diboot.core.util.S;
|
||||
import com.diboot.core.util.V;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
@ -96,7 +99,7 @@ public class EntityBinder<T> extends BaseBinder<T> {
|
|||
}
|
||||
String key = entry.getKey();
|
||||
T value = listMap.get(String.valueOf(fetchValueId));
|
||||
valueEntityMap.put(key, cloneEntity(value));
|
||||
valueEntityMap.put(key, BeanUtils.cloneBean(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -113,31 +116,11 @@ public class EntityBinder<T> extends BaseBinder<T> {
|
|||
String refEntityPKFieldName = S.toLowerCaseCamel(referencedEntityPrimaryKey);
|
||||
for(T entity : list){
|
||||
String pkValue = BeanUtils.getStringProperty(entity, refEntityPKFieldName);
|
||||
valueEntityMap.put(pkValue, cloneEntity(entity));
|
||||
valueEntityMap.put(pkValue, BeanUtils.cloneBean(entity));
|
||||
}
|
||||
}
|
||||
}
|
||||
// 绑定结果
|
||||
BeanUtils.bindPropValueOfList(annoObjectField, annoObjectList, annoObjectForeignKey, valueEntityMap);
|
||||
}
|
||||
|
||||
/**
|
||||
* 克隆对象
|
||||
* @param ent
|
||||
* @param <T>
|
||||
* @return
|
||||
*/
|
||||
protected <T> T cloneEntity(T ent){
|
||||
// 克隆对象
|
||||
try{
|
||||
T cloneEnt = (T)org.springframework.beans.BeanUtils.instantiateClass(ent.getClass());
|
||||
BeanUtils.copyProperties(ent ,cloneEnt);
|
||||
return cloneEnt;
|
||||
}
|
||||
catch (Exception e){
|
||||
log.warn("Clone Object "+ent.getClass().getSimpleName()+" error", e);
|
||||
return ent;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@ import com.diboot.core.util.V;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Entity集合绑定实现
|
||||
|
|
@ -68,7 +71,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
|
|||
for(Object obj : annoObjFKList){
|
||||
T ent = entityMap.get(String.valueOf(obj));
|
||||
if(ent != null){
|
||||
valueList.add(cloneEntity(ent));
|
||||
valueList.add(BeanUtils.cloneBean(ent));
|
||||
}
|
||||
}
|
||||
valueEntityListMap.put(entry.getKey(), valueList);
|
||||
|
|
@ -88,7 +91,7 @@ public class EntityListBinder<T> extends EntityBinder<T> {
|
|||
entityList = new ArrayList<>();
|
||||
valueEntityListMap.put(keyValue, entityList);
|
||||
}
|
||||
entityList.add(cloneEntity(entity));
|
||||
entityList.add(BeanUtils.cloneBean(entity));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package com.diboot.core.binding.parser;
|
||||
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.core.binding.annotation.BindEntity;
|
||||
import com.diboot.core.binding.annotation.BindEntityList;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.diboot.core.binding.parser;
|
||||
|
||||
import com.diboot.core.binding.parser.BindAnnotationGroup;
|
||||
import com.diboot.core.util.V;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import com.diboot.core.util.S;
|
|||
import com.diboot.core.util.SqlExecutor;
|
||||
import com.diboot.core.util.V;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.binding.QueryBuilder;
|
||||
import com.diboot.core.config.Cons;
|
||||
import com.diboot.core.entity.BaseEntity;
|
||||
import com.diboot.core.util.S;
|
||||
import com.diboot.core.util.V;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.validation.ObjectError;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.*;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,12 @@ import com.diboot.core.binding.RelationsBinder;
|
|||
import com.diboot.core.entity.BaseEntity;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.core.vo.Status;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.validation.BindingResult;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.core.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import com.diboot.core.exception.BusinessException;
|
|||
import com.diboot.core.util.S;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.web.ServerProperties;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.diboot.core.binding.RelationsBinder;
|
||||
import com.diboot.core.binding.binder.EntityBinder;
|
||||
import com.diboot.core.binding.binder.EntityListBinder;
|
||||
import com.diboot.core.binding.binder.FieldBinder;
|
||||
import com.diboot.core.binding.RelationsBinder;
|
||||
import com.diboot.core.config.BaseConfig;
|
||||
import com.diboot.core.config.Cons;
|
||||
import com.diboot.core.mapper.BaseCrudMapper;
|
||||
|
|
|
|||
|
|
@ -584,6 +584,25 @@ public class BeanUtils {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 克隆对象
|
||||
* @param ent
|
||||
* @param <T>
|
||||
* @return
|
||||
*/
|
||||
public static <T> T cloneBean(T ent){
|
||||
// 克隆对象
|
||||
try{
|
||||
T cloneObj = (T)org.springframework.beans.BeanUtils.instantiateClass(ent.getClass());
|
||||
copyProperties(ent ,cloneObj);
|
||||
return cloneObj;
|
||||
}
|
||||
catch (Exception e){
|
||||
log.warn("Clone Object "+ent.getClass().getSimpleName()+" error", e);
|
||||
return ent;
|
||||
}
|
||||
}
|
||||
|
||||
/***
|
||||
* 转换方法引用为属性名
|
||||
* @param fn
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package com.diboot.core.util;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.BeansException;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,14 @@ import org.apache.ibatis.session.SqlSessionFactory;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.sql.*;
|
||||
import java.util.*;
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.ResultSetMetaData;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 原生SQL执行类
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.core.vo;
|
||||
|
||||
import com.diboot.core.config.BaseConfig;
|
||||
import com.diboot.core.config.Cons;
|
||||
import com.diboot.core.util.S;
|
||||
import com.diboot.core.util.V;
|
||||
import org.slf4j.Logger;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package diboot.core.test.binder.mapper;
|
|||
|
||||
import com.diboot.core.mapper.BaseCrudMapper;
|
||||
import diboot.core.test.binder.entity.Role;
|
||||
import diboot.core.test.binder.entity.User;
|
||||
|
||||
/**
|
||||
* 员工Mapper
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
package diboot.core.test.binder.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import diboot.core.test.binder.entity.Role;
|
||||
import diboot.core.test.binder.entity.User;
|
||||
|
||||
/**
|
||||
* 角色相关Service
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package diboot.core.test.binder.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import diboot.core.test.binder.entity.User;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package diboot.core.test.binder.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.diboot.core.service.impl.BaseServiceImpl;
|
||||
import diboot.core.test.binder.entity.Role;
|
||||
import diboot.core.test.binder.mapper.RoleMapper;
|
||||
import diboot.core.test.binder.service.RoleService;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package diboot.core.test.binder.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.diboot.core.service.impl.BaseServiceImpl;
|
||||
import diboot.core.test.binder.entity.User;
|
||||
import diboot.core.test.binder.mapper.UserMapper;
|
||||
import diboot.core.test.binder.service.UserService;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package diboot.core.test.binder.vo;
|
||||
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import diboot.core.test.binder.entity.Department;
|
||||
import diboot.core.test.binder.entity.Organization;
|
||||
import diboot.core.test.binder.entity.User;
|
||||
|
|
|
|||
|
|
@ -9,16 +9,13 @@ import com.diboot.core.util.DateConverter;
|
|||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
|
||||
import org.springframework.boot.test.context.TestConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.format.FormatterRegistry;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.converter.HttpMessageConverter;
|
||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package diboot.core.test.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.config.BaseConfig;
|
||||
import com.diboot.core.entity.Dictionary;
|
||||
import com.diboot.core.service.DictionaryService;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@ package com.diboot.example.config;
|
|||
|
||||
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
|
||||
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
|
||||
//import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
|
||||
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
//import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
|
||||
|
||||
/**
|
||||
* Mybatis-Plus配置
|
||||
* @author Mazhicheng
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
|
|||
import com.diboot.core.config.Cons;
|
||||
import com.diboot.core.util.D;
|
||||
import com.diboot.core.util.DateConverter;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import com.diboot.core.config.BaseConfig;
|
|||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.shiro.jwt.BaseJwtAuthenticationToken;
|
||||
import com.diboot.shiro.config.AuthType;
|
||||
import com.diboot.shiro.entity.SysUser;
|
||||
import com.diboot.shiro.jwt.BaseJwtAuthenticationToken;
|
||||
import com.diboot.shiro.service.AuthWayService;
|
||||
import com.diboot.shiro.service.SysUserService;
|
||||
import com.diboot.shiro.util.JwtHelper;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.diboot.example.controller;
|
||||
|
||||
import com.diboot.core.util.JSON;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationPrefix;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationWrapper;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import com.diboot.core.vo.Pagination;
|
|||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.dto.DepartmentDto;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Organization;
|
||||
import com.diboot.example.entity.Tree;
|
||||
import com.diboot.example.service.DepartmentService;
|
||||
import com.diboot.example.vo.DepartmentVO;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.example.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.controller.BaseCrudRestController;
|
||||
import com.diboot.core.service.BaseService;
|
||||
|
|
@ -12,7 +11,6 @@ import com.diboot.core.vo.KeyValue;
|
|||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.dto.EmployeeDto;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Employee;
|
||||
import com.diboot.example.service.EmployeeService;
|
||||
import com.diboot.example.vo.EmployeeVO;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import com.diboot.core.util.S;
|
|||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.util.QiniuHelper;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.example.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.controller.BaseCrudRestController;
|
||||
import com.diboot.core.service.BaseService;
|
||||
|
|
@ -13,7 +12,6 @@ import com.diboot.core.vo.Pagination;
|
|||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.dto.PositionDto;
|
||||
import com.diboot.example.entity.Position;
|
||||
import com.diboot.example.entity.PositionDepartment;
|
||||
import com.diboot.example.entity.Tree;
|
||||
import com.diboot.example.service.PositionDepartmentService;
|
||||
import com.diboot.example.service.PositionService;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package com.diboot.example.controller;
|
|||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.binding.RelationsBinder;
|
||||
import com.diboot.core.controller.BaseCrudRestController;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.service.DictionaryService;
|
||||
|
|
@ -13,14 +12,9 @@ import com.diboot.core.vo.KeyValue;
|
|||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.dto.SysUserDto;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.SysUser;
|
||||
import com.diboot.example.entity.User;
|
||||
import com.diboot.example.service.DepartmentService;
|
||||
import com.diboot.example.service.SysUserService;
|
||||
import com.diboot.example.vo.SysUserListVO;
|
||||
import com.diboot.example.vo.SysUserVO;
|
||||
import com.diboot.example.vo.UserVO;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationPrefix;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationWrapper;
|
||||
import com.diboot.shiro.entity.Permission;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.example.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.binding.QueryBuilder;
|
||||
import com.diboot.core.controller.BaseCrudRestController;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
|
|
@ -10,10 +9,11 @@ import com.diboot.core.vo.Status;
|
|||
import com.diboot.example.dto.UserDto;
|
||||
import com.diboot.example.entity.User;
|
||||
import com.diboot.example.service.UserService;
|
||||
import com.diboot.example.vo.DepartmentVO;
|
||||
import com.diboot.example.vo.UserVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.diboot.example.entity;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Yangzhao
|
||||
* @version v2.0
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package com.diboot.example.entity;
|
|||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/*
|
||||
* 树图标
|
||||
* */
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
package com.diboot.example.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.example.entity.Employee;
|
||||
import com.diboot.example.vo.EmployeeVO;
|
||||
import com.diboot.example.vo.PositionVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
package com.diboot.example.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.example.entity.SysUser;
|
||||
import com.diboot.example.vo.SysUserVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户相关Service
|
||||
* @author Yangzhao
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import com.diboot.example.mapper.DepartmentMapper;
|
|||
import com.diboot.example.service.DepartmentService;
|
||||
import com.diboot.example.util.TreeUtil;
|
||||
import com.diboot.example.vo.DepartmentVO;
|
||||
import com.diboot.example.vo.OrganizationVO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import com.diboot.core.vo.Pagination;
|
|||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Employee;
|
||||
import com.diboot.example.entity.EmployeePositionDepartment;
|
||||
import com.diboot.example.entity.PositionDepartment;
|
||||
import com.diboot.example.mapper.EmployeeMapper;
|
||||
import com.diboot.example.service.DepartmentService;
|
||||
import com.diboot.example.service.EmployeePositionDepartmentService;
|
||||
|
|
@ -25,9 +24,11 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 员工相关Service实现
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.diboot.example.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.diboot.core.binding.RelationsBinder;
|
||||
import com.diboot.core.service.impl.BaseServiceImpl;
|
||||
import com.diboot.core.util.BeanUtils;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import com.diboot.core.binding.RelationsBinder;
|
|||
import com.diboot.core.service.impl.BaseServiceImpl;
|
||||
import com.diboot.core.util.BeanUtils;
|
||||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Position;
|
||||
|
|
@ -26,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 职位相关Service实现
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
package com.diboot.example.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.binding.RelationsBinder;
|
||||
import com.diboot.core.service.impl.BaseServiceImpl;
|
||||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.example.entity.SysUser;
|
||||
import com.diboot.example.mapper.SysUserMapper;
|
||||
import com.diboot.example.service.SysUserService;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package com.diboot.example.vo;
|
||||
|
||||
import com.diboot.core.binding.annotation.BindEntity;
|
||||
import com.diboot.core.binding.annotation.BindEntityList;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Organization;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.diboot.example.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.diboot.core.binding.annotation.BindEntityList;
|
||||
import com.diboot.core.entity.Dictionary;
|
||||
import lombok.Data;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.diboot.example.vo;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.core.binding.annotation.BindEntityList;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.SysUser;
|
||||
import com.diboot.shiro.entity.Role;
|
||||
import lombok.Data;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package com.diboot.example.vo;
|
||||
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.core.binding.annotation.BindEntity;
|
||||
import com.diboot.core.binding.annotation.BindField;
|
||||
import com.diboot.core.binding.annotation.BindDict;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.Organization;
|
||||
import com.diboot.example.entity.User;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import com.diboot.core.util.V;
|
|||
import com.diboot.shiro.wx.cp.service.impl.WxCpServiceExtImpl;
|
||||
import com.google.common.collect.Maps;
|
||||
import me.chanjar.weixin.cp.api.WxCpService;
|
||||
import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
|
||||
import me.chanjar.weixin.cp.config.WxCpInMemoryConfigStorage;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import com.diboot.shiro.util.JwtHelper;
|
|||
import com.diboot.shiro.wx.cp.config.WxCpConfig;
|
||||
import com.diboot.shiro.wx.cp.service.impl.WxCpServiceExtImpl;
|
||||
import me.chanjar.weixin.common.api.WxConsts;
|
||||
import me.chanjar.weixin.cp.api.WxCpService;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.slf4j.Logger;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.diboot.shiro.authz.config;
|
||||
|
||||
import com.diboot.shiro.authz.properties.AuthorizationProperties;
|
||||
import com.diboot.shiro.authz.properties.AuthCacheProperties;
|
||||
import com.diboot.shiro.authz.properties.AuthorizationProperties;
|
||||
import com.diboot.shiro.authz.storage.AuthorizationStorage;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
|
|||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author : wee
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import lombok.Data;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ApplicationListener;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.lang.reflect.Method;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ import com.diboot.shiro.authz.aop.CustomAuthorizationAttributeSourceAdvisor;
|
|||
import com.diboot.shiro.authz.cache.MemoryCondition;
|
||||
import com.diboot.shiro.authz.cache.RedisCacheManager;
|
||||
import com.diboot.shiro.authz.cache.RedisCondition;
|
||||
import com.diboot.shiro.authz.properties.AuthorizationProperties;
|
||||
import com.diboot.shiro.authz.properties.AuthCacheProperties;
|
||||
import com.diboot.shiro.authz.properties.AuthorizationProperties;
|
||||
import com.diboot.shiro.jwt.BaseJwtAuthenticationFilter;
|
||||
import com.diboot.shiro.jwt.BaseJwtRealm;
|
||||
import org.apache.shiro.cache.CacheManager;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
|||
import com.diboot.core.entity.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package com.diboot.shiro.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.diboot.core.entity.BaseEntity;
|
||||
import com.diboot.core.util.S;
|
||||
import com.diboot.shiro.vo.RoleVO;
|
||||
import lombok.Data;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
package com.diboot.shiro.jwt;
|
||||
|
||||
import com.diboot.core.exception.BusinessException;
|
||||
import com.diboot.core.util.JSON;
|
||||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.JsonResult;
|
||||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.shiro.util.JwtHelper;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
|||
|
|
@ -13,14 +13,12 @@ import org.apache.shiro.authc.AuthenticationToken;
|
|||
import org.apache.shiro.authc.SimpleAuthenticationInfo;
|
||||
import org.apache.shiro.authz.AuthorizationInfo;
|
||||
import org.apache.shiro.authz.SimpleAuthorizationInfo;
|
||||
import org.apache.shiro.cache.CacheManager;
|
||||
import org.apache.shiro.realm.AuthorizingRealm;
|
||||
import org.apache.shiro.subject.PrincipalCollection;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
package com.diboot.shiro.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.diboot.core.service.BaseService;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.shiro.dto.PermissionDto;
|
||||
import com.diboot.shiro.entity.Permission;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.diboot.shiro.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.enums.SqlMethod;
|
||||
|
|
@ -14,7 +13,6 @@ import com.diboot.core.service.impl.BaseServiceImpl;
|
|||
import com.diboot.core.util.BeanUtils;
|
||||
import com.diboot.core.util.V;
|
||||
import com.diboot.core.vo.Pagination;
|
||||
import com.diboot.shiro.dto.PermissionDto;
|
||||
import com.diboot.shiro.entity.Permission;
|
||||
import com.diboot.shiro.mapper.PermissionMapper;
|
||||
import com.diboot.shiro.service.PermissionService;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import com.diboot.shiro.jwt.BaseJwtAuthenticationToken;
|
|||
import com.diboot.shiro.service.AuthWayService;
|
||||
import com.diboot.shiro.service.SysUserService;
|
||||
import com.diboot.shiro.util.AuthHelper;
|
||||
import com.diboot.shiro.util.ProxyToTargetObjectHelper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import com.diboot.core.entity.BaseEntity;
|
|||
import com.diboot.core.util.S;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.crypto.hash.Md5Hash;
|
||||
import org.apache.shiro.crypto.hash.SimpleHash;
|
||||
import org.apache.shiro.subject.Subject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
|||
Loading…
Reference in New Issue