Skip to content

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

Merge branch 'dev' into 'main' 

Dev

See merge request !117
parents 4c3b7fd9 2d2e0d9e
Pipeline #143176 passed with stages
      in 5 minutes and 11 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 125 additions and 85 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ 4287bf69
      ......@@ -70,28 +70,30 @@ public class RegionController extends BaseController {
      try {
      AjaxResult result = new AjaxResult();
      // SysUser user = SecurityUtils.getLoginUser().getUser();
      // //网格
      // GridRegionUserExample example = new GridRegionUserExample();
      // GridRegionUserExample.Criteria criteria = example.createCriteria();
      //网格
      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);
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
      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.getRoles(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);
      // 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) {
      ......@@ -574,39 +576,41 @@ public class RegionController extends BaseController {
      @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();
      //网格
      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);
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
      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));
      return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null,regionList));
      // return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null));
      }
      // SysUser sysUser = getLoginUser().getUser();
      List<String> wgCodeList = new ArrayList<>();
      // if(StringUtils.isBlank(isAll) && wgType.equals("1")){
      // //目前只有基础网格有权限
      //// List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId());
      // List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes("1");
      // if(CollectionUtils.isEmpty(list)) {
      // return AjaxResult.success();
      // }
      // 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));
      if(StringUtils.isBlank(isAll) && wgType.equals("1")){
      //目前只有基础网格有权限
      // List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId());
      List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes("1");
      if(CollectionUtils.isEmpty(list)) {
      return AjaxResult.success();
      }
      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));
      }
      ......@@ -803,15 +807,35 @@ public class RegionController extends BaseController {
      @RequestParam(value = "pageNum", required = false) Integer pageNum,
      @RequestParam(value = "pageSize", required = false) Integer pageSize
      ){
      if(level.equals("1")){
      GridRegionExample example = new GridRegionExample();
      GridRegionExample.Criteria criteria = example.createCriteria();
      criteria.andIsValidEqualTo("1");
      criteria.andLevelEqualTo(level);
      criteria.andLevelEqualTo("1");
      criteria.andWgTypeEqualTo("1");
      List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
      return AjaxResult.success(gridRegionList);
      }
      // SysUser user = SecurityUtils.getLoginUser().getUser();
      //网格
      GridRegionUserExample example = new GridRegionUserExample();
      GridRegionUserExample.Criteria criteria = example.createCriteria();
      // criteria.andUserIdEqualTo(user.getUserId());
      criteria.andUserIdEqualTo("8c48c6cab96e462a9632492762c4cfaa");
      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<>(regions);
      if(regionList.size()==1 && regionList.get(0).equals("320282001")){
      return AjaxResult.success(gridRegionMapper.getAllLevelTwoByType(null));
      }
      return AjaxResult.success(gridRegionMapper.getAllLevelTwoByType(regionList));
      }
      @RequestMapping(value = "/getTwoThreeRegion",method = RequestMethod.GET)
      @ResponseBody
      ......
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java
      View file @ 4287bf69
      ......@@ -57,4 +57,6 @@ public interface GridRegionMapper {
      List<GridRegion> getAllLevelFourByType(@Param("type") String type,@Param("code") String code);
      int changeTreeNodeName(@Param("id") String id, @Param("name") String name);
      List<GridRegion> getAllLevelTwoByType(@Param("wgCodeLikes")List<String> wgCodeLikes);
      }
      \ No newline at end of file
      ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java
      View file @ 4287bf69
      ......@@ -247,8 +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) {
      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;
      }
      ......@@ -788,8 +788,8 @@ public void getRoles(String wgName, String wgCode, String wgType, String level,
      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) {
      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)){
      ......@@ -799,22 +799,22 @@ public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, Stri
      param.setShow(false);
      }
      List<GridRegion> gridRegionList = gridRegionMapper.getByParams(param);
      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;
      // 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) {
      ......@@ -1174,8 +1174,8 @@ public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, Stri
      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) {
      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<>();
      ......@@ -1273,19 +1273,19 @@ public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<S
      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;
      ......
      ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
      View file @ 4287bf69
      ......@@ -683,6 +683,20 @@
      and wg_code like CONCAT(#{code}, '%')
      and wg_code != #{code}
      </select>
      <select id="getAllLevelTwoByType" resultType="com.ruoyi.system.domain.grid.GridRegion">
      select
      <include refid="Base_Column_List" />
      from grid_region where is_valid = '1'
      and wg_type = 1
      <if test="wgCodeLikes != null and wgCodeLikes.size() > 0">
      and (
      <foreach collection="wgCodeLikes" item="wgCode" open="(" close=")" separator="or">
      wg_code = #{wgCode}
      </foreach>
      )
      </if>
      and level = 2
      </select>
      <update id="changeTreeNodeName">
      update grid_region set wg_name=#{name} where id = #{id}
      ......
      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