完成设备管理部分功能

朱桂飞

2025-01-15 d5dff36d38fc7a211b34916796bbc37f17e7a2d0

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquTypeServiceImpl.java

ÎļþÃû´Ó eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/SysEquTypeServiceImpl.java ÐÞ¸Ä
@@ -13,12 +13,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.TreeBuildUtils;
import org.dromara.eims.domain.EimsEquType;
import org.dromara.eims.domain.bo.EimsEquTypeBo;
import org.dromara.eims.domain.vo.EimsEquTypeVo;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.SysEquTypeBo;
import org.dromara.eims.domain.vo.SysEquTypeVo;
import org.dromara.eims.domain.SysEquType;
import org.dromara.eims.mapper.SysEquTypeMapper;
import org.dromara.eims.service.ISysEquTypeService;
import org.dromara.eims.mapper.EimsEquTypeMapper;
import org.dromara.eims.service.IEimsEquTypeService;

import java.util.ArrayList;
import java.util.List;
@@ -33,9 +33,9 @@
 */
@RequiredArgsConstructor
@Service
public class SysEquTypeServiceImpl implements ISysEquTypeService, EquTypeService {
public class EimsEquTypeServiceImpl implements IEimsEquTypeService, EquTypeService {

    private final SysEquTypeMapper baseMapper;
    private final EimsEquTypeMapper baseMapper;

    /**
     * æŸ¥è¯¢è®¾å¤‡ç±»åž‹
@@ -44,7 +44,7 @@
     * @return è®¾å¤‡ç±»åž‹
     */
    @Override
    public SysEquTypeVo queryById(Long equTypeId){
    public EimsEquTypeVo queryById(Long equTypeId){
        return baseMapper.selectVoById(equTypeId);
    }

@@ -56,21 +56,21 @@
     * @return è®¾å¤‡ç±»åž‹åˆ—表
     */
    @Override
    public List<SysEquTypeVo> queryList(SysEquTypeBo bo) {
        LambdaQueryWrapper<SysEquType> lqw = buildQueryWrapper(bo);
    public List<EimsEquTypeVo> queryList(EimsEquTypeBo bo) {
        LambdaQueryWrapper<EimsEquType> lqw = buildQueryWrapper(bo);
        return baseMapper.selectVoList(lqw);
    }

    private LambdaQueryWrapper<SysEquType> buildQueryWrapper(SysEquTypeBo bo) {
    private LambdaQueryWrapper<EimsEquType> buildQueryWrapper(EimsEquTypeBo bo) {
        Map<String, Object> params = bo.getParams();
        LambdaQueryWrapper<SysEquType> lqw = Wrappers.lambdaQuery();
        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), SysEquType::getTypeName, bo.getTypeName());
        lqw.eq(StringUtils.isNotBlank(bo.getTypeCode()), SysEquType::getTypeCode, bo.getTypeCode());
        lqw.eq(bo.getParentId() != null, SysEquType::getParentId, bo.getParentId());
        lqw.eq(bo.getOrderNum() != null, SysEquType::getOrderNum, bo.getOrderNum());
        lqw.eq(StringUtils.isNotBlank(bo.getMenuType()), SysEquType::getMenuType, bo.getMenuType());
        lqw.eq(StringUtils.isNotBlank(bo.getIcon()), SysEquType::getIcon, bo.getIcon());
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysEquType::getStatus, bo.getStatus());
        LambdaQueryWrapper<EimsEquType> lqw = Wrappers.lambdaQuery();
        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), EimsEquType::getTypeName, bo.getTypeName());
        lqw.eq(StringUtils.isNotBlank(bo.getTypeCode()), EimsEquType::getTypeCode, bo.getTypeCode());
        lqw.eq(bo.getParentId() != null, EimsEquType::getParentId, bo.getParentId());
        lqw.eq(bo.getOrderNum() != null, EimsEquType::getOrderNum, bo.getOrderNum());
        lqw.eq(StringUtils.isNotBlank(bo.getMenuType()), EimsEquType::getMenuType, bo.getMenuType());
        lqw.eq(StringUtils.isNotBlank(bo.getIcon()), EimsEquType::getIcon, bo.getIcon());
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsEquType::getStatus, bo.getStatus());
        return lqw;
    }

