提交 427753dc 作者: 涂茂林

合并分支 'dev_tzl' 到 'dev_tml'

Dev tzl

查看合并请求 chemical-kesai/kshg-api!36
......@@ -9,6 +9,7 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import lombok.experimental.SuperBuilder;
import org.hibernate.annotations.Comment;
/**
......@@ -20,7 +21,7 @@ import org.hibernate.annotations.Comment;
@Getter
@Setter
@ToString
@Builder
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
......
......@@ -35,11 +35,9 @@ public class WorkAreaParam implements Serializable {
String workAreaName;
@ApiModelProperty(value = "消抖阈值(秒)", example = "1", required = true)
@NotEmpty(message = "消抖阈值(秒)不能为空")
Integer threshold;
@ApiModelProperty(value = "超时时间(秒)", example = "1", required = true)
@NotEmpty(message = "超时时间(秒)不能为空")
Integer timeout;
@ApiModelProperty(value = "负责人", example = "1")
......
......@@ -25,7 +25,7 @@ public class WorkAreaQueryParam implements Serializable {
@Serial
private static final long serialVersionUID = -8037877534751243885L;
@ApiModelProperty(value = "工区名称", example = "工业区", required = true)
@ApiModelProperty(value = "工区名称", example = "工业区")
String workAreaName;
@ApiModelProperty(value = "每页记录数", example = "10")
......
......@@ -3,6 +3,7 @@ package com.yiring.app.service.workArea.impl;
import cn.hutool.core.util.StrUtil;
import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
import com.yiring.app.domain.video.Video;
import com.yiring.app.domain.workArea.WorkArea;
import com.yiring.app.domain.workArea.WorkAreaRepository;
import com.yiring.app.excel.workArea.WorkAreaExportExcel;
......@@ -58,6 +59,7 @@ public class WorkAreaServiceImpl implements WorkAreaService {
}
WorkArea workArea = new WorkArea();
BeanUtils.copyProperties(workAreaParam, workArea);
workArea.setVideo(Video.builder().id(workAreaParam.getVideoId()).build());
workAreaRepository.saveAndFlush(workArea);
return Result.ok();
}
......@@ -76,6 +78,7 @@ public class WorkAreaServiceImpl implements WorkAreaService {
}
}
BeanUtils.copyProperties(workAreaParam, workArea);
workArea.setVideo(Video.builder().id(workAreaParam.getVideoId()).build());
workAreaRepository.saveAndFlush(workArea);
return Result.ok();
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论