src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -100,6 +100,7 @@ param.put(TokenConstant.DETAIL, userInfo.getDetail()); param.put(TokenConstant.REAL_NAME, user.getRealName()); param.put("phone", user.getPhone()); param.put("status", user.getStatus()); //拼装accessToken try { @@ -122,6 +123,7 @@ .set(TokenConstant.EXPIRES_IN, accessToken.getExpire()) .set(TokenConstant.DETAIL, userInfo.getDetail()) .set("phone", user.getPhone()) .set("status", user.getStatus()) .set(TokenConstant.REAL_NAME, user.getRealName()) .set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME); } catch (Exception ex) { src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -21,10 +21,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; import org.springblade.common.cache.SysCache; import org.springblade.common.constant.CommonConstant; import org.springblade.common.param.CommonParamSet; import org.springblade.common.utils.SpringUtils; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.modules.grid.service.IGridService; import org.springblade.modules.house.entity.HouseRentalEntity; import org.springblade.modules.house.entity.HouseholdEntity; @@ -36,9 +37,7 @@ import org.springblade.modules.house.vo.HouseRentalTenantVO; import org.springblade.modules.house.vo.HouseRentalVO; import org.springblade.modules.house.vo.HouseholdVO; import org.springblade.modules.system.entity.Dept; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.service.IDeptService; import org.springblade.modules.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -234,17 +233,32 @@ List<HouseholdEntity> addList = new ArrayList<>(); List<HouseholdEntity> updateList = new ArrayList<>(); List<HouseholdEntity> removeList = new ArrayList<>(); List<User> addUserList = new ArrayList<>(); // List<User> updateUserList = new ArrayList<>(); // List<User> removeUserList = new ArrayList<>(); // 找出需要新增的，否则组成新集合进行比对 List<String> phoneList = new ArrayList<>(); IUserService userService = SpringUtils.getBean(IUserService.class); for (HouseholdEntity householdEntity : list) { if (null == householdEntity.getId()) { // 新增 // 新增用戶 User user = new User(); user.setAccount(householdEntity.getPhoneNumber()); user.setUserType(1); user.setRealName(householdEntity.getName()); user.setName(householdEntity.getName()); user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD)); user.setRoleId("1717429059648606209"); boolean save = userService.save(user); // 新增住户 householdEntity.setHouseCode(houseRental.getHouseCode()); householdEntity.setHousingRentalId(houseRental.getId()); householdEntity.setRelationship(18); householdEntity.setResidentialStatus(1); householdEntity.setRoleType(2); if (save) { householdEntity.setAssociatedUserId(user.getId()); } addList.add(householdEntity); phoneList.add(householdEntity.getPhoneNumber()); } else { src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -18,13 +18,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import liquibase.repackaged.org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import org.springblade.common.constant.CommonConstant; import org.springblade.common.node.TreeIntegerNode; import org.springblade.common.node.TreeStringNode; import org.springblade.common.param.CommonParamSet; import org.springblade.common.utils.NodeTreeUtil; import org.springblade.common.utils.SpringUtils; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; @@ -38,6 +41,9 @@ import org.springblade.modules.house.vo.HouseholdLabelVO; import org.springblade.modules.house.vo.HouseholdOtherVO; import org.springblade.modules.house.vo.HouseholdVO; import org.springblade.modules.label.entity.LabelEntity; import org.springblade.modules.label.service.ILabelService; import org.springblade.modules.label.vo.LabelVO; import org.springblade.modules.place.entity.PlaceEntity; import org.springblade.modules.place.service.IPlaceService; import org.springblade.modules.system.entity.DictBiz; @@ -81,12 +87,36 @@ // List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId()); // Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2; // 重点人员与关注人员 if (Objects.nonNull(household.getLabelType())) { extracted(household); } List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household, commonParamSet.getIsAdministrator(), commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList()); stopWatch.stop(); // System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis()); return page.setRecords(householdVOS); } /** * 重点人员与关注人员 * @param household */ private void extracted(HouseholdVO household) { ILabelService iLabelService = SpringUtils.getBean(ILabelService.class); if (CommonConstant.NUMBER_ONE.equals(household.getLabelType())) { List<LabelEntity> list = iLabelService.list(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getParentId, 103)); List<Integer> collect = list.stream().map(item -> item.getId() ).collect(Collectors.toList()); household.setLabelIdList(collect); } else if (CommonConstant.NUMBER_TWO.equals(household.getLabelType())) { List<LabelEntity> list = iLabelService.list(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getParentId, 1032)); List<Integer> collect = list.stream().map(item -> item.getId() ).collect(Collectors.toList()); household.setLabelIdList(collect); } } /** @@ -297,13 +327,13 @@ * @return */ @Override public Integer statistics(Long userId, String neiCode,Integer confirmFlag) { public Integer statistics(Long userId, String neiCode, Integer confirmFlag) { HouseholdVO householdVO = new HouseholdVO(); householdVO.setConfirmFlag(confirmFlag); householdVO.setNeiCode(neiCode); CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO); return baseMapper.statistics(householdVO,commonParamSet.getIsAdministrator(), return baseMapper.statistics(householdVO, commonParamSet.getIsAdministrator(), commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList()); }
@@ -43,6 +43,9 @@ @ApiModelProperty(value = "标签") private List<Integer> labelIdList; @ApiModelProperty(value = "标签类型：重点人员，关注人员") private Integer labelType; /** * 小区名称 */
