From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 459 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 381 insertions(+), 78 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 60ea4b0..49f0ab7 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,17 +20,14 @@
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.W;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
@@ -41,32 +38,25 @@
import org.springblade.modules.grid.mapper.GridMapper;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.grid.service.IGridmanService;
-import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.place.entity.*;
+import org.springblade.modules.place.excel.ExportPlaceExcel;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
-import org.springblade.modules.place.excel.PlaceExcel;
+import org.springblade.modules.place.excel.ImportPlaceExcel;
import org.springblade.modules.place.service.*;
-import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
-import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.Region;
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.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;
@@ -106,9 +96,6 @@
@Autowired
private IGridRangeService gridRangeService;
-
- @Autowired
- private IGridmanService gridmanService;
@Autowired
private GridMapper gridMapper;
@@ -215,8 +202,70 @@
gridBind(placeVO);
// 警务网格绑定
jwGridCodeBind(placeVO);
+ // 保存从业人员
+ savePlacePractitioner(placeVO);
+ // 判断是否校园
+ if (placeVO.getLabel().startsWith("1601")) {
+ // 校园的新增一个主体用户和一个通用用户
+ addSchoolUser(placeVO);
+ }
// 返回结果
return flag;
+ }
+
+
+ /**
+ * 保存从业人员
+ *
+ * @param placeVO
+ */
+ private void savePlacePractitioner(PlaceVO placeVO) {
+ if (placeVO.getPlacePractitioner() != null) {
+ IPlacePractitionerService practitionerService = SpringUtil.getBean(IPlacePractitionerService.class);
+ // 查询对应已存在的租户
+ QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id", placeVO.getId()).eq("is_deleted", 0);
+ List<PlacePractitionerEntity> oldList = practitionerService.list(wrapper);
+ // 取出从业人员信息
+ List<PlacePractitionerEntity> placePractitionerList = placeVO.getPlacePractitioner();
+ for (PlacePractitionerEntity placePractitionerEntity : placePractitionerList) {
+ placePractitionerEntity.setPlaceId(placeVO.getId());
+ }
+ // 申明新增，修改，删除集合
+ List<PlacePractitionerEntity> newList = new ArrayList<>();
+ List<PlacePractitionerEntity> addList = new ArrayList<>();
+ List<PlacePractitionerEntity> updateList = new ArrayList<>();
+ List<PlacePractitionerEntity> removeList = new ArrayList<>();
+ // 遍历设置数据
+ for (PlacePractitionerEntity placePractitionerEntity : placePractitionerList) {
+ if (null == placePractitionerEntity.getId()) {
+ // 新增
+ addList.add(placePractitionerEntity);
+ } else {
+ newList.add(placePractitionerEntity);
+ }
+ }
+ // 遍历去差集，判断是新增还是删除还是更新
+ // 取旧数据和新提交数据差集--删除
+ removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
+ e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
+ // 取旧数据和新提交数据交集--更新
+ updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
+
+ // 批量新增
+ if (addList.size() > 0) {
+ practitionerService.saveBatch(addList);
+ }
+ // 批量修改
+ if (updateList.size() > 0) {
+ practitionerService.updateBatchById(updateList);
+ }
+ // 批量删除
+ if (removeList.size() > 0) {
+ practitionerService.removeBatchByIds(removeList);
+ }
+ }
}
/**
@@ -245,6 +294,7 @@
*
* @param placeVO
*/
+ @Override
public void jwGridCodeBind(PlaceVO placeVO) {
if (!Strings.isBlank(placeVO.getLng())) {
String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() + ")'";
@@ -290,6 +340,18 @@
placeVO.setIsScene(2);
}
}
+ }
+
+ /**
+ * 房屋绑定处理
+ * @param placeEntity
+ */
+ public void houseCodeBindHandle(PlaceEntity placeEntity) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(placeEntity.getId());
+ placeVO.setHouseCodeBinds(placeEntity.getHouseCodeBinds());
+ // 绑定
+ houseCodeBindHandle(placeVO);
}
/**
@@ -478,7 +540,8 @@
*
* @param placeVO
*/
- private void policePositionHandle(PlaceVO placeVO) {
+ @Override
+ public void policePositionHandle(PlaceVO placeVO) {
// 是民警且位置信息存在
if (!Strings.isBlank(placeVO.getLng())) {
//点坐标解析
@@ -654,6 +717,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
@@ -665,18 +775,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;
@@ -718,13 +819,16 @@
@Transactional(rollbackFor = Exception.class)
public void savePlaceExtAndTaskInfo(PlaceVO placeVO) {
PlaceExtEntity placeExtEntity = new PlaceExtEntity();
- placeExtEntity.setPlaceId(placeVO.getId());
// 判断是否已存在，已存在则不新增
QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_deleted", 0)
.eq("place_id", placeVO.getId());
- PlaceExtEntity one = placeExtService.getOne(wrapper);
- if (null == one) {
+ PlaceExtEntity extServiceOne = placeExtService.getOne(wrapper);
+ if (null == extServiceOne) {
+ // 判断是否有传
+ if (placeVO.getPlaceExtEntity() != null) {
+ placeExtEntity = placeVO.getPlaceExtEntity();
+ }
placeExtEntity.setPlaceId(placeVO.getId());
// 默认给待完善状态
placeExtEntity.setConfirmFlag(4);
@@ -734,6 +838,10 @@
placeExtEntity.setUpdateUser(AuthUtil.getUserId());
// 新增场所详情
placeExtService.save(placeExtEntity);
+ } else {
+ if (placeVO.getPlaceExtEntity() != null) {
+ placeExtService.updateById(placeVO.getPlaceExtEntity());
+ }
}
}
@@ -852,6 +960,13 @@
QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
+ // 查询从业人员
+ IPlacePractitionerService placePractitionerService = SpringUtils.getBean(IPlacePractitionerService.class);
+ List<PlacePractitionerEntity> entityList = placePractitionerService.list(Wrappers.<PlacePractitionerEntity>lambdaQuery()
+ .eq(PlacePractitionerEntity::getPlaceId, placeVO.getId()));
+ placeVO.setPlacePractitioner(entityList);
+ // 查询绑定的房屋
+ placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
}
} else {
// 查询地址编码信息（社区派出所相关信息）
@@ -880,27 +995,169 @@
* @param isCovered
*/
@Override
- public void importPlace(List<PlaceExcel> data, Boolean isCovered) {
- for (PlaceExcel placeExcel : data) {
+ public String importPlace(List<ImportPlaceExcel> data, Boolean isCovered) {
+ int totalNum = data.size();
+ int importNum = 0;
+ int updateNum = 0;
+ int errorNum = 0;
+ for (ImportPlaceExcel placeExcel : data) {
+ if (Strings.isBlank(placeExcel.getPlaceName()) || Strings.isBlank(placeExcel.getHouseCode())){
+ errorNum++;
+ continue;
+ }
+ PlaceEntity placeEntity = Objects.requireNonNull(BeanUtil.copy(placeExcel, PlaceEntity.class));
+ Long userId = updateUser(placeExcel);
+ // 九小场所类型处理
+ if (!Strings.isBlank(placeExcel.getNineType())) {
+ placeEntity.setIsNine(1);
+ placeEntity.setNineType(Integer.parseInt(placeExcel.getNineType()));
+ }
+ // 阵地类型处理
+ if (!Strings.isBlank(placeExcel.getFrontType())) {
+ placeEntity.setIsFront(1);
+ placeEntity.setFrontType(Integer.parseInt(placeExcel.getFrontType()));
+ }
+ // 无诈类别
+ if (!Strings.isBlank(placeExcel.getNoExplosionCategory())){
+ placeEntity.setNoExplosionCategory(Integer.parseInt(placeExcel.getNoExplosionCategory()));
+ }
+ // 三级单位
+ if (!Strings.isBlank(placeExcel.getThreeFireProtection())){
+ if (placeExcel.getThreeFireProtection().equals("是")){
+ placeEntity.setThreeFireProtection(1);
+ }
+ if (placeExcel.getThreeFireProtection().equals("否")){
+ placeEntity.setThreeFireProtection(2);
+ }
+ }
+ String[] split = placeExcel.getHouseCode().split(",");
+ placeEntity.setHouseCode(split[0]);
+ placeEntity.setHouseCodeBinds(placeExcel.getHouseCode());
+ placeEntity.setPrincipalUserId(userId);
+ // houseCode 关联处理 来源 1：地址总表 2：国控采集 3：商超
+ houseCodeHandle(placeExcel, placeEntity);
+ // 网格绑定处理
+ importGridHandle(placeExcel, placeEntity);
// 判断是否存在，不存在则插入，否则不操作
QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_deleted", 0)
.eq("house_code", placeExcel.getHouseCode());
PlaceEntity one = getOne(wrapper);
if (null == one) {
- Long userId = updateUser(placeExcel);
- // 插入场所
- PlaceEntity placeEntity = new PlaceEntity();
- placeEntity.setHouseCode(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());
- //一个一个插入，防止同一个表中有相同的数据
+ // 新增
save(placeEntity);
+ importNum++;
+ // 保存详情
+ savePlaceExt(placeEntity,placeExcel);
+ // 场所标签信息处理
+ if (!Strings.isBlank(placeExcel.getLabelCode())) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(placeEntity.getId());
+ placeVO.setLabel(placeExcel.getLabelCode());
+ // 处理
+ placeLabelBind(placeVO);
+ }
+ // 房屋编号绑定处理
+ houseCodeBindHandle(placeEntity);
+ } else {
+ updateNum++;
+ // 是否覆盖更新
+ if (isCovered) {
+ // 更新场所
+ placeEntity.setId(one.getId());
+ // 更新
+ updateById(placeEntity);
+ importNum++;
+ // 场所标签信息处理
+ if (!Strings.isBlank(placeExcel.getLabelCode())) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(one.getId());
+ placeVO.setLabel(placeExcel.getLabelCode());
+ // 处理
+ placeLabelBind(placeVO);
+ }
+ }
+ }
+ }
+ StringBuilder builder = new StringBuilder("导入完成!");
+ builder.append("其中本次表格共有 ").append(totalNum).append(" 条数据，")
+ .append("成功导入 ").append(importNum).append(" 条数据。");
+ if (updateNum>0) {
+ builder.append("其中有 ").append(updateNum).append(" 条数据已存在。");
+ }
+ if (errorNum>0){
+ builder.append("共有 ").append(errorNum).append(" 条数据由于无企业（店铺）名称信息或无地址编号未导入!");
+ }
+ return builder.toString();
+ }
+
+ /**
+ * 保存场所详情信息
+ * @param placeEntity
+ * @param placeExcel
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void savePlaceExt(PlaceEntity placeEntity, ImportPlaceExcel placeExcel) {
+ PlaceVO placeVO = new PlaceVO();
+ placeVO.setId(placeEntity.getId());
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setLegalPerson(placeExcel.getLegalPerson());
+ placeExtEntity.setLegalTel(placeExcel.getLegalTel());
+ placeExtEntity.setLegalIdCard(placeExcel.getLegalIdCard());
+ // 设置详情
+ placeVO.setPlaceExtEntity(placeExtEntity);
+ // 保存详情
+ savePlaceExtAndTaskInfo(placeVO);
+ }
+
+ /**
+ *
+ * @param placeExcel
+ * @param placeEntity
+ */
+ public void houseCodeHandle(ImportPlaceExcel placeExcel, PlaceEntity placeEntity) {
+ if (!Strings.isBlank(placeExcel.getHouseCode())) {
+ placeEntity.setSource(1);
+ // 设置经纬度及地址
+ DoorplateAddressEntity doorplateAddressEntity
+ = doorplateAddressService.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery().eq(DoorplateAddressEntity::getAddressCode, placeExcel.getHouseCode()));
+ if (null!=doorplateAddressEntity){
+ placeEntity.setLng(doorplateAddressEntity.getX());
+ placeEntity.setLat(doorplateAddressEntity.getY());
+ placeEntity.setLocation(doorplateAddressEntity.getAddressName());
+ placeEntity.setBuildingCode(doorplateAddressEntity.getBuildingCode());
+ placeEntity.setAoiCode(doorplateAddressEntity.getAoiCode());
+ }
+ } else {
+ placeEntity.setSource(2);
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ }
+ }
+
+ /**
+ * 导入是网格数据绑定处理
+ *
+ * @param placeExcel
+ * @param placeEntity
+ */
+ private void importGridHandle(ImportPlaceExcel placeExcel, PlaceEntity 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);
}
}
}
@@ -911,12 +1168,12 @@
* @param placeExcel
* @return
*/
- public Long updateUser(PlaceExcel placeExcel) {
- if (!Strings.isBlank(placeExcel.getPhoneNumber()) &&
- !Strings.isBlank(placeExcel.getName())) {
+ public Long updateUser(ImportPlaceExcel placeExcel) {
+ if (!Strings.isBlank(placeExcel.getPrincipal()) &&
+ !Strings.isBlank(placeExcel.getPrincipalPhone())) {
PlaceVO placeVO = new PlaceVO();
- placeVO.setPhone(placeExcel.getPhoneNumber());
- placeVO.setUsername(placeExcel.getName());
+ placeVO.setPrincipal(placeExcel.getPrincipal());
+ placeVO.setPrincipalPhone(placeExcel.getPrincipalPhone());
// 更新场所负责人
User user = bindUserHandle(placeVO);
// 返回
@@ -986,9 +1243,9 @@
placeRelEntity.setPlaceId(placeEntity.getId());
placeRelEntity.setStreetName(placeExcel.getStreetName());
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",placeExcel.getCommunityName());
+ wrapper.eq("name", placeExcel.getCommunityName());
Region region = SpringUtils.getBean(IRegionService.class).getOne(wrapper);
- if (null!=region){
+ if (null != region) {
placeRelEntity.setCommunityCode(region.getCode());
}
placeRelEntity.setCommunityName(placeExcel.getCommunityName());
@@ -1032,10 +1289,10 @@
if (!Strings.isBlank(placeExcel.getLabelCode())) {
// 匹配标签
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("level",3).eq("category_name",placeExcel.getLabelCode()).eq("is_deleted",0);
+ wrapper.eq("level", 3).eq("category_name", placeExcel.getLabelCode()).eq("is_deleted", 0);
// 查询
List<CategoryEntity> list = SpringUtils.getBean(ICategoryService.class).list(wrapper);
- if (list.size()>0){
+ if (list.size() > 0) {
PlaceVO placeVO = new PlaceVO();
CategoryEntity categoryEntity = list.get(0);
placeVO.setLabel(categoryEntity.getCategoryNo());
@@ -1367,28 +1624,7 @@
@Override
public List<NinePlaceExcel> export(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());
- }
- }
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(PlaceVO.class, place);
List<String> strings = new ArrayList<>();
if (null != place.getNineType()) {
QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
@@ -1403,7 +1639,11 @@
strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
}
}
- List<NinePlaceExcel> aa = baseMapper.export(place, gridCodeList, regionChildCodesList, isAdministrator, strings);
+ List<NinePlaceExcel> aa = baseMapper.export(place,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(),
+ strings);
IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
for (NinePlaceExcel ninePlaceExcel : aa) {
@@ -1503,4 +1743,67 @@
}
return null;
}
+
+ /**
+ * 企业商超列表查询
+ */
+ @Override
+ public IPage<PlaceVO> selectMallPage(IPage<PlaceVO> page, PlaceVO place) {
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
+ List<PlaceVO> placeVOS = baseMapper.selectMallPage(page,
+ place,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
+ // 返回
+ 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);
+ }
+
+ /**
+ * 导出场所信息
+ * @param place
+ * @return
+ */
+ @Override
+ public List<ExportPlaceExcel> exportPlaceList(PlaceVO place) {
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
+ return baseMapper.exportPlaceList(place,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()
+ );
+ }
}
--
Gitblit v1.9.3