Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 4fb84985 by 罗志长
Options

Merge branch 'dev'

parents f9d3ee91 6ef38ac5
Inline Side-by-side
Showing with 27 additions and 8 deletions
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.makeit.common.entity.BaseEntity; import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
...@@ -17,6 +18,8 @@ import com.makeit.entity.platform.auth.PlatUserRole; ...@@ -17,6 +18,8 @@ import com.makeit.entity.platform.auth.PlatUserRole;
import com.makeit.entity.platform.space.PlatSpace; import com.makeit.entity.platform.space.PlatSpace;
import com.makeit.enums.CodeMessageEnum; import com.makeit.enums.CodeMessageEnum;
import com.makeit.enums.CommonEnum; import com.makeit.enums.CommonEnum;
import com.makeit.enums.Const;
import com.makeit.enums.HeaderConst;
import com.makeit.enums.id.TreeConst; import com.makeit.enums.id.TreeConst;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.global.aspect.tenant.TenantIdUtil; import com.makeit.global.aspect.tenant.TenantIdUtil;
...@@ -31,6 +34,7 @@ import com.makeit.service.platform.space.PlatSpaceService; ...@@ -31,6 +34,7 @@ import com.makeit.service.platform.space.PlatSpaceService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.utils.data.convert.PageUtil; import com.makeit.utils.data.convert.PageUtil;
import com.makeit.utils.data.convert.StreamUtil; import com.makeit.utils.data.convert.StreamUtil;
import com.makeit.utils.request.RequestUtil;
import com.makeit.utils.user.plat.PlatUserUtil; import com.makeit.utils.user.plat.PlatUserUtil;
import com.makeit.utils.user.plat.PlatUserVO; import com.makeit.utils.user.plat.PlatUserVO;
import com.makeit.vo.platform.auth.PlatOrgQueryDTO; import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
...@@ -441,6 +445,10 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -441,6 +445,10 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
*/ */
@Override @Override
public Set<String> getOrgIdListByUserId(String userId) { public Set<String> getOrgIdListByUserId(String userId) {
String dataScope = RequestUtil.getHeader(HeaderConst.DATA_SCOPE);
if (StringUtils.isNotBlank(dataScope)) {
return Sets.newHashSet(dataScope.split(Const.COMMON_SPLIT));
}
List<PlatUserRole> userRoleList = platUserRoleService.getByUserId(userId); List<PlatUserRole> userRoleList = platUserRoleService.getByUserId(userId);
if (CollectionUtils.isEmpty(userRoleList)) { if (CollectionUtils.isEmpty(userRoleList)) {
return new HashSet<>(); return new HashSet<>();
......
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
...@@ -571,6 +571,12 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -571,6 +571,12 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
roleIdList.add(-1 + ""); roleIdList.add(-1 + "");
roleIdList = platRoleService.list(new QueryWrapper<PlatRole>().lambda()
.eq(PlatRole::getStatus, CommonEnum.YES.getValue())
.in(PlatRole::getId, roleIdList))
.stream().map(PlatRole::getId)
.collect(Collectors.toList());
List<PlatRoleMenu> roleMenuList = platRoleMenuService.list(new QueryWrapper<PlatRoleMenu>().lambda() List<PlatRoleMenu> roleMenuList = platRoleMenuService.list(new QueryWrapper<PlatRoleMenu>().lambda()
.in(PlatRoleMenu::getRoleId, roleIdList)); .in(PlatRoleMenu::getRoleId, roleIdList));
List<String> menuIdList = StreamUtil.map(roleMenuList, PlatRoleMenu::getMenuId); List<String> menuIdList = StreamUtil.map(roleMenuList, PlatRoleMenu::getMenuId);
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
...@@ -33,6 +33,7 @@ import com.makeit.utils.sql.join.JoinUtil; ...@@ -33,6 +33,7 @@ import com.makeit.utils.sql.join.JoinUtil;
import com.makeit.utils.sys.FileUtil; import com.makeit.utils.sys.FileUtil;
import com.makeit.utils.user.common.CommonUserUtil; import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.utils.user.common.CommonUserVO; import com.makeit.utils.user.common.CommonUserVO;
import com.makeit.utils.user.wechat.WechatUserInfo;
import com.makeit.utils.user.wechat.WechatUserUtil; import com.makeit.utils.user.wechat.WechatUserUtil;
import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO; import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
import com.makeit.vo.platform.elder.PlatElderListVO; import com.makeit.vo.platform.elder.PlatElderListVO;
...@@ -367,11 +368,9 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild ...@@ -367,11 +368,9 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void unbind(String elderId) { public void unbind(String elderId) {
remove(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getElderId,elderId)); WechatUserInfo userInfo = WechatUserUtil.getUserVO();
/* PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId()); remove(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getElderId,elderId)
childrenInfo.setElderId(null); .eq(PlatElderChildrenInfo::getOpenid, userInfo.getOpenid()));
updateById(childrenInfo);*/
} }
} }
//TODO ywc 组织还没填充 //TODO ywc 组织还没填充
\ No newline at end of file
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -576,7 +576,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -576,7 +576,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
int start = 3; int start = 3;
List<ExcelErrorVo> errorVoList = new ArrayList<>(10); List<ExcelErrorVo> errorVoList = new ArrayList<>(10);
Map<String, String> certificateMap = new HashMap<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
PlatElderImportDTO platElderImportDTO = list.get(i); PlatElderImportDTO platElderImportDTO = list.get(i);
...@@ -587,6 +587,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -587,6 +587,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
if(StringUtils.equals(type,"-1")){ if(StringUtils.equals(type,"-1")){
errorVoList.add(new ExcelErrorVo(i + start, "证件类型*","证件类型不存在")); errorVoList.add(new ExcelErrorVo(i + start, "证件类型*","证件类型不存在"));
} }
String certificateKey = type + "_" + platElderImportDTO.getCertificateNumber();
if (certificateMap.containsKey(certificateKey)) {
errorVoList.add(new ExcelErrorVo(i + start, "证件号*","证件号不能重复"));
} else {
certificateMap.put(certificateKey, certificateKey);
}
long count = count(new QueryWrapper<PlatElder>().lambda() long count = count(new QueryWrapper<PlatElder>().lambda()
.eq(StringUtils.isNotEmpty(type), PlatElder::getCertificateType, type) .eq(StringUtils.isNotEmpty(type), PlatElder::getCertificateType, type)
.eq(PlatElder::getCertificateNumber, platElderImportDTO.getCertificateNumber()) .eq(PlatElder::getCertificateNumber, platElderImportDTO.getCertificateNumber())
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
...@@ -171,9 +171,8 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl ...@@ -171,9 +171,8 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
if (StringUtil.isNotEmpty(dto.getOrgId())) { if (StringUtil.isNotEmpty(dto.getOrgId())) {
choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(","))); choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
} }
List<String> orgIdList = Lists.newArrayList(); List<String> orgIdList = typeOrgIdList;
if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgType()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgId())) { if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgType()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgId())) {
orgIdList = typeOrgIdList;
if (CollectionUtils.isEmpty(orgIdList)) { if (CollectionUtils.isEmpty(orgIdList)) {
orgIdList.add("-1"); orgIdList.add("-1");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment