From 34de42f43fd75a31fe0c0d51adf30fb554ad5fa6 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 15 九月 2022 12:45:26 +0800
Subject: [PATCH] 1：代码迁移
---
ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
index 1cfee0f..60717c6 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.depart.impl;
+package com.ycl.service.platform.depart.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.user.AdminDepartDTO;
-import com.ycl.entity.depart.SccgDepart;
-import com.ycl.entity.user.UmsDepartManage;
+import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.depart.SccgDepartMapper;
-import com.ycl.service.depart.SccgDepartService;
-import com.ycl.service.user.UmsDepartManageService;
-import com.ycl.service.user.UmsAdminService;
+import com.ycl.mapper.platform.depart.UmsDepartMapper;
+import com.ycl.service.platform.depart.UmsDepartService;
+import com.ycl.service.platform.user.UmsDepartManageService;
+import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
import org.apache.commons.lang3.StringUtils;
@@ -34,9 +34,9 @@
* @since 2022-09-07
*/
@Service
-public class SccgDepartServiceImpl extends ServiceImpl<SccgDepartMapper, SccgDepart> implements SccgDepartService {
+public class UmsDepartServiceImpl extends ServiceImpl<UmsDepartMapper, UmsDepart> implements UmsDepartService {
@Resource
- private SccgDepartMapper sccgDepartMapper;
+ private UmsDepartMapper sccgDepartMapper;
@Resource
private UmsDepartManageService umsAdminDepartService;
@Resource
@@ -45,11 +45,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void create(DepartVO.AddDepartVO addDepartVO) {
- SccgDepart sccgDepart = this.queryByName(addDepartVO.getDepartName());
+ UmsDepart sccgDepart = this.queryByName(addDepartVO.getDepartName());
if (null != sccgDepart) {
throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
}
- SccgDepart depart = new SccgDepart();
+ UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
if (sccgDepartMapper.insert(depart) <= 0) {
throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
@@ -57,8 +57,8 @@
}
@Override
- public SccgDepart loadDepartById(long id) {
- SccgDepart sccgDepart = sccgDepartMapper.selectById(id);
+ public UmsDepart loadDepartById(long id) {
+ UmsDepart sccgDepart = sccgDepartMapper.selectById(id);
if (null == sccgDepart) {
throw new ApiException(ResultCode.RECORD_NOT_EXISTS);
}
@@ -68,11 +68,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void update(DepartVO.UpdateDepartVO updateDepartVO) {
- SccgDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
+ UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) {
throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
}
- SccgDepart depart = this.getById(updateDepartVO.getId());
+ UmsDepart depart = this.getById(updateDepartVO.getId());
BeanUtils.copyProperties(updateDepartVO, depart);
List<Long> userIds = updateDepartVO.getUserIds();
if (CollUtil.isNotEmpty(userIds)) {
@@ -103,13 +103,13 @@
}
@Override
- public List<SccgDepart> tree() {
+ public List<UmsDepart> tree() {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
- List<SccgDepart> list = list();
+ List<UmsDepart> list = list();
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
- List<SccgDepart> collect = list.stream().filter(griddingEntity -> {
+ List<UmsDepart> collect = list.stream().filter(griddingEntity -> {
//鍒嗙被鐖秈d涓�0灏辫〃绀鸿缃戞牸涓� 涓�绾х綉鏍�
return griddingEntity.getParentId() == 0;
}).map(item -> {
@@ -117,26 +117,26 @@
item.setChildren(getChildrens(item, list));
return item;
}).collect(Collectors.toList());
- List<SccgDepart> treeData = getTreeData(collect);
+ List<UmsDepart> treeData = getTreeData(collect);
return treeData;
}
@Override
- public IPage<SccgDepart> pageDepart(DepartVO.PageDepartVO params) {
- Page<SccgDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
- LambdaQueryWrapper<SccgDepart> query = new LambdaQueryWrapper<>();
+ public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) {
+ Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
+ LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(params.getDepartName())) {
- query.like(SccgDepart::getDepartName, params.getDepartName());
+ query.like(UmsDepart::getDepartName, params.getDepartName());
}
if (PojoUtils.Vo.isUsefulSearchParam(params.getDepartType())) {
- query.like(SccgDepart::getDepartType, params.getDepartType());
+ query.like(UmsDepart::getDepartType, params.getDepartType());
}
- query.orderByDesc(SccgDepart::getCreateTime);
- Page<SccgDepart> departPage = sccgDepartMapper.selectPage(page, query);
- List<SccgDepart> records = departPage.getRecords();
+ query.orderByDesc(UmsDepart::getCreateTime);
+ Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query);
+ List<UmsDepart> records = departPage.getRecords();
//璐熻矗浜�
if (CollUtil.isNotEmpty(records)) {
- for (SccgDepart record : records) {
+ for (UmsDepart record : records) {
List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId());
if (CollUtil.isNotEmpty(umsAdminDeparts)) {
List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> {
@@ -154,7 +154,7 @@
@Override
public void updateStatus(DepartVO.StatusDepartVO params) {
- SccgDepart sccgDepart = this.loadDepartById(params.getId());
+ UmsDepart sccgDepart = this.loadDepartById(params.getId());
BeanUtils.copyProperties(params, sccgDepart);
if (sccgDepartMapper.updateById(sccgDepart) <= 0) {
throw new ApiException(ResultCode.RECORD_UPDATE_FAIL);
@@ -167,7 +167,7 @@
*
* @return
*/
- public List<SccgDepart> getTreeData(List<SccgDepart> griddingEntities) {
+ public List<UmsDepart> getTreeData(List<UmsDepart> griddingEntities) {
for (int i = 0; i < griddingEntities.size(); i++) {
//濡傛灉Children鐨剆ize灏忎簬1灏辫鏄庝负绌猴紝璁剧疆涓簄ull
if (griddingEntities.get(i).getChildren().size() < 1) {
@@ -187,8 +187,8 @@
* @param all 鎵�鏈夌綉鏍�
* @return
*/
- public List<SccgDepart> getChildrens(SccgDepart root, List<SccgDepart> all) {
- List<SccgDepart> collect = all.stream().filter(griddingEntity -> {
+ public List<UmsDepart> getChildrens(UmsDepart root, List<UmsDepart> all) {
+ List<UmsDepart> collect = all.stream().filter(griddingEntity -> {
return griddingEntity.getParentId().equals(root.getId());
}).map(item -> {
item.setChildren(getChildrens(item, all));
@@ -204,10 +204,10 @@
* @param name
* @return
*/
- private SccgDepart queryByName(String name) {
- LambdaQueryWrapper<SccgDepart> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SccgDepart::getDepartName, name);
- SccgDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper);
+ private UmsDepart queryByName(String name) {
+ LambdaQueryWrapper<UmsDepart> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(UmsDepart::getDepartName, name);
+ UmsDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper);
return sccgDepart;
}
--
Gitblit v1.8.0