From 9499e3c887fc1be2115c38540d1dc515c7403d38 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 26 Feb 2024 15:46:48 +0800
Subject: [PATCH] 去除多余代码
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 96 +----------------------------------------------
1 files changed, 3 insertions(+), 93 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 027413b..356c289 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -32,14 +32,6 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
-import org.springblade.modules.community.entity.CommunityEntity;
-import org.springblade.modules.community.service.ICommunityService;
-import org.springblade.modules.grid.entity.GridEntity;
-import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
-import org.springblade.modules.police.service.IPoliceAffairsGridService;
-import org.springblade.modules.property.entity.PropertyCompanyEntity;
-import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.mapper.DeptMapper;
@@ -67,9 +59,9 @@
public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
private static final String TENANT_ID = "tenantId";
private static final String PARENT_ID = "parentId";
-
- @Autowired
- private IPropertyCompanyService propertyCompanyService;
+//
+// @Autowired
+// private IPropertyCompanyService propertyCompanyService;
@Autowired
private IRegionService regionService;
@@ -189,11 +181,6 @@
for (Long id : longs) {
// 查询当前机构信息
DeptVO dept = baseMapper.getDeptById(id);
- // 如果父机构为物业公司
- if (dept.getParentName().equals("物业公司")) {
- // 删除
- propertyCompanyService.remove(Wrappers.<PropertyCompanyEntity>update().lambda().eq(PropertyCompanyEntity::getDeptId, id));
- }
}
return removeByIds(longs);
}
@@ -276,26 +263,6 @@
*/
@Transactional(rollbackFor = Exception.class)
public void savePropertyCompany(Dept dept) {
- // 查询物业公司是否存在
- QueryWrapper<PropertyCompanyEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted", 0)
- .eq("dept_id", dept.getId())
- .eq("name", dept.getDeptName());
- PropertyCompanyEntity propertyCompanyEntity = propertyCompanyService.getOne(wrapper);
- if (null != propertyCompanyEntity) {
- // 修改
- propertyCompanyEntity.setDeptId(dept.getId());
- propertyCompanyEntity.setName(dept.getDeptName());
- // 往物业公司表中插入一条数据
- propertyCompanyService.updateById(propertyCompanyEntity);
- } else {
- // 新增
- PropertyCompanyEntity companyEntity = new PropertyCompanyEntity();
- companyEntity.setDeptId(dept.getId());
- companyEntity.setName(dept.getDeptName());
- // 往物业公司表中插入一条数据
- propertyCompanyService.save(companyEntity);
- }
}
@Override
@@ -362,26 +329,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Object dataHandleCommunity() {
- // 查询所有的社区
- QueryWrapper<Region> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("district_code","361102").eq("region_level",5);
- List<Region> list = regionService.list(queryWrapper);
- // 遍历
- for (Region region : list) {
- // 查询是否已创建
- QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted", 0).eq("name", region.getName());
- CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
- if (null == one) {
- // 新增
- CommunityEntity communityEntity = new CommunityEntity();
- communityEntity.setStreetCode(region.getTownCode());
- communityEntity.setName(region.getName());
- communityEntity.setCode(region.getCode());
- // 新增
- SpringUtil.getBean(ICommunityService.class).save(communityEntity);
- }
- }
return null;
}
@@ -391,17 +338,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Object dataRegionGridCodeBindHandle() {
- // 查询网格对应的机构信息（包含父级机构名称）
- List<DeptVO> deptVOS = baseMapper.getGridDeptAndParentList();
- //遍历处理
- for (DeptVO deptVO : deptVOS) {
- GridEntity gridEntity = SpringUtils.getBean(IGridService.class).getGridByNames(deptVO.getDeptName(), deptVO.getParentName());
- if (null != gridEntity) {
- deptVO.setRegionCode(gridEntity.getGridCode());
- // 更新
- updateById(deptVO);
- }
- }
return null;
}
@@ -422,32 +358,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Object dataHandleCommunityByPolice() {
- // 查询所有的派出所
- QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).like("dept_name","派出所");
- List<Dept> list = list(wrapper);
- // 遍历
- for (Dept dept : list) {
- // 通过派出所名称查询对应的警务网格信息
- QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("pcs_name",dept.getDeptName());
- List<PoliceAffairsGridEntity> policeAffairsGridEntityList
- = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
- // 遍历
- for (PoliceAffairsGridEntity policeAffairsGridEntity : policeAffairsGridEntityList) {
- Dept deptInfo = new Dept();
- deptInfo.setTenantId("000000");
- deptInfo.setDeptName(policeAffairsGridEntity.getCommunityName());
- deptInfo.setFullName(policeAffairsGridEntity.getCommunityName());
- deptInfo.setDeptCategory(1);
- deptInfo.setDeptNature(1);
- deptInfo.setParentId(dept.getId());
- deptInfo.setAncestors(dept.getAncestors() + "," + dept.getId());
- deptInfo.setRegionCode(policeAffairsGridEntity.getJwGridCode());
- // 保存
- save(deptInfo);
- }
- }
return null;
}
--
Gitblit v1.9.3