From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index f90d4f8..e277f60 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -17,26 +17,32 @@
package org.springblade.modules.grid.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
+import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridmanExcel;
-import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.grid.vo.GridmanVO;
import org.springblade.modules.grid.mapper.GridmanMapper;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
+import org.springblade.modules.grid.vo.GridmanVO;
import org.springblade.modules.system.entity.Dept;
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.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -57,8 +63,15 @@
@Autowired
private IRegionService regionService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ gridman.setRegionCode(dept.getRegionCode());
+ }
return page.setRecords(baseMapper.selectGridmanPage(page, gridman));
}
@@ -93,11 +106,26 @@
}
//插入网格员信息
gridman.setUserId(user.getId());
- flag = save(gridman);
+ //匹配
+ QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0)
+ .eq("grid_id",gridman.getGridId())
+ .eq("user_id",gridman.getUserId());
+ GridmanEntity one = getOne(queryWrapper);
+ if (null==one){
+ flag = save(gridman);
+ }
} else {
saveUser(gridman);
- // 插入网格员信息
- flag = save(gridman);
+ //匹配
+ QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0)
+ .eq("grid_id",gridman.getGridId())
+ .eq("user_id",gridman.getUserId());
+ GridmanEntity one = getOne(queryWrapper);
+ if (null==one){
+ flag = save(gridman);
+ }
}
}
// 返回
@@ -137,31 +165,78 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importGridman(List<GridmanExcel> data, Boolean isCovered) {
// 遍历
for (GridmanExcel gridmanExcel : data) {
GridmanEntity gridmanEntity = Objects.requireNonNull(BeanUtil.copy(gridmanExcel, GridmanEntity.class));
- // 先查询当前网格社区对应的机构id
- QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
- regionWrapper.eq("name",gridmanExcel.getCommunityName());
- Region region = regionService.getOne(regionWrapper);
// 通过社区名称和网格名称获取网格id
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted",0)
- .eq("community_code",region.getCode())
- .eq("grid_name",gridmanExcel.getGridName());
+ .eq("grid_code",gridmanExcel.getGridCode());
GridEntity gridEntity = gridService.getOne(queryWrapper);
// 设置网格id
gridmanEntity.setGridId(gridEntity.getId());
- // 通过手机号查询网格员id
- QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).eq("mobile",gridmanEntity.getMobile());
- GridmanEntity one = getOne(wrapper);
- if (one!=null){
- gridmanEntity.setId(one.getId());
- }
// 插入网格员
- saveOrUpdateGridman(gridmanEntity);
+ if (!Strings.isBlank(gridmanExcel.getMobile())) {
+ saveOrUpdateGridman(gridmanEntity);
+ }
}
}
+
+ /**
+ * 网格员查询
+ *
+ * @param gridman
+ * @return
+ */
+ @Override
+ public List<GridmanVO> getGridmanList(GridmanVO gridman) {
+ return baseMapper.getGridmanList(gridman);
+ }
+
+ @Override
+ public Object getGridStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ if (roleType.equals("2")) {
+ Integer gridStatistics = baseMapper.getGridStatistics(code, null, roleType);
+ Integer companyStatistics = baseMapper.getCompanyStatistics(code, null, roleType);
+ Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, null, roleType);
+ objectObjectHashMap.put("gridStatistics", gridStatistics);
+ objectObjectHashMap.put("companyStatistics", companyStatistics);
+ objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
+ } else {
+ Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId(), roleType);
+ Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId(), roleType);
+ Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, AuthUtil.getUserId(), roleType);
+ objectObjectHashMap.put("gridStatistics", gridStatistics);
+ objectObjectHashMap.put("companyStatistics", companyStatistics);
+ objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
+
+ }
+ return objectObjectHashMap;
+ }
+
+ /**
+ * 网格员表 自定义详情
+ */
+ @Override
+ public GridmanVO getDetail(GridmanEntity gridman) {
+ return baseMapper.getDetail(gridman);
+ }
+
+ /**
+ * 查询网格id
+ * @param userId
+ * @return
+ */
+ @Override
+ public Integer getGridIdByUserId(Long userId) {
+ return baseMapper.getGridIdByUserId(userId);
+ }
+
+ @Override
+ public List<UserEntity> getGridManByCode(String houseCode) {
+ return baseMapper.getGridManByCode(houseCode);
+ }
}
--
Gitblit v1.9.3