|
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
- * 服务实现类
|
|
|
|
|
|
+ * 服务实现类
|
|
* </p>
|
|
* </p>
|
|
*
|
|
*
|
|
* @author author
|
|
* @author author
|
|
@@ -45,12 +45,13 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
public Result addPigpen(BasePigpenDto basePigpenDto) {
|
|
public Result addPigpen(BasePigpenDto basePigpenDto) {
|
|
- Integer num = basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpenDto.getBuildName()));
|
|
|
|
- if (num > 0){
|
|
|
|
- return ResultUtil.exist();
|
|
|
|
|
|
+ Integer num = basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpenDto.getBuildName())
|
|
|
|
+ .eq("farm_id", basePigpenDto.getFarmId()));
|
|
|
|
+ if (num > 0) {
|
|
|
|
+ return new Result(10001, "栋舍名称已存在!", false);
|
|
}
|
|
}
|
|
BasePigpen basePigpen = new BasePigpen();
|
|
BasePigpen basePigpen = new BasePigpen();
|
|
- BeanUtil.copyProperties(basePigpenDto,basePigpen);
|
|
|
|
|
|
+ BeanUtil.copyProperties(basePigpenDto, basePigpen);
|
|
basePigpen.setParentId(0);
|
|
basePigpen.setParentId(0);
|
|
basePigpen.setFType(1);
|
|
basePigpen.setFType(1);
|
|
basePigpen.setOther2("0");
|
|
basePigpen.setOther2("0");
|
|
@@ -62,9 +63,9 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
BasePigpen basePigpen1 = new BasePigpen();
|
|
BasePigpen basePigpen1 = new BasePigpen();
|
|
basePigpen1.setFType(2);
|
|
basePigpen1.setFType(2);
|
|
basePigpen1.setParentId(id);
|
|
basePigpen1.setParentId(id);
|
|
- basePigpen1.setBuildName(buildName+Convert.numberToChinese(integer,false) +"层");
|
|
|
|
- basePigpen1.setOther1(Convert.numberToChinese(integer,false) +"层");
|
|
|
|
- basePigpen1.setOther2("0,"+id);
|
|
|
|
|
|
+ basePigpen1.setBuildName(buildName + Convert.numberToChinese(integer, false) + "层");
|
|
|
|
+ basePigpen1.setOther1(Convert.numberToChinese(integer, false) + "层");
|
|
|
|
+ basePigpen1.setOther2("0," + id);
|
|
basePigpen1.setFarmId(basePigpen.getFarmId());
|
|
basePigpen1.setFarmId(basePigpen.getFarmId());
|
|
basePigpen1.setStageCode(basePigpen.getStageCode());
|
|
basePigpen1.setStageCode(basePigpen.getStageCode());
|
|
basePigpenMapper.insert(basePigpen1);
|
|
basePigpenMapper.insert(basePigpen1);
|
|
@@ -75,14 +76,19 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
public Result updatePigpen(BasePigpen basePigpen) {
|
|
public Result updatePigpen(BasePigpen basePigpen) {
|
|
|
|
+ Integer num = basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpen.getBuildName())
|
|
|
|
+ .eq("farm_id", basePigpen.getFarmId()).ne("id", basePigpen.getId()));
|
|
|
|
+ if (num > 0) {
|
|
|
|
+ return new Result(10001, "栋舍名称已存在!", false);
|
|
|
|
+ }
|
|
basePigpenMapper.updateById(basePigpen);
|
|
basePigpenMapper.updateById(basePigpen);
|
|
Integer id = basePigpen.getId();
|
|
Integer id = basePigpen.getId();
|
|
List<BasePigpen> parentId = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("parent_id", id));
|
|
List<BasePigpen> parentId = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("parent_id", id));
|
|
String buildName = basePigpen.getBuildName();
|
|
String buildName = basePigpen.getBuildName();
|
|
- if (StringUtils.isNotBlank(buildName)){
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(buildName)) {
|
|
for (BasePigpen pigpen : parentId) {
|
|
for (BasePigpen pigpen : parentId) {
|
|
String other1 = pigpen.getOther1();
|
|
String other1 = pigpen.getOther1();
|
|
- pigpen.setBuildName(buildName+other1);
|
|
|
|
|
|
+ pigpen.setBuildName(buildName + other1);
|
|
basePigpenMapper.updateById(pigpen);
|
|
basePigpenMapper.updateById(pigpen);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -94,14 +100,14 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
public Result deletePigpen(Map<String, Integer> map) {
|
|
public Result deletePigpen(Map<String, Integer> map) {
|
|
Integer integer = map.get("id");
|
|
Integer integer = map.get("id");
|
|
Integer integer1 = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", integer));
|
|
Integer integer1 = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", integer));
|
|
- if (integer1 > 0){
|
|
|
|
- return new Result(10001,"删除失败,该栋舍下有采集器",false);
|
|
|
|
|
|
+ if (integer1 > 0) {
|
|
|
|
+ return new Result(10001, "删除失败,该栋舍下有采集器", false);
|
|
}
|
|
}
|
|
List<BasePigpen> other2 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().like("other2", integer));
|
|
List<BasePigpen> other2 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().like("other2", integer));
|
|
for (BasePigpen basePigpen : other2) {
|
|
for (BasePigpen basePigpen : other2) {
|
|
Integer count = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", basePigpen.getId()));
|
|
Integer count = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", basePigpen.getId()));
|
|
- if (count > 0){
|
|
|
|
- return new Result(10001,"删除失败,该栋舍下有采集器",false);
|
|
|
|
|
|
+ if (count > 0) {
|
|
|
|
+ return new Result(10001, "删除失败,该栋舍下有采集器", false);
|
|
}
|
|
}
|
|
basePigpenMapper.deleteById(basePigpen);
|
|
basePigpenMapper.deleteById(basePigpen);
|
|
}
|
|
}
|
|
@@ -112,27 +118,28 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
@Override
|
|
@Override
|
|
public Result list(String farmCode, String buildName, String stageCode) {
|
|
public Result list(String farmCode, String buildName, String stageCode) {
|
|
QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
|
|
- queryWrapper.like(StringUtils.isNotBlank(buildName),"build_name", buildName);
|
|
|
|
- queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
|
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_id", farmCode);
|
|
|
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(buildName), "build_name", buildName);
|
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(stageCode), "stage_code", stageCode);
|
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(farmCode), "farm_id", farmCode);
|
|
queryWrapper.orderByAsc("sort");
|
|
queryWrapper.orderByAsc("sort");
|
|
//创建排序
|
|
//创建排序
|
|
List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
|
|
List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
|
|
//将结果List改为树
|
|
//将结果List改为树
|
|
List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
|
|
List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
|
|
- return new Result(ResultCode.SUCCESS,treeBasePigpens);
|
|
|
|
|
|
+ return new Result(ResultCode.SUCCESS, treeBasePigpens);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 查询结果 转换成树形结构
|
|
* 查询结果 转换成树形结构
|
|
|
|
+ *
|
|
* @param bizBaseAreas 原始数据
|
|
* @param bizBaseAreas 原始数据
|
|
* @return 树
|
|
* @return 树
|
|
*/
|
|
*/
|
|
- private List<TreeBasePigpen> parseBizBaseArea(List<BasePigpen> bizBaseAreas){
|
|
|
|
|
|
+ private List<TreeBasePigpen> parseBizBaseArea(List<BasePigpen> bizBaseAreas) {
|
|
//构建需要展示的树形节点结构
|
|
//构建需要展示的树形节点结构
|
|
Map<String, TreeBasePigpen> nodeMap = bizBaseAreas.stream().map(basePigpen -> {
|
|
Map<String, TreeBasePigpen> nodeMap = bizBaseAreas.stream().map(basePigpen -> {
|
|
- TreeBasePigpen baseVo = new TreeBasePigpen();
|
|
|
|
- baseVo.setId(basePigpen.getId()+"");
|
|
|
|
|
|
+ TreeBasePigpen baseVo = new TreeBasePigpen();
|
|
|
|
+ baseVo.setId(basePigpen.getId() + "");
|
|
baseVo.setFarmCode(basePigpen.getFarmId());
|
|
baseVo.setFarmCode(basePigpen.getFarmId());
|
|
baseVo.setParentId(basePigpen.getParentId());
|
|
baseVo.setParentId(basePigpen.getParentId());
|
|
baseVo.setSort(basePigpen.getSort());
|
|
baseVo.setSort(basePigpen.getSort());
|
|
@@ -141,16 +148,16 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
baseVo.setType(basePigpen.getFType());
|
|
baseVo.setType(basePigpen.getFType());
|
|
baseVo.setChildNode(new ArrayList<>());
|
|
baseVo.setChildNode(new ArrayList<>());
|
|
return baseVo;
|
|
return baseVo;
|
|
- }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b,(k1, k2)->k1));
|
|
|
|
|
|
+ }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b, (k1, k2) -> k1));
|
|
//创建数组存父亲节点
|
|
//创建数组存父亲节点
|
|
ArrayList<TreeBasePigpen> roots = new ArrayList<>();
|
|
ArrayList<TreeBasePigpen> roots = new ArrayList<>();
|
|
//构建树形
|
|
//构建树形
|
|
- nodeMap.values().forEach(item->{
|
|
|
|
- String parentCode = item.getParentId()+"";
|
|
|
|
- if (nodeMap.get(parentCode) == null){
|
|
|
|
|
|
+ nodeMap.values().forEach(item -> {
|
|
|
|
+ String parentCode = item.getParentId() + "";
|
|
|
|
+ if (nodeMap.get(parentCode) == null) {
|
|
//父节点为空,说明当前节点就已经是父节点了 将该节点存起来
|
|
//父节点为空,说明当前节点就已经是父节点了 将该节点存起来
|
|
roots.add(item);
|
|
roots.add(item);
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
//父节点 不为空,说明有父节点,拿到该节点的父节点的孩子节点(就是我自己),将该节点存起来
|
|
//父节点 不为空,说明有父节点,拿到该节点的父节点的孩子节点(就是我自己),将该节点存起来
|
|
nodeMap.get(parentCode).getChildNode().add(item);
|
|
nodeMap.get(parentCode).getChildNode().add(item);
|
|
}
|
|
}
|