chuangte/project-manager-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本更新0.0.1

Browse Source
This commit is contained in:
磷叶 2025-02-10 15:41:31 +08:00
parent 282fb562f1
commit f52607018a
21 changed files with 251 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java
View File

@ -10,11 +10,7 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum RedisLockKey {
SYNC_PROD_BILL("sync_prod_bill", "同步生产订单"),
SAVE_MATERIAL("save_material", "保存物料"),
SAVE_UNIT("save_unit", "保存单位");
TASK_SUBMIT("task_submit", "任务提交");
private final String key;
private final String name;

17
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/Task.java
View File

@ -34,12 +34,6 @@ public class Task extends BaseEntity
@ApiModelProperty("项目ID")
private Long projectId;
@Excel(name = "任务名称")
@ApiModelProperty("任务名称")
@NotBlank(message = "任务名称不能为空", groups = {ValidGroup.Create.class})
@Size(max = 50, message = "任务名称长度不能超过50个字符")
private String name;
@Excel(name = "类型", readConverterExp = "1=功能,2=优化,3=BUG")
@ApiModelProperty("类型")
@NotBlank(message = "类型不能为空", groups = {ValidGroup.Create.class})
@ -74,9 +68,9 @@ public class Task extends BaseEntity
@NotNull(message = "负责人ID不能为空", groups = {ValidGroup.Create.class})
private Long ownerId;
@Excel(name = "描述")
@ApiModelProperty("描述")
@Size(max = 1000, message = "描述长度不能超过1000个字符")
@Excel(name = "任务内容")
@ApiModelProperty("任务内容")
@Size(max = 1000, message = "任务内容长度不能超过1000个字符")
private String description;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -84,11 +78,6 @@ public class Task extends BaseEntity
@ApiModelProperty("预计完成时间")
private LocalDateTime expectFinishTime;
@Excel(name = "最后一次审核记录ID")
@ApiModelProperty("最后一次审核记录ID")
private Long verifyId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "通过时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("通过时间")

21
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml
View File

@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
bt.id,
bt.project_id,
bt.name,
bt.type,
bt.status,
bt.level,
@ -23,7 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bt.description,
bt.expect_finish_time,
bt.pass_time,
bt.verify_id,
bt.cancel_time,
bt.cancel_user_id,
bt.cancel_remark,
@ -41,7 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="searchCondition">
<if test="query.id != null "> and bt.id = #{query.id}</if>
<if test="query.projectId != null "> and bt.project_id = #{query.projectId}</if>
<if test="query.name != null and query.name != ''"> and bt.name like concat('%', #{query.name}, '%')</if>
<if test="query.type != null and query.type != ''"> and bt.type = #{query.type}</if>
<if test="query.status != null and query.status != ''"> and bt.status = #{query.status}</if>
<if test="query.level != null and query.level != ''"> and bt.level = #{query.level}</if>
@ -52,11 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.projectName != null and query.projectName != ''"> and bp.name like concat('%', #{query.projectName}, '%')</if>
<if test="query.createName != null and query.createName != ''"> and su.nick_name like concat('%', #{query.createName}, '%')</if>
<if test="query.ownerName != null and query.ownerName != ''"> and ou.nick_name like concat('%', #{query.ownerName}, '%')</if>
<if test="query.description != null and query.description != ''"> and bt.description like concat('%', #{query.description}, '%')</if> <if test="query.verifyId != null"> and bt.verify_id = #{query.verifyId}</if>
<if test="query.description != null and query.description != ''"> and bt.description like concat('%', #{query.description}, '%')</if>
<if test="query.cancelUserId != null"> and bt.cancel_user_id = #{query.cancelUserId}</if>
<if test="query.cancelRemark != null and query.cancelRemark != ''"> and bt.cancel_remark like concat('%', #{query.cancelRemark}, '%')</if>
<if test="query.cancelUserName != null and query.cancelUserName != ''"> and cu.nick_name like concat('%', #{query.cancelUserName}, '%')</if>
<if test="query.statusList != null and query.statusList.size() > 0">
<if test="query.statusList != null and query.statusList.size() > 0">
and bt.status in
<foreach item="item" collection="query.statusList" open="(" separator="," close=")">
#{item}
@ -81,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bst_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="projectId != null">project_id,</if>
<if test="name != null and name != ''">name,</if>
<if test="type != null and type != ''">type,</if>
<if test="status != null and status != ''">status,</if>
<if test="level != null and level != ''">level,</if>
@ -94,14 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deleted != null">deleted,</if>
<if test="expectFinishTime != null">expect_finish_time,</if>
<if test="passTime != null">pass_time,</if>
<if test="verifyId != null">verify_id,</if>
<if test="cancelTime != null">cancel_time,</if>
<if test="cancelUserId != null">cancel_user_id,</if>
<if test="cancelRemark != null and cancelRemark != ''">cancel_remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="type != null and type != ''">#{type},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="level != null and level != ''">#{level},</if>
@ -114,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deleted != null">#{deleted},</if>
<if test="expectFinishTime != null">#{expectFinishTime},</if>
<if test="passTime != null">#{passTime},</if>
<if test="verifyId != null">#{verifyId},</if>
<if test="cancelTime != null">#{cancelTime},</if>
<if test="cancelUserId != null">#{cancelUserId},</if>
<if test="cancelRemark != null and cancelRemark != ''">#{cancelRemark},</if>
@ -131,7 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="updateColumns">
<if test="data.projectId != null">project_id = #{data.projectId},</if>
<if test="data.name != null and data.name != ''">name = #{data.name},</if>
<if test="data.type != null and data.type != ''">type = #{data.type},</if>
<if test="data.status != null and data.status != ''">status = #{data.status},</if>
<if test="data.level != null and data.level != ''">level = #{data.level},</if>
@ -144,7 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.description != null and data.description != ''">description = #{data.description},</if>
<if test="data.expectFinishTime != null">expect_finish_time = #{data.expectFinishTime},</if>
<if test="data.passTime != null">pass_time = #{data.passTime},</if>
<if test="data.verifyId != null">verify_id = #{data.verifyId},</if>
<if test="data.cancelTime != null">cancel_time = #{data.cancelTime},</if>
<if test="data.cancelUserId != null">cancel_user_id = #{data.cancelUserId},</if>
<if test="data.cancelRemark != null and data.cancelRemark != ''">cancel_remark = #{data.cancelRemark},</if>
@ -173,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by `key`
</select>
<!-- selectCount -->
<!-- selectCount -->
<select id="selectCount" parameterType="TaskQuery" resultType="Integer">
select count(bt.id)
@ -183,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<!-- selectCountGroupByProject -->
<!-- selectCountGroupByProject -->
<select id="selectCountGroupByProject" parameterType="TaskQuery" resultMap="com.ruoyi.common.mapper.CommonMapper.LongIntegerVO">
select
@ -196,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by `key`
</select>
<!-- updateByQuery -->
<!-- updateByQuery -->
<update id="updateByQuery">
update bst_task bt
@ -206,5 +197,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<include refid="searchCondition"/>
</where>
</update>
</update>
</mapper>

16
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/TaskService.java
View File

@ -8,7 +8,6 @@ import com.ruoyi.bst.task.domain.TaskVO;
import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
import com.ruoyi.bst.task.domain.dto.TaskVerifyDTO;
import com.ruoyi.common.vo.LongIntegerVO;
import com.ruoyi.common.vo.StringIntegerVO;
@ -95,17 +94,18 @@ public interface TaskService
*/
int startTask(TaskStartDTO dto);
/**
* 审核任务
* @param dto
* @return
*/
int verifyTask(TaskVerifyDTO dto);
/**
* 取消任务
* @param dto
* @return
*/
int cancelTask(TaskCancelDTO dto);
/**
* 根据条件更新任务
* @param task
* @param taskQuery
* @return
*/
int updateByQuery(Task task, TaskQuery taskQuery);
}

2
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskAssemblerImpl.java
View File

@ -30,7 +30,7 @@ public class TaskAssemblerImpl implements TaskAssembler {
List<Long> taskIds = CollectionUtils.map(list, TaskVO::getId);
List<TaskSubmitVO> submitList = taskSubmitService.selectListByTaskIds(taskIds);
// 组装审核列表
// 组装列表
for (TaskVO task : list) {
List<TaskSubmitVO> taskSubmitList = submitList.stream()
.filter(item -> Objects.equals(item.getTaskId(), task.getId()))

2
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskConverterImpl.java
View File

@ -21,7 +21,6 @@ public class TaskConverterImpl implements TaskConverter {
}
Task po = new Task();
po.setProjectId(data.getProjectId());
po.setName(data.getName());
po.setType(data.getType());
po.setStatus(TaskStatus.WAIT_COMPLETED.getStatus());
po.setLevel(data.getLevel());
@ -41,7 +40,6 @@ public class TaskConverterImpl implements TaskConverter {
Task po = new Task();
po.setId(data.getId());
po.setProjectId(data.getProjectId());
po.setName(data.getName());
po.setType(data.getType());
po.setLevel(data.getLevel());
po.setPicture(data.getPicture());

90
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java
View File

@ -13,16 +13,16 @@ import com.ruoyi.bst.task.domain.TaskVO;
import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
import com.ruoyi.bst.task.domain.dto.TaskVerifyDTO;
import com.ruoyi.bst.task.domain.enums.TaskStatus;
import com.ruoyi.bst.task.mapper.TaskMapper;
import com.ruoyi.bst.task.service.TaskService;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
import com.ruoyi.bst.taskSubmit.service.TaskSubmitConverter;
import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
import com.ruoyi.bst.verify.domain.Verify;
import com.ruoyi.bst.verify.service.VerifyConverter;
import com.ruoyi.bst.verify.service.VerifyService;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
@ -56,6 +56,9 @@ public class TaskServiceImpl implements TaskService
@Autowired
private TaskSubmitService taskSubmitService;
@Autowired
private RedisLock redisLock;
/**
* 查询任务
*
@ -140,31 +143,38 @@ public class TaskServiceImpl implements TaskService
// 校验
ServiceUtil.assertion(dto == null, "参数不允许为空");
ServiceUtil.assertion(dto.getId() == null, "任务ID不允许为空");
TaskVO old = this.selectTaskById(dto.getId());
ServiceUtil.assertion(old == null, "ID为%s的任务不存在", dto.getId());
ServiceUtil.assertion(!TaskStatus.canSubmit().contains(old.getStatus()), "ID为%s的任务当前状态不允许提交", dto.getId());
// 更新任务状态
Integer result = transactionTemplate.execute(status -> {
// 更新状态
Task data = new Task();
data.setStatus(TaskStatus.WAIT_CONFIRM.getStatus());
TaskQuery query = new TaskQuery();
query.setId(dto.getId());
query.setStatusList(TaskStatus.canSubmit());
int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
// 加锁
Long lockKey = dto.getId();
ServiceUtil.assertion(!redisLock.lock(RedisLockKey.TASK_SUBMIT, lockKey), "ID为%s的任务正在提交，请稍后再试", dto.getId());
try {
// 更新任务状态
Integer result = transactionTemplate.execute(status -> {
// 更新状态
Task data = new Task();
data.setStatus(TaskStatus.WAIT_CONFIRM.getStatus());
TaskQuery query = new TaskQuery();
query.setId(dto.getId());
query.setStatusList(TaskStatus.canSubmit());
int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
// 新增提交记录
TaskSubmit submit = taskSubmitConverter.toPo(dto);
int insertSubmit = taskSubmitService.insertTaskSubmit(submit);
ServiceUtil.assertion(insertSubmit != 1, "新增提交记录失败");
// 新增提交记录
TaskSubmit submit = taskSubmitConverter.toPo(dto);
int insertSubmit = taskSubmitService.insertTaskSubmit(submit);
ServiceUtil.assertion(insertSubmit != 1, "新增提交记录失败");
return update;
});
return update;
});
return result == null ? 0 : result;
} finally {
redisLock.unlock(RedisLockKey.TASK_SUBMIT, lockKey);
}
return result == null ? 0 : result;
}
@Override
@ -193,45 +203,9 @@ public class TaskServiceImpl implements TaskService
return result == null ? 0 : result;
}
private int updateByQuery(Task data, TaskQuery query) {
return taskMapper.updateByQuery(data, query);
}
@Override
public int verifyTask(TaskVerifyDTO dto) {
// 校验
ServiceUtil.assertion(dto == null, "参数不允许为空");
ServiceUtil.assertion(dto.getId() == null, "任务ID不允许为空");
TaskVO old = this.selectTaskById(dto.getId());
ServiceUtil.assertion(old == null, "ID为%s的任务不存在", dto.getId());
ServiceUtil.assertion(!TaskStatus.canVerify().contains(old.getStatus()), "ID为%s的任务当前状态不允许审核", dto.getId());
Integer result = transactionTemplate.execute(status -> {
// 新增审核记录
Verify verify = verifyConverter.toPo(dto);
int insertVerify = verifyService.insertVerify(verify);
ServiceUtil.assertion(insertVerify != 1, "新增审核记录失败");
// 更新任务状态
Task data = new Task();
if (dto.getPass() != null && dto.getPass()) {
data.setStatus(TaskStatus.PASS.getStatus());
data.setPassTime(LocalDateTime.now());
} else {
data.setStatus(TaskStatus.REJECT.getStatus());
}
data.setVerifyId(verify.getId());
TaskQuery query = new TaskQuery();
query.setId(dto.getId());
query.setStatusList(TaskStatus.canVerify());
int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
return update;
});
return result == null ? 0 : result;
public int updateByQuery(Task data, TaskQuery query) {
return taskMapper.updateByQuery(data, query);
}
@Override

11
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/TaskSubmit.java
View File

@ -1,11 +1,10 @@
package com.ruoyi.bst.taskSubmit.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 任务提交记录对象 bst_task_submit
@ -36,4 +35,8 @@ public class TaskSubmit extends BaseEntity
@ApiModelProperty("审核ID")
private Long verifyId;
@Excel(name = "状态")
@ApiModelProperty("状态")
private String status;
}

4
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/TaskSubmitQuery.java
View File

@ -10,5 +10,9 @@ public class TaskSubmitQuery extends TaskSubmitVO {
@ApiModelProperty(value = "任务ID列表")
private List<Long> taskIds;
@ApiModelProperty(value = "状态列表")
private List<String> statusList;
}

16
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/TaskSubmitVO.java
View File

@ -1,8 +1,24 @@
package com.ruoyi.bst.taskSubmit.domain;
import com.ruoyi.bst.verify.domain.VerifyVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class TaskSubmitVO extends TaskSubmit {
@ApiModelProperty("审核信息")
private VerifyVO verify;
@ApiModelProperty("提交人名称")
private String userName;
@ApiModelProperty("提交人头像")
private String userAvatar;
@ApiModelProperty("任务状态")
private String taskStatus;
}

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/dto/TaskVerifyDTO.java → common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/dto/TaskSubmitVerifyDTO.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.bst.task.domain.dto;
package com.ruoyi.bst.taskSubmit.domain.dto;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@ -7,10 +7,10 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class TaskVerifyDTO {
public class TaskSubmitVerifyDTO {
@ApiModelProperty("任务ID")
@NotNull(message = "任务ID不能为空")
@ApiModelProperty("提交ID")
@NotNull(message = "提交ID不能为空")
private Long id;
@ApiModelProperty("审核结果")

28
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/enums/TaskSubmitStatus.java Normal file
View File

@ -0,0 +1,28 @@
package com.ruoyi.bst.taskSubmit.domain.enums;
import java.util.List;
import com.ruoyi.common.utils.collection.CollectionUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum TaskSubmitStatus {
WAIT_CONFIRM("1", "待审核"),
PASS("2", "通过"),
REJECT("3", "驳回");
private String code;
private String name;
// 允许审核的状态列表
public static List<String> canVerify() {
return CollectionUtils.map(TaskSubmitStatus::getCode, WAIT_CONFIRM);
}
}

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/mapper/TaskSubmitMapper.java
View File

@ -63,4 +63,12 @@ public interface TaskSubmitMapper
* @return 结果
*/
public int deleteTaskSubmitByIds(Long[] ids);
/**
* 根据条件更新任务提交记录
* @param data 任务提交记录
* @param query 条件
* @return 结果
*/
int updateByQuery(@Param("data") TaskSubmit data, @Param("query") TaskSubmitQuery query);
}

36
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/mapper/TaskSubmitMapper.xml
View File

@ -4,7 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.bst.taskSubmit.mapper.TaskSubmitMapper">
<resultMap type="TaskSubmitVO" id="TaskSubmitResult" autoMapping="true"/>
<resultMap type="TaskSubmitVO" id="TaskSubmitResult" autoMapping="true">
<association property="verify" column="verify_id" select="com.ruoyi.bst.verify.mapper.VerifyMapper.selectVerifyById"/>
</resultMap>
<sql id="selectTaskSubmitVo">
select
@ -14,8 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bts.create_time,
bts.attaches,
bts.remark,
bts.verify_id
bts.verify_id,
bts.status,
bt.status as task_status,
su.nick_name as user_name,
su.avatar as user_avatar
from bst_task_submit bts
left join bst_task bt on bt.id = bts.task_id
left join sys_user su on su.user_id = bts.user_id
</sql>
<sql id="searchCondition">
@ -24,8 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.userId != null "> and bts.user_id = #{query.userId}</if>
<if test="query.remark != null and query.remark != ''"> and bts.remark like concat('%', #{query.remark}, '%')</if>
<if test="query.verifyId != null "> and bts.verify_id = #{query.verifyId}</if>
<if test="query.status != null and query.status != ''"> and bts.status = #{query.status}</if>
<if test="query.taskStatus != null and query.taskStatus != ''"> and bt.status = #{query.taskStatus}</if>
<if test="query.taskIds != null and query.taskIds.size() > 0">
and bts.task_id in
<foreach collection="query.taskIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@ -45,28 +56,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where bts.id = #{id}
</select>
<insert id="insertTaskSubmit" parameterType="TaskSubmit">
<insert id="insertTaskSubmit" parameterType="TaskSubmit" useGeneratedKeys="true" keyProperty="id">
insert into bst_task_submit
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="taskId != null">task_id,</if>
<if test="userId != null">user_id,</if>
<if test="createTime != null">create_time,</if>
<if test="attaches != null">attaches,</if>
<if test="remark != null">remark,</if>
<if test="verifyId != null">verify_id,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="taskId != null">#{taskId},</if>
<if test="userId != null">#{userId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="attaches != null">#{attaches},</if>
<if test="remark != null">#{remark},</if>
<if test="verifyId != null">#{verifyId},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
<update id="updateTaskSubmit" parameterType="TaskSubmit">
update bst_task_submit
<trim prefix="SET" suffixOverrides=",">
@ -82,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.attaches != null">attaches = #{data.attaches},</if>
<if test="data.remark != null">remark = #{data.remark},</if>
<if test="data.verifyId != null">verify_id = #{data.verifyId},</if>
<if test="data.status != null">status = #{data.status},</if>
</sql>
<delete id="deleteTaskSubmitById" parameterType="Long">
@ -94,4 +107,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<!-- updateByQuery -->
<update id="updateByQuery">
update bst_task_submit bts
<trim prefix="SET" suffixOverrides=",">
<include refid="updateColumns"/>
</trim>
<where>
<include refid="searchCondition"/>
</where>
</update>
</mapper>

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/TaskSubmitService.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
/**
* 任务提交记录Service接口
@ -68,4 +69,11 @@ public interface TaskSubmitService
* @return 任务提交记录列表
*/
List<TaskSubmitVO> selectListByTaskIds(List<Long> taskIds);
/**
* 审核
* @param dto
* @return
*/
int verify(TaskSubmitVerifyDTO dto);
}

2
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/impl/TaskSubmitConverterImpl.java
View File

@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
import com.ruoyi.bst.taskSubmit.domain.enums.TaskSubmitStatus;
import com.ruoyi.bst.taskSubmit.service.TaskSubmitConverter;
import com.ruoyi.common.utils.SecurityUtils;
@ -20,6 +21,7 @@ public class TaskSubmitConverterImpl implements TaskSubmitConverter {
submit.setUserId(SecurityUtils.getUserId());
submit.setAttaches(dto.getSubmitAttaches());
submit.setRemark(dto.getSubmitRemark());
submit.setStatus(TaskSubmitStatus.WAIT_CONFIRM.getCode());
return submit;
}

76
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/impl/TaskSubmitServiceImpl.java
View File

@ -1,17 +1,29 @@
package com.ruoyi.bst.taskSubmit.service.impl;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionTemplate;
import com.ruoyi.bst.task.domain.Task;
import com.ruoyi.bst.task.domain.TaskQuery;
import com.ruoyi.bst.task.domain.enums.TaskStatus;
import com.ruoyi.bst.task.service.TaskService;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
import com.ruoyi.bst.taskSubmit.domain.enums.TaskSubmitStatus;
import com.ruoyi.bst.taskSubmit.mapper.TaskSubmitMapper;
import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
import com.ruoyi.bst.verify.domain.Verify;
import com.ruoyi.bst.verify.service.VerifyConverter;
import com.ruoyi.bst.verify.service.VerifyService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
/**
@ -26,6 +38,18 @@ public class TaskSubmitServiceImpl implements TaskSubmitService
@Autowired
private TaskSubmitMapper taskSubmitMapper;
@Autowired
private TransactionTemplate transactionTemplate;
@Autowired
private VerifyService verifyService;
@Autowired
private VerifyConverter verifyConverter;
@Autowired
private TaskService taskService;
/**
* 查询任务提交记录
*
@ -109,4 +133,56 @@ public class TaskSubmitServiceImpl implements TaskSubmitService
query.setTaskIds(taskIds);
return this.selectTaskSubmitList(query);
}
@Override
public int verify(TaskSubmitVerifyDTO dto) {
// 校验
ServiceUtil.assertion(dto == null, "参数不允许为空");
ServiceUtil.assertion(dto.getId() == null, "提交ID不允许为空");
TaskSubmitVO old = this.selectTaskSubmitById(dto.getId());
ServiceUtil.assertion(old == null, "ID为%s的提交不存在", dto.getId());
ServiceUtil.assertion(!TaskSubmitStatus.canVerify().contains(old.getStatus()), "ID为%s的提交状态不允许审核", dto.getId());
ServiceUtil.assertion(!TaskStatus.canVerify().contains(old.getTaskStatus()), "ID为%s的任务状态不允许审核", old.getTaskId());
Integer result = transactionTemplate.execute(status -> {
// 创建审核记录
Verify verify = verifyConverter.toPo(dto);
int insertVerify = verifyService.insertVerify(verify);
ServiceUtil.assertion(insertVerify != 1, "为ID为%s的提交创建审核记录失败", dto.getId());
// 更新提交数据
TaskSubmit submit = new TaskSubmit();
submit.setVerifyId(verify.getId());
submit.setStatus(dto.getPass() ? TaskSubmitStatus.PASS.getCode() : TaskSubmitStatus.REJECT.getCode());
TaskSubmitQuery query = new TaskSubmitQuery();
query.setId(dto.getId());
query.setStatusList(TaskSubmitStatus.canVerify());
int updateTaskSubmit = this.updateByQuery(submit, query);
ServiceUtil.assertion(updateTaskSubmit != 1, "更新ID为%s的提交数据失败", dto.getId());
// 更新任务状态
Task task = new Task();
if (dto.getPass()) {
task.setStatus(TaskStatus.PASS.getStatus());
task.setPassTime(LocalDateTime.now());
} else {
task.setStatus(TaskStatus.REJECT.getStatus());
}
TaskQuery taskQuery = new TaskQuery();
taskQuery.setId(old.getTaskId());
taskQuery.setStatusList(TaskStatus.canVerify());
int updateTask = taskService.updateByQuery(task, taskQuery);
ServiceUtil.assertion(updateTask != 1, "更新ID为%s的任务状态失败", old.getTaskId());
return updateTaskSubmit;
});
return result == null ? 0 : result;
}
private int updateByQuery(TaskSubmit data, TaskSubmitQuery query) {
return taskSubmitMapper.updateByQuery(data, query);
}
}

4
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/verify/service/VerifyConverter.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.bst.verify.service;
import com.ruoyi.bst.task.domain.dto.TaskVerifyDTO;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
import com.ruoyi.bst.verify.domain.Verify;
public interface VerifyConverter {
@ -10,6 +10,6 @@ public interface VerifyConverter {
* @param dto
* @return
*/
Verify toPo(TaskVerifyDTO dto);
Verify toPo(TaskSubmitVerifyDTO dto);
}

4
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/verify/service/impl/VerifyConverterImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.bst.verify.service.impl;
import org.springframework.stereotype.Service;
import com.ruoyi.bst.task.domain.dto.TaskVerifyDTO;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
import com.ruoyi.bst.verify.domain.Verify;
import com.ruoyi.bst.verify.domain.enums.VerifyBstType;
import com.ruoyi.bst.verify.domain.enums.VerifyStatus;
@ -13,7 +13,7 @@ import com.ruoyi.common.utils.SecurityUtils;
public class VerifyConverterImpl implements VerifyConverter {
@Override
public Verify toPo(TaskVerifyDTO dto) {
public Verify toPo(TaskSubmitVerifyDTO dto) {
if (dto == null) {
return null;
}

13
ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java
View File

@ -23,11 +23,11 @@ import com.ruoyi.bst.task.domain.TaskVO;
import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
import com.ruoyi.bst.task.domain.dto.TaskVerifyDTO;
import com.ruoyi.bst.task.service.TaskAssembler;
import com.ruoyi.bst.task.service.TaskConverter;
import com.ruoyi.bst.task.service.TaskService;
import com.ruoyi.bst.task.service.TaskValidator;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -163,17 +163,6 @@ public class TaskController extends BaseController
return toAjax(taskService.submitTask(dto));
}
/**
* FIXME 审核任务
* TODO 需要移动到taskSubmit模块
*/
@PreAuthorize("@ss.hasPermi('bst:task:verify')")
@Log(title = "任务", businessType = BusinessType.UPDATE)
@PutMapping("/verify")
public AjaxResult verify(@RequestBody @Validated TaskVerifyDTO dto) {
return toAjax(taskService.verifyTask(dto));
}
/**
* 取消任务
*/

46
ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskSubmitController.java
View File

@ -6,14 +6,12 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@ -22,6 +20,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
/**
* 任务提交记录Controller
*
@ -72,35 +71,12 @@ public class TaskSubmitController extends BaseController
}
/**
* 新增任务提交记录
* 审核提交记录
*/
// @PreAuthorize("@ss.hasPermi('bst:taskSubmit:add')")
// @Log(title = "任务提交记录", businessType = BusinessType.INSERT)
// @PostMapping
// public AjaxResult add(@RequestBody TaskSubmit taskSubmit)
// {
// return toAjax(taskSubmitService.insertTaskSubmit(taskSubmit));
// }
// /**
// * 修改任务提交记录
// */
// @PreAuthorize("@ss.hasPermi('bst:taskSubmit:edit')")
// @Log(title = "任务提交记录", businessType = BusinessType.UPDATE)
// @PutMapping
// public AjaxResult edit(@RequestBody TaskSubmit taskSubmit)
// {
// return toAjax(taskSubmitService.updateTaskSubmit(taskSubmit));
// }
// /**
// * 删除任务提交记录
// */
// @PreAuthorize("@ss.hasPermi('bst:taskSubmit:remove')")
// @Log(title = "任务提交记录", businessType = BusinessType.DELETE)
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids)
// {
// return toAjax(taskSubmitService.deleteTaskSubmitByIds(ids));
// }
@PreAuthorize("@ss.hasPermi('bst:taskSubmit:verify')")
@Log(title = "任务提交记录", businessType = BusinessType.UPDATE)
@PutMapping("/verify")
public AjaxResult verify(@RequestBody @Validated TaskSubmitVerifyDTO dto){
return toAjax(taskSubmitService.verify(dto));
}
}