@@ -81,8 +81,8 @@
     * @return æ˜¯å¦æ–°å¢žæˆåŠŸ
     */
    @Override
    public Boolean insertByBo(SysEquTypeBo bo) {
        SysEquType add = MapstructUtils.convert(bo, SysEquType.class);
    public Boolean insertByBo(EimsEquTypeBo bo) {
        EimsEquType add = MapstructUtils.convert(bo, EimsEquType.class);
        validEntityBeforeSave(add);
        boolean flag = baseMapper.insert(add) > 0;
        if (flag) {
@@ -98,8 +98,8 @@
     * @return æ˜¯å¦ä¿®æ”¹æˆåŠŸ
     */
    @Override
    public Boolean updateByBo(SysEquTypeBo bo) {
        SysEquType update = MapstructUtils.convert(bo, SysEquType.class);
    public Boolean updateByBo(EimsEquTypeBo bo) {
        EimsEquType update = MapstructUtils.convert(bo, EimsEquType.class);
        validEntityBeforeSave(update);
        return baseMapper.updateById(update) > 0;
    }
@@ -107,7 +107,7 @@
    /**
     * ä¿å­˜å‰çš„数据校验
     */
    private void validEntityBeforeSave(SysEquType entity){
    private void validEntityBeforeSave(EimsEquType entity){
        //TODO åšä¸€äº›æ•°æ®æ ¡éªŒ,如唯一约束
    }

@@ -133,7 +133,7 @@
     */
    @Override
    public boolean hasChildByEquTypeId(Long equTypeId) {
        return baseMapper.exists(new LambdaQueryWrapper<SysEquType>().eq(SysEquType::getParentId, equTypeId));
        return baseMapper.exists(new LambdaQueryWrapper<EimsEquType>().eq(EimsEquType::getParentId, equTypeId));
    }
    /**
     * èŽ·å–设备类型树列表
@@ -142,20 +142,20 @@
     * @return æ ‘列表
     */
    @Override
    public List<Tree<Long>> selectEquTypeTreeList(SysEquTypeBo bo) {
    public List<Tree<Long>> selectEquTypeTreeList(EimsEquTypeBo bo) {
        // åªæŸ¥è¯¢æœªç¦ç”¨éƒ¨é—¨
        bo.setStatus(UserConstants.DEPT_NORMAL);
        LambdaQueryWrapper<SysEquType> lqw = buildQueryWrapper(bo);
        List<SysEquTypeVo> equTypeVoList = baseMapper.selectVoList(lqw);
        LambdaQueryWrapper<EimsEquType> lqw = buildQueryWrapper(bo);
        List<EimsEquTypeVo> equTypeVoList = baseMapper.selectVoList(lqw);

        for (int i = 0; i < equTypeVoList.size(); i++) {
            SysEquTypeVo sysEquTypeVo = equTypeVoList.get(i);
            if(sysEquTypeVo.getParentId() == null){
            EimsEquTypeVo eimsEquTypeVo = equTypeVoList.get(i);
            if(eimsEquTypeVo.getParentId() == null){
                equTypeVoList.get(i).setParentId(0L);
            }
        }
        //加根目录
        SysEquTypeVo root = new SysEquTypeVo();
        EimsEquTypeVo root = new EimsEquTypeVo();
        root.setEquTypeId(0L);
        root.setMenuType("M");
        root.setTypeName("所有设备");
@@ -175,7 +175,7 @@
     * @param equTypeVoList è®¾å¤‡ç±»åž‹åˆ—表
     * @return ä¸‹æ‹‰æ ‘结构列表
     */
    public List<Tree<Long>> buildEquTypeTreeSelect(List<SysEquTypeVo> equTypeVoList) {
    public List<Tree<Long>> buildEquTypeTreeSelect(List<EimsEquTypeVo> equTypeVoList) {
        if (CollUtil.isEmpty(equTypeVoList)) {
            return CollUtil.newArrayList();
        }
@@ -195,7 +195,7 @@
    public String selectEquTypeNameByIds(String equTypeIds) {
        List<String> list = new ArrayList<>();
        for (Long id : StringUtils.splitTo(equTypeIds, Convert::toLong)) {
            SysEquTypeVo vo = SpringUtils.getAopProxy(this).queryById(id);
            EimsEquTypeVo vo = SpringUtils.getAopProxy(this).queryById(id);
            if (ObjectUtil.isNotNull(vo)) {
                list.add(vo.getTypeName());
            }