From c4d861d166f64a295d0a1acb692af8fe9a721b50 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 13 十月 2022 17:42:02 +0800
Subject: [PATCH] 统一异常处理
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index e1f2837..801bdf2 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -7,21 +7,27 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.user.AdminDepartDTO;
import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.UmsDepartManage;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.depart.UmsDepartMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.service.depart.IDepartManagerService;
import com.ycl.service.depart.UmsDepartService;
-import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
+import com.ycl.vo.depart.UmsDepartVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +47,12 @@
private UmsDepartManageService umsAdminDepartService;
@Resource
private UmsAdminService umsAdminService;
+ @Resource
+ IDepartManagerService iDepartManagerService;
+ @Resource
+ UmsDepartService umsDepartService;
+ @Resource
+ DataDictionaryMapper dataDictionaryMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -51,10 +63,14 @@
}
UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
- depart.setStatus(Short.valueOf("1"));
- if (sccgDepartMapper.insert(depart) != 1) {
- throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
- }
+ depart.setStatus(Short.valueOf("1"));
+ umsDepartService.save(depart);
+ addDepartVO.getDepartManagerList()
+ .forEach(item -> {
+ item.setCreateTime(LocalDateTime.now());
+ item.setDepartId(depart.getId());
+ });
+ iDepartManagerService.saveBatch(addDepartVO.getDepartManagerList());
}
@Override
@@ -106,7 +122,7 @@
@Override
public List<UmsDepart> tree() {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
- List<UmsDepart> list = list();
+ List<UmsDepart> list = baseMapper.selectDepartList();
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
@@ -123,7 +139,7 @@
}
@Override
- public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) {
+ public IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params) {
Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(params.getDepartName())) {
@@ -134,23 +150,33 @@
}
query.orderByDesc(UmsDepart::getCreateTime);
Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query);
- List<UmsDepart> records = departPage.getRecords();
+ Page<UmsDepartVO> umsDepartVOPage = new Page<>();
+ BeanUtils.copyProperties(departPage, umsDepartVOPage);
+ List<UmsDepartVO> umsDepartVOList = new ArrayList<>();
//璐熻矗浜�
- if (CollUtil.isNotEmpty(records)) {
- for (UmsDepart record : records) {
+ if (CollUtil.isNotEmpty(departPage.getRecords())) {
+ for (UmsDepart record : departPage.getRecords()) {
+ UmsDepartVO umsDepartVO = new UmsDepartVO();
+ BeanUtils.copyProperties(record, umsDepartVO);
+ umsDepartVO.setDepartType(dataDictionaryMapper
+ .selectOne(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getId, record.getDepartType()))
+ .getName());
+ umsDepartVOList.add(umsDepartVO);
List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId());
if (CollUtil.isNotEmpty(umsAdminDeparts)) {
List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> {
AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO();
userInfoDTO.setUserId(a.getUserId());
- userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername());
+// userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername());
return userInfoDTO;
}).collect(Collectors.toList());
record.setUserInfoDTOS(userInfoDTOS);
}
}
}
- return departPage;
+ umsDepartVOPage.setRecords(umsDepartVOList);
+ return umsDepartVOPage;
}
@Override
--
Gitblit v1.8.0