art: 设备管理-设备检索接口

zhangherong

2025-03-31 eafb61d4b75fa30c7fd8b3d4917fad4ed1bfa088

art: 设备管理-设备检索接口

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;

import java.util.List;

@@ -36,4 +37,12 @@
     * @return
     */
    IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment);

    /**
     * å…³é”®å­—搜索
     * @param keyword
     * @param pageSize
     * @return
     */
    List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize);
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -24,6 +25,7 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,7 @@
/**
 * @Description: è®¾å¤‡å°è´¦
 * @Author: jeecg-boot
 * @Date:   2025-03-19
 * @Date: 2025-03-19
 * @Version: V1.0
 */
@Service
@@ -103,66 +105,98 @@
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if(sysUser == null){
        if (sysUser == null) {
            return page;
        }
        if(StringUtils.isNotBlank(sysUser.getEquipmentIds())){
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        }else {
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
        }
        //查询条件过滤
        if(eamEquipment != null){
            if(StringUtils.isNotBlank(eamEquipment.getEquipmentCode())){
        if (eamEquipment != null) {
            if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) {
                queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode());
            }
            if(StringUtils.isNotBlank(eamEquipment.getEquipmentName())){
            if (StringUtils.isNotBlank(eamEquipment.getEquipmentName())) {
                queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName());
            }
            if(StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())){
            if (StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())) {
                queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance());
            }
            if(StringUtils.isNotBlank(eamEquipment.getAssetStatus())){
            if (StringUtils.isNotBlank(eamEquipment.getAssetStatus())) {
                queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
            }
            if(StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())){
            if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) {
                queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
            }
            if(StringUtils.isNotBlank(eamEquipment.getOperationSystem())){
            if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
                queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
            }
            if(StringUtils.isNotBlank(eamEquipment.getOrgId())){
            if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
                queryWrapper.like("e.org_id", eamEquipment.getOrgId());
            }
            if(StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())){
            if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
                queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
            }
            //排序
            if(StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())){
            if (StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())) {
                //queryWrapper.like("column", eamEquipment.getColumn());
                String column = eamEquipment.getColumn();
                if(column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                    column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
                }
                if(DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())){
                if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) {
                    queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
                }else {
                } else {
                    queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
                }
            }else {
            } else {
                queryWrapper.orderByDesc("e.create_time");
            }
        }else {
        } else {
            queryWrapper.orderByDesc("e.create_time");
        }

        IPage<EamEquipment> ipage =  eamEquipmentMapper.queryPageList(page, queryWrapper);
        IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
        return ipage;
    }

    @Override
    public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize) {
        IPage<EamEquipment> page = new Page<>(1, pageSize);
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return Collections.emptyList();
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("equipment_code", equipArr);
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
        }
        if (StringUtils.isNotBlank(keyword)) {
            queryWrapper.like("equipment_code", keyword);
            queryWrapper.or().like("equipment_name", keyword);
        }
        IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
        if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
            List<EquipmentSearchResult> resultList = new ArrayList<>();
            pageResult.getRecords().forEach((record) -> {
                resultList.add(new EquipmentSearchResult(record));
            });
            return resultList;
        }
        return Collections.emptyList();
    }

    /**
     * èŽ·å–所有的产线id（包含所有上级）
     */

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package org.jeecg.modules.eam.vo;

import lombok.Data;
import org.jeecg.modules.eam.entity.EamEquipment;

import java.io.Serializable;

@Data
public class EquipmentSearchResult implements Serializable {
    /**
     * å­—å…¸value
     */
    private String value;
    /**
     * å­—典文本
     */
    private String text;

    public EquipmentSearchResult() {
    }

    public EquipmentSearchResult(EamEquipment eamEquipment) {
        this.value = eamEquipment.getId();
        this.text = eamEquipment.getEquipmentCode() + "[" + eamEquipment.getEquipmentName() + "]";
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -14,6 +14,7 @@
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -278,4 +279,18 @@
        return result;
    }

    /**
     * æ£€ç´¢è®¾å¤‡
     * @param keyword æŸ¥è¯¢å…³é”®è¯ è®¾å¤‡ç¼–号，设备名称模糊匹配
     * @param pageSize ä¸€æ¬¡è¿”回多少记录
     * @return
     */
    @ApiOperation(value = "设备表-异步加载设备列表", notes = "设备表-异步加载设备列表")
    @GetMapping(value = "/asyncLoadEquipment")
    public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
                                        @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
        List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize);
        return Result.ok(resultList);
    }

}