|
@@ -2,13 +2,17 @@ package com.citu.module.menduner.system.service.enterprise.bind;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
|
+import com.citu.framework.common.enums.UserTypeEnum;
|
|
import com.citu.framework.common.pojo.PageResult;
|
|
import com.citu.framework.common.pojo.PageResult;
|
|
import com.citu.framework.common.util.object.BeanUtils;
|
|
import com.citu.framework.common.util.object.BeanUtils;
|
|
import com.citu.framework.security.core.LoginUser;
|
|
import com.citu.framework.security.core.LoginUser;
|
|
|
|
+import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
|
|
|
|
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
|
|
|
|
+import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserPageReqVO;
|
|
|
|
+import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserSaveReqVO;
|
|
|
|
+import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
|
|
import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
|
|
import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
|
|
import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
|
|
import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
|
|
-import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
|
|
|
|
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
|
|
|
|
import com.citu.module.menduner.system.convert.EnterpriseConvert;
|
|
import com.citu.module.menduner.system.convert.EnterpriseConvert;
|
|
import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
|
|
import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
|
|
import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
|
|
import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
|
|
@@ -16,6 +20,7 @@ import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserB
|
|
import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
|
|
import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
|
|
import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
|
|
import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
|
|
import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
|
|
import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
|
|
|
|
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
|
|
import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
|
|
import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
|
|
import com.citu.module.menduner.system.service.user.MdeUserService;
|
|
import com.citu.module.menduner.system.service.user.MdeUserService;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -27,10 +32,11 @@ import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
+import static com.citu.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN;
|
|
import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
|
|
import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
|
|
import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_USER_BIND_NOT_EXISTS;
|
|
|
|
|
|
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 门墩儿-企业登录用户 Service 实现类
|
|
* 门墩儿-企业登录用户 Service 实现类
|
|
@@ -134,14 +140,14 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<AppAdminEnterpriseUserBindRespVO> getBindList() {
|
|
|
|
|
|
+ public List<AppEnterpriseUserBindRespVO> getBindList() {
|
|
List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
|
|
List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
|
|
if (null == list) {
|
|
if (null == list) {
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
- List<AppAdminEnterpriseUserBindRespVO> respList = new ArrayList<>();
|
|
|
|
|
|
+ List<AppEnterpriseUserBindRespVO> respList = new ArrayList<>();
|
|
for (EnterpriseUserBindDO userBindDO : list) {
|
|
for (EnterpriseUserBindDO userBindDO : list) {
|
|
- AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
|
|
|
|
|
|
+ AppEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert11(userBindDO);
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
if (null != enterprise) {
|
|
if (null != enterprise) {
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
@@ -153,7 +159,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<AppAdminEnterpriseUserBindRespVO> getBindListByPhone(String phone) {
|
|
|
|
|
|
+ public List<AppEnterpriseUserBindRespVO> getBindListByPhone(String phone) {
|
|
MdeUserDO user = mdeUserService.getUserByPhone(phone);
|
|
MdeUserDO user = mdeUserService.getUserByPhone(phone);
|
|
if (null == user) {
|
|
if (null == user) {
|
|
// 返回空列表,方便前端跳注册申请页面
|
|
// 返回空列表,方便前端跳注册申请页面
|
|
@@ -164,9 +170,9 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
|
|
if (null == list) {
|
|
if (null == list) {
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
- List<AppAdminEnterpriseUserBindRespVO> respList = new ArrayList<>();
|
|
|
|
|
|
+ List<AppEnterpriseUserBindRespVO> respList = new ArrayList<>();
|
|
for (EnterpriseUserBindDO userBindDO : list) {
|
|
for (EnterpriseUserBindDO userBindDO : list) {
|
|
- AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
|
|
|
|
|
|
+ AppEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert11(userBindDO);
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
if (null != enterprise) {
|
|
if (null != enterprise) {
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
@@ -179,11 +185,8 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public AppAdminEnterpriseUserBindRespVO getBindEnterprise() {
|
|
public AppAdminEnterpriseUserBindRespVO getBindEnterprise() {
|
|
- LoginUser loginUser = getLoginUser();
|
|
|
|
- if (null == loginUser
|
|
|
|
- || null == loginUser.getInfo()) {
|
|
|
|
- throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
|
|
|
|
- }
|
|
|
|
|
|
+ LoginUser loginUser = validAppAdmin();
|
|
|
|
+
|
|
EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
|
|
EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
|
|
.selectByEnterpriseIdAndUserId(
|
|
.selectByEnterpriseIdAndUserId(
|
|
Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)), loginUser.getId());
|
|
Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)), loginUser.getId());
|
|
@@ -191,12 +194,89 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
|
|
throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
|
|
throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 设置企业的信息
|
|
AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
|
|
AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
|
|
if (null != enterprise) {
|
|
if (null != enterprise) {
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
resp.setEnterpriseId(enterprise.getId());
|
|
resp.setEnterpriseName(enterprise.getName());
|
|
resp.setEnterpriseName(enterprise.getName());
|
|
|
|
+ resp.setLogoUrl(enterprise.getLogoUrl());
|
|
}
|
|
}
|
|
return resp;
|
|
return resp;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ @DSTransactional
|
|
|
|
+ public boolean save(AppAdminUserSaveReqVO reqVO) {
|
|
|
|
+ EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper.selectById(reqVO.getId());
|
|
|
|
+ if (null == userBindDO) {
|
|
|
|
+ throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
|
|
|
|
+ }
|
|
|
|
+ userBindDO.setName(reqVO.getName());
|
|
|
|
+ userBindDO.setSex(reqVO.getSex());
|
|
|
|
+ userBindDO.setPhone(reqVO.getPhone());
|
|
|
|
+ userBindDO.setAvatar(reqVO.getAvatar());
|
|
|
|
+ userBindDO.setEmail(reqVO.getEmail());
|
|
|
|
+ return enterpriseUserBindMapper.updateById(userBindDO) > 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ @DSTransactional
|
|
|
|
+ public boolean disable(Long id) {
|
|
|
|
+ EnterpriseUserBindDO userBindDO = valid(id);
|
|
|
|
+ if (MendunerStatusEnum.DISABLE.getStatus().equals(userBindDO.getStatus())) {
|
|
|
|
+ throw exception(MDE_ENTERPRISE_USER_BIND_IS_DISABLE);
|
|
|
|
+ }
|
|
|
|
+ userBindDO.setStatus(MendunerStatusEnum.DISABLE.getStatus());
|
|
|
|
+ return enterpriseUserBindMapper.updateById(userBindDO) == 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ @DSTransactional
|
|
|
|
+ public boolean enable(Long id) {
|
|
|
|
+ EnterpriseUserBindDO userBindDO = valid(id);
|
|
|
|
+ if (MendunerStatusEnum.ENABLE.getStatus().equals(userBindDO.getStatus())) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
|
|
|
|
+ return enterpriseUserBindMapper.updateById(userBindDO) == 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private EnterpriseUserBindDO valid(Long id) {
|
|
|
|
+ LoginUser loginUser = validAppAdmin();
|
|
|
|
+
|
|
|
|
+ // 查找操作的目标用户
|
|
|
|
+ EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
|
|
|
|
+ .selectByEnterpriseIdAndId(
|
|
|
|
+ Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)), id);
|
|
|
|
+
|
|
|
|
+ if (null == userBindDO) {
|
|
|
|
+ throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
|
|
|
|
+ }
|
|
|
|
+ if (userBindDO.getUserId().equals(loginUser.getId())) {
|
|
|
|
+ throw exception(MDE_ENTERPRISE_USER_BIND_IS_ADMIN);
|
|
|
|
+ }
|
|
|
|
+ return userBindDO;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 校验是否app 管理员用户
|
|
|
|
+ **/
|
|
|
|
+ private LoginUser validAppAdmin() {
|
|
|
|
+ LoginUser loginUser = getLoginUser();
|
|
|
|
+
|
|
|
|
+ // 判断操作者是否有权限操作
|
|
|
|
+ if (!UserTypeEnum.MEMBER_ADMIN.getValue()
|
|
|
|
+ .equals(loginUser.getUserType())) {
|
|
|
|
+ throw exception(FORBIDDEN);
|
|
|
|
+ }
|
|
|
|
+ return loginUser;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public PageResult<AppAdminEnterpriseUserBindRespVO> selectPage(AppAdminUserPageReqVO reqVO) {
|
|
|
|
+ LoginUser loginUser = validAppAdmin();
|
|
|
|
+ Long enterpriseId = Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID));
|
|
|
|
+ return enterpriseUserBindMapper.selectPage(reqVO, enterpriseId);
|
|
|
|
+ }
|
|
}
|
|
}
|