用户管理添加eam中心

lyh

2025-07-09 fa2ea8ba96fe9b52814fcd55f5cebf2b5ce43f9d

用户管理添加eam中心

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

@@ -42,6 +42,6 @@
        select * from
                     eam_equipment
                 where del_flag = 0
        and factory_org_code =(select org_cod,e from eam_base_factory where eam_base_factory.id=#{eamCenterId})
        and factory_org_code =(select org_code from eam_base_factory where eam_base_factory.id=#{eamCenterId})
    </select>
</mapper>

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

@@ -167,6 +167,7 @@
                item.setOrgCodeTxt(useDepNames.get(item.getId()));
                item.setProductionName(useProNames.get(item.getId()));
                item.setRepairDepartName(useRepDepNames.get(item.getId()));
                item.setEamFactoryIds( String.join(",",iBaseFactoryUserService.queryEamCenterIdsByUserId(item.getId())));
            });
        }
        result.setSuccess(true);
@@ -184,6 +185,7 @@
        String selectedDeparts = jsonObject.getString("selecteddeparts");
        String selectedProductions = jsonObject.getString("selectedProduction");
        String selectedRepairDeparts = jsonObject.getString("selectedRepairDeparts");
        String factoryIds=jsonObject.getString("selectedBaseFactory");
        try {
            SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
            user.setCreateTime(new Date());//设置创建时间
@@ -199,6 +201,9 @@
            user.setOrgCode(null);
            // ä¿å­˜ç”¨æˆ·èµ°ä¸€ä¸ªservice ä¿è¯äº‹åŠ¡
            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions, selectedRepairDeparts);
            if (oConvertUtils.isNotEmpty(factoryIds)) {
                iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
            }
            baseCommonService.addLog("添加用户，username： " + user.getUsername(), CommonConstant.LOG_TYPE_2, 2);
            result.success("添加成功！");
        } catch (Exception e) {
@@ -227,6 +232,7 @@
                String departs = jsonObject.getString("selecteddeparts");
                String productions = jsonObject.getString("selectedProduction");
                String repairDeparts = jsonObject.getString("selectedRepairDeparts");
                String factoryIds=jsonObject.getString("selectedBaseFactory");
                if (oConvertUtils.isEmpty(departs)) {
                    //vue3.0前端只传递了departIds
                    departs = user.getDepartIds();
@@ -237,6 +243,9 @@
                if (oConvertUtils.isNotEmpty(repairDeparts)) {
                    repairDeparts = user.getRepairDepartIds();
                }
                if (oConvertUtils.isNotEmpty(factoryIds)) {
                    iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
                }
                //用户表字段org_code不能在这里设置他的值
                user.setOrgCode(null);
                // ä¿®æ”¹ç”¨æˆ·èµ°ä¸€ä¸ªservice ä¿è¯äº‹åŠ¡

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

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

    /**
     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询EAM中心信息
     */
    List<String> queryEamCenterIdsByUserId(String userId);

    /**
     * æ·»åŠ å•ä¸ªç”¨æˆ·ä¸Žä¸€ç»„中心
     * @param userId
     * @param factoryIds
     */
    void addUserFactory(String userId, String factoryIds);
}

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

@@ -58,4 +58,47 @@
        }
        return null;
    }

    /**
     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询EAM中心信息
     */
    @Override
    public List<String> queryEamCenterIdsByUserId(String userId){
        LambdaQueryWrapper<BaseFactoryUser> factoryUserLambdaQueryWrapper=new LambdaQueryWrapper<>();
        factoryUserLambdaQueryWrapper.eq(BaseFactoryUser::getUserId, userId);
        factoryUserLambdaQueryWrapper.exists("select 1 from eam_base_factory b where b.id=eam_base_factory_user.factory_id and b.del_flag=0");
        List<BaseFactoryUser> baseFactoryUsers=this.list(factoryUserLambdaQueryWrapper);
        List<String> eamCenterIds=new ArrayList<>();
        if(baseFactoryUsers!=null&& !baseFactoryUsers.isEmpty()) {
            for (BaseFactoryUser baseFactoryUser : baseFactoryUsers) {
                eamCenterIds.add(baseFactoryUser.getFactoryId());
            }
        }
        return eamCenterIds;
    }

    /**
     * æ·»åŠ å•ä¸ªç”¨æˆ·ä¸Žä¸€ç»„中心
     * @param userId
     * @param factoryIds
     */
    @Override
    public void addUserFactory(String userId, String factoryIds){
        if (factoryIds.contains(",")){
            //先查询
            List<String> eamCenterIds=this.queryEamCenterIdsByUserId(userId);
            if (eamCenterIds != null && !eamCenterIds.isEmpty()) {
                for (String eamCenterId : eamCenterIds) {
                    this.remove(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, userId).eq(BaseFactoryUser::getFactoryId, eamCenterId));
                }
            }
            String [] factoryIdArray=factoryIds.split(",");
            for(String factoryId:factoryIdArray){
                BaseFactoryUser baseFactoryUser=new BaseFactoryUser();
                baseFactoryUser.setUserId(userId);
                baseFactoryUser.setFactoryId(factoryId);
                this.save(baseFactoryUser);
            }
        }
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/EamBaseFactoryVo.java

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

import lombok.Data;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-03
 * @Description:
 */
@Data
public class EamBaseFactoryVo {
    private String userId;
    private String factoryName;
}