Skip to content

Y
yichengstreet-be
Commit b09558ee authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

Dev lb

See merge request !108
parents 4d7092a0 bdba9fa9
Pipeline #143125 passed with stages
      in 3 minutes and 10 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 91 additions and 81 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ b09558ee
      ......@@ -69,27 +69,29 @@ public class RegionController extends BaseController {
      @RequestParam("pageSize") Integer pageSize) {
      try {
      AjaxResult result = new AjaxResult();
      SysUser user = SecurityUtils.getLoginUser().getUser();
      //网格
      GridRegionUserExample example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria();
      criteria.andUserIdEqualTo(user.getUserId());
      // criteria.andUserIdEqualTo("2");
      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(","));
      List<String> regionList = new ArrayList<>();
      if(!regions.get(0).equals("320282001")){
      regionList.add("320282001");
      }
      regionList.addAll(regions);
      // SysUser user = SecurityUtils.getLoginUser().getUser();
      // //网格
      // GridRegionUserExample example = new GridRegionUserExample();
      // GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId());
      //// criteria.andUserIdEqualTo("2");
      // 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(","));
      // List<String> regionList = new ArrayList<>();
      // if(!regions.get(0).equals("320282001")){
      // regionList.add("320282001");
      // }
      // regionList.addAll(regions);
      if(wgType.equals("0")){
      gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
      // gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
      gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
      }else {
      gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result, regionList);
      gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
      // gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result, regionList);
      }
      return JSON.toJSONString(result);
      } catch (Exception e) {
      ......@@ -571,24 +573,25 @@ public class RegionController extends BaseController {
      @RequestMapping(value = "/getWsTreeNode", method = RequestMethod.GET)
      @ResponseBody
      public AjaxResult getWsTreeNode(@RequestParam("wgType") String wgType, String isShow, @RequestParam(value = "isAll", required = false) String isAll) {
      SysUser user = SecurityUtils.getLoginUser().getUser();
      //网格
      GridRegionUserExample example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria();
      criteria.andUserIdEqualTo(user.getUserId());
      // criteria.andUserIdEqualTo("2");
      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(","));
      List<String> regionList = new ArrayList<>();
      if(!regions.get(0).equals("320282001")){
      regionList.add("320282001");
      }
      regionList.addAll(regions);
      // SysUser user = SecurityUtils.getLoginUser().getUser();
      // //网格
      // GridRegionUserExample example = new GridRegionUserExample();
      // GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId());
      //// criteria.andUserIdEqualTo("1");
      // 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(","));
      // List<String> regionList = new ArrayList<>();
      // if(!regions.get(0).equals("320282001")){
      // regionList.add("320282001");
      // }
      // regionList.addAll(regions);
      if(wgType.equals("0")){
      return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null,regionList));
      // return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null,regionList));
      return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null));
      }
      SysUser sysUser = getLoginUser().getUser();
      ......@@ -601,7 +604,8 @@ public class RegionController extends BaseController {
      }
      wgCodeList = list.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
      }
      return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions));
      // return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions));
      return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow));
      }
      ......
      ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
      View file @ b09558ee
      ......@@ -247,7 +247,8 @@ public class GridRegionFacadeService {
      return gridRegion;
      }
      public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result, List<String> regions) {
      // public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result, List<String> regions) {
      public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result) {
      if (null == pageNum || pageNum <= 0) {
      pageNum = 1;
      }
      ......@@ -295,26 +296,28 @@ public class GridRegionFacadeService {
      result.buildSuccess("success", appPageModel);
      return;
      }
      List<GridRegion> res = new ArrayList<>();
      if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      Map<String,Integer> map = new HashMap<>();
      for(String region: regions){
      map.put(region, 1);
      }
      for(GridRegion region: roles){
      if(map.containsKey(region.getWgCode())){
      res.add(region);
      }
      }
      }else{
      res = roles;
      }
      // List<GridRegion> res = new ArrayList<>();
      // if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      // Map<String,Integer> map = new HashMap<>();
      // for(String region: regions){
      // map.put(region, 1);
      // }
      // for(GridRegion region: roles){
      // if(map.containsKey(region.getWgCode())){
      // res.add(region);
      // }
      // }
      // }else{
      // res = roles;
      // }
      appPageModel.setCurPage(pageNum);
      appPageModel.setRecordCount(res.size());
      // appPageModel.setRecordCount(res.size());
      appPageModel.setRecordCount(count);
      appPageModel.setPageCount((long) Math.ceil(1.0 * count / pageSize));
      List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(res, GridRegionWithCompanyItem.class);
      // List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(res, GridRegionWithCompanyItem.class);
      List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(roles, GridRegionWithCompanyItem.class);
      itemList.forEach( e -> {
      GridCompanyLandExample gridCompanyLandExample = new GridCompanyLandExample();
      GridCompanyLandExample.Criteria gridCompanyLandExampleCriteria = gridCompanyLandExample.createCriteria();
      ......@@ -785,7 +788,8 @@ public class GridRegionFacadeService {
      return;
      }
      public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow, List<String> regions) {
      // public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow, List<String> regions) {
      public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow) {
      GridRegionSearchParam param = new GridRegionSearchParam();
      param.setWgType(wgType);
      if(!CollectionUtils.isEmpty(wgList)){
      ......@@ -795,21 +799,22 @@ public class GridRegionFacadeService {
      param.setShow(false);
      }
      List<GridRegion> gridRegionList = gridRegionMapper.getByParams(param);
      List<GridTreeNode> res = convertFrRegion(gridRegionList, wgList);
      List<GridTreeNode> degree_second = new ArrayList<>();
      if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      Map<String,Integer> map = new HashMap<>();
      for(String region: regions){
      map.put(region, 1);
      }
      for(GridTreeNode region: res.get(0).getChild()){
      if(map.containsKey(region.getCode())){
      degree_second.add(region);
      }
      }
      res.get(0).setChild(degree_second);
      }
      return res;
      return convertFrRegion(gridRegionList, wgList);
      // List<GridTreeNode> res = convertFrRegion(gridRegionList, wgList);
      // List<GridTreeNode> degree_second = new ArrayList<>();
      // if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      // Map<String,Integer> map = new HashMap<>();
      // for(String region: regions){
      // map.put(region, 1);
      // }
      // for(GridTreeNode region: res.get(0).getChild()){
      // if(map.containsKey(region.getCode())){
      // degree_second.add(region);
      // }
      // }
      // res.get(0).setChild(degree_second);
      // }
      // return res;
      }
      private List<GridTreeNode> convertFrRegion(List<GridRegion> gridRegionList, List<String> wgCodes) {
      ......@@ -1169,7 +1174,8 @@ public class GridRegionFacadeService {
      return gridRegionList;
      }
      public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow, List<String> regions) {
      // public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow, List<String> regions) {
      public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow) {
      //获取一级树
      List<GridRegion> gridRegionList = gridRegionMapper.getRegionByTypeAndCode("1",new ArrayList<>(),"1");
      List<GridTreeNode> res = new ArrayList<>();
      ......@@ -1267,19 +1273,19 @@ public class GridRegionFacadeService {
      gridTreeNode.setChild(secondFiveTree);
      }
      List<GridTreeNode> degree_second = new ArrayList<>();
      if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      Map<String,Integer> map = new HashMap<>();
      for(String region: regions){
      map.put(region, 1);
      }
      for(GridTreeNode region: res.get(0).getChild()){
      if(map.containsKey(region.getCode())){
      degree_second.add(region);
      }
      }
      res.get(0).setChild(degree_second);
      }
      // List<GridTreeNode> degree_second = new ArrayList<>();
      // if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
      // Map<String,Integer> map = new HashMap<>();
      // for(String region: regions){
      // map.put(region, 1);
      // }
      // for(GridTreeNode region: res.get(0).getChild()){
      // if(map.containsKey(region.getCode())){
      // degree_second.add(region);
      // }
      // }
      // res.get(0).setChild(degree_second);
      // }
      return res;
      ......
      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