wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：更新数据脚本

Browse Source
This commit is contained in:
Jerry
2022-02-21 15:15:09 +08:00
parent 1cab239a13
commit 499c60a00a
77 changed files with 23843 additions and 16735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml
View File

@@ -9,7 +9,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<resultMap id="BaseResultMapEx" type="com.orangeforms.upmsservice.model.SysDataPerm" extends="BaseResultMap">
@@ -29,7 +28,6 @@
AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString}
</if>
</if>
AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getSysDataPermList" resultMap="BaseResultMap" parameterType="com.orangeforms.upmsservice.model.SysDataPerm">

1
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysMenuMapper.xml
View File

@@ -15,7 +15,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<select id="getMenuListByUserId" resultMap="BaseResultMap">

1
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermCodeMapper.xml
View File

@@ -12,7 +12,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<select id="getPermCodeListByUserId" resultType="java.lang.String">

1
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermMapper.xml
View File

@@ -11,7 +11,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<select id="getPermListByUserId" resultType="java.lang.String">

6
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermModuleMapper.xml
View File

@@ -11,7 +11,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<resultMap id="BaseResultMapEx" type="com.orangeforms.upmsservice.model.SysPermModule" extends="BaseResultMap">
@@ -34,10 +33,7 @@
FROM
zz_sys_perm_module pm
LEFT JOIN
zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
<where>
AND pm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
</where>
zz_sys_perm p ON pm.module_id = p.module_id
ORDER BY
pm.show_order, p.show_order
</select>

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml
View File

@@ -8,7 +8,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<sql id="filterRef">
@@ -18,7 +17,6 @@
AND role_name LIKE #{safeRoleName}
</if>
</if>
AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getSysRoleList" resultMap="BaseResultMap" parameterType="com.orangeforms.upmsservice.model.SysRole">

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysDataPerm.java
View File

@@ -43,13 +43,6 @@ public class SysDataPerm extends BaseModel {
@TableField(value = "rule_type")
private Integer ruleType;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@TableField(exist = false)
private String deptIdListString;

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysMenu.java
View File

@@ -77,13 +77,6 @@ public class SysMenu extends BaseModel {
*/
private String icon;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysMenuPermCodeMapper",
relationMasterIdField = "menuId",

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysPerm.java
View File

@@ -48,13 +48,6 @@ public class SysPerm extends BaseModel {
@TableField(value = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@RelationDict(
masterIdField = "moduleId",
slaveServiceName = "SysPermModuleService",

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysPermCode.java
View File

@@ -60,13 +60,6 @@ public class SysPermCode extends BaseModel {
@TableField(value = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysPermCodePermMapper",
relationMasterIdField = "permCodeId",

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysPermModule.java
View File

@@ -48,13 +48,6 @@ public class SysPermModule extends BaseModel {
@TableField(value = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@TableField(exist = false)
private List<SysPerm> sysPermList;
}

7
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/model/SysRole.java
View File

@@ -36,13 +36,6 @@ public class SysRole extends BaseModel {
@TableField(value = "role_name")
private String roleName;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@TableLogic
@TableField(value = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysRoleMenuMapper",
relationMasterIdField = "roleId",

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysDataPermServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.RedisKeyUtil;
@@ -78,7 +77,6 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
@Override
public SysDataPerm saveNew(SysDataPerm dataPerm, Set<Long> deptIdSet) {
dataPerm.setDataPermId(idGenerator.nextLongId());
dataPerm.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(dataPerm);
sysDataPermMapper.insert(dataPerm);
this.insertRelationData(dataPerm, deptIdSet);

4
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysMenuServiceImpl.java
View File

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.upmsapi.constant.SysMenuType;
@@ -72,7 +71,6 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
@Override
public SysMenu saveNew(SysMenu sysMenu, Set<Long> permCodeIdSet) {
sysMenu.setMenuId(idGenerator.nextLongId());
sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(sysMenu);
sysMenuMapper.insert(sysMenu);
if (permCodeIdSet != null) {
@@ -93,7 +91,6 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
viewSubMenu.setShowOrder(0);
viewSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
viewSubMenu.setOnlineMenuPermType(SysOnlineMenuPermType.TYPE_VIEW);
viewSubMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(viewSubMenu);
sysMenuMapper.insert(viewSubMenu);
SysMenu editSubMenu = new SysMenu();
@@ -104,7 +101,6 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
editSubMenu.setShowOrder(1);
editSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
editSubMenu.setOnlineMenuPermType(SysOnlineMenuPermType.TYPE_EDIT);
editSubMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(editSubMenu);
sysMenuMapper.insert(editSubMenu);
}

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysPermCodeServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.upmsservice.dao.SysMenuPermCodeMapper;
@@ -91,7 +90,6 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
@Override
public SysPermCode saveNew(SysPermCode sysPermCode, Set<Long> permIdSet) {
sysPermCode.setPermCodeId(idGenerator.nextLongId());
sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(sysPermCode);
sysPermCodeMapper.insert(sysPermCode);
if (permIdSet != null) {

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysPermModuleServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.orangeforms.upmsservice.service.impl;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.upmsservice.dao.SysPermModuleMapper;
import com.orangeforms.upmsservice.model.SysPerm;
@@ -55,7 +54,6 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
public SysPermModule saveNew(SysPermModule sysPermModule) {
sysPermModule.setModuleId(idGenerator.nextLongId());
MyModelUtil.fillCommonsForInsert(sysPermModule);
sysPermModule.setDeletedFlag(GlobalDeletedFlag.NORMAL);
sysPermModuleMapper.insert(sysPermModule);
return sysPermModule;
}

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysPermServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.upmsservice.dao.SysPermCodePermMapper;
@@ -62,7 +61,6 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
public SysPerm saveNew(SysPerm perm) {
perm.setPermId(idGenerator.nextLongId());
MyModelUtil.fillCommonsForInsert(perm);
perm.setDeletedFlag(GlobalDeletedFlag.NORMAL);
sysPermMapper.insert(perm);
return perm;
}

2
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/service/impl/SysRoleServiceImpl.java
View File

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.upmsservice.dao.SysRoleMapper;
@@ -67,7 +66,6 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
@Override
public SysRole saveNew(SysRole role, Set<Long> menuIdSet) {
role.setRoleId(idGenerator.nextLongId());
role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(role);
sysRoleMapper.insert(role);
if (menuIdSet != null) {