MDC设备树和设备权限改造

Lius

7 天以前 904727f59b7e10a291ce7d1576e33192a619f2f2

 src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java

@@ -7,8 +7,6 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.UserFactory;
@@ -18,8 +16,7 @@
import org.jeecg.modules.base.model.FactoryTreeModel;
import org.jeecg.modules.base.service.IFactoryService;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.util.FindsProductionsChildrenUtil;
import org.springframework.cache.annotation.Cacheable;
import org.jeecg.modules.system.util.FindsFactorysChildrenUtil;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +24,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
@@ -93,7 +91,7 @@
        query.orderByAsc(Factory::getSorter);
        List<Factory> list = this.list(query);
        //调用wrapTreeDataToTreeList方法生成树状数据
        return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
        return FindsFactorysChildrenUtil.wrapTreeDataToTreeList(list);
    }

    /**
@@ -158,7 +156,15 @@
        query.orderByAsc(Factory::getSorter);
        List<Factory> list = this.list(query);
        //调用wrapTreeDataToTreeList方法生成树状数据
        return FindsProductionsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
        return FindsFactorysChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
    }

    /**
     * 根据id查询下级产线
     */
    @Override
    public List<Factory> queryFacByPid(String pid) {
        return this.baseMapper.queryFacByPid(pid);
    }

    /**