更新代码

puzhibing

6 天以前 082bddee7df8a05ca95f473ec2643701d41a5213

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java

@@ -2,7 +2,10 @@


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -29,6 +32,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -54,6 +58,16 @@
    private TProjectTeamService projectTeamService;
    @Resource
    private TProjectTeamStaffService projectTeamStaffService;
    @ApiOperation(value = "修改用户签名")
    @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
    @PostMapping("/api/system/user/editSignPicture")
    public R editSignPicture(@RequestBody String param)
    {
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser user = JSON.parseObject(param,SysUser.class);
        user.setUserId(userId);
        return R.ok(sysUserService.editSignPicture(user));
    }
    /**
     * 选择人员
     */
@@ -61,14 +75,19 @@
    @PostMapping(value = "/api/t-train-library/choiceUserList")
    public R<PageInfo<ChoiceUserVO>> choiceUserList(@RequestBody String param) {
        ChoiceStrainDTO query = JSON.parseObject(param, ChoiceStrainDTO.class);
        if (query.getRoleType()==2){
            query.setRoleType(3);
        }
        if (query.getRoleType()==1){
            query.setRoleType(2);
        }
        List<String> userIds = projectTeamStaffService.lambdaQuery()
                .eq(TProjectTeamStaff::getRoleType,  query.getRoleType())
                .eq(TProjectTeamStaff::getRoleType, query.getRoleType() )
                .eq(TProjectTeamStaff::getTeamId, query.getProjectId()).list().stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
        if (userIds.isEmpty()){
            userIds.add("0");
        }
        query.setUserIds(userIds);

        return R.ok(sysUserService.choiceUserList(query));
    }
    /**
@@ -79,26 +98,63 @@
    public R<PageInfo<TProjectTeamVO>> choiceProjectList(@RequestBody String param) {
        LoginUser loginUser = tokenService.getLoginUser();
        SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId());
        List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, sysUser.getUserId()).list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
        if (collect.isEmpty()){
            collect.add("0");
        }
        ChoiceProjectDTO query = JSON.parseObject(param, ChoiceProjectDTO.class);
        query.setProjectIds(collect);
        if (!"1".equals(sysUser.getRoleType())) {
            List<String> projectIds = getAccessibleProjectIds(sysUser.getUserId());
            if (projectIds.isEmpty()) {
                projectIds.add("0");
            }
            query.setProjectIds(projectIds);
        }
        return R.ok(projectTeamService.choiceProjectList(query));
    }
    // 提取为独立方法以提高可读性和复用性

    /**
     * 获取菌种库分页列表
     */
    //@PreAuthorize("@ss.hasPermi('system:trainLibrary:list')")
    @ApiOperation(value = "获取菌种库分页列表",tags = "菌种库管理",response = TTrainLibraryQuery.class)
    @PostMapping(value = "/api/t-train-library/pageList")
    public R<PageInfo<TTrainLibraryVO>> pageList(@RequestBody String param) {
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser sysUser = sysUserService.selectUserById(userId);
        TTrainLibraryQuery query = JSON.parseObject(param, TTrainLibraryQuery.class);
        return R.ok(tTrainLibraryService.pageList(query));
        if (!sysUser.getRoleType().equals("1")){
            List<String> accessibleProjectIds = getAccessibleProjectIds(userId);
            if (accessibleProjectIds.isEmpty()) {
                return R.ok(new PageInfo<>());
            }
            if (CollectionUtils.isNotEmpty(query.getProjectIds())) {
                List<String> requestedProjectIds = new ArrayList<>(query.getProjectIds());
                requestedProjectIds.retainAll(accessibleProjectIds);
                if (requestedProjectIds.isEmpty()) {
                    return R.ok(new PageInfo<>());
                }
                query.setProjectIds(requestedProjectIds);
            } else {
                query.setProjectIds(accessibleProjectIds);
            }
        }
        return R.ok(tTrainLibraryService.pageList(query, sysUser.getRoleType()));
    }

    private List<String> getAccessibleProjectIds(Long userId) {
        List<String> teamIds = projectTeamStaffService.lambdaQuery()
                .eq(TProjectTeamStaff::getUserId, userId)
                .list().stream()
                .map(TProjectTeamStaff::getTeamId)
                .distinct()
                .collect(Collectors.toList());
        if (teamIds.isEmpty()) {
            return new ArrayList<>();
        }
        return projectTeamService.lambdaQuery()
                .in(TProjectTeam::getId, teamIds)
                .eq(TProjectTeam::getStatus, 1)
                .list().stream()
                .map(TProjectTeam::getId)
                .collect(Collectors.toList());
    }

    /**
     * 获取菌种库出入库时间轴列表
     */
