From fe59ae00aef5cdbc39c6d1b29c84af25071a32ff Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 10 May 2024 16:42:46 +0800
Subject: [PATCH] 防诈宣传优化
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 209 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 191 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 8942f88..b38339a 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.P;
import liquibase.pro.packaged.W;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
@@ -216,6 +217,11 @@
jwGridCodeBind(placeVO);
// 保存从业人员
savePlacePractitioner(placeVO);
+ // 判断是否校园
+ if (placeVO.getLabel().startsWith("1601")) {
+ // 校园的新增一个主体用户和一个通用用户
+ addSchoolUser(placeVO);
+ }
// 返回结果
return flag;
}
@@ -231,7 +237,7 @@
IPlacePractitionerService practitionerService = SpringUtil.getBean(IPlacePractitionerService.class);
// 查询对应已存在的租户
QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("place_id", placeVO.getId()).eq("is_deleted",0);
+ wrapper.eq("place_id", placeVO.getId()).eq("is_deleted", 0);
List<PlacePractitionerEntity> oldList = practitionerService.list(wrapper);
// 取出从业人员信息
List<PlacePractitionerEntity> placePractitionerList = placeVO.getPlacePractitioner();
@@ -712,6 +718,53 @@
}
/**
+ * 新增校方主体账号和通用账号
+ *
+ * @param placeVO
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public User addSchoolUser(PlaceVO placeVO) {
+ User newUser = new User();
+ if (StringUtils.isNotBlank(placeVO.getPlaceName())) {
+// placeVO.setPrincipal(placeVO.getPrincipal());
+// placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
+ //如果用户不存在，则新增一个用户
+ newUser.setAccount(placeVO.getPlaceName() + "主体");
+ newUser.setName(placeVO.getPlaceName() + "-主体");
+ newUser.setRealName(placeVO.getPlaceName() + "-主体");
+ // 社区群众部门
+ newUser.setDeptId("1727979636479037441");
+ // 校园主体，
+ newUser.setRoleId("1780786647371706370");
+
+ //默认密码为 123456
+ newUser.setPassword("123456");
+ // 设置机构
+ // 用户新增
+ newUser.setId(null);
+ boolean submit = userService.submit(newUser);
+ placeVO.setPrincipalAccount(newUser.getId());
+ // 校园通用
+ newUser.setId(null);
+ newUser.setPassword("123456");
+ newUser.setRoleId("1780786746076262402");
+ newUser.setAccount(placeVO.getPlaceName() + "通用");
+ newUser.setName(placeVO.getPlaceName() + "-通用");
+ newUser.setRealName(placeVO.getPlaceName() + "-通用");
+ boolean submit2 = userService.submit(newUser);
+ placeVO.setUniversalAccount(newUser.getId());
+ // 更新场所信息
+ updateById(placeVO);
+ //绑定id
+// placeVO.setPrincipalUserId(newUser.getId());
+ //给人员打上场所负责人的标签
+// baseMapper.saveUserLabel(newUser.getId(), 1002);
+ }
+ return newUser;
+ }
+
+ /**
* 场所负责人和用户绑定
*
* @param placeVO
@@ -723,18 +776,9 @@
placeVO.setPrincipal(placeVO.getPrincipal());
placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
//根据手机号查询库里的数据
- User userParams = new User();
- userParams.setPhone(placeVO.getPrincipalPhone());
- userParams.setIsDeleted(0);
- User user = userService.getOne(Condition.getQueryWrapper(userParams));
- if (null == user) {
- User userParams1 = new User();
- userParams1.setAccount(placeVO.getPrincipalPhone());
- userParams1.setIsDeleted(0);
- user = userService.getOne(Condition.getQueryWrapper(userParams1));
- }
-
- if (null != user) {
+ List<User> list = userService.getUserListByPhoneOrAccount(placeVO.getPrincipalPhone());
+ if (list.size() > 0) {
+ User user = list.get(0);
//如果用户存在，则该用户id绑定场所
placeVO.setPrincipalUserId(user.getId());
newUser = user;
@@ -962,8 +1006,10 @@
if (null == one) {
Long userId = updateUser(placeExcel);
// 插入场所
- PlaceEntity placeEntity = new PlaceEntity();
- placeEntity.setHouseCode(placeExcel.getHouseCode());
+ PlaceVO placeEntity = new PlaceVO();
+ String[] split = placeExcel.getHouseCode().split(",");
+ placeEntity.setHouseCode(split[0]);
+ placeEntity.setHouseCodeBinds(placeExcel.getHouseCode());
placeEntity.setPrincipalUserId(userId);
placeEntity.setPrincipal(placeExcel.getName());
placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
@@ -971,8 +1017,104 @@
placeEntity.setCreateUser(AuthUtil.getUserId());
placeEntity.setUpdateTime(new Date());
placeEntity.setUpdateUser(AuthUtil.getUserId());
- //一个一个插入，防止同一个表中有相同的数据
+ // 默认为未完善
+ placeEntity.setStatus(1);
+ // 是否现场采集 1：是 2：否
+ placeEntity.setIsScene(1);
+ // 来源 1：地址总表 2：国控采集 3：商超
+ if (!Strings.isBlank(placeExcel.getHouseCode())) {
+ placeEntity.setSource(1);
+ } else {
+ placeEntity.setSource(2);
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ }
+ // 九小场所类型处理
+ if (!Strings.isBlank(placeExcel.getNineType())) {
+ placeEntity.setIsNine(1);
+ placeEntity.setNineType(Integer.parseInt(placeExcel.getNineType()));
+ }
+ // 网格绑定处理
+ importGridHandle(placeExcel, placeEntity);
+ // 新增
save(placeEntity);
+ // 保存详情
+ savePlaceExtAndTaskInfo(placeEntity);
+ // 场所标签信息处理
+ if (!Strings.isBlank(placeExcel.getLabelCode())) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(placeEntity.getId());
+ placeVO.setLabel(placeExcel.getLabelCode());
+ // 处理
+ placeLabelBind(placeVO);
+ }
+ // 房屋编号绑定处理
+ houseCodeBindHandle(placeEntity);
+ } else {
+ // 更新
+ Long userId = updateUser(placeExcel);
+ // 插入场所
+ PlaceVO placeEntity = new PlaceVO();
+ placeEntity.setId(one.getId());
+ placeEntity.setHouseCode(placeExcel.getHouseCode());
+ placeEntity.setHouseCodeBinds(placeExcel.getHouseCode());
+ placeEntity.setPrincipalUserId(userId);
+ placeEntity.setPrincipal(placeExcel.getName());
+ placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
+ placeEntity.setCreateTime(new Date());
+ placeEntity.setCreateUser(AuthUtil.getUserId());
+ placeEntity.setUpdateTime(new Date());
+ placeEntity.setUpdateUser(AuthUtil.getUserId());
+ // 默认为未完善
+ placeEntity.setStatus(1);
+ // 是否现场采集 1：是 2：否
+ placeEntity.setIsScene(1);
+ // 来源 1：地址总表 2：国控采集 3：商超
+ placeEntity.setSource(1);
+ // 九小场所类型处理
+ if (!Strings.isBlank(placeExcel.getNineType())) {
+ placeEntity.setIsNine(1);
+ placeEntity.setNineType(Integer.parseInt(placeExcel.getNineType()));
+ }
+ // 网格绑定处理
+ importGridHandle(placeExcel, placeEntity);
+ // 更新
+ updateById(placeEntity);
+ // 场所标签信息处理
+ if (!Strings.isBlank(placeExcel.getLabelCode())) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(placeEntity.getId());
+ placeVO.setLabel(placeExcel.getLabelCode());
+ // 处理
+ placeLabelBind(placeVO);
+ }
+ }
+ }
+ }
+
+ /**
+ * 导入是网格数据绑定处理
+ *
+ * @param placeExcel
+ * @param placeEntity
+ */
+ private void importGridHandle(PlaceExcel placeExcel, PlaceVO placeEntity) {
+ if (!Strings.isBlank(placeExcel.getCommunityName()) &&
+ !Strings.isBlank(placeExcel.getGridName())) {
+ // 查询对应的网格信息
+ GridEntity gridEntity = gridService.getGridInfoByParam(placeExcel.getCommunityName(), placeExcel.getGridName());
+ if (null != gridEntity) {
+ // 设置场所范围
+ placeEntity.setGridId(gridEntity.getId());
+ placeEntity.setGridCode(gridEntity.getGridCode());
+ // 更新网格范围绑定
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ gridRangeEntity.setHouseCode(placeEntity.getHouseCode());
+ UpdateWrapper<GridRangeEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("house_code", placeEntity.getHouseCode());
+ gridRangeService.update(gridRangeEntity, updateWrapper);
}
}
}
@@ -987,8 +1129,8 @@
if (!Strings.isBlank(placeExcel.getPhoneNumber()) &&
!Strings.isBlank(placeExcel.getName())) {
PlaceVO placeVO = new PlaceVO();
- placeVO.setPhone(placeExcel.getPhoneNumber());
- placeVO.setUsername(placeExcel.getName());
+ placeVO.setPrincipal(placeExcel.getPhoneNumber());
+ placeVO.setPrincipalPhone(placeExcel.getName());
// 更新场所负责人
User user = bindUserHandle(placeVO);
// 返回
@@ -1574,4 +1716,35 @@
// 返回
return page.setRecords(placeVOS);
}
+
+ /**
+ * 查询所有场所数据
+ *
+ * @return
+ */
+ @Override
+ public List<PlaceVO> getAllList(int i, int size) {
+ return baseMapper.getAllList(i, size);
+ }
+
+ /**
+ * 查询所有场所数据总数
+ *
+ * @return
+ */
+ @Override
+ public int getAllListTotal() {
+ return baseMapper.getAllListTotal();
+ }
+
+ /**
+ * 查询对应的社区编号
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public String getCommunityCode(Long id) {
+ return baseMapper.getCommunityCode(id);
+ }
}
--
Gitblit v1.9.3