mirror of
https://gitee.com/orangeform/orange-admin.git
synced 2026-01-18 19:16:37 +08:00
commit:添加多对多关联中间表更新支持,功能位于 班级管理 -> 课程 -> 编辑课程顺序
This commit is contained in:
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
|
||||
/**
|
||||
* upms服务启动类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@SpringCloudApplication
|
||||
@EnableFeignClients(basePackages = "com.orange.demo")
|
||||
|
||||
@@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration;
|
||||
* 应用程序自定义的程序属性配置文件。
|
||||
* NOTE: 和multiDataSource相关的配置没有包含进来,因为涉及到条件属性,所以由其相关的配置对象自己处理。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@RefreshScope
|
||||
|
||||
@@ -13,8 +13,8 @@ import javax.sql.DataSource;
|
||||
/**
|
||||
* 数据源配置Bean对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Configuration
|
||||
@EnableTransactionManagement
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.orange.demo.common.core.object.ResponseResult;
|
||||
import com.orange.demo.common.core.object.TokenData;
|
||||
import com.orange.demo.common.core.util.MyCommonUtil;
|
||||
import com.orange.demo.common.core.util.RsaUtil;
|
||||
import com.orange.demo.common.redis.cache.SessionCacheHelper;
|
||||
import com.orange.demo.upmsinterface.constant.SysUserStatus;
|
||||
import com.orange.demo.upmsinterface.constant.SysUserType;
|
||||
import com.orange.demo.upmsservice.config.ApplicationConfig;
|
||||
@@ -27,8 +28,8 @@ import java.util.*;
|
||||
/**
|
||||
* 登录接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@@ -46,6 +47,8 @@ public class LoginController {
|
||||
@Autowired
|
||||
private ApplicationConfig appConfig;
|
||||
@Autowired
|
||||
private SessionCacheHelper cacheHelper;
|
||||
@Autowired
|
||||
private PasswordEncoder passwordEncoder;
|
||||
|
||||
/**
|
||||
@@ -85,6 +88,7 @@ public class LoginController {
|
||||
*/
|
||||
@PostMapping("/doLogout")
|
||||
public ResponseResult<Void> doLogout() {
|
||||
cacheHelper.removeAllSessionCache();
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@ import java.util.*;
|
||||
/**
|
||||
* 菜单管理接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.*;
|
||||
/**
|
||||
* 权限字管理接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -27,8 +27,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限资源管理接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -25,8 +25,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限资源模块管理接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 角色管理接口控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -12,6 +12,7 @@ import com.orange.demo.common.core.constant.ErrorCodeEnum;
|
||||
import com.orange.demo.common.core.base.controller.BaseController;
|
||||
import com.orange.demo.common.core.base.service.BaseService;
|
||||
import com.orange.demo.common.core.annotation.MyRequestBody;
|
||||
import com.orange.demo.common.core.validator.AddGroup;
|
||||
import com.orange.demo.common.core.validator.UpdateGroup;
|
||||
import com.orange.demo.upmsservice.config.ApplicationConfig;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -24,8 +25,8 @@ import java.util.*;
|
||||
/**
|
||||
* 用户管理操作控制器类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@@ -53,7 +54,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
|
||||
@PostMapping("/add")
|
||||
public ResponseResult<JSONObject> add(
|
||||
@MyRequestBody("sysUser") SysUserDto sysUserDto, @MyRequestBody String roleIdListString) {
|
||||
String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto);
|
||||
String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, Default.class, AddGroup.class);
|
||||
if (errorMessage != null) {
|
||||
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ import java.util.List;
|
||||
/**
|
||||
* 菜单数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysMenuMapper extends BaseDaoMapper<SysMenu> {
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysMenuPermCode;
|
||||
/**
|
||||
* 菜单与权限字关系数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysMenuPermCodeMapper extends BaseDaoMapper<SysMenuPermCode> {
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限字数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysPermCodeMapper extends BaseDaoMapper<SysPermCode> {
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysPermCodePerm;
|
||||
/**
|
||||
* 权限字与权限资源关系数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysPermCodePermMapper extends BaseDaoMapper<SysPermCodePerm> {
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限资源数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysPermMapper extends BaseDaoMapper<SysPerm> {
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ import java.util.List;
|
||||
/**
|
||||
* 权限资源模块数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysPermModuleMapper extends BaseDaoMapper<SysPermModule> {
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysPermWhitelist;
|
||||
/**
|
||||
* 权限资源白名单数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysPermWhitelistMapper extends BaseDaoMapper<SysPermWhitelist> {
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ import java.util.List;
|
||||
/**
|
||||
* 角色数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysRoleMapper extends BaseDaoMapper<SysRole> {
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysRoleMenu;
|
||||
/**
|
||||
* 角色与菜单操作关联关系数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysRoleMenuMapper extends BaseDaoMapper<SysRoleMenu> {
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ import java.util.*;
|
||||
/**
|
||||
* 用户管理数据操作访问接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysUserMapper extends BaseDaoMapper<SysUser> {
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ import java.util.List;
|
||||
/**
|
||||
* 用户与角色关联关系数据访问操作接口。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
public interface SysUserRoleMapper extends BaseDaoMapper<SysUserRole> {
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ import java.util.List;
|
||||
/**
|
||||
* 菜单实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_menu")
|
||||
|
||||
@@ -7,8 +7,8 @@ import javax.persistence.*;
|
||||
/**
|
||||
* 菜单与权限字关联实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_menu_perm_code")
|
||||
|
||||
@@ -13,8 +13,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限资源实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_perm")
|
||||
|
||||
@@ -20,8 +20,8 @@ import java.util.List;
|
||||
/**
|
||||
* 权限字实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_perm_code")
|
||||
|
||||
@@ -7,8 +7,8 @@ import javax.persistence.*;
|
||||
/**
|
||||
* 权限字与权限资源关联实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_perm_code_perm")
|
||||
|
||||
@@ -14,8 +14,8 @@ import java.util.List;
|
||||
/**
|
||||
* 权限模块实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_perm_module")
|
||||
|
||||
@@ -7,8 +7,8 @@ import javax.persistence.*;
|
||||
/**
|
||||
* 白名单实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_perm_whitelist")
|
||||
|
||||
@@ -18,8 +18,8 @@ import java.util.List;
|
||||
/**
|
||||
* 角色实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_role")
|
||||
|
||||
@@ -7,8 +7,8 @@ import javax.persistence.*;
|
||||
/**
|
||||
* 角色菜单实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_role_menu")
|
||||
|
||||
@@ -22,8 +22,8 @@ import java.util.List;
|
||||
/**
|
||||
* SysUser实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_user")
|
||||
|
||||
@@ -7,8 +7,8 @@ import javax.persistence.*;
|
||||
/**
|
||||
* 用户角色实体对象。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Data
|
||||
@Table(name = "zz_sys_user_role")
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 菜单数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysMenuService extends BaseService<SysMenu, SysMenuDto, Long> {
|
||||
|
||||
@@ -24,8 +24,8 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 权限字数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysPermCodeService extends BaseService<SysPermCode, SysPermCodeDto, Long> {
|
||||
|
||||
@@ -18,8 +18,8 @@ import java.util.List;
|
||||
/**
|
||||
* 权限资源模块数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysPermModuleService extends BaseService<SysPermModule, SysPermModuleDto, Long> {
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.Map;
|
||||
/**
|
||||
* 权限资源数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysPermService extends BaseService<SysPerm, SysPermDto, Long> {
|
||||
|
||||
@@ -10,8 +10,8 @@ import org.springframework.stereotype.Service;
|
||||
/**
|
||||
* 白名单数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysPermWhitelistService extends BaseService<SysPermWhitelist, SysPermWhitelist, String> {
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 角色数据服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysRoleService extends BaseService<SysRole, SysRoleDto, Long> {
|
||||
|
||||
@@ -25,8 +25,8 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 用户管理数据操作服务类。
|
||||
*
|
||||
* @author Orange Team
|
||||
* @date 2020-08-08
|
||||
* @author Jerry
|
||||
* @date 2020-09-27
|
||||
*/
|
||||
@Service
|
||||
public class SysUserService extends BaseService<SysUser, SysUserDto, Long> {
|
||||
|
||||
Reference in New Issue
Block a user