Commit c1b96883 authored by lixuan's avatar lixuan

feat: 新需求

parent 3c96bb68
Pipeline #146829 failed with stages
in 0 seconds
...@@ -13,6 +13,7 @@ import com.ruoyi.common.zqt.ZQTImportExcelUtil; ...@@ -13,6 +13,7 @@ import com.ruoyi.common.zqt.ZQTImportExcelUtil;
import com.ruoyi.system.domain.grid.*; import com.ruoyi.system.domain.grid.*;
import com.ruoyi.system.domain.grid.vo.GridDxbVO; import com.ruoyi.system.domain.grid.vo.GridDxbVO;
import com.ruoyi.system.domain.grid.vo.GridTreeNode; import com.ruoyi.system.domain.grid.vo.GridTreeNode;
import com.ruoyi.system.domain.grid.vo.GridTwoDto;
import com.ruoyi.system.domain.video.ext.Position; import com.ruoyi.system.domain.video.ext.Position;
import com.ruoyi.system.mapper.grid.GridRegionMapper; import com.ruoyi.system.mapper.grid.GridRegionMapper;
import com.ruoyi.system.service.grid.GridRegionFacadeService; import com.ruoyi.system.service.grid.GridRegionFacadeService;
...@@ -1107,4 +1108,30 @@ public class RegionController extends BaseController { ...@@ -1107,4 +1108,30 @@ public class RegionController extends BaseController {
return AjaxResult.success(gridRegionList); return AjaxResult.success(gridRegionList);
} }
@GetMapping("/onlyTwoTree")
public AjaxResult getOnlyTwoTree(){
SysUser user = SecurityUtils.getLoginUser().getUser();
GridRegionUserExample example = new GridRegionUserExample();
GridRegionUserExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(user.getUserId());
criteria.andIsValidEqualTo("1");
List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
List<String> regions = Arrays.asList(region.split(","));
GridRegionExample gridRegionExample = new GridRegionExample();
if (regions.contains("320282001")) {
gridRegionExample.createCriteria().andIsValidEqualTo("1").andWgTypeEqualTo("1").andLevelEqualTo("2");
List<GridRegion> gridRegions = gridRegionMapper.selectByExample(gridRegionExample);
GridTwoDto gridTwoDto = new GridTwoDto();
gridTwoDto.setChildren(gridRegions);
return AjaxResult.success(gridTwoDto);
} else {
gridRegionExample.createCriteria().andIsValidEqualTo("1").andWgTypeEqualTo("1").andLevelEqualTo("2").andWgCodeIn(regions);
List<GridRegion> gridRegions = gridRegionMapper.selectByExample(gridRegionExample);
GridTwoDto gridTwoDto = new GridTwoDto();
gridTwoDto.setChildren(gridRegions);
return AjaxResult.success(gridTwoDto);
}
}
} }
package com.ruoyi.system.domain.grid.vo;
import com.ruoyi.system.domain.grid.GridRegion;
import lombok.Data;
import java.util.List;
@Data
public class GridTwoDto {
private String wgCode = "320282001";
private String name = "宜城街道";
private List<GridRegion> children;
}
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 to comment