From 0852acae13603be95eaaa0b501f3441508ff3fe5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 14 四月 2025 09:52:12 +0800
Subject: [PATCH] 大屏统计修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 139 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 15 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index 9db5211..6fc2758 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -1,5 +1,6 @@
package com.sinata.system.service.impl;
+import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,9 +13,16 @@
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwApplication;
+import com.sinata.system.domain.MwContract;
+import com.sinata.system.domain.MwMicroEquipment;
+import com.sinata.system.domain.MwProtectionEquipment;
+import com.sinata.system.domain.MwProtectionRegulation;
+import com.sinata.system.domain.MwProtectionTask;
+import com.sinata.system.domain.MwStagingRoom;
+import com.sinata.system.domain.MwTransitCar;
+import com.sinata.system.domain.MwTransitRoute;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.SysDepartmentInfo;
-import com.sinata.system.domain.SysUserDepartment;
import com.sinata.system.domain.dto.DisposalUnitDTO;
import com.sinata.system.domain.dto.MedicalInstitutionDTO;
import com.sinata.system.domain.dto.RegulatoryUnitDTO;
@@ -26,6 +34,16 @@
import com.sinata.system.domain.vo.SysDepartmentVO;
import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.mapper.SysDepartmentMapper;
+import com.sinata.system.service.ISysUserService;
+import com.sinata.system.service.MwApplicationService;
+import com.sinata.system.service.MwContractService;
+import com.sinata.system.service.MwMicroEquipmentService;
+import com.sinata.system.service.MwProtectionEquipmentService;
+import com.sinata.system.service.MwProtectionRegulationService;
+import com.sinata.system.service.MwProtectionTaskService;
+import com.sinata.system.service.MwStagingRoomService;
+import com.sinata.system.service.MwTransitCarService;
+import com.sinata.system.service.MwTransitRouteService;
import com.sinata.system.service.SysDepartmentInfoService;
import com.sinata.system.service.SysDepartmentService;
import com.sinata.system.service.SysUserDepartmentService;
@@ -60,6 +78,17 @@
private final SysUserDepartmentService sysUserDepartmentService;
private final RedisTemplate<Object, Object> redisTemplate;
private final SysDepartmentInfoService sysDepartmentInfoService;
+ private final ISysUserService sysUserService;
+
+ private final MwApplicationService mwApplicationService;
+ private final MwContractService mwContractService;
+ private final MwMicroEquipmentService mwMicroEquipmentService;
+ private final MwProtectionEquipmentService mwProtectionEquipmentService;
+ private final MwProtectionTaskService mwProtectionTaskService;
+ private final MwProtectionRegulationService mwProtectionRegulationService;
+ private final MwStagingRoomService mwStagingRoomService;
+ private final MwTransitCarService mwTransitCarService;
+ private final MwTransitRouteService mwTransitRouteService;
/**
* 获取区域树
* @return
@@ -87,6 +116,15 @@
break;
case 4:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
+ break;
+ case 5:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
+ break;
+ case 6:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
+ break;
+ case 7:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
break;
default:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
@@ -135,14 +173,26 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentByOrgType(SysDepartment myDepartment, List<Integer> orgTypes) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
- .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.in(CollUtils.isNotEmpty(orgTypes), SysDepartment::getOrgType, orgTypes)
+ .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
return sysDepartmentList.stream()
.collect(Collectors.groupingBy(SysDepartment::getParentId));
}
+ @NotNull
+ private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
+ List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .ne(SysDepartment::getOrgType , 4)
+ .ne(SysDepartment::getOrgType , 3)
+ .ne(SysDepartment::getOrgType , 2)
+ .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
+ .orderByDesc(SysDepartment::getCreateTime)
+ .list();
+ return sysDepartmentList.stream()
+ .collect(Collectors.groupingBy(SysDepartment::getParentId));
+ }
@Override
public SysDepartment getDepartmentByParentId(Long parentId) {
return this.lambdaQuery().eq(SysDepartment::getId, parentId).one();
@@ -194,16 +244,51 @@
}
public List<SysDepartmentVO> getRegionTree2(String keyword) {
+// SysDepartment currentDepartment = getMyDepartment();
+
List<SysDepartmentVO> root = new ArrayList<>();
- SysDepartment currentDepartment = this.baseMapper.selectById(-1);
+ SysDepartment currentDepartment = getMyDepartment();
if (Objects.isNull(currentDepartment)) {
return root;
}
- if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
- return root;
- }
- Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+// if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
+// return root;
+// }
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ Integer orgType = sysDepartmentVO.getOrgType();
+ if (sysDepartmentVO.getOrgType()==4){
+ SysDepartment byId = this.getById(sysDepartmentVO.getParentId());
+ childrenMap = getChildrenDepartmentMap(byId);
+ sysDepartmentVO = fillChildrenTreeModel(byId, childrenMap);
+// sysDepartmentVO.setChildren(new ArrayList<>());
+ }
+ if (sysDepartmentVO.getTreeCode().length()==10){
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
+ SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
+ List<SysDepartmentVO> root1 = new ArrayList<>();
+ root1.add(sysDepartmentVO);
+ sysDepartmentVO1.setChildren(root1);
+ sysDepartmentVO = sysDepartmentVO1;
+ }
+ if (sysDepartmentVO.getTreeCode().length()>=14){
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
+ SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
+ List<SysDepartmentVO> root1 = new ArrayList<>();
+ root1.add(sysDepartmentVO);
+ sysDepartmentVO1.setChildren(root1);
+
+
+ SysDepartment sysDepartment2 = this.baseMapper.selectById(sysDepartment.getParentId());
+ SysDepartmentVO sysDepartmentVO2 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment2,sysDepartmentVO2);
+ List<SysDepartmentVO> root2 = new ArrayList<>();
+ root2.add(sysDepartmentVO1);
+ sysDepartmentVO2.setChildren(root2);
+ sysDepartmentVO = sysDepartmentVO2;
+ }
root.add(sysDepartmentVO);
if (StringUtils.isNotBlank(keyword)) {
treeMatch(root, keyword);
@@ -420,9 +505,9 @@
.orderByDesc(SysDepartment::getCreateTime)
.list();
List<Long> departmentIds = sysDepartmentList.stream().map(SysDepartment::getId).collect(Collectors.toList());
- Long count = sysUserDepartmentService.lambdaQuery().in(SysUserDepartment::getDepartmentId, departmentIds).count();
+ Long count = sysUserService.lambdaQuery().in(SysUser::getDepartmentId, departmentIds).count();
if (count > 0) {
- throw new ServiceException("该区域已存在用户，无法删除");
+ throw new ServiceException("该区域已关联用户，无法删除");
}
removeById(id);
}
@@ -572,6 +657,8 @@
sysDepartmentInfo.setDepartmentId(department.getId());
sysDepartmentInfo.setId(null);
sysDepartmentInfoService.save(sysDepartmentInfo);
+ //处理层级关系
+ handleRelation(sysDepartment, parent, dto.getRelation());
}
/**
@@ -595,9 +682,9 @@
*/
@Override
public void deleteMedical(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该医疗机构已存在用户，无法删除");
+ throw new ServiceException("该医疗机构已关联用户，无法删除");
}
removeById(id);
}
@@ -702,6 +789,26 @@
sysDepartmentInfo.setId(null);
sysDepartmentInfo.setDepartmentId(department.getId());
sysDepartmentInfoService.save(sysDepartmentInfo);
+ //如果修改了所属区域
+ handleRelation(sysDepartment, parent, dto.getRelation());
+ }
+
+ private void handleRelation(SysDepartment sysDepartment, SysDepartment parent, String relation) {
+ if (!sysDepartment.getParentId().equals(parent.getId())) {
+ List<Long> relationList = Arrays.stream(relation.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ relationList.add(sysDepartment.getId());
+ relation = JSONArray.toJSONString(relationList);
+ //同步该单位所属器具的层级
+ mwApplicationService.lambdaUpdate().set(MwApplication::getRelation, relation).eq(MwApplication::getDepartmentId, sysDepartment.getId()).update();
+ mwContractService.lambdaUpdate().set(MwContract::getRelation, relation).eq(MwContract::getDepartmentId, sysDepartment.getId()).update();
+ mwMicroEquipmentService.lambdaUpdate().set(MwMicroEquipment::getRelation, relation).eq(MwMicroEquipment::getDepartmentId, sysDepartment.getId()).update();
+ mwProtectionEquipmentService.lambdaUpdate().set(MwProtectionEquipment::getRelation, relation).eq(MwProtectionEquipment::getDepartmentId, sysDepartment.getId()).update();
+ mwProtectionTaskService.lambdaUpdate().set(MwProtectionTask::getRelation, relation).eq(MwProtectionTask::getDepartmentId, sysDepartment.getId()).update();
+ mwProtectionRegulationService.lambdaUpdate().set(MwProtectionRegulation::getRelation, relation).eq(MwProtectionRegulation::getDepartmentId, sysDepartment.getId()).update();
+ mwStagingRoomService.lambdaUpdate().set(MwStagingRoom::getRelation, relation).eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).update();
+ mwTransitCarService.lambdaUpdate().set(MwTransitCar::getRelation, relation).eq(MwTransitCar::getDepartmentId, sysDepartment.getId()).update();
+ mwTransitRouteService.lambdaUpdate().set(MwTransitRoute::getRelation, relation).eq(MwTransitRoute::getDepartmentId, sysDepartment.getId()).update();
+ }
}
/**
@@ -717,9 +824,9 @@
@Override
public void deleteDisposalUnit(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该处置单位构已存在用户，无法删除");
+ throw new ServiceException("该处置单位构已关联用户，无法删除");
}
removeById(id);
}
@@ -742,6 +849,7 @@
.like(StringUtils.isNotBlank(query.getContactPerson()), SysDepartment::getContactPerson, query.getContactPerson())
.like(StringUtils.isNotBlank(query.getContactPhone()), SysDepartment::getContactPhone, query.getContactPhone())
.eq(SysDepartment::getOrgType, DepartmentEnum.REGULATORY_UNIT.getCode())
+ .orderByDesc(SysDepartment::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
return PageDTO.of(page, RegulatoryUnitVO.class);
}
@@ -821,6 +929,7 @@
department.setRegion(region);
}
updateById(department);
+ handleRelation(sysDepartment, parent, dto.getRelation());
}
/**
@@ -845,9 +954,9 @@
*/
@Override
public void deleteRegulatoryUnit(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该监管单位构已存在用户，无法删除");
+ throw new ServiceException("该监管单位构已关联用户，无法删除");
}
removeById(id);
}
--
Gitblit v1.7.1