提交 a9c7512c authored 作者: zjm's avatar zjm

feat(单位模块): 添加了单位逻辑注释

添加了单位逻辑注释
上级 0cb1a683
...@@ -112,4 +112,9 @@ public class UnitsCache { ...@@ -112,4 +112,9 @@ public class UnitsCache {
return new ArrayList<>(idMap.values()).stream().noneMatch(units -> units.getName().equals(name)); return new ArrayList<>(idMap.values()).stream().noneMatch(units -> units.getName().equals(name));
} }
public List<Units> queryAreaExhibitionIdList(List<Integer> areaExhibitionIdList)
{
return new ArrayList<>(idMap.values()).stream().filter(unit->areaExhibitionIdList.contains(unit.getExhibitionId())).collect(Collectors.toList());
}
} }
...@@ -16,6 +16,11 @@ public interface AreaExhibitionService extends PublicService<AreaExhibition>{ ...@@ -16,6 +16,11 @@ public interface AreaExhibitionService extends PublicService<AreaExhibition>{
*/ */
AreaExhibition findById(Integer areaExhibitionId); AreaExhibition findById(Integer areaExhibitionId);
/**
* 根据区域id查询对应下级区域以及自己
*/
List<AreaExhibition> queryLowerLevel(Integer areaExhibitionId);
} }
...@@ -215,5 +215,10 @@ public interface UnitsService extends PublicService<Units> { ...@@ -215,5 +215,10 @@ public interface UnitsService extends PublicService<Units> {
*/ */
Units updateUnit(Units units); Units updateUnit(Units units);
/**
* 根据区域id查询对应所有单位id集合
* @param areaExhibitionId
* @return
*/
List<Integer> queryAreaExhibitionIdUnitIds(Integer areaExhibitionId);
} }
package com.tykj.dev.device.user.subject.service.impl; package com.tykj.dev.device.user.subject.service.impl;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.tykj.dev.device.user.cache.AreaExhibitionCache; import com.tykj.dev.device.user.cache.AreaExhibitionCache;
import com.tykj.dev.device.user.subject.dao.AreaExhibitionDao; import com.tykj.dev.device.user.subject.dao.AreaExhibitionDao;
import com.tykj.dev.device.user.subject.entity.Area; import com.tykj.dev.device.user.subject.entity.Area;
import com.tykj.dev.device.user.subject.entity.AreaExhibition; import com.tykj.dev.device.user.subject.entity.AreaExhibition;
import com.tykj.dev.device.user.subject.entity.Units; import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.service.AreaExhibitionService; import com.tykj.dev.device.user.subject.service.AreaExhibitionService;
import com.tykj.dev.misc.base.BaseEntity;
import com.tykj.dev.misc.exception.ApiException; import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.JacksonUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -55,6 +61,18 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService { ...@@ -55,6 +61,18 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService {
} }
} }
@Override
public List<AreaExhibition> queryLowerLevel(Integer areaExhibitionId) {
List<AreaExhibition> areaExhibitionList=new ArrayList<>();
AreaExhibition byId = findById(areaExhibitionId);
areaExhibitionList.add(byId);
if (byId.getFatherId()==null){
List<AreaExhibition> byFatherId = areaExhibitionCache.findByFatherId(byId.getId());
areaExhibitionList.addAll(byFatherId);
}
return areaExhibitionList;
}
@Override @Override
public AreaExhibition save(AreaExhibition areaExhibition) { public AreaExhibition save(AreaExhibition areaExhibition) {
......
...@@ -369,7 +369,6 @@ public class UnitsServiceImpl implements UnitsService { ...@@ -369,7 +369,6 @@ public class UnitsServiceImpl implements UnitsService {
return leftNavigation; return leftNavigation;
} }
@Override @Override
public LeftNavigation findLeftNavigation2(SecurityUser securityUser) { public LeftNavigation findLeftNavigation2(SecurityUser securityUser) {
//直属信息 //直属信息
...@@ -591,6 +590,14 @@ public class UnitsServiceImpl implements UnitsService { ...@@ -591,6 +590,14 @@ public class UnitsServiceImpl implements UnitsService {
return units; return units;
} }
@Override
public List<Integer> queryAreaExhibitionIdUnitIds(Integer areaExhibitionId) {
List<AreaExhibition> areaExhibitionList = areaExhibitionService.queryLowerLevel(areaExhibitionId);
List<Integer> collect = areaExhibitionList.stream().map(AreaExhibition::getId).collect(Collectors.toList());
List<Integer> unitIds = unitsCache.queryAreaExhibitionIdList(collect).stream().map(Units::getUnitId).collect(Collectors.toList());
return unitIds;
}
private void sortingUnit(Integer originalOrder,Integer newOrder){ private void sortingUnit(Integer originalOrder,Integer newOrder){
List<Units> unitsList; List<Units> unitsList;
if (originalOrder>newOrder){ if (originalOrder>newOrder){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论