@@ -106,10 +162,10 @@
    @ApiOperation(value = "获取菌种库出入库时间轴列表",tags = "菌种库管理")
    @PostMapping(value = "/api/t-train-library/timeList")
    public R<List<TTrainLibraryWarehousing>> timeList(@RequestParam String id) {
        List<TTrainLibraryWarehousing> list = tTrainLibraryWarehousingService.lambdaQuery().eq(TTrainLibraryWarehousing::getTrainLibraryId,id)
        List<TTrainLibraryWarehousing> tTrainLibraryWarehousings = tTrainLibraryWarehousingService.lambdaQuery().eq(TTrainLibraryWarehousing::getTrainLibraryId,id)
                .orderByDesc(TTrainLibraryWarehousing::getCreateTime).list();
        List<SysUser> sysUsers = sysUserService.selectList();
        for (TTrainLibraryWarehousing tTrainLibraryWarehousing : list) {
        for (TTrainLibraryWarehousing tTrainLibraryWarehousing : tTrainLibraryWarehousings) {
            if (tTrainLibraryWarehousing.getHandleId()!=null){
                SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(tTrainLibraryWarehousing.getHandleId())).findFirst().orElse(null);
                if (sysUser!=null){
@@ -123,7 +179,7 @@
                }
            }
        }
        return R.ok(list);
        return R.ok(tTrainLibraryWarehousings);
    }
    @Resource
    private TNoticeService noticeService;
@@ -139,6 +195,17 @@
            return R.fail(401,"登陆失效");
        }
        TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);

        //改为前端传值
