设备车间管理与用户

lyh

2025-06-30 0843d9fa608a6d319d9d1c37860a0f16ce263a19

设备车间管理与用户

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

@@ -9,6 +9,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.WorkShopDepart;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.eam.service.IWorkShopDepartService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -80,6 +81,21 @@
         return result;
     }

     @AutoLog(value = "产线表-查询树形结构所有产线名称")
     @ApiOperation(value = "产线表-查询树形结构所有产线名称", notes = "产线表-查询树形结构所有产线名称")
     @GetMapping(value = "/queryIdTree")
     public Result<List<WorkShopIdModel>> queryIdTree() {
         Result<List<WorkShopIdModel>> result = new Result<>();
         try {
             List<WorkShopIdModel> list = workShopDepartService.queryProductionIdTreeList();
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
         return result;
     }

     /**
      * 添加
      *

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

@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +52,8 @@
    @Autowired
    private IWorkShopDepartUserService workShopDepartUserService;

    @Autowired
    private ISysUserService sysUserService;
    /**
     * 分页列表查询
     *
@@ -72,6 +76,18 @@
        return Result.OK(pageList);
    }

     @RequestMapping(value = "/workShopDepartUserList", method = RequestMethod.GET)
     public Result<IPage<SysUser>> userRoleList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         String workShopDepartId = req.getParameter("workShopDepartId");
         IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, workShopDepartId);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
     }

    /**
     *   添加
     *

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

@@ -3,6 +3,8 @@
import org.jeecg.modules.eam.entity.WorkShopDepart;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.system.model.ProductionIdModel;

import java.util.List;

@@ -37,6 +39,11 @@
    void saveWorkShopDepartData(WorkShopDepart workShopDepart);

    /**
     * 查询所有部门DepartId信息,并分节点进行显示
     */
    List<WorkShopIdModel> queryProductionIdTreeList();

    /**
     * 更新产线数据
     */
    boolean updateWorkShopDepartDataById(WorkShopDepart workShopDepart);

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

@@ -13,9 +13,9 @@
import org.jeecg.modules.eam.mapper.WorkShopDepartMapper;
import org.jeecg.modules.eam.mapper.WorkShopDepartUserMapper;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.eam.service.IWorkShopDepartService;
import org.jeecg.modules.eam.util.FindsWorkShopDepartsChildrenUtil;
import org.jeecg.modules.system.entity.MdcUserProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -126,6 +126,18 @@
        }
    }

    @Override
    @Cacheable(value = "eam:cache:workshop:allids")
    public List<WorkShopIdModel> queryProductionIdTreeList() {
        LambdaQueryWrapper<WorkShopDepart> query = new LambdaQueryWrapper<>();
        query.eq(WorkShopDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
        query.orderByAsc(WorkShopDepart::getWorkShopOrder);
        List<WorkShopDepart> list = this.list(query);
        //调用wrapTreeDataToTreeList方法生成树状数据
        return FindsWorkShopDepartsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
    }


    /**
     * updateProductionDataById 对应 edit 根据设备车间管理主键来更新对应的设备车间管理数据
     */

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

@@ -62,22 +62,30 @@
     * @return
     */
    IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
	

    /**
     * 根据设备车间管理Id查询
     * @param page
     * @param workShopDepartId 设备车间管理Id
     * @return
     */
    IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("workShopDepartId") String workShopDepartId);

    /**
     * 根据用户名设置部门ID
     * @param username
     * @param orgCode
     */
    void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode);
	

    /**
     * 根据手机号查询用户信息
     * @param phone
     * @return
     */
    public SysUser getUserByPhone(@Param("phone") String phone);
	
	


    /**
     * 根据邮箱查询用户信息
     * @param email
@@ -150,7 +158,7 @@
     */
    @Deprecated
    int updateNullByEmptyString(@Param("fieldName") String fieldName);
    

    /**
     *  根据部门Ids,查询部门下用户信息
     * @param departIds

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

@@ -45,7 +45,7 @@
            and username = #{username}
        </if>
    </select>
	

    <!--  修改用户部门code -->
    <update id="updateUserDepart">
        UPDATE sys_user SET org_code = #{orgCode} where username = #{username}
@@ -55,7 +55,7 @@
    <select id="getUserByPhone"  resultType="org.jeecg.modules.system.entity.SysUser">
        select * from  sys_user  where phone = #{phone} and del_flag = 0
    </select>
	

    <!-- 根据邮箱查询用户信息 -->
    <select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
    select * from  sys_user  where email = #{email} and del_flag = 0
@@ -230,4 +230,7 @@
            #{roleCode}
        </foreach>
    </select>
</mapper>
    <select id="getUserByWorkShopDepartId" resultType="org.jeecg.modules.system.entity.SysUser">
        select * from sys_user where del_flag = 0 and id in (select user_id from mom_eam_work_shop_depart_user where work_shop_depart_id = #{workShopDepartId})
    </select>
</mapper>

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

@@ -66,15 +66,15 @@
     * @return SysUser
     */
    public SysUser getUserByName(String username);
	

    /**
     * 添加用户和用户角色关系
     * @param user
     * @param roles
     */
    public void addUserWithRole(SysUser user,String roles);
	
	


    /**
     * 修改用户和用户角色关系
     * @param user
@@ -97,7 +97,7 @@
     * @return
     */
    public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
	

    /**
      * 查询用户信息包括 部门信息
     * @param username
@@ -162,6 +162,16 @@
     */
    public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);


    /**
     * 根据设备车间管理Id查询
     * @param page
     * @param workShopDepartId 设备车间管理Id
     * @return
     */
    public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId);


    /**
     * 通过用户名获取用户角色集合
     *
@@ -177,14 +187,14 @@
     * @return 权限集合
     */
    Set<String> getUserPermissionsSet(String username);
	

    /**
     * 根据用户名设置部门ID
     * @param username
     * @param orgCode
     */
    void updateUserDepart(String username,String orgCode);
	

    /**
     * 根据手机号获取用户名和密码
     * @param phone 手机号
@@ -214,7 +224,7 @@
     * @param departs
     */
    void editUserWithDepart(SysUser user, String departs);
	

    /**
       * 校验用户是否有效
     * @param sysUser

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

@@ -48,7 +48,7 @@
@Service
@Slf4j
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
	

    @Autowired
    private SysUserMapper userMapper;
    @Autowired
@@ -141,8 +141,8 @@
    public SysUser getUserByName(String username) {
        return userMapper.getUserByName(username);
    }
	
	


    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addUserWithRole(SysUser user, String roles) {
@@ -203,7 +203,7 @@
                roleIndex = list.get(0);
            }
        }
		

        //如果componentUrl为空，则返回空
        if(oConvertUtils.isEmpty(roleIndex.getComponent())){
            return null;
@@ -269,7 +269,7 @@
            info.setSysUserName(sysUser.getRealname());
            info.setSysOrgCode(sysUser.getOrgCode());
        }
		

        //多部门支持in查询
        List<SysDepart> list = sysDepartMapper.queryUserDeparts(sysUser.getId());
        List<String> sysMultiOrgCode = new ArrayList<String>();
@@ -285,7 +285,7 @@
            }
        }
        info.setSysMultiOrgCode(sysMultiOrgCode);
		

        return info;
    }

@@ -357,6 +357,16 @@
        return userMapper.getUserByRoleId(page,roleId,username);
    }

    /**
     * 根据设备车间管理Id查询
     * @param page
     * @param workShopDepartId 设备车间管理Id
     * @return
     */
    public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId){
        return userMapper.getUserByWorkShopDepartId(page,workShopDepartId);
    }


    @Override
    @CacheEvict(value= {CacheConstant.SYS_USERS_CACHE}, key="#username")