运维人员优化

xiangpei

2024-03-05 40d1cad64d2de02d3d93beab89058287b9a355ea

运维人员优化

 ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java

New file
@@ -0,0 +1,22 @@
package com.ycl.platform.base;

import lombok.Data;

/**
 * @author：xp
 * @date：2024/3/5 15:11
 */
@Data
public class BaseSelect {

    /**
     * 主键
     */
    private Integer id;

    /**
     * 值
     */
    private String value;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java

@@ -40,7 +40,6 @@
    @ApiModelProperty("所属运维单位")
    private Integer belongUnit;

    @NotBlank(message = "添加数据的方式：手动、导入不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("添加数据的方式：手动、导入")
    private String addWay;


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java

@@ -15,5 +15,21 @@
@Accessors(chain = true)
@ApiModel(value = "YwPeople查询", description = "运维人员查询")
public class YwPeopleQuery extends AbsQuery {

    /**
     * 运维人员编码
     */
    private String ywPersonCode;

    /**
     * 运维人员姓名
     */
    private String ywPersonName;

    /**
     * 所属运维单位
     */
    private Integer belongUnit;

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java

@@ -28,6 +28,7 @@

    /** 所属运维单位 */
    private Integer belongUnit;
    private String belongUnitName;

    /** 添加数据的方式：手动、导入 */
    private String addWay;

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java

@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,10 +18,12 @@
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;

import java.util.Objects;
import java.util.stream.Collectors;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

/**
 * 运维人员 服务实现类
@@ -32,6 +36,7 @@
public class YwPeopleServiceImpl extends ServiceImpl<YwPeopleMapper, YwPeople> implements YwPeopleService {

    private final YwPeopleMapper ywPeopleMapper;
    private final YwUnitMapper ywUnitMapper;

    /**
     * 添加
@@ -41,6 +46,7 @@
    @Override
    public Result add(YwPeopleForm form) {
        YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
        entity.setAddWay("manual");
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -101,12 +107,25 @@
    public Result page(YwPeopleQuery query) {

        IPage<YwPeople> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.hasText(query.getYwPersonCode()), YwPeople::getYwPersonCode, query.getYwPersonCode())
                .like(StringUtils.hasText(query.getYwPersonName()), YwPeople::getYwPersonName, query.getYwPersonName())
                .eq(Objects.nonNull(query.getBelongUnit()), YwPeople::getBelongUnit, query.getBelongUnit())
                .orderByDesc(YwPeople::getCreateTime)
                .page(PageUtil.getPage(query, YwPeople.class));

        List<YwPeopleVO> vos = page.getRecords().stream()
                .map(
                        entity -> YwPeopleVO.getVoByEntity(entity, null)
                        entity -> {
                            YwPeopleVO vo = YwPeopleVO.getVoByEntity(entity, null);
                            YwUnit unit = new LambdaQueryChainWrapper<>(ywUnitMapper)
                                    .eq(YwUnit::getId, vo.getBelongUnit())
                                    .select(YwUnit::getUnitName)
                                    .one();
                            if (Objects.nonNull(unit)) {
                                vo.setBelongUnitName(unit.getUnitName());
                            }
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java

@@ -1,8 +1,11 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.HashMap;
import java.util.List;

import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.platform.domain.query.YwUnitQuery;
@@ -142,9 +145,15 @@
    @Override
    public Result all() {
        List<YwUnit> entities = baseMapper.selectList(null);
        List<YwUnitVO> vos = entities.stream()

        List<BaseSelect> vos = entities.stream()
                .map(
                        entity -> YwUnitVO.getVoByEntity(entity, null)
                        entity -> {
                            BaseSelect baseSelect = new BaseSelect();
                            baseSelect.setId(entity.getId());
                            baseSelect.setValue(entity.getUnitName());
                            return baseSelect;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);