修改

lyh

2025-07-08 d4c5f8e7bf9b2bb48922396d1be5b2f274d8effb

修改

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryUserMapper.xml

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.micrometer.core.instrument.binder.BaseUnits;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
@@ -15,10 +14,10 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
import org.jeecg.modules.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java

@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -78,12 +77,4 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;

/**
@@ -22,5 +20,5 @@
     * @param queryWrapper
     * @return
     */
    IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
    IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
}

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

@@ -193,9 +193,7 @@
        if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
            //先删除检查项
            standardDetailService.removeByStandardId(entity.getId());
            request.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setStandardId(entity.getId());
            });

            //根据分类判断是否保存
            if(CommonConstant.STATUS_1.equals(entity.getHasOtherCheck())) {
                //保存其他分类

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.controller;
package org.jeecg.modules.system.controller;

import java.util.Arrays;
import java.util.List;
@@ -7,10 +7,10 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.eam.base.model.WorkShopIdModel;
import org.jeecg.modules.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.service.IBaseFactoryService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,10 +83,10 @@
     @AutoLog(value = "产线表-查询树形结构所有产线名称")
     @ApiOperation(value = "产线表-查询树形结构所有产线名称", notes = "产线表-查询树形结构所有产线名称")
     @GetMapping(value = "/queryIdTree")
     public Result<List<WorkShopIdModel>> queryIdTree() {
         Result<List<WorkShopIdModel>> result = new Result<>();
     public Result<List<EamBaseFactoryIdModel>> queryIdTree() {
         Result<List<EamBaseFactoryIdModel>> result = new Result<>();
         try {
             List<WorkShopIdModel> list = BaseFactoryService.queryProductionIdTreeList();
             List<EamBaseFactoryIdModel> list = BaseFactoryService.queryProductionIdTreeList();
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryUserController.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.controller;
package org.jeecg.modules.system.controller;

import java.util.Arrays;
import java.util.List;
@@ -7,8 +7,8 @@

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryUserService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/EamBaseRepairDepartController.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.controller;
package org.jeecg.modules.system.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -27,10 +27,7 @@
import org.jeecg.common.util.*;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.ProductionIdModel;
import org.jeecg.modules.system.model.RepairDepartIdModel;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.model.*;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
@@ -102,6 +99,9 @@

    @Resource
    private IEamBaseRepairDepartUserService eamBaseRepairDepartUserService;

    @Resource
    private IBaseFactoryUserService iBaseFactoryUserService;

    /**
     * èŽ·å–用户列表数据
@@ -458,6 +458,30 @@
        }
    }

    @AutoLog(value = "用户表-查询指定用户和维修部门关联的数据")
    @ApiOperation(value = "用户表-查询指定用户和维修部门关联的数据", notes = "用户表-查询指定用户和维修部门关联的数据")
    @GetMapping(value = "/userBaseFactoryList")
    public Result<List<EamBaseFactoryIdModel>> userBaseFactoryList(@RequestParam(name = "userId", required = true) String userId) {
        Result<List<EamBaseFactoryIdModel>> result = new Result<>();
        try {
            List<EamBaseFactoryIdModel> repDepIdModelList = this.iBaseFactoryUserService.queryEamBaseFactoryIdsOfUser(userId);
            if (repDepIdModelList != null && !repDepIdModelList.isEmpty()) {
                result.setSuccess(true);
                result.setMessage("查找成功");
                result.setResult(repDepIdModelList);
            } else {
                result.setSuccess(false);
                result.setMessage("查找失败");
            }
            return result;
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            result.setSuccess(false);
            result.setMessage("查找过程中出现了异常: " + e.getMessage());
            return result;
        }
    }

    /**
     * ç”Ÿæˆåœ¨æ·»åŠ ç”¨æˆ·æƒ…况下没有主键的问题,返回给前端,根据该id绑定部门数据
     *

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactory.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactory.java ÐÞ¸Ä
@@ -1,16 +1,13 @@
package org.jeecg.modules.eam.base.entity;
package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactoryUser.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactoryUser.java ÐÞ¸Ä
@@ -1,18 +1,12 @@
package org.jeecg.modules.eam.base.entity;
package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryMapper.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.base.mapper;
package org.jeecg.modules.system.mapper;

import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryUserMapper.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryUserMapper.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.base.mapper;
package org.jeecg.modules.system.mapper;

import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryMapper.xml

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml ÐÞ¸Ä
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.base.mapper.BaseFactoryMapper">
<mapper namespace="org.jeecg.modules.system.mapper.BaseFactoryMapper">

</mapper>

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml

copy from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml
copy to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml
Îļþ´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml ¸´ÖÆ
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.base.mapper.BaseFactoryMapper">
<mapper namespace="org.jeecg.modules.system.mapper.BaseFactoryUserMapper">

</mapper>

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryIdModel.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/WorkShopIdModel.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.model;
package org.jeecg.modules.system.model;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactory;

import java.io.Serializable;
import java.util.ArrayList;
@@ -18,7 +18,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class WorkShopIdModel implements Serializable {
public class EamBaseFactoryIdModel implements Serializable {

    private static final long serialVersionUID = 6403075134223338239L;

@@ -42,7 +42,7 @@
     */
    private Boolean selectable = true;

    List<WorkShopIdModel> children = new ArrayList<>();
    List<EamBaseFactoryIdModel> children = new ArrayList<>();

    /**
     * å°†EamBaseFactoryTreeModel的部分数据放在该对象当中
@@ -50,7 +50,7 @@
     * @param treeModel
     * @return
     */
    public WorkShopIdModel convert(EamBaseFactoryTreeModel treeModel) {
    public EamBaseFactoryIdModel convert(EamBaseFactoryTreeModel treeModel) {
        this.key = treeModel.getId();
        this.value = treeModel.getId();
        this.title = treeModel.getFactoryName();
@@ -62,7 +62,7 @@
     *
     * @return
     */
    public WorkShopIdModel convertByUserProduction(BaseFactory BaseFactory) {
    public EamBaseFactoryIdModel convertByUserProduction(BaseFactory BaseFactory) {
        this.key = BaseFactory.getId();
        this.value = BaseFactory.getId();
        this.title = BaseFactory.getFactoryName();

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryTreeModel.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/EamBaseFactoryTreeModel.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.base.model;
package org.jeecg.modules.system.model;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactory;

import java.io.Serializable;
import java.util.ArrayList;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRepDepRule.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.rule;
package org.jeecg.modules.system.rule;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryService.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.service;
package org.jeecg.modules.system.service;

import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactory;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.eam.base.model.WorkShopIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;

import java.util.List;

@@ -40,7 +40,7 @@
    /**
     * æŸ¥è¯¢æ‰€æœ‰éƒ¨é—¨DepartId信息,并分节点进行显示
     */
    List<WorkShopIdModel> queryProductionIdTreeList();
    List<EamBaseFactoryIdModel> queryProductionIdTreeList();

    /**
     * æ›´æ–°äº§çº¿æ•°æ®

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryUserService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package org.jeecg.modules.system.service;

import org.jeecg.modules.system.entity.BaseFactoryUser;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;

import java.util.List;

/**
 * @Description: è®¾å¤‡è½¦é—´ç®¡ç†ä¸Žç”¨æˆ·
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Version: V1.0
 */
public interface IBaseFactoryUserService extends IService<BaseFactoryUser> {

    /**
     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询产线信息
     */
    List<EamBaseFactoryIdModel> queryEamBaseFactoryIdsOfUser(String userId);
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.service.impl;
package org.jeecg.modules.system.service.impl;

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -9,16 +9,16 @@
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
import org.jeecg.modules.eam.base.mapper.BaseFactoryMapper;
import org.jeecg.modules.eam.base.mapper.BaseFactoryUserMapper;
import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.eam.base.model.WorkShopIdModel;
import org.jeecg.modules.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.eam.base.util.FindsBaseFactorysChildrenUtil;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.mapper.BaseFactoryMapper;
import org.jeecg.modules.system.mapper.BaseFactoryUserMapper;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.util.FindsBaseFactorysChildrenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -130,7 +130,7 @@
    }

    @Override
    public List<WorkShopIdModel> queryProductionIdTreeList() {
    public List<EamBaseFactoryIdModel> queryProductionIdTreeList() {
        LambdaQueryWrapper<BaseFactory> query = new LambdaQueryWrapper<>();
        query.eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
        query.orderByAsc(BaseFactory::getSorter);

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryUserServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package org.jeecg.modules.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.mapper.BaseFactoryUserMapper;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

import java.util.ArrayList;
import java.util.List;

/**
 * @Description: è®¾å¤‡è½¦é—´ç®¡ç†ä¸Žç”¨æˆ·
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Version: V1.0
 */
@Service
public class BaseFactoryUserServiceImpl extends ServiceImpl<BaseFactoryUserMapper, BaseFactoryUser> implements IBaseFactoryUserService {
    @Autowired
    private IBaseFactoryService iBaseFactoryService;

    /**
     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询产线信息
     */
    @Override
    public List<EamBaseFactoryIdModel> queryEamBaseFactoryIdsOfUser(String userId){
        LambdaQueryWrapper<BaseFactoryUser> queryUserRepDep = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<BaseFactory> queryRepDep = new LambdaQueryWrapper<>();
        try {
            queryUserRepDep.eq(BaseFactoryUser::getUserId, userId);
            List<String> repRepDepIdList = new ArrayList<>();
            List<EamBaseFactoryIdModel> repDepIdModelList = new ArrayList<>();
            List<BaseFactoryUser> userRepDepList = this.list(queryUserRepDep);
            if (userRepDepList != null && !userRepDepList.isEmpty()) {
                for (BaseFactoryUser BaseFactoryUser : userRepDepList) {
                    repRepDepIdList.add(BaseFactoryUser.getFactoryId());
                }
                queryRepDep.in(BaseFactory::getId, repRepDepIdList);
                List<BaseFactory> repDepList = iBaseFactoryService.list(queryRepDep);
                if (repDepList != null && !repDepList.isEmpty()) {
                    for (BaseFactory BaseFactory : repDepList) {
                        repDepIdModelList.add(new EamBaseFactoryIdModel().convertByUserProduction(BaseFactory));
                    }
                }
                return repDepIdModelList;
            }
        } catch (Exception e) {
            e.fillInStackTrace();
        }
        return null;
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.base.util;
package org.jeecg.modules.system.util;

import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
import org.jeecg.modules.eam.base.model.WorkShopIdModel;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;

import java.util.ArrayList;
import java.util.List;
@@ -22,7 +22,7 @@
     * è¯¥æ–¹æ³•æ˜¯s将BaseFactory类型的list集合转换成EamBaseFactoryTreeModel类型的集合
     */
    public static List<EamBaseFactoryTreeModel> wrapTreeDataToTreeList(List<BaseFactory> recordList) {
        List<WorkShopIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryTreeModel> records = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            BaseFactory BaseFactory = recordList.get(i);
@@ -40,17 +40,17 @@
     * queryTreeList的子方法 ====1=====
     * è¯¥æ–¹æ³•æ˜¯æ‰¾åˆ°å¹¶å°è£…顶级父类的节点到TreeList集合
     */
    public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> workShopIdModelList) {
    public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> EamBaseFactoryIdModelList) {
        List<EamBaseFactoryTreeModel> treeList = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            EamBaseFactoryTreeModel branch = recordList.get(i);
            if (oConvertUtils.isEmpty(branch.getParentId())) {
                treeList.add(branch);
                WorkShopIdModel WorkShopIdModel = new WorkShopIdModel().convert(branch);
                workShopIdModelList.add(WorkShopIdModel);
                EamBaseFactoryIdModel EamBaseFactoryIdModel = new EamBaseFactoryIdModel().convert(branch);
                EamBaseFactoryIdModelList.add(EamBaseFactoryIdModel);
            }
        }
        getGrandChildren(treeList, recordList, workShopIdModelList);
        getGrandChildren(treeList, recordList, EamBaseFactoryIdModelList);
        return treeList;
    }

@@ -58,15 +58,15 @@
     * queryTreeList的子方法====3====
     *该方法是找到顶级父类下的所有子节点集合并封装到TreeList集合
     */
    private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> idList) {
    private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> idList) {
        for (int i = 0; i < treeList.size(); i++) {
            EamBaseFactoryTreeModel model = treeList.get(i);
            WorkShopIdModel idModel = idList.get(i);
            EamBaseFactoryIdModel idModel = idList.get(i);
            for (int i1 = 0; i1 < recordList.size(); i1++) {
                EamBaseFactoryTreeModel m = recordList.get(i1);
                if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
                    model.getChildren().add(m);
                    WorkShopIdModel pim = new WorkShopIdModel().convert(m);
                    EamBaseFactoryIdModel pim = new EamBaseFactoryIdModel().convert(m);
                    idModel.setSelectable(false);
                    idModel.getChildren().add(pim);
                }
@@ -95,8 +95,8 @@
    /**
     * èŽ·å– DepartIdModel
     */
    public static List<WorkShopIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
        List<WorkShopIdModel> idList = new ArrayList<>();
    public static List<EamBaseFactoryIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
        List<EamBaseFactoryIdModel> idList = new ArrayList<>();
        List<EamBaseFactoryTreeModel> records = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            BaseFactory BaseFactory = recordList.get(i);

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/WorkShopOrgCodeProRule.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/WorkShopOrgCodeProRule.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.util;
package org.jeecg.modules.system.util;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,8 +6,8 @@
import org.jeecg.common.handler.IFillRuleHandler;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.YouBianCodeUtil;
import org.jeecg.modules.eam.base.entity.BaseFactory;
import org.jeecg.modules.eam.base.service.IBaseFactoryService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.service.IBaseFactoryService;

import java.util.ArrayList;
import java.util.List;