Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit f8b24d5c by huangjy
Options

fixbug

parent 30be6791
Inline Side-by-side
Showing with 18 additions and 9 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
...@@ -142,14 +142,17 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -142,14 +142,17 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
} }
private LambdaQueryWrapper<PlatAlarmRecord> getLambdaQueryWrapper(PlatAlarmRecordQueryDTO param) { private LambdaQueryWrapper<PlatAlarmRecord> getLambdaQueryWrapper(PlatAlarmRecordQueryDTO param) {
List<String> orgIdList = Lists.newArrayList(); List<String> typeOrgIdList = Lists.newArrayList();
List<String> choiceOrgIdList = Lists.newArrayList();
if (StringUtils.isNotEmpty(param.getType())) { if (StringUtils.isNotEmpty(param.getType())) {
List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, param.getType())); List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, param.getType()));
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId); typeOrgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
} }
if (StringUtils.isNotEmpty(param.getOrgId())) { if (StringUtils.isNotEmpty(param.getOrgId())) {
orgIdList.addAll(Lists.newArrayList(param.getOrgId().split(","))); choiceOrgIdList.addAll(Lists.newArrayList(param.getOrgId().split(",")));
} }
List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom()) return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
.eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId()) .eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())
.le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo()) .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -108,14 +108,17 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -108,14 +108,17 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
private PersonalConfigCacheUtil personalConfigCacheUtil; private PersonalConfigCacheUtil personalConfigCacheUtil;
private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) { private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
List<String> orgIdList = Lists.newArrayList(); List<String> typeOrgIdList = Lists.newArrayList();
List<String> choiceOrgIdList = Lists.newArrayList();
if (StringUtils.isNotEmpty(dto.getType())) { if (StringUtils.isNotEmpty(dto.getType())) {
List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getType())); List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getType()));
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId); typeOrgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
} }
if (StringUtils.isNotEmpty(dto.getOrgId())) { if (StringUtils.isNotEmpty(dto.getOrgId())) {
orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(","))); choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
} }
List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
return new QueryWrapper<PlatElder>().lambda() return new QueryWrapper<PlatElder>().lambda()
.like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName()) .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
.eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType()) .eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType())
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
...@@ -31,6 +31,7 @@ import com.makeit.vo.platform.space.PlatBedVo; ...@@ -31,6 +31,7 @@ import com.makeit.vo.platform.space.PlatBedVo;
import com.makeit.vo.platform.workstation.WorkStationHomeBedVO; import com.makeit.vo.platform.workstation.WorkStationHomeBedVO;
import com.makeit.vo.platform.workstation.WorkStationInstitutionBedVO; import com.makeit.vo.platform.workstation.WorkStationInstitutionBedVO;
import jodd.util.StringUtil; import jodd.util.StringUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -160,14 +161,16 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl ...@@ -160,14 +161,16 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
@Override @Override
public Page<PlatBedPanoramaVO> selectBySpaceIdAndStatus(PageReqDTO<PlatBedPanoramaDTO> pageReqDTO, PlatBedPanoramaDTO dto) { public Page<PlatBedPanoramaVO> selectBySpaceIdAndStatus(PageReqDTO<PlatBedPanoramaDTO> pageReqDTO, PlatBedPanoramaDTO dto) {
List<String> orgIdList = Lists.newArrayList(); List<String> typeOrgIdList = Lists.newArrayList();
List<String> choiceOrgIdList = Lists.newArrayList();
if (StringUtils.isNotEmpty(dto.getOrgType())) { if (StringUtils.isNotEmpty(dto.getOrgType())) {
List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getOrgType())); List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getOrgType()));
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId); typeOrgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
} }
if (StringUtil.isNotEmpty(dto.getOrgId())) { if (StringUtil.isNotEmpty(dto.getOrgId())) {
orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(","))); choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
} }
List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList); return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
} }
......
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