lin
2024-03-02 861e9b1eb145094dff6d1caf3dba30d7ce0e11d7
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -62,6 +62,7 @@
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -216,6 +217,7 @@
   /**
    * 设置场所的source 来源
    *
    * @param placeVO
    */
   public void setSource(PlaceVO placeVO) {
@@ -329,6 +331,7 @@
   /**
    * 处理对应的绑定房屋数据
    *
    * @param list
    */
   public void handlePlaceOne(List<String> list,PlaceVO place) {
@@ -1269,28 +1272,30 @@
    */
   @Override
   public IPage<PlaceVO> selectNinePlacePage(IPage<PlaceVO> page, PlaceVO place) {
      String roleName = SpringUtils.getRequestParam("roleName");
      String communityCode = SpringUtils.getRequestParam("communityCode");
      if (!Strings.isBlank(communityCode)){
         // 校验社区编号是否合规
         if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
            place.setCommunityCode(communityCode);
         }
      }
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      // 网格编号集合
      List<String> gridCodeList = new ArrayList<>();
      // 民警角色
      if (!Strings.isBlank(roleName)){
         place.setRoleName(roleName);
         if(roleName.equals("mj")) {
            regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
         if (roleName.equals("wgy")) {
            gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
         }
      }
//      String roleName = SpringUtils.getRequestParam("roleName");
//      String communityCode = SpringUtils.getRequestParam("communityCode");
//      if (!Strings.isBlank(communityCode)){
//         // 校验社区编号是否合规
//         if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
//            place.setCommunityCode(communityCode);
//         }
//      }
//      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
//      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
//      // 网格编号集合
//      List<String> gridCodeList = new ArrayList<>();
//      // 民警角色
//      if (!Strings.isBlank(roleName)){
//         place.setRoleName(roleName);
//         if(roleName.equals("mj")) {
//            regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
//         }
//         if (roleName.equals("wgy")) {
//            gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
//         }
//      }
      CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
      List<String> strings = new ArrayList<>();
      if (null!=place.getNineType()){
         QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
@@ -1305,7 +1310,8 @@
            strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
         }
      }
      List<PlaceVO> placeVOS = baseMapper.selectNinePlacePage(page, place, gridCodeList, regionChildCodesList, isAdministrator,strings);
      List<PlaceVO> placeVOS = baseMapper.selectNinePlacePage(page, place, commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), strings);
      // 返回
      return page.setRecords(placeVOS);
   }