From e4920837b74c0db2f4e280f5ece08c27e8721e3f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Jan 2024 20:38:39 +0800
Subject: [PATCH] 住户导入标签设置默认颜色绿色
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 206 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 183 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 9cba3f2..e127388 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -16,24 +16,33 @@
*/
package org.springblade.modules.house.service.impl;
+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 org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.service.IUserHouseLabelService;
+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.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StopWatch;
import java.util.*;
@@ -47,11 +56,40 @@
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
@Autowired
+ private IUserHouseLabelService userHouseLabelService;
+
+ @Autowired
private IDictBizService dictBizService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IDeptService deptService;
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
- return page.setRecords(baseMapper.selectHouseholdPage(page, household));
+ StopWatch stopWatch = new StopWatch();
+ stopWatch.start();
+// doInsert();
+// 执行业务等
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ household.setRegionCode(dept.getRegionCode());
+ }
+ List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
+ // 遍历
+ // for (HouseholdVO householdVO : householdVOS) {
+ // // 设置对应的网格名称
+ // GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
+ // if (null!= gridVO){
+ // householdVO.setGridName(gridVO.getGridName());
+ // }
+ // }
+ // 返回
+ stopWatch.stop();
+ System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
+ return page.setRecords(householdVOS);
}
/**
@@ -108,33 +146,107 @@
* @return
*/
@Override
- public boolean saveOrUpdateHousehold(HouseholdEntity household) {
- // 判断添加人是否房屋业主
- Long count = count(Wrappers.<HouseholdEntity>lambdaQuery()
- .eq(HouseholdEntity::getHouseCode, household.getHouseCode())
- .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
- .eq(HouseholdEntity::getRelationship, 1));
- if (count == 0) {
- return false;
- }
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateHousehold(HouseholdVO household) {
boolean flag = false;
household.setUpdateTime(new Date());
household.setUpdateUser(AuthUtil.getUserId());
if (null != household.getId()) {
// 更新
flag = updateById(household);
+ // 更新用户信息
+ updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
} else {
- // 往用户表中插入数据
- // 通过手机号判断
- if (!Strings.isBlank(household.getPhoneNumber())) {
- //判断用户是否存在
- }
// 新增
household.setCreateTime(new Date());
household.setCreateUser(AuthUtil.getUserId());
flag = save(household);
+ // 更新用户信息
+ updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
}
return flag;
+ }
+
+ /**
+ * 更新用户标签信息
+ * @param household
+ */
+ public void updateUserLabelInfo(HouseholdVO household) {
+ if (household.getHouseholdLabelList().size()>0){
+ List<HouseholdLabelVO> householdLabelList = household.getHouseholdLabelList();
+ for (HouseholdLabelVO householdLabelVO : householdLabelList) {
+ if (!Strings.isBlank(household.getHouseCode())) {
+ householdLabelVO.setHouseCode(household.getHouseCode());
+ }
+ householdLabelVO.setHouseholdId(household.getId());
+ // 先删除对应绑定的信息
+ userHouseLabelService.saveOrUpdateHouseholdLabel(householdLabelVO);
+ }
+ }
+ }
+
+ /**
+ * 更新用户信息
+ * @param household
+ */
+ public void updateUserInfo(HouseholdEntity household) {
+ // 判断用户是否为业主，如果是业主，则新增
+ if (null!=household.getRelationship() && household.getRelationship()==1){
+ // 如果为业主
+ // 新增用户
+ bindUserHandle(household);
+ }
+ }
+
+ /**
+ * 业主和用户绑定
+ * @param
+ */
+ public User bindUserHandle(HouseholdEntity householdEntity) {
+ User newUser = new User();
+ if (null!=householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
+ //根据手机号查询库里的数据
+ User userParams = new User();
+ userParams.setPhone(householdEntity.getPhoneNumber());
+ User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null!=user) {
+ //如果用户存在，则该用户id绑定场所
+ householdEntity.setAssociatedUserId(user.getId());
+ //更新住户信息
+ updateById(householdEntity);
+ newUser = user;
+ // 判断用户是否包含了居民角色,不包含则需更新
+ if (!user.getRoleId().contains("1717429059648606209")){
+ user.setRoleId(user.getRoleId() + ",1717429059648606209");
+ //更新
+ userService.updateById(user);
+ }
+ } else {
+ //如果用户不存在，则新增一个用户
+ 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);
+ //绑定id
+ householdEntity.setAssociatedUserId(newUser.getId());
+ //更新住户信息
+ updateById(householdEntity);
+ }
+ }
+ return newUser;
}
/**
@@ -169,8 +281,8 @@
* @return
*/
@Override
- public Integer statistics(Long userId) {
- return baseMapper.statistics(userId);
+ public Integer statistics(Long userId,String neiCode) {
+ return baseMapper.statistics(userId,neiCode);
}
/**
@@ -197,19 +309,67 @@
@Override
public Object getHouseHoldStatistics(String code, String roleType) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
- if (roleType.equals("1")) {
- List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId());
- List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId());
+ if (roleType.equals("2")) {
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null, roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null, roleType);
objectObjectHashMap.put("gender", result);
objectObjectHashMap.put("age", result1);
return objectObjectHashMap;
} else {
- List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null);
- List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null);
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId(), roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId(), roleType);
objectObjectHashMap.put("gender", result);
objectObjectHashMap.put("age", result1);
return objectObjectHashMap;
}
}
+
+ /**
+ * 住户业主信息处理，将业主人员插入到用户表
+ * @return
+ */
+ @Override
+ public Object userHandle() {
+ // 查询所有未入库的业主信息
+ List<HouseholdEntity> householdEntityList = baseMapper.getNotInsertUserHousehold();
+ // 批量入用户库
+ for (HouseholdEntity householdEntity : householdEntityList) {
+ // 根据手机号查询对应账号和手机号的用户信息
+ List<User> userList = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+ if (userList.size()>0){
+ User user = userList.get(0);
+ householdEntity.setAssociatedUserId(user.getId());
+ // 更新
+ 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());
+ // 更新
+ updateById(householdEntity);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3