zhc077
/
projectManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
赵玉瑞 2 years ago
parent dfb6a997ed be9e09c84c
commit fbedf10989
9 changed files with 1065 additions and 1037 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
  2. 11
      ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue
  3. 21
      ant-design-vue-jeecg/src/views/tablex/TablexList.vue
  4. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java
  5. 419
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  6. 151
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  7. 12
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
  8. 2
      jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
  9. 2
      jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml

24
ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
Unescape View File

@ -138,7 +138,7 @@
} }
}, },
{ {
title:'对应实体id', title:'对应实体',
align:"center", align:"center",
dataIndex: 'tableId_dictText' dataIndex: 'tableId_dictText'
}, },
@ -245,8 +245,9 @@
} }
}, },
created() { created() {
this.getSuperFieldList();
this.loadParameter(); this.loadParameter();
this.getSuperFieldList();
this.searchQuery();
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function(){
@ -256,17 +257,30 @@
methods: { methods: {
initDictConfig(){ initDictConfig(){
}, },
searchReset() {
this.tableId = this.$route.query.tableId;
this.queryParam ={};
this.queryParam.tableId = this.tableId;
this.loadData(1);
},
searchQuery(){
this.tableId = this.$route.query.tableId;
this.queryParam.tableId = this.$route.query.tableId;
this.loadData(1);
},
//加载传递参数 //加载传递参数
loadParameter() { loadParameter() {
if (this.loadRouteType == false) { if (this.loadRouteType == false) {
this.tableId = this.$route.query.id; this.queryParam.tableId = this.$route.query.tableId;
console.log(this.tableId) this.tableId = this.$route.query.tableId;
console.log(this.queryParam.tableId)
this.loadRouteType = true; this.loadRouteType = true;
this.loadData(1);
} }
}, },
getSuperFieldList(){ getSuperFieldList(){
let fieldList=[]; let fieldList=[];
fieldList.push({type:'string',value:'tableId',text:'对应实体id',dictCode:'tablex,table_name,id'}) fieldList.push({type:'string',value:'tableId',text:'对应实体',dictCode:'tablex,table_name,id'})
fieldList.push({type:'string',value:'fieldName',text:'中文名称',dictCode:''}) fieldList.push({type:'string',value:'fieldName',text:'中文名称',dictCode:''})
fieldList.push({type:'string',value:'fieldEnName',text:'英文名称',dictCode:''}) fieldList.push({type:'string',value:'fieldEnName',text:'英文名称',dictCode:''})
fieldList.push({type:'sel_search',value:'type',text:'数据类型',dictTable:'', dictText:'', dictCode:'date_type'}) fieldList.push({type:'sel_search',value:'type',text:'数据类型',dictTable:'', dictText:'', dictCode:'date_type'})

11
ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue
Unescape View File

@ -50,12 +50,12 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="关联实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateTable"> <a-form-model-item label="关联实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateTable">
<j-search-select-tag v-model="model.associateTable" dict="tablex,table_name,id" ></j-search-select-tag> <j-search-select-tag v-model="model.associateTable" dict="tablex,table_name,id" @change="ziduan" ></j-search-select-tag>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="关联字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateField"> <a-form-model-item label="关联字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="associateField">
<j-search-select-tag v-model="model.associateField" placeholder="请输入关联字段" dict="fieldx,field_name,id"></j-search-select-tag> <j-search-select-tag v-model="model.associateField" placeholder="请输入关联字段" :dict=field></j-search-select-tag>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -163,7 +163,8 @@
add: "/fieldx/fieldx/add", add: "/fieldx/fieldx/add",
edit: "/fieldx/fieldx/edit", edit: "/fieldx/fieldx/edit",
queryById: "/fieldx/fieldx/queryById" queryById: "/fieldx/fieldx/queryById"
} },
field:'fieldx,field_name,id',
} }
}, },
computed: { computed: {
@ -176,6 +177,10 @@
this.modelDefault = JSON.parse(JSON.stringify(this.model)); this.modelDefault = JSON.parse(JSON.stringify(this.model));
}, },
methods: { methods: {
ziduan(){
this.field="fieldx,field_name,id,table_id="+this.model.associateTable;
this.model.associateField = '';
},
add () { add () {
this.edit(this.modelDefault); this.edit(this.modelDefault);
}, },

21
ant-design-vue-jeecg/src/views/tablex/TablexList.vue
Unescape View File

@ -88,9 +88,11 @@
</a-button> </a-button>
</template> </template>
<template slot="htmlSlot" slot-scope="text,record">
<a @click="tablemanage(record.id)">字段</a>
</template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="tablemanage(record.id)">实体管理</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
@ -165,7 +167,8 @@
{ {
title:'结构图', title:'结构图',
align:"center", align:"center",
dataIndex: 'structuralDiagram' dataIndex: 'structuralDiagram',
scopedSlots: {customRender: 'imgSlot'}
}, },
{ {
title:'创建人', title:'创建人',
@ -202,6 +205,14 @@
align:"center", align:"center",
dataIndex: 'verison' dataIndex: 'verison'
}, },
{
title: '管理',
dataIndex: 'htmlSlot',
align: "center",
fixed: "right",
width: 147,
scopedSlots: {customRender: 'htmlSlot'}
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
@ -232,10 +243,10 @@
}, },
}, },
methods: { methods: {
tablemanage(id) { tablemanage(tableId) {
this.$router.push({ this.$router.push({
path: '/fieldx/FieldxList', path: '/fieldx/FieldxList',
query: {id: id} query: {tableId: tableId}
}) })
}, },
initDictConfig(){ initDictConfig(){

20
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java
Unescape View File

@ -87,6 +87,9 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody Fieldx fieldx) { public Result<?> add(@RequestBody Fieldx fieldx) {
fieldx.setVerison(1); fieldx.setVerison(1);
if (fieldx.getAssociateTable() != null && fieldx.getAssociateTable().equals(fieldx.getTableId())){
return Result.error("实体不能关联自身，添加失败");
}
if (fieldx.getTableId() != null){ if (fieldx.getTableId() != null){
List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", fieldx.getTableId())); List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", fieldx.getTableId()));
for (Fieldx fieldx1 : fieldxList){ for (Fieldx fieldx1 : fieldxList){
@ -116,6 +119,23 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
@ApiOperation(value="字段管理-编辑", notes="字段管理-编辑") @ApiOperation(value="字段管理-编辑", notes="字段管理-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody Fieldx fieldx) { public Result<?> edit(@RequestBody Fieldx fieldx) {
if (fieldx.getAssociateTable() != null && fieldx.getAssociateTable().equals(fieldx.getTableId())){
return Result.error("实体不能关联自身，编辑失败");
}
if (fieldx.getTableId() != null){
List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", fieldx.getTableId()));
for (Fieldx fieldx1 : fieldxList){
if (fieldx1.getFieldName().equals(fieldx.getFieldName())){
return Result.error("编辑失败，所属实体已有该中文名称");
}
if (fieldx1.getFieldEnName().equals(fieldx.getFieldEnName())){
return Result.error("编辑失败，所属实体已有该英文名称");
}
if (fieldx.getIsPk() == 1 && fieldx1.getIsPk() == 1){
return Result.error("该实体已经有主键，编辑失败");
}
}
}
fieldxService.updateById(fieldx); fieldxService.updateById(fieldx);
tablexService.updateSql(fieldx.getTableId(),createSql(fieldx.getTableId())); tablexService.updateSql(fieldx.getTableId(),createSql(fieldx.getTableId()));
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");

419
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View File

File diff suppressed because it is too large Load Diff

151
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -105,7 +105,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
@Override @Override
@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteUser(String userId) { public boolean deleteUser(String userId) {
//1.删除用户 //1.删除用户
@ -116,7 +116,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
@Override @Override
@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteBatchUsers(String userIds) { public boolean deleteBatchUsers(String userIds) {
//1.删除用户 //1.删除用户
@ -136,7 +136,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Transactional @Transactional
public void addUserWithRole(SysUser user, String roles) { public void addUserWithRole(SysUser user, String roles) {
this.save(user); this.save(user);
if(oConvertUtils.isNotEmpty(roles)) { if (oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(","); String[] arr = roles.split(",");
for (String roleId : arr) { for (String roleId : arr) {
SysUserRole userRole = new SysUserRole(user.getId(), roleId); SysUserRole userRole = new SysUserRole(user.getId(), roleId);
@ -146,13 +146,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
@Override @Override
@CacheEvict(value= {CacheConstant.SYS_USERS_CACHE}, allEntries=true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@Transactional @Transactional
public void editUserWithRole(SysUser user, String roles) { public void editUserWithRole(SysUser user, String roles) {
this.updateById(user); this.updateById(user);
//先删后加 //先删后加
sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId())); sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(roles)) { if (oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(","); String[] arr = roles.split(",");
for (String roleId : arr) { for (String roleId : arr) {
SysUserRole userRole = new SysUserRole(user.getId(), roleId); SysUserRole userRole = new SysUserRole(user.getId(), roleId);
@ -169,6 +169,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
/** /**
* 通过用户名获取用户角色集合 * 通过用户名获取用户角色集合
*
* @param username 用户名 * @param username 用户名
* @return 角色集合 * @return 角色集合
*/ */
@ -199,7 +200,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
permissionSet.add(po.getPerms()); permissionSet.add(po.getPerms());
} }
} }
log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) ); log.info("-------通过数据库读取用户拥有的权限Perms------username： " + username + ",Perms size: " + (permissionSet == null ? 0 : permissionSet.size()));
return permissionSet; return permissionSet;
} }
@ -213,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
LoginUser user = sysBaseAPI.getUserByName(username); LoginUser user = sysBaseAPI.getUserByName(username);
if(user!=null) { if (user != null) {
info.setSysUserCode(user.getUsername()); info.setSysUserCode(user.getUsername());
info.setSysUserName(user.getRealname()); info.setSysUserName(user.getRealname());
info.setSysOrgCode(user.getOrgCode()); info.setSysOrgCode(user.getOrgCode());
@ -222,12 +223,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
//多部门支持in查询 //多部门支持in查询
List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId()); List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
List<String> sysMultiOrgCode = new ArrayList<String>(); List<String> sysMultiOrgCode = new ArrayList<String>();
if(list==null || list.size()==0) { if (list == null || list.size() == 0) {
//当前用户无部门 //当前用户无部门
//sysMultiOrgCode.add("0"); //sysMultiOrgCode.add("0");
}else if(list.size()==1) { } else if (list.size() == 1) {
sysMultiOrgCode.add(list.get(0).getOrgCode()); sysMultiOrgCode.add(list.get(0).getOrgCode());
}else { } else {
info.setOneDepart(false); info.setOneDepart(false);
for (SysDepart dpt : list) { for (SysDepart dpt : list) {
sysMultiOrgCode.add(dpt.getOrgCode()); sysMultiOrgCode.add(dpt.getOrgCode());
@ -240,18 +241,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 根据部门Id查询 // 根据部门Id查询
@Override @Override
public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId,String username) { public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId, String username) {
return userMapper.getUserByDepId(page, departId,username); return userMapper.getUserByDepId(page, departId, username);
} }
@Override @Override
public IPage<SysUser> getUserByDepIds(Page<SysUser> page, List<String> departIds, String username) { public IPage<SysUser> getUserByDepIds(Page<SysUser> page, List<String> departIds, String username) {
return userMapper.getUserByDepIds(page, departIds,username); return userMapper.getUserByDepIds(page, departIds, username);
} }
@Override @Override
public List<SysUser> getUserByDepIds(List<String> departIds, String username) { public List<SysUser> getUserByDepIds(List<String> departIds, String username) {
return userMapper.getUserByDepIds(departIds,username); return userMapper.getUserByDepIds(departIds, username);
} }
@Override @Override
public Map<String, String> getDepNamesByUserIds(List<String> userIds) { public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds); List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
@ -292,13 +295,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 根据角色Id查询 // 根据角色Id查询
@Override @Override
public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) { public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {
return userMapper.getUserByRoleId(page,roleId,username); return userMapper.getUserByRoleId(page, roleId, username);
} }
@Override @Override
@CacheEvict(value= {CacheConstant.SYS_USERS_CACHE}, key="#username") @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, key = "#username")
public void updateUserDepart(String username,String orgCode) { public void updateUserDepart(String username, String orgCode) {
baseMapper.updateUserDepart(username, orgCode); baseMapper.updateUserDepart(username, orgCode);
} }
@ -318,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Transactional @Transactional
public void addUserWithDepart(SysUser user, String selectedParts) { public void addUserWithDepart(SysUser user, String selectedParts) {
// this.save(user); //保存角色的时候已经添加过一次了 // this.save(user); //保存角色的时候已经添加过一次了
if(oConvertUtils.isNotEmpty(selectedParts)) { if (oConvertUtils.isNotEmpty(selectedParts)) {
String[] arr = selectedParts.split(","); String[] arr = selectedParts.split(",");
for (String deaprtId : arr) { for (String deaprtId : arr) {
SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
@ -330,32 +333,32 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
public void editUserWithDepart(SysUser user, String departs) { public void editUserWithDepart(SysUser user, String departs) {
this.updateById(user); //更新角色的时候已经更新了一次了，可以再跟新一次 this.updateById(user); //更新角色的时候已经更新了一次了，可以再跟新一次
String[] arr = {}; String[] arr = {};
if(oConvertUtils.isNotEmpty(departs)){ if (oConvertUtils.isNotEmpty(departs)) {
arr = departs.split(","); arr = departs.split(",");
} }
//查询已关联部门 //查询已关联部门
List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(userDepartList != null && userDepartList.size()>0){ if (userDepartList != null && userDepartList.size() > 0) {
for(SysUserDepart depart : userDepartList ){ for (SysUserDepart depart : userDepartList) {
//修改已关联部门删除部门用户角色关系 //修改已关联部门删除部门用户角色关系
if(!Arrays.asList(arr).contains(depart.getDepId())){ if (!Arrays.asList(arr).contains(depart.getDepId())) {
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList( List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId, depart.getDepId()));
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){ if (roleIds != null && roleIds.size() > 0) {
departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
.in(SysDepartRoleUser::getDroleId,roleIds)); .in(SysDepartRoleUser::getDroleId, roleIds));
} }
} }
} }
} }
//先删后加 //先删后加
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) { if (oConvertUtils.isNotEmpty(departs)) {
for (String departId : arr) { for (String departId : arr) {
SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
sysUserDepartMapper.insert(userDepart); sysUserDepartMapper.insert(userDepart);
@ -366,6 +369,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
/** /**
* 校验用户是否有效 * 校验用户是否有效
*
* @param sysUser * @param sysUser
* @return * @return
*/ */
@ -463,51 +467,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public List<SysUser> queryByDepIds(List<String> departIds, String username) { public List<SysUser> queryByDepIds(List<String> departIds, String username) {
return userMapper.queryByDepIds(departIds,username); return userMapper.queryByDepIds(departIds, username);
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) { public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
//首先根据id看修改前有没有这个学生，如果有的话，调用edit修改，没有的话直接添加。
int ans=jxStudentService.cont(user.getId());
//step.1 保存用户 //step.1 保存用户
this.save(user); this.save(user);
//step.2 保存角色 //step.2 保存角色
if(oConvertUtils.isNotEmpty(selectedRoles)) { if (oConvertUtils.isNotEmpty(selectedRoles)) {
String[] arr = selectedRoles.split(","); String[] arr = selectedRoles.split(",");
for (String roleId : arr) { for (String roleId : arr) {
//这串数字是学生角色id
if(roleId.equals("1296245993988284417")){
JxStudent jxStudent=new JxStudent();
jxStudent.setId(user.getId());
jxStudent.setName(user.getRealname());
jxStudent.setPhone(user.getPhone());
jxStudent.setBirthday(user.getBirthday());
if(user.getSex()==1)
jxStudent.setSex("1");
else
jxStudent.setSex("2");
//这里的判断主要是为了防止学生表新加后再来用户表新加会出现的问题。
if(ans==0)
jxStudentService.save(jxStudent);
}
SysUserRole userRole = new SysUserRole(user.getId(), roleId); SysUserRole userRole = new SysUserRole(user.getId(), roleId);
sysUserRoleMapper.insert(userRole); sysUserRoleMapper.insert(userRole);
} }
} }
//step.3 保存所属部门 //step.3 保存所属部门
if(oConvertUtils.isNotEmpty(selectedDeparts)) { if (oConvertUtils.isNotEmpty(selectedDeparts)) {
ans=jxStudentService.cont(user.getId());
String[] arr = selectedDeparts.split(","); String[] arr = selectedDeparts.split(",");
System.out.println(arr.length);
for (String deaprtId : arr) { for (String deaprtId : arr) {
if(arr.length==1&&ans!=0){
JxStudent jxStudent=new JxStudent();
jxStudent.setId(user.getId());
jxStudent.setFaculty(deaprtId);
jxStudentService.updateById(jxStudent);
}
SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
sysUserDepartMapper.insert(userDeaprt); sysUserDepartMapper.insert(userDeaprt);
} }
@ -516,84 +495,46 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
public void editUser(SysUser user, String roles, String departs) { public void editUser(SysUser user, String roles, String departs) {
//首先根据id看修改前有没有这个学生，如果有的话，调用edit修改，没有的话直接添加。
int ans=jxStudentService.cont(user.getId());
//ans不等于0的话，就是有这条数据，调用edit修改，否则就是添加。
//判断修改后，对应用户是否还有学生这个角色。
boolean student=false;
//step.1 修改用户基础信息 //step.1 修改用户基础信息
this.updateById(user); this.updateById(user);
//step.2 修改角色 //step.2 修改角色
//处理用户角色 先删后加 //处理用户角色 先删后加
sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId())); sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
//这里if中判断的是否角色为空，为空直接不执行了，所以说，如果之前有学生的话，要给删掉的。 if (oConvertUtils.isNotEmpty(roles)) {
if(oConvertUtils.isNotEmpty(roles)) {
String[] arr = roles.split(","); String[] arr = roles.split(",");
for (String roleId : arr) { for (String roleId : arr) {
//在修改用户角色时，如果没了学生这个角色，一会就要把对应学生表中的数据给删掉了。
if(roleId.equals("1296245993988284417")){
student=true;
JxStudent jxStudent=new JxStudent();
jxStudent.setId(user.getId());
jxStudent.setName(user.getRealname());
jxStudent.setPhone(user.getPhone());
jxStudent.setBirthday(user.getBirthday());
if(user.getSex()==1)
jxStudent.setSex("1");
else
jxStudent.setSex("2");
//判断是不是第一次给用户学生这个角色，如果是的话就会调用save新增，如果不是的话，就会在原表中进行修改。
if(ans==0)
jxStudentService.save(jxStudent);
else
jxStudentService.updateById(jxStudent);
}
SysUserRole userRole = new SysUserRole(user.getId(), roleId); SysUserRole userRole = new SysUserRole(user.getId(), roleId);
sysUserRoleMapper.insert(userRole); sysUserRoleMapper.insert(userRole);
} }
//如果student为false，则证明修改之后，没有学生这个角色了，要把学生表中对应的信息给删除。
if(!student&&ans!=0){
jxStudentService.removeById(user.getId());
} }
}else{
//修改完一个角色都没有，而且学生表还存在的话，就直接删除。
if(ans!=0)
jxStudentService.removeById(user.getId());}
//step.3 修改部门 //step.3 修改部门
String[] arr = {}; String[] arr = {};
if(oConvertUtils.isNotEmpty(departs)){ if (oConvertUtils.isNotEmpty(departs)) {
arr = departs.split(","); arr = departs.split(",");
} }
//查询已关联部门 //查询已关联部门
List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(userDepartList != null && userDepartList.size()>0){ if (userDepartList != null && userDepartList.size() > 0) {
for(SysUserDepart depart : userDepartList ){ for (SysUserDepart depart : userDepartList) {
//修改已关联部门删除部门用户角色关系 //修改已关联部门删除部门用户角色关系
if(!Arrays.asList(arr).contains(depart.getDepId())){ if (!Arrays.asList(arr).contains(depart.getDepId())) {
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList( List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(
new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId,depart.getDepId())); new QueryWrapper<SysDepartRole>().lambda().eq(SysDepartRole::getDepartId, depart.getDepId()));
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){ if (roleIds != null && roleIds.size() > 0) {
departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId()) departRoleUserMapper.delete(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, user.getId())
.in(SysDepartRoleUser::getDroleId,roleIds)); .in(SysDepartRoleUser::getDroleId, roleIds));
} }
} }
} }
} }
//先删后加 //先删后加
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) { if (oConvertUtils.isNotEmpty(departs)) {
//ans=jxStudentService.cont(user.getId());
for (String departId : arr) { for (String departId : arr) {
if(arr.length==1&&ans!=0){
JxStudent jxStudent=new JxStudent();
jxStudent.setId(user.getId());
jxStudent.setFaculty(departId);
jxStudentService.updateById(jxStudent);
}
SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
sysUserDepartMapper.insert(userDepart); sysUserDepartMapper.insert(userDepart);
} }
@ -615,12 +556,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
public IPage<SysUser> selectStudent(Page<SysUser> page, SysUser user) { public IPage<SysUser> selectStudent(Page<SysUser> page, SysUser user) {
return userMapper.selctStudent(page,user); return userMapper.selctStudent(page, user);
} }
@Override @Override
public IPage<SysUser> page(Page<SysUser> page, String username, String realname) { public IPage<SysUser> page(Page<SysUser> page, String username, String realname) {
return userMapper.page(page,username,realname); return userMapper.page(page, username, realname);
} }
} }

12
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
Unescape View File

@ -97,6 +97,12 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
@ApiOperation(value="实体表-添加", notes="实体表-添加") @ApiOperation(value="实体表-添加", notes="实体表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody Tablex tablex) { public Result<?> add(@RequestBody Tablex tablex) {
List<Tablex> tablexList = tablexService.list();
for (Tablex tablex1 : tablexList){
if (tablex1.getModuleId().equals(tablex.getModuleId())){
return Result.error("该模块已有实体，添加失败");
}
}
if (tablex.getModuleId() != null){ if (tablex.getModuleId() != null){
Modulex modulex = modulexService.getById(tablex.getModuleId()); Modulex modulex = modulexService.getById(tablex.getModuleId());
tablex.setTableName(modulex.getModuleName()); tablex.setTableName(modulex.getModuleName());
@ -118,6 +124,12 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
@ApiOperation(value="实体表-编辑", notes="实体表-编辑") @ApiOperation(value="实体表-编辑", notes="实体表-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody Tablex tablex) { public Result<?> edit(@RequestBody Tablex tablex) {
List<Tablex> tablexList = tablexService.list();
for (Tablex tablex1 : tablexList){
if (tablex1.getModuleId().equals(tablex.getModuleId())){
return Result.error("该模块已有实体，编辑失败");
}
}
if (tablex.getModuleId() != null){ if (tablex.getModuleId() != null){
Modulex modulex = modulexService.getById(tablex.getModuleId()); Modulex modulex = modulexService.getById(tablex.getModuleId());
tablex.setTableName(modulex.getModuleName()); tablex.setTableName(modulex.getModuleName());

2
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
Unescape View File

@ -169,7 +169,7 @@ mybatis-plus:
table-underline: true table-underline: true
configuration: configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段 # 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true call-setters-on-nulls: true
#jeecg专用配置 #jeecg专用配置

2
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
Unescape View File

@ -168,7 +168,7 @@ mybatis-plus:
table-underline: true table-underline: true
configuration: configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段 # 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true call-setters-on-nulls: true
#jeecg专用配置 #jeecg专用配置

Write Preview
Loading…
Cancel
Save