Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -214,7 +214,7 @@
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("网格员")) {
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),null);
         }
      }
      return stringList;
@@ -287,6 +287,21 @@
         }
         // 新增
         save(houseEntity);
      }else {
         // 更新
         one.setHouseName(houseAndHoldExcel.getHouseName());
         one.setAddress(houseAndHoldExcel.getHouseName());
         one.setDistrictName(houseAndHoldExcel.getDistrictName());
         one.setUnit(houseAndHoldExcel.getUnit());
         if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
            one.setFloor(houseAndHoldExcel.getFloor());
         }
         one.setRoom(houseAndHoldExcel.getRoom());
         one.setBuilding(houseAndHoldExcel.getBuilding());
         one.setArea(houseAndHoldExcel.getArea());
         one.setPropertyPrice(houseAndHoldExcel.getPropertyPrice());
         // 更新
         updateById(one);
      }
   }

@@ -301,7 +316,7 @@
      QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
         .eq("is_deleted", 0)
         .eq("id_card", houseAndHoldExcel.getIdCard())
         .eq("phone_number", houseAndHoldExcel.getPhoneNumber())
         .eq("name", houseAndHoldExcel.getName());
      HouseholdEntity one = householdService.getOne(wrapper);
      // 不存在则插入，存在则不操作
@@ -420,27 +435,7 @@
         // 新增
         boolean save = householdService.save(householdEntity);
         if (save) {
            String labelId = houseAndHoldExcel.getLabelId();
            if (StringUtils.isBlank(labelId)) {
               return;
            }
            String[] split = labelId.split(",");
            IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
            ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
            for (String s : split) {
               LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
               if (one1 != null) {
                  UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
                  userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
                  userHouseLabelEntity.setHouseholdId(householdEntity.getId());
                  // 设置默认的绿色
                  userHouseLabelEntity.setColor("green");
                  userHouseLabelEntity.setLableType(1);
                  userHouseLabelEntity.setLabelName(s);
                  userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
                  bean.save(userHouseLabelEntity);
               }
            }
            householdLabelHandle(houseAndHoldExcel, householdEntity);
         }
      } else {
         // 更新
@@ -550,27 +545,80 @@
         // 新增
         boolean update = householdService.updateById(one);
         if (update) {
            String labelId = houseAndHoldExcel.getLabelId();
            if (StringUtils.isBlank(labelId)) {
               return;
            // 住户标签处理
            householdLabelHandle(houseAndHoldExcel,one);
         }
      }
   }

   /**
    * 住户标签处理
    * @param houseAndHoldExcel
    * @param householdEntity
    */
   public void householdLabelHandle(HouseAndHoldExcel houseAndHoldExcel, HouseholdEntity householdEntity) {
      String labelId = houseAndHoldExcel.getLabelId();
      if (!StringUtils.isBlank(labelId)) {
         String[] split = labelId.split(",");
         IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
         ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
         for (String s : split) {
            LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
            if (one1 != null) {
               UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
               userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
               userHouseLabelEntity.setHouseholdId(householdEntity.getId());
               // 设置默认的绿色
               userHouseLabelEntity.setColor("green");
               userHouseLabelEntity.setLableType(1);
               userHouseLabelEntity.setLabelName(s);
               userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
               bean.save(userHouseLabelEntity);
            }
            String[] split = labelId.split(",");
            IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
            ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
            for (String s : split) {
               LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
               if (one1 != null) {
                  UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
                  userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
                  userHouseLabelEntity.setHouseholdId(one.getId());
                  userHouseLabelEntity.setLableType(1);
                  userHouseLabelEntity.setLabelName(s);
                  // 设置默认的绿色
                  userHouseLabelEntity.setColor("green");
                  userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
                  bean.save(userHouseLabelEntity);
               }
         }
      }
   }

   /**
    * 住户业主信息处理，将业主人员插入到用户表
    *
    * @return
    */
   public void userHandle(HouseholdEntity householdEntity) {
      if (!Strings.isBlank(householdEntity.getPhoneNumber())) {
         // 根据手机号查询对应账号和手机号的用户信息
         List<User> userList = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
         if (userList.size() > 0) {
            User user = userList.get(0);
            householdEntity.setAssociatedUserId(user.getId());
            // 更新
            householdService.updateById(householdEntity);
            // 判断用户是否包含了居民角色,不包含则需更新
            if (!user.getRoleId().contains("1717429059648606209")) {
               user.setRoleId(user.getRoleId() + ",1717429059648606209");
               //更新
               userService.updateById(user);
            }
         } else {
            // 插入用户信息
            //如果用户不存在，则新增一个用户
            User newUser = new User();
            newUser.setAccount(householdEntity.getPhoneNumber());
            newUser.setPhone(householdEntity.getPhoneNumber());
            newUser.setName(householdEntity.getName());
            newUser.setRealName(householdEntity.getName());
            // 社区群众部门
            newUser.setDeptId("1727979636479037441");
            // 目前暂定居民角色，
            newUser.setRoleId("1717429059648606209");
            //默认密码为 123456
            newUser.setPassword("123456");
            // 用户新增
            boolean submit = userService.submit(newUser);
            // 更新绑定用户信息
            householdEntity.setAssociatedUserId(newUser.getId());
            // 更新
            householdService.updateById(householdEntity);
         }
      }
   }
@@ -704,18 +752,19 @@

   @Override
   public List<Map<String, Object>> labelStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      return baseMapper.labelStatistics(house, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
   }

   @Override
   public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, commonParamSet.getRegionChildCodesList());
      for (Map<String, Object> map : list) {
         List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
         List<LabelVO> code = baseMapper.getlabelCount(house,
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator(),
            map.get("code").toString());
         map.put("child",code);
      }
      return list;
@@ -781,4 +830,34 @@
      // 返回
      return list;
   }

   /**
    * 查询对应的社区编号
    * @param id
    * @return
    */
   @Override
   public String getCommunityCode(Long id) {
      return baseMapper.getCommunityCode(id);
   }

   /**
    * 查询所有房屋总数
    * @return
    */
   @Override
   public int getAllListTotal() {
      return baseMapper.getAllListTotal();
   }

   /**
    * 查询所有的房屋
    * @param i
    * @param size
    * @return
    */
   @Override
   public List<HouseVO> getAllList(int i, int size) {
      return baseMapper.getAllList(i,size);
   }
}