//        List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
//                .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
//        if (!projectIds.isEmpty()){
//            TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
//                    .eq(TProjectTeam::getStatus, 1)
//                    .orderByDesc(BaseModel::getCreateTime)
//                    .last("limit 1").one();
//            dto.setProjectId(projectTeam.getId());
//        }
        tTrainLibraryService.save(dto);
        if (dto.getIsDraft()==0){
            // 新增入库记录
@@ -147,39 +214,56 @@
            tTrainLibraryWarehousing.setType(2);
            tTrainLibraryWarehousing.setBoundTime(LocalDateTime.now());
            tTrainLibraryWarehousing.setHandleId(tokenService.getLoginUser().getUserId());
            tTrainLibraryWarehousing.setHandleSignature(dto.getHandleSignature());
            tTrainLibraryWarehousing.setHandleSignature(dto.getSignature());
            tTrainLibraryWarehousingService.save(tTrainLibraryWarehousing);
            // 新增消息
            TNotice tNotice = new TNotice();
            List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                    .eq(TProjectTeamStaff::getRoleType, 2)
            List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                    .eq(TProjectTeamStaff::getRoleType, 3)
                    .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            TProjectTeam one = projectTeamService.lambdaQuery().in(TProjectTeam::getId, collect).eq(TProjectTeam::getStatus, 1)
            TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds).eq(TProjectTeam::getStatus, 1)
                    .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
            TProjectTeamStaff one1 = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, one.getId()).eq(TProjectTeamStaff::getRoleType, 2).one();
            tNotice.setUserId(one1.getUserId());
            TProjectTeamStaff projectTeamStaff = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, projectTeam.getId()).eq(TProjectTeamStaff::getRoleType, 2).one();
            tNotice.setUserId(projectTeamStaff.getUserId());

            tNotice.setCommitId(tokenService.getLoginUser().getUserId()+"");
            tNotice.setStatus(1);
            StringBuilder stringBuilder = new StringBuilder();
            StringBuilder content = new StringBuilder();
            switch (dto.getType()){
                case 1:
                    stringBuilder.append("【原始细胞库】");
                    content.append("【原始细胞库】");
                    break;
                case 2:
                    stringBuilder.append("【主细胞库】");
                    content.append("【主细胞库】");
                    break;
                case 3:
                    stringBuilder.append("【生产细胞库】");
                    content.append("【生产细胞库】");
                    break;
                case 4:
                    content.append("【孙细胞库】");
                    break;
            }

            tNotice.setNoticeContent("您有【1】条"+stringBuilder+"入库记录等待签字确认;");
            tNotice.setNoticeContent("您有【1】条"+content+"入库记录等待签字确认;");
            tNotice.setDataId(dto.getId());
            tNotice.setNoticeType(3);
            noticeService.save(tNotice);
        }
        return R.ok();
    }

    public static void main(String[] args) {
//        String jsonStr = "[{\"id\":1,\"num1\":\"00:00\",\"num2\":\"19:00\",\"num3\":1,\"num4\":1,\"num5\":1,\"num6\":1,\"num7\":1}]";
//        JSONArray startingFareJsonArray = JSONArray.parseArray(jsonStr);
//        for (int i = 0; i < startingFareJsonArray.size(); i++) {
//            JSONObject jsonObject = startingFareJsonArray.getJSONObject(i);
//            System.out.println(jsonObject.getString("num1"));
//            System.out.println(jsonObject.getString("num2"));
//            System.out.println(jsonObject.getInteger("num3"));
//        }
        Long temp =2027571910897541122L;
        System.out.println(temp%20);

    }
    /**
     * 新增菌种库
@@ -195,10 +279,17 @@
            TTrainLibrary tTrainLibrary = new TTrainLibrary();
            BeanUtils.copyProperties(dto,tTrainLibrary);
            if (i==0){
                List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                        .eq(TProjectTeamStaff::getRoleType, 3)

                List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
                        .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
                if (collect.isEmpty()){
                if (!projectIds.isEmpty()){
                    TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
                            .eq(TProjectTeam::getStatus, 1)
                            .orderByDesc(BaseModel::getCreateTime)
                            .last("limit 1").one();
                    tTrainLibrary.setProjectId(projectTeam.getId());
                    dto.setProjectId(projectTeam.getId());
                }else{
                    return R.fail("请先加入项目组");
                }
                tTrainLibrary.setStatus(4);
@@ -213,29 +304,32 @@
                // 新增消息
                TNotice tNotice = new TNotice();

                TProjectTeam one = projectTeamService.lambdaQuery().in(TProjectTeam::getId, collect)
                TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
                        .eq(TProjectTeam::getStatus, 1)
                        .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
                TProjectTeamStaff one1 = projectTeamStaffService.lambdaQuery()
                        .eq(TProjectTeamStaff::getTeamId, one.getId()).eq(TProjectTeamStaff::getRoleType, 2).one();
                tNotice.setUserId(one1.getUserId());
                TProjectTeamStaff tProjectTeamStaff = projectTeamStaffService.lambdaQuery()
                        .eq(TProjectTeamStaff::getTeamId, projectTeam.getId()).eq(TProjectTeamStaff::getRoleType, 2).one();
                tNotice.setUserId(tProjectTeamStaff.getUserId());

                tNotice.setCommitId(tokenService.getLoginUser().getUserId()+"");
                tNotice.setStatus(1);
                StringBuilder stringBuilder = new StringBuilder();
                StringBuilder content = new StringBuilder();
                switch (dto.getType()){
                    case 1:
                        stringBuilder.append("【原始细胞库】");
                        content.append("【原始细胞库】");
                        break;
                    case 2:
                        stringBuilder.append("【主细胞库】");
                        content.append("【主细胞库】");
                        break;
                    case 3:
                        stringBuilder.append("【生产细胞库】");
                        content.append("【生产细胞库】");
                        break;
                    case 4:
                        content.append("【孙细胞库】");
                        break;
                }

                tNotice.setNoticeContent("您有【1】条"+stringBuilder+"入库记录等待签字确认;");
                tNotice.setNoticeContent("您有【1】条"+content+"入库记录等待签字确认;");
                tNotice.setDataId(dto.getId());
                tNotice.setNoticeType(3);
                noticeService.save(tNotice);
@@ -261,7 +355,7 @@
        }
        TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);
        tTrainLibraryService.updateById(dto);
        if (dto.getIsDraft()==0){
        if (dto.getIsDraft()==0) {
            List<TTrainLibraryWarehousing> list = tTrainLibraryWarehousingService.lambdaQuery().eq(TTrainLibraryWarehousing::getTrainLibraryId, dto.getId()).list();
            if (list.isEmpty()){
                // 新增入库记录
@@ -289,15 +383,15 @@
        }
        TTrainLibraryDetailConfirmDto query = JSON.parseObject(param, TTrainLibraryDetailConfirmDto.class);
        TTrainLibraryWarehousing tTrainLibraryWarehousing = tTrainLibraryWarehousingService.getById(query.getId());
        TTrainLibrary byId = tTrainLibraryService.getById(tTrainLibraryWarehousing.getTrainLibraryId());
        TTrainLibrary tTrainLibrary = tTrainLibraryService.getById(tTrainLibraryWarehousing.getTrainLibraryId());
        if (tTrainLibraryWarehousing.getType()==1){
            byId.setStock(0);
            byId.setStatus(1);
            tTrainLibrary.setStock(0);
            tTrainLibrary.setStatus(1);
        }else{
            byId.setStock(1);
            byId.setStatus(3);
            tTrainLibrary.setStock(1);
            tTrainLibrary.setStatus(3);
        }
        tTrainLibraryService.updateById(byId);
        tTrainLibraryService.updateById(tTrainLibrary);
        tTrainLibraryWarehousing.setPreserveSignature(query.getPreserveSignature());
        tTrainLibraryWarehousing.setPreserveId(tokenService.getLoginUser().getUserId());
        tTrainLibraryWarehousing.setConfirmTime(LocalDateTime.now());
@@ -312,9 +406,12 @@
    @ApiOperation(value = "编辑获取菌种库详情",tags = "菌种库管理",response = TTrainLibraryDetailVO.class)
    @GetMapping(value = "/open/t-train-library/getDetailEditById")
    public R<TTrainLibraryDetailVO> getDetailEditById(@RequestParam String id) {
        TTrainLibrary byId = tTrainLibraryService.getById(id);
        TTrainLibrary trainLibrary = tTrainLibraryService.getById(id);
        if (trainLibrary == null) {
            return R.fail("菌种库记录不存在或已删除");
        }
        TTrainLibraryDetailVO tTrainLibraryDetailVO = new TTrainLibraryDetailVO();
        BeanUtils.copyProperties(byId,tTrainLibraryDetailVO);
        BeanUtils.copyProperties(trainLibrary,tTrainLibraryDetailVO);
        return R.ok(tTrainLibraryDetailVO);
    }
    /**
@@ -325,8 +422,8 @@
    @PostMapping(value = "/open/t-train-library/getDetailById")
    public R<TTrainLibraryDetailVO> getDetailById(@RequestBody String param) {
        TTrainLibraryDetailQuery query = JSON.parseObject(param, TTrainLibraryDetailQuery.class);
        TTrainLibraryDetailVO detailById = tTrainLibraryService.getDetailById(query);
        PageInfo<TTrainLibraryWarehousingVO> warehousingList = detailById.getWarehousingList();
        TTrainLibraryDetailVO libraryDetailVO = tTrainLibraryService.getDetailById(query);
        PageInfo<TTrainLibraryWarehousingVO> warehousingList = libraryDetailVO.getWarehousingList();
        List<TTrainLibraryWarehousingVO> records = warehousingList.getRecords();
        List<SysUser> sysUsers = sysUserService.selectList();
        for (TTrainLibraryWarehousingVO record : records) {
@@ -360,8 +457,8 @@
                }
            }
        }
        detailById.setList(list);
        return R.ok(detailById);
        libraryDetailVO.setList(list);
        return R.ok(libraryDetailVO);
    }
    /**
     * 删除项目组
@@ -396,29 +493,65 @@
        }
        AddTrainLibraryWarehousingDTO query = JSON.parseObject(param, AddTrainLibraryWarehousingDTO.class);
        TTrainLibrary tTrainLibrary = tTrainLibraryService.getById(query.getTrainLibraryId());
        if (query.getType()==1){
            if (tTrainLibrary.getStatus()==1||tTrainLibrary.getStatus()==2){
                if(tTrainLibrary.getStatus()==2){
                    return R.fail("当前菌种为出库待确认状态,不可重复出库");

                }else{
                    return R.fail("当前菌种为已出库状态,不可重复出库");
        List<TTrainLibraryWarehousing> tTrainLibraryWarehousings = tTrainLibraryWarehousingService.lambdaQuery()
                .isNull(TTrainLibraryWarehousing::getConfirmTime)
                .eq(TTrainLibraryWarehousing::getTrainLibraryId, query.getTrainLibraryId()).list();
        if (!tTrainLibraryWarehousings.isEmpty()){
            for (TTrainLibraryWarehousing tTrainLibraryWarehousing : tTrainLibraryWarehousings) {
                if (Objects.equals(tTrainLibraryWarehousing.getType(), query.getType())){
                    if (query.getType()==1){
                        return R.fail("当前已存在该类型待确认出库记录");
                    }else{
                        return R.fail("当前已存在该类型待确认入库记录");
                    }
                }
            }
        }
        if (query.getType()==1){
            tTrainLibrary.setStatus(2);
        }
        if (query.getType()==2){
            if (tTrainLibrary.getStatus()==3||tTrainLibrary.getStatus()==4){
                if(tTrainLibrary.getStatus()==4){
                    return R.fail("当前菌种为入库待确认状态,不可重复入库");

                }else{
                    return R.fail("当前菌种为已入库状态,不可重复入库");
                }
            }
            tTrainLibrary.setStatus(4);
        }
        query.setHandleId(tokenService.getLoginUser().getUserId());
        query.setBoundTime(LocalDateTime.now());
        tTrainLibraryWarehousingService.save(query);
        tTrainLibraryService.updateById(tTrainLibrary);
        // 新增消息
        TNotice tNotice = new TNotice();

        TProjectTeamStaff tProjectTeamStaff = projectTeamStaffService.lambdaQuery()
                .eq(TProjectTeamStaff::getTeamId, tTrainLibrary.getProjectId()).eq(TProjectTeamStaff::getRoleType, 2).one();
        tNotice.setUserId(tProjectTeamStaff.getUserId());
        tNotice.setCommitId(tokenService.getLoginUser().getUserId()+"");
        tNotice.setStatus(1);
        StringBuilder content = new StringBuilder();
        switch (tTrainLibrary.getType()){
            case 1:
                content.append("【原始细胞库】");
                break;
            case 2:
                content.append("【主细胞库】");
                break;
            case 3:
                content.append("【生产细胞库】");
                break;
            case 4:
                content.append("【孙细胞库】");
                break;
        }
        switch (query.getType()){
            case 1:
                tNotice.setNoticeContent("您有【1】条"+content+"出库记录等待签字确认;");
                break;
            case 2:
                tNotice.setNoticeContent("您有【1】条"+content+"入库记录等待签字确认;");
                break;

        }
        tNotice.setDataId(query.getId());
        tNotice.setNoticeType(3);
        noticeService.save(tNotice);
        return R.ok();
    }
    /**