Skip to content

D
device-back
提交 24c7a7d5 authored 作者: 133's avatar 133
浏览文件
操作

[用户] 单位添加type字段

上级 6357ce6d
隐藏空白字符变更
内嵌 并排
正在显示 包含 139 行增加 和 68 行删除
dev-user/src/main/java/com/tykj/dev/device/user/base/ret/AreaVo.java
浏览文件 @ 24c7a7d5
......@@ -39,6 +39,7 @@ public class AreaVo {
private List<UnitsVo> units;
private List<AreaVo> areaVos;
/**
* 前端使用对象
*/
......
dev-user/src/main/java/com/tykj/dev/device/user/base/ret/LeftNavigation.java 0 → 100644
浏览文件 @ 24c7a7d5
package com.tykj.dev.device.user.base.ret;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author zjm
* @version 1.0.0
* @ClassName LeftNavigation.java
* @Description TODO
* @createTime 2021年01月15日 15:55:00
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "专管员交接对象", description = "专管员交接对象")
public class LeftNavigation {
/**
* id
*/
private Integer id;
/**
* 名称
*/
private String name;
/**
* 下级对象
*/
private List<LeftNavigation> leftNavigations;
/**
* 定位id
*/
private String location;
/**
* 类型
*/
private Integer type;
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java
浏览文件 @ 24c7a7d5
......@@ -51,7 +51,7 @@ public class UnitsController {
@ApiOperation(value = "查询装备库、专管员左侧的区域单位列表", notes = "单位组织结构集合")
public ResponseEntity selectOrganizationUnits(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
log.info("数据星系：{}",securityUser);
return ResponseEntity.ok(unitsService.findListAreaUnitsVo(securityUser));
return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser));
}
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Area.java
浏览文件 @ 24c7a7d5
package com.tykj.dev.device.user.subject.entity;
import com.tykj.dev.device.user.base.ret.AreaVo;
import com.tykj.dev.device.user.base.ret.LeftNavigation;
import com.tykj.dev.misc.base.BeanHelper;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
......@@ -9,6 +10,7 @@ import lombok.NoArgsConstructor;
import org.modelmapper.ModelMapper;
import javax.persistence.*;
import java.util.UUID;
/**
* @author zjm
......@@ -69,6 +71,9 @@ public class Area {
return mapper.map(this, AreaVo.class);
}
public LeftNavigation toLeftNavigation(){
return new LeftNavigation(id,name,null, UUID.randomUUID().toString(),1);
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Units.java
浏览文件 @ 24c7a7d5
package com.tykj.dev.device.user.subject.entity;
import com.tykj.dev.device.user.base.ret.LeftNavigation;
import com.tykj.dev.device.user.base.ret.UnitsTrainVo;
import com.tykj.dev.device.user.base.ret.UnitsVo;
import com.tykj.dev.misc.base.BeanHelper;
......@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
import org.modelmapper.ModelMapper;
import javax.persistence.*;
import java.util.UUID;
/**
* @author zjm
......@@ -109,4 +111,8 @@ public class Units {
ModelMapper mapper = BeanHelper.getUserMapper();
return mapper.map(this, UnitsTrainVo.class);
}
public LeftNavigation toLeftNavigation(){
return new LeftNavigation(unitId,name,null, UUID.randomUUID().toString(),2);
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitsService.java
浏览文件 @ 24c7a7d5
......@@ -115,4 +115,10 @@ public interface UnitsService extends PublicService<Units> {
List<Units> finAllDirectlUnderUnits();
/**
* 左边侧面导航栏接口
*/
LeftNavigation findLeftNavigation(SecurityUser securityUser);
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java
浏览文件 @ 24c7a7d5
......@@ -54,41 +54,42 @@ public class UnitsServiceImpl implements UnitsService {
@Override
public List<AreaVo> findListAreaUnitsVo(SecurityUser securityUser) {
List<AreaVo> areaVos=new ArrayList<>();
//查询当前登入用户所属单位 的区域
log.info("数据："+securityUser.getUsername());
Integer areaId=securityUser.getCurrentUserInfo().getUnits().getAreaId();
Area belongsArea= areaDao.findById(areaId).get();
if (belongsArea.getType()==1){
int i=10000;
AreaVo areaVo = belongsArea.toVo();
areaVo.setFrontEnd(i++);
List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
for (UnitsVo unitsVo : unitsList) {
unitsVo.setFrontEnd(i++);
}
areaVo.setUnits(unitsList);
areaVos.add(areaVo);
}
List<Area> areas= areaDao.findAllByFatherId(areaId);
if (areas.size()!=0) {
areaVos=provinceAndCity(belongsArea,areas,areaVos);
}else {
int i=0;
AreaVo areaVo = belongsArea.toVo();
areaVo.setFrontEnd(i++);
List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
for (UnitsVo unitsVo : unitsList) {
unitsVo.setFrontEnd(i++);
}
areaVo.setUnits(unitsList);
areaVos.add(areaVo);
}
//查询区域下所有的区域
//根据区域查看
return areaVos;
// List<AreaVo> areaVos=new ArrayList<>();
// //查询当前登入用户所属单位 的区域
// log.info("数据："+securityUser.getUsername());
// Integer areaId=securityUser.getCurrentUserInfo().getUnits().getAreaId();
//
// Area belongsArea= areaDao.findById(areaId).get();
// if (belongsArea.getType()==1){
// int i=10000;
// AreaVo areaVo = belongsArea.toVo();
// areaVo.setFrontEnd(i++);
// List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
// for (UnitsVo unitsVo : unitsList) {
// unitsVo.setFrontEnd(i++);
// }
// areaVo.setUnits(unitsList);
// areaVos.add(areaVo);
// }
// List<Area> areas= areaDao.findAllByFatherId(areaId);
// if (areas.size()!=0) {
// areaVos=provinceAndCity(belongsArea,areas,areaVos);
// }else {
// int i=0;
// AreaVo areaVo = belongsArea.toVo();
// areaVo.setFrontEnd(i++);
// List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
// for (UnitsVo unitsVo : unitsList) {
// unitsVo.setFrontEnd(i++);
// }
// areaVo.setUnits(unitsList);
// areaVos.add(areaVo);
// }
// //查询区域下所有的区域
// //根据区域查看
//
// return areaVos;
return new ArrayList<>();
}
/**
......@@ -98,50 +99,30 @@ public class UnitsServiceImpl implements UnitsService {
* @param thisArea 本单位区域
* @param areas 下级区域列表
*/
private List<AreaVo> provinceAndCity(Area thisArea,List<Area> areas,List<AreaVo> areaVos){
AreaVo thisAreaVo=thisArea.toVo();
private List<LeftNavigation> provinceAndCity(Area thisArea,List<Area> areas,List<LeftNavigation> leftNavigationList){
if (thisArea.getType()==1) {
areas.forEach(area -> {
int i = 1;
AreaVo areaVo = area.toVo();
areaVo.setFrontEnd(i++);
List<UnitsVo> unitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
LeftNavigation leftNavigation = area.toLeftNavigation();
List<LeftNavigation> leftNavigationList1 = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
List<Area> countys = areaDao.findAllByFatherId(area.getId());
if (countys != null && countys.size() != 0) {
countys.forEach(
area1 -> {
List<UnitsVo> countyUnitsList = unitsDao.findAllByAreaId(area1.getId()).stream().map(Units::toVo).collect(Collectors.toList());
unitsList.addAll(countyUnitsList);
leftNavigationList1.addAll(unitsDao.findAllByAreaId(area1.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList()));
}
);
}
for (UnitsVo unitsVo : unitsList) {
unitsVo.setFrontEnd(i++);
}
areaVo.setUnits(unitsList);
areaVos.add(areaVo);
leftNavigation.setLeftNavigations(leftNavigationList1);
leftNavigationList.add(leftNavigation);
});
}else if (thisArea.getType()==2){
List<UnitsVo> unitsLists = unitsDao.findAllByAreaId(thisArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
for (UnitsVo unitsVo : unitsLists) {
unitsVo.setFrontEnd(5000);
}
thisAreaVo.setUnits(unitsLists);
areas.forEach(area -> {
int i = 1;
thisAreaVo.setFrontEnd(i++);
List<UnitsVo> unitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
for (UnitsVo unitsVo : unitsList) {
unitsVo.setFrontEnd(i++);
}
thisAreaVo.getUnits().addAll(unitsList);
leftNavigationList.addAll(unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList()));
});
areaVos.add(thisAreaVo);
}else {
return areaVos;
return leftNavigationList;
}
return areaVos;
return leftNavigationList;
}
......@@ -200,9 +181,12 @@ public class UnitsServiceImpl implements UnitsService {
@Override
public List<Units> findBySubordinate(Integer unitsId) {
Units units = unitsDao.findById(unitsId).get();
List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
return unitsDao.findAllByAreaIdIn(areaIds);
List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
List<Units> units1= unitsDao.findAllByAreaIdIn(areaIds);
if (units.getLevel()==1){
units1.addAll(unitsDao.findAllByType(2));
}
return units1;
}
@Override
......@@ -272,6 +256,30 @@ public class UnitsServiceImpl implements UnitsService {
return unitsDao.findAllByType(2);
}
@Override
public LeftNavigation findLeftNavigation(SecurityUser securityUser) {
LeftNavigation leftNavigation=new LeftNavigation();
List<LeftNavigation> leftNavigationList=new ArrayList<>();
Integer areaId=securityUser.getCurrentUserInfo().getUnits().getAreaId();
Area belongsArea= areaDao.findById(areaId).get();
if (belongsArea.getType()==1|| belongsArea.getType()==2){
leftNavigation = belongsArea.toLeftNavigation();
leftNavigationList= unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
}
if (belongsArea.getType()==1){
leftNavigationList.addAll(unitsDao.findAllByType(2).stream().map(Units::toLeftNavigation).collect(Collectors.toList()));
}
List<Area> areas= areaDao.findAllByFatherId(areaId);
if (areas.size()!=0) {
provinceAndCity(belongsArea,areas,leftNavigationList);
}else {
leftNavigation= belongsArea.toLeftNavigation();
leftNavigationList= unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
}
leftNavigation.setLeftNavigations(leftNavigationList);
return leftNavigation;
}
@Override
public Units save(Units units) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论