From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 349 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
index 5268c91..1a075e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -1,9 +1,33 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.ExperimentDispatchSignDTO;
+import com.ruoyi.system.dto.TExperimentDispatchDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TExperimentDispatchQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TExperimentDispatchVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,8 +39,330 @@
*/
@Api(tags = "实验调度管理")
@RestController
-@RequestMapping("/t-experiment-dispatch")
+@RequestMapping("")
public class TExperimentDispatchController {
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final TExperimentDispatchGroupService experimentDispatchGroupService;
+ private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
+ private final TExperimentDispatchTaskService experimentDispatchTaskService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final TProjectProposalService projectProposalService;
+ private final TNoticeService noticeService;
+ @Autowired
+ public TExperimentDispatchController(TExperimentDispatchService experimentDispatchService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentDispatchGroupService experimentDispatchGroupService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchTaskService experimentDispatchTaskService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TProjectProposalService projectProposalService, TNoticeService noticeService) {
+ this.experimentDispatchService = experimentDispatchService;
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ this.experimentDispatchGroupService = experimentDispatchGroupService;
+ this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
+ this.experimentDispatchTaskService = experimentDispatchTaskService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.projectProposalService = projectProposalService;
+ this.noticeService = noticeService;
+ }
+
+ /**
+ * 获取实验调度管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:list')")
+ @ApiOperation(value = "获取实验调度分页列表",response = TExperimentDispatchQuery.class)
+ @PostMapping(value = "/api/t-experiment-dispatch/pageList")
+ public R<PageInfo<TExperimentDispatchVO>> pageList(@RequestBody String param) {
+ TExperimentDispatchQuery query = JSON.parseObject(param, TExperimentDispatchQuery.class);
+ // 获取当前用户
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
+ if (roleType != 1){
+ query.setUserId(userId);
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未加入项目组,无法进行操作");
+ }
+ // 查询项目的工艺工程师id
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }else {
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, userId));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }
+ }
+ return R.ok(experimentDispatchService.pageList(query));
+ }
+
+ /**
+ * 添加实验调度管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:add')")
+ @Log(title = "实验调度信息-新增实验调度", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加实验调度",response = TExperimentDispatchDTO.class)
+ @PostMapping(value = "/api/t-experiment-dispatch/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TExperimentDispatchDTO dto = JSON.parseObject(param,TExperimentDispatchDTO.class);
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法创建项目课题方案");
+ }
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ if(projectTeam.getStatus() == 2){
+ return R.fail("项目组已封存,无法创建项目课题方案");
+ }
+
+ // 生成实验调度编号
+ String experimentCode = projectTeam.getTeamName() + "-EX";
+
+ // 查询上个项目课题方案的序号
+ long count = experimentDispatchService.count(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .like(TExperimentDispatch::getExperimentCode, experimentCode));
+ experimentCode = experimentCode + String.format("%03d", count+1);;
+ dto.setExperimentCode(experimentCode);
+
+ experimentDispatchService.save(dto);
+ // 添加实验分组
+ List<TExperimentDispatchGroup> experimentDispatchGroups = dto.getExperimentDispatchGroups();
+ for (TExperimentDispatchGroup experimentDispatchGroup : experimentDispatchGroups) {
+ experimentDispatchGroup.setDispatchId(dto.getId());
+ }
+ experimentDispatchGroupService.saveBatch(experimentDispatchGroups);
+ // 添加参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = dto.getExperimentDispatchParticipants();
+ experimentDispatchParticipants.forEach(experimentDispatchParticipant -> {
+ experimentDispatchParticipant.setDispatchId(dto.getId());
+ });
+ experimentDispatchParticipantsService.saveBatch(experimentDispatchParticipants);
+ // 添加实验任务
+ List<TExperimentDispatchTask> experimentDispatchTasks = dto.getExperimentDispatchTasks();
+ experimentDispatchTasks.forEach(experimentDispatchTask -> {
+ experimentDispatchTask.setDispatchId(dto.getId());
+ });
+ experimentDispatchTaskService.saveBatch(experimentDispatchTasks);
+
+ // MESSAGE 添加消息
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(4)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),11);
+ });
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(5)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),14);
+ });
+
+ return R.ok();
+ }
+
+ /**
+ * 修改实验调度
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:edit')")
+ @Log(title = "实验调度信息-修改实验调度", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改实验调度")
+ @PostMapping(value = "/api/t-experiment-dispatch/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TExperimentDispatchDTO dto = JSON.parseObject(param,TExperimentDispatchDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ dto.setStatus(null);
+ experimentDispatchService.updateById(dto);
+ return R.ok();
+ }
+
+ experimentDispatchService.updateById(dto);
+
+ // 添加实验分组
+ experimentDispatchGroupService.remove(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).eq(TExperimentDispatchGroup::getDispatchId, dto.getId()));
+ List<TExperimentDispatchGroup> experimentDispatchGroups = dto.getExperimentDispatchGroups();
+ for (TExperimentDispatchGroup experimentDispatchGroup : experimentDispatchGroups) {
+ experimentDispatchGroup.setDispatchId(dto.getId());
+ }
+ experimentDispatchGroupService.saveBatch(experimentDispatchGroups);
+ // 添加参与人员
+ experimentDispatchParticipantsService.remove(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class).eq(TExperimentDispatchParticipants::getDispatchId, dto.getId()));
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = dto.getExperimentDispatchParticipants();
+ experimentDispatchParticipants.forEach(experimentDispatchParticipant -> {
+ experimentDispatchParticipant.setDispatchId(dto.getId());
+ });
+ experimentDispatchParticipantsService.saveBatch(experimentDispatchParticipants);
+ // 添加实验任务
+ experimentDispatchTaskService.remove(Wrappers.lambdaQuery(TExperimentDispatchTask.class).eq(TExperimentDispatchTask::getDispatchId, dto.getId()));
+ List<TExperimentDispatchTask> experimentDispatchTasks = dto.getExperimentDispatchTasks();
+ experimentDispatchTasks.forEach(experimentDispatchTask -> {
+ experimentDispatchTask.setDispatchId(dto.getId());
+ });
+ experimentDispatchTaskService.saveBatch(experimentDispatchTasks);
+ // MESSAGE 添加消息
+ if(!dto.getStatus().equals(-1)){
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(4)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),11);
+ });
+ experimentDispatchParticipants.stream().filter(e->e.getRoleType().equals(5)).forEach(teamStaff -> {
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验调度】等待确认", tokenService.getLoginUser().getUser().getNickName(),14);
+ });
+ }
+ return R.ok();
+ }
+
+ /**
+ * 查看实验调度详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:detail')")
+ @ApiOperation(value = "查看实验调度详情")
+ @GetMapping(value = "/open/t-experiment-dispatch/getDetailById")
+ public R<TExperimentDispatchVO> getDetailById(@RequestParam String id) {
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(id);
+ TExperimentDispatchVO experimentDispatchVO = new TExperimentDispatchVO();
+ BeanUtils.copyProperties(experimentDispatch, experimentDispatchVO);
+
+ // 查询项目课题
+ TProjectProposal proposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(proposal)){
+ experimentDispatchVO.setProjectName(proposal.getProjectName());
+ experimentDispatchVO.setProjectCode(proposal.getProjectCode());
+ experimentDispatchVO.setProjectStage(proposal.getProjectStage());
+ }
+ // 查询组别
+ experimentDispatchVO.setExperimentDispatchGroups(experimentDispatchGroupService.list(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).eq(TExperimentDispatchGroup::getDispatchId, id)));
+ // 查询参与人员
+ List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class).eq(TExperimentDispatchParticipants::getDispatchId, id));
+ List<Long> userIds = list.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ list.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ }
+ });
+ }
+ experimentDispatchVO.setExperimentDispatchParticipants(list);
+ // 查询实验任务
+ experimentDispatchVO.setExperimentDispatchTasks(experimentDispatchTaskService.list(Wrappers.lambdaQuery(TExperimentDispatchTask.class).eq(TExperimentDispatchTask::getDispatchId, id)));
+
+ return R.ok(experimentDispatchVO);
+ }
+
+ /**
+ * 查询化验师的通过签字的实验调度
+ */
+ @ApiOperation(value = "查询化验师的通过签字的实验调度")
+ @PostMapping(value = "/api/t-experiment-dispatch/chemistSignList")
+ public R<PageInfo<TExperimentDispatch>> chemistSignList(@RequestBody String param) {
+ TExperimentDispatchQuery query = JSON.parseObject(param, TExperimentDispatchQuery.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 4){
+ return R.fail("您不是化验师，无法查看");
+ }
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getRoleType, roleType)
+ .eq(TExperimentDispatchParticipants::getUserId, userId)
+ .eq(TExperimentDispatchParticipants::getStatus, 2));
+ if(CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ return R.fail("您没有通过签字的实验调度");
+ }
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ PageInfo<TExperimentDispatch> experimentDispatches = experimentDispatchService.chemistSignList(query);
+ return R.ok(experimentDispatches);
+ }
+
+ /**
+ * 删除实验调度
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
+ @Log(title = "实验调度信息-删除实验调度", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除实验调度")
+ @DeleteMapping(value = "/open/t-experiment-dispatch/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ // 删除组别
+ experimentDispatchGroupService.remove(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).eq(TExperimentDispatchGroup::getDispatchId, id));
+ // 删除参与人员
+ experimentDispatchParticipantsService.remove(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class).eq(TExperimentDispatchParticipants::getDispatchId, id));
+ // 删除任务
+ experimentDispatchTaskService.remove(Wrappers.lambdaQuery(TExperimentDispatchTask.class).eq(TExperimentDispatchTask::getDispatchId, id));
+ return R.ok(experimentDispatchService.removeById(id));
+ }
+
+ /**
+ * 批量删除实验调度
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
+ @Log(title = "实验调度信息-删除实验调度", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除实验调度")
+ @DeleteMapping(value = "/open/t-experiment-dispatch/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ // 删除组别
+ experimentDispatchGroupService.remove(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).in(TExperimentDispatchGroup::getDispatchId, ids));
+ // 删除参与人员
+ experimentDispatchParticipantsService.remove(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class).in(TExperimentDispatchParticipants::getDispatchId, ids));
+ // 删除任务
+ experimentDispatchTaskService.remove(Wrappers.lambdaQuery(TExperimentDispatchTask.class).in(TExperimentDispatchTask::getDispatchId, ids));
+ return R.ok(experimentDispatchService.removeByIds(ids));
+ }
+
+ /**
+ * 批量删除实验调度
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentDispatch:sign')")
+ @Log(title = "实验调度信息-实验调度签字", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "实验调度签字",response = ExperimentDispatchSignDTO.class)
+ @PostMapping(value = "/api/t-experiment-dispatch/sign")
+ public R<Boolean> sign(@RequestBody String param) {
+ ExperimentDispatchSignDTO experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSignDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ TExperimentDispatchParticipants experimentDispatchParticipants = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatchSign.getDispatchId())
+ .eq(TExperimentDispatchParticipants::getRoleType, roleType)
+ .eq(TExperimentDispatchParticipants::getUserId, userId)
+ .last("LIMIT 1"));
+ if(experimentDispatchParticipants != null){
+ experimentDispatchParticipants.setStatus(2);
+ experimentDispatchParticipants.setSignTime(LocalDateTime.now());
+ experimentDispatchParticipants.setConfirmSign(experimentDispatchSign.getConfirmSign());
+ experimentDispatchParticipantsService.updateById(experimentDispatchParticipants);
+ }
+ long count = experimentDispatchParticipantsService.count(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatchSign.getDispatchId())
+ .in(TExperimentDispatchParticipants::getRoleType, 4, 5)
+ .eq(TExperimentDispatchParticipants::getStatus, 1));
+ if(count == 0){
+ TExperimentDispatch tExperimentDispatch = experimentDispatchService.getById(experimentDispatchSign.getDispatchId());
+ tExperimentDispatch.setStatus(2);
+ experimentDispatchService.updateById(tExperimentDispatch);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1