|
@@ -51,8 +51,8 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
@ApiOperation("场景树")
|
|
|
@Override
|
|
|
public R<List<Tree<Long>>> tree(SysSceneDto.SceneListDto pater) {
|
|
|
- Long parentId = Emptys.check(pater.getPaterId())?pater.getPaterId():0L;
|
|
|
- List<SysSceneDto.Vo> list = copy(SysSceneDto.Vo.class,list(null));
|
|
|
+ Long parentId = Emptys.check(pater.getPaterId()) ? pater.getPaterId() : 0L;
|
|
|
+ List<SysSceneDto.Vo> list = copy(SysSceneDto.Vo.class, list(null));
|
|
|
List<TreeNode<Long>> collect = list.stream()
|
|
|
.filter(item -> !item.getId().equals(item.getPaterId()))
|
|
|
.sorted(Comparator.comparingInt(SysSceneDto.Vo::getWeigh))
|
|
@@ -64,7 +64,7 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
treeNode.setWeight(item.getWeigh());
|
|
|
Map<String, Object> extra = new HashMap<>(1);
|
|
|
extra.put(LambdaUtils.getProperty(SysScene::getSceneCode), item.getSceneCode());
|
|
|
- if(Emptys.check(pater.getAllColumn()) && pater.getAllColumn()) {
|
|
|
+ if (Emptys.check(pater.getAllColumn()) && pater.getAllColumn()) {
|
|
|
extra.put(LambdaUtils.getProperty(SysScene::getLevel), item.getLevel());
|
|
|
extra.put(LambdaUtils.getProperty(SysScene::getWeigh), item.getWeigh());
|
|
|
extra.put(LambdaUtils.getProperty(SysScene::getStatus), item.getStatus());
|
|
@@ -79,14 +79,14 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
|
|
|
@Override
|
|
|
@ApiOperation("查询下一级列表")
|
|
|
- public R<List<SysSceneDto.Vo>> nextList(@RequestBody @Validated SysSceneDto.SceneListDto pater){
|
|
|
- Long parentId = Emptys.check(pater.getPaterId())?pater.getPaterId():0L;
|
|
|
+ public R<List<SysSceneDto.Vo>> nextList(@RequestBody @Validated SysSceneDto.SceneListDto pater) {
|
|
|
+ Long parentId = Emptys.check(pater.getPaterId()) ? pater.getPaterId() : 0L;
|
|
|
LambdaQueryWrapper<SysScene> lqw = new LambdaQueryWrapper<>();
|
|
|
- lqw.eq(SysScene::getPaterId,parentId);
|
|
|
- if(!Emptys.check(pater.getAllColumn()) || !pater.getAllColumn()){
|
|
|
- lqw.select(SysScene::getId,SysScene::getSceneCode,SysScene::getName);
|
|
|
+ lqw.eq(SysScene::getPaterId, parentId);
|
|
|
+ if (!Emptys.check(pater.getAllColumn()) || !pater.getAllColumn()) {
|
|
|
+ lqw.select(SysScene::getId, SysScene::getSceneCode, SysScene::getName);
|
|
|
}
|
|
|
- return R.ok(copy(SysSceneDto.Vo.class,list(lqw)));
|
|
|
+ return R.ok(copy(SysSceneDto.Vo.class, list(lqw)));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "删除", notes = "有子类不能删除")
|
|
@@ -94,7 +94,7 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
public R deleteById(@RequestBody @Validated SysSceneDto.IdListDto idListDto) {
|
|
|
List<Long> idList = idListDto.getIdList();
|
|
|
//判断是否有子类
|
|
|
- LambdaQueryWrapper<SysScene> lambdaQueryWrapper = Wrappers.<SysScene>lambdaQuery().in(SysScene::getPaterId,idList).last("limit 1");
|
|
|
+ LambdaQueryWrapper<SysScene> lambdaQueryWrapper = Wrappers.<SysScene>lambdaQuery().in(SysScene::getPaterId, idList).last("limit 1");
|
|
|
List<SysScene> list = list(lambdaQueryWrapper);
|
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
|
return R.fail("有子类不能删除!");
|
|
@@ -107,7 +107,12 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
public R<SysSceneDto.Vo> obj(SysSceneDto.Vo vo) {
|
|
|
LambdaQueryWrapper<SysScene> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(vo, SysScene.class).build()
|
|
|
.last("limit 1");
|
|
|
- return R.ok(copy(SysSceneDto.Vo.class, baseMapper.selectOne(lambdaQueryWrapper)));
|
|
|
+ SysScene sysScene = baseMapper.selectOne(lambdaQueryWrapper);
|
|
|
+ if (Emptys.check(sysScene)) {
|
|
|
+ return R.ok(copy(SysSceneDto.Vo.class, sysScene));
|
|
|
+ } else {
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "新增、更新场景", notes = "不传id为新增,传id为修改")
|