jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-01-15 23:16:33 +08:00
parent 4dde6b7b36
commit 45af87f1f6
6 changed files with 72 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java
View File

@ -202,31 +202,25 @@ public class SysLoginService
{
LoginUser userInfo;
// 查询小程序授权情况
R<SysUserUniopen> uniResult = remoteUserService.findByMaOpenId(loginBody.getOpenId(),SecurityConstants.INNER);
if(Objects.isNull(uniResult) || Objects.isNull(uniResult.getData())){
Map<String,Object> phoneResult = remoteUserService.getMaPhoneNumber(loginBody,SecurityConstants.INNER).getData();
if(Objects.nonNull(phoneResult) && Objects.nonNull(phoneResult.get("phoneNumber"))){
// 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(Convert.toStr(phoneResult.get("phoneNumber")), SecurityConstants.INNER);
if(Objects.isNull(userResult.getData())){
throw new ServiceException("登录失败，当前手机号未获取项目授权...");
}
userInfo = userResult.getData();
Map<String,Object> phoneResult = remoteUserService.getMaPhoneNumber(loginBody,SecurityConstants.INNER).getData();
if(Objects.nonNull(phoneResult) && Objects.nonNull(phoneResult.get("phoneNumber"))){
// 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(Convert.toStr(phoneResult.get("phoneNumber")), SecurityConstants.INNER);
userInfo = userResult.getData();
if(Objects.isNull(userResult.getData())){
throw new ServiceException("登录失败，当前手机号未获取项目授权...");
}
R<SysUserUniopen> uniResult = remoteUserService.findByMaOpenId(loginBody.getOpenId(),SecurityConstants.INNER);
if(Objects.isNull(uniResult) || Objects.isNull(uniResult.getData())){
SysUserUniopen uniopen = new SysUserUniopen();
uniopen.setUserId(userInfo.getUserid());
uniopen.setUserName(userInfo.getUsername());
uniopen.setUserNick(userInfo.getSysUser().getNickName());
uniopen.setMaOpenId(loginBody.getOpenId());
remoteUserService.addSysUserUniopen(uniopen,SecurityConstants.INNER);
}else{
throw new ServiceException("获取授权手机号失败...");
}
}else{
R<LoginUser> userResult = remoteUserService.getUserInfo(Convert.toStr(uniResult.getData().getUserName()), SecurityConstants.INNER);
if(Objects.isNull(userResult.getData())){
throw new ServiceException("登录失败，当前手机号未获取项目授权...");
}
userInfo = userResult.getData();
throw new ServiceException("获取授权手机号失败...");
}
SysUser user = userInfo.getSysUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))

1
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
View File

@ -235,7 +235,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
sysUser.setUpdateBy(DataSourceEnuns.APP.getInfo());
sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName());
sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId());
try {
R<Long> userResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
proProjectInfoSubdepts.setSubDeptLeaderId(userResult.getData());

1
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
View File

@ -378,7 +378,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
sysUser.setUpdateBy(SecurityUtils.getUsername());
sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName());
sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId());
Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
proProjectInfoSubdeptsUsers.setUserId(userId);
proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);

62
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
View File

@ -447,6 +447,7 @@ public class SysUserServiceImpl implements ISysUserService
public Long registerUser(SysUser user) throws ServiceException
{
SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber());
String userPost = user.getUserType();
if(Objects.nonNull(sysUser)){
user.setUserId(sysUser.getUserId());
sysUser.setUserName(user.getUserName());
@ -490,63 +491,79 @@ public class SysUserServiceImpl implements ISysUserService
}
}
Long userId = user.getUserId();
if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){
if(Objects.nonNull(userPost) && Objects.nonNull(user.getDeptId())){
// 删除用户与角色关联
List<SysUserRole> sysUserRoleList = new ArrayList<>();
SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId);
userRole.setDeptId(user.getActiveProjectId());
userRole.setDeptId(user.getDeptId());
userRoleMapper.deleteUserRoleByUserRole(userRole);
if(Objects.equals(user.getUserType(), UserTypeEnums.FBWTDL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getActiveProjectId());
System.out.println("user.getUserType()==>"+userPost);
if(Objects.equals(userPost, UserTypeEnums.FBWTDL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId());
System.out.println("FBWTDL==>"+list.size());
if(StringUtils.isEmpty(list)){
//新增单位角色...
Long roleId = insertDeptSysRole(UserTypeEnums.FBWTDL.getInfo(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId());
Long roleId = insertDeptSysRole(UserTypeEnums.FBWTDL.getInfo(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId(),user.getDeptId());
userRole.setRoleId(roleId);
}else{
userRole.setRoleId(list.get(0).getRoleId());
}
sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(user.getUserType(), UserTypeEnums.FBXMJL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getActiveProjectId());
}else if(Objects.equals(userPost, UserTypeEnums.FBXMJL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId());
System.out.println("FBXMJL==>"+list.size());
if(StringUtils.isEmpty(list)){
//新增单位角色...
Long roleId = insertDeptSysRole(UserTypeEnums.FBXMJL.getInfo(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId());
Long roleId = insertDeptSysRole(UserTypeEnums.FBXMJL.getInfo(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId(),user.getDeptId());
userRole.setRoleId(roleId);
}else{
userRole.setRoleId(list.get(0).getRoleId());
}
sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(user.getUserType(), UserTypeEnums.FBBZZZ.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getActiveProjectId());
}else if(Objects.equals(userPost, UserTypeEnums.FBBZZZ.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId());
System.out.println("FBBZZZ==>"+list.size());
if(StringUtils.isEmpty(list)){
//新增单位角色...
Long roleId = insertDeptSysRole(UserTypeEnums.FBBZZZ.getInfo(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getActiveProjectId(),user.getActiveProjectId());
Long roleId = insertDeptSysRole(UserTypeEnums.FBBZZZ.getInfo(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId(),user.getDeptId());
userRole.setRoleId(roleId);
}else{
userRole.setRoleId(list.get(0).getRoleId());
}
sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(user.getUserType(), UserTypeEnums.JSDWRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.FBLWRY.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId());
System.out.println("FBLWRY==>"+list.size());
if(StringUtils.isEmpty(list)){
//新增单位角色...
Long roleId = insertDeptSysRole(UserTypeEnums.FBLWRY.getInfo(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId(),user.getDeptId());
userRole.setRoleId(roleId);
}else{
userRole.setRoleId(list.get(0).getRoleId());
}
sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userPost, UserTypeEnums.JSDWRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.JLDWRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.JLDWRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.SGDWRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.SGDWRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.CLFBRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.CLFBRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.HQFBRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.HQFBRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.TSSBRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.TSSBRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.KTDWRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.KTDWRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.SJDWRY.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.SJDWRY.getCode())){
}else if(Objects.equals(user.getUserType(), UserTypeEnums.OTHERS.getCode())){
}else if(Objects.equals(userPost, UserTypeEnums.OTHERS.getCode())){
}
}
@ -563,7 +580,7 @@ public class SysUserServiceImpl implements ISysUserService
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
SysUserRole userRole = new SysUserRole();
userRole.setUserId(info.getUserId());
userRole.setDeptId(user.getActiveProjectId());
userRole.setDeptId(user.getDeptId());
userRoleMapper.deleteUserRoleByUserRole(userRole);
return info.getUserId();
}
@ -583,7 +600,8 @@ public class SysUserServiceImpl implements ISysUserService
sysRole.setStatus(ShiFouEnums.FOU.getCodeStr());
sysRole.setCreateBy("SYSTEM");
sysRole.setCreateTime(DateUtils.getNowDate());
roleMapper.insertRole(sysRole);
int r1 = roleMapper.insertRole(sysRole);
System.out.println("insertDeptSysRole.insertRole==>"+r1);
List<SysRoleDept> sysRoleDeptList = new ArrayList<>();
SysRoleDept sysRoleDept = new SysRoleDept();
sysRoleDept.setRoleId(sysRole.getRoleId());

2
yanzhu-ui-app/miniprogram/project.private.config.json
View File

@ -11,7 +11,7 @@
{
"name": "pages/project_qr/index",
"pathName": "pages/project_qr/index",
"query": "QRPID=116&SIGID=1",
"query": "QRPID=132&SIGID=1",
"launchMode": "default",
"scene": null
},

29
yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
View File

@ -3,14 +3,12 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="所属单位" prop="subDeptId">
<el-select v-model="queryParams.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange('query')" clearable
style="width:150px;">
<el-select v-model="queryParams.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange('query')" clearable>
<el-option v-for="(it) in data.subdepts" :key="it.id" :label="it.subDeptName" :value="it.id" />
</el-select>
</el-form-item>
<el-form-item label="班组" prop="subDeptName">
<el-select v-model="queryParams.subDeptGroup" placeholder="请选择班组" @change="doDeptGroupChange" clearable
style="width:150px;">
<el-select v-model="queryParams.subDeptGroup" placeholder="请选择班组" @change="doDeptGroupChange" clearable>
<el-option v-for="(it, idx) in data.queryDeptGroups" :key="idx" :label="it.groupName" :value="it.id" />
</el-select>
</el-form-item>
@ -21,12 +19,12 @@
<el-input v-model="queryParams.userPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工种类型" prop="craftType">
<el-select v-model="queryParams.craftType" placeholder="请选择工种类型" clearable style="width:150px;">
<el-select v-model="queryParams.craftType" placeholder="请选择工种类型" clearable>
<el-option v-for="dict in pro_craft_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工种岗位" prop="craftPost">
<el-select v-model="queryParams.craftPost" placeholder="请选择工种岗位" clearable style="width:150px;">
<el-select v-model="queryParams.craftPost" placeholder="请选择工种岗位" clearable>
<el-option
v-for="dict in (queryParams.craftType ? pro_craft_post.filter(d => d.remark == queryParams.craftType) : [])"
:key="dict.value" :label="dict.label" :value="dict.value" />
@ -95,15 +93,23 @@
<dict-tag :options="pro_craft_post" :value="scope.row.craftPost" />
</template>
</el-table-column>
<el-table-column label="三级安全教育" align="center" class-name="small-padding fixed-width" width="100">
<template #default="scope">
<div v-if="scope.row.subDeptType=='4' || scope.row.subDeptType=='5'">
<el-button v-if="scope.row.eduStatus=='0'" link type="primary" icon="Link" @click="handleDownloadFile(scope.row)">查看</el-button>
<el-button v-if="scope.row.eduStatus!='0'" link type="warning" disabled>未完成</el-button>
</div>
<el-button v-if="scope.row.subDeptType!='4' && scope.row.subDeptType!='5'" link disabled> - </el-button>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="enterState">
<template #default="scope">
<span v-if="scope.row.useStatus == 0" style="color: green;">在场</span>
<span v-else style="color: red">离场</span>
</template>
</el-table-column>
<el-table-column label="出生日期" align="center" prop="info.birthDayStr" v-if="false" />
<el-table-column label="籍贯" align="center" prop="info.nativePlace" v-if="false" />
<!-- <el-table-column label="出生日期" align="center" prop="info.birthDayStr" v-if="false" />
<el-table-column label="籍贯" align="center" prop="info.nativePlace" v-if="false" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@ -761,6 +767,11 @@ function handleDelete(row) {
}).catch(() => { });
}
/** 打开三级安全教育承诺书 */
function handleDownloadFile(row){
proxy.$download.resource(row.eduFilePath);
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('manage/proProjectInfoSubdeptsUsers/export', {