diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTaskController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTaskController.java deleted file mode 100644 index bd1b27b..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTaskController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.bonus.ai.controller; - -import com.bonus.ai.domain.AiDataSet; -import com.bonus.ai.domain.AnnotationFile; -import com.bonus.ai.domain.AnnotationTask; -import com.bonus.ai.domain.ReleaseVersion; -import com.bonus.common.core.web.domain.AjaxResult; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/task") -public class AnnotationTaskController { - - /** - * 查看由我创建的任务列表和我参与的或全部任务列表 - * 统一获取文件列表 - * @param type 参数类型：myCreated - 由我创建的任务列表, myParticipated - 由我参与的任务列表, all - 用户创建和公共文件 - * @return 返回满足条件的任务列表 - */ - @GetMapping("/list") - public AjaxResult list(@RequestParam String type) { - return AjaxResult.success(); - } - - /** - * 根据任务编号获取任务详情,如果是标注人员获取分配的文件列表，如果是审核人员获取所有分配的文件列表，如果是管理员获取所有文件列表 - * @param taskId 任务编号 - * @return 返回任务详情 - */ - @GetMapping(value = "/{taskId}") - public AjaxResult getInfo(@PathVariable Long taskId) { - return AjaxResult.success(new AnnotationTask()); - } - - - /**标注或审核 - * @param subTask 标注文件的信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping("/annotate") - public AjaxResult release(@Validated @RequestBody AnnotationFile subTask) { - return AjaxResult.success(); - } - - /**发布任务 - * @param version 发布任务的版本信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping("/release") - public AjaxResult release(@Validated @RequestBody ReleaseVersion version) { - return AjaxResult.success(); - } - - /**创建标注任务 - * @param task 新增的数据集信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping - public AjaxResult add(@Validated @RequestBody AnnotationTask task) { - return AjaxResult.success(); - } - - /**修改任务 - * @param task 修改的任务 - * @return 返回影响的行数或错误信 - */ - @PutMapping - public AjaxResult edit(@Validated @RequestBody AnnotationTask task) { - return AjaxResult.success(); - } - - /** - * 删除的任务 - * @param taskId 修改的任务 - * @return 返回影响的行数或错误信 - */ - @DeleteMapping("/{taskId}") - public AjaxResult remove(@PathVariable Long taskId) { - return AjaxResult.success(); - } - -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTeamController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTeamController.java deleted file mode 100644 index 31f1dd5..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/AnnotationTeamController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.bonus.ai.controller; - -import com.bonus.ai.domain.AiDataSet; -import com.bonus.ai.domain.AnnotationTeam; -import com.bonus.common.core.web.domain.AjaxResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 标注人员管理控制层 - * @author wangvivi - */ - -@RestController -@RequestMapping("/team") -@Slf4j -public class AnnotationTeamController { - - /** - * 获取所有标注人员和审核人员 - * @return 返回满足条件的数据集列表 - */ - @GetMapping("/list") - public AjaxResult list() { - return AjaxResult.success(); - } - - /**新增标注人员或审核人员 - * @param team 新增的人员id和角色信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping - public AjaxResult add(@Validated @RequestBody AnnotationTeam team) { - return AjaxResult.success(); - } - - /**修改标注人员或审核人员 - * @param team 修改的数据信息 - * @return 返回影响的行数或错误信 - */ - @PutMapping - public AjaxResult edit(@Validated @RequestBody AnnotationTeam team) { - return AjaxResult.success(); - } - - /** - * 删除的team标注人员或审核人员 - * @param team 删除的信息 - * @return 返回影响的行数或错误信 - */ - @DeleteMapping - public AjaxResult remove(@Validated @RequestBody AnnotationTeam team) { - return AjaxResult.success(); - } - -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/BasicFileController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/BasicFileController.java deleted file mode 100644 index 0a9d1a5..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/BasicFileController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.bonus.ai.controller; - -import com.bonus.ai.domain.AiDataSet; -import com.bonus.ai.domain.BasicFile; -import com.bonus.common.core.web.domain.AjaxResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; - -/** -* 基础文件管理控制层，获取指定存储方式的文件列表等 -* @author wangvivi - */ -@RestController -@RequestMapping("/basicfile") -@Slf4j -public class BasicFileController { - - - - /** - * 统一获取文件列表 - * @param type 参数类型：my - 当前用户创建的文件, public - 公共文件, all - 用户创建和公共文件 - * @return 符合条件的文件列表 - */ - @GetMapping("/list/") - public AjaxResult getFilesList(@RequestParam String type) { - return AjaxResult.success(); - } - /** - * 统一获取文件列表树 - * @param type 文件类型：my - 当前用户创建的文件, public - 公共文件, all - 用户创建和公共文件 - * @return 返回所有的文件树 - */ - @GetMapping("/tree/") - public AjaxResult tree(@RequestParam String type) { - return AjaxResult.success(); - } - - /** - * 根据文件编号获取文件详情 - * @param fileId 文件编号 - * @return 返回文件详情 - */ - @GetMapping(value = "/{fileId}") - public AjaxResult getInfo(@PathVariable Long fileId) { - return AjaxResult.success(new BasicFile()); - } - - - /** - * 设置或取消文件的公共状态,如果是文件夹则同时设置整个文件夹里所有文件夹的属性 - * @param fileId 文件的ID - * @param isPublic 是否设置为公共文件：true - 设置为公共文件, false - 取消公共状态 - * @return 操作结果 - */ - @PostMapping("/set-public") - public AjaxResult setFilePublicStatus(@RequestParam Long fileId, @RequestParam Boolean isPublic){ - return AjaxResult.success(); - } - - /** - * 创建文件夹 - * @param folderName 单个文件 - * @return 文件夹网络路径 - */ - @PostMapping("/createFolder") - public AjaxResult createFolder(@RequestParam("folderName") String folderName) - { - return AjaxResult.success("创建文件夹"); - } - - /** - * 文件夹删除 - * 从各个存储平台删除文件 - * @param folderName 文件夹名，默认为根目录 - * @return 文件夹网络路径 - */ - @DeleteMapping("/deleteFolder") - public AjaxResult deleteFolder(@RequestParam("folderName") String folderName) { - return AjaxResult.success("文件夹删除成功"); - } - - /** - * 单文件上传到指定文件夹 - * @param file 单个文件 - * @return 文件信息，包括文件名和文件路径 - */ - @PostMapping("upload") - public AjaxResult upload(MultipartFile file, String folderName){ - return AjaxResult.success("文件上传成功"); - } - - /** - * 多文件上传到指定文件夹 - * @param files 多个文件流 - * @return 文件信息 - */ - @PostMapping("/uploadFiles") - public AjaxResult uploadFile(MultipartFile[] files, String folderName) { - return AjaxResult.success("文件上传成功"); - } - - /** - * 多文件下载 - * @param response 请求响应,按照文件目录结构打包下载，如果是文件夹则打包下载文件夹下的所有文件 - * @param objectKeys，除mongodb 存fileid之外，其他均存上传文件的网络路径 - */ - @GetMapping("/downloadFiles") - public void downloadFile(HttpServletResponse response, @RequestParam List objectKeys) throws IOException {} - - -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetSampleController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetSampleController.java new file mode 100644 index 0000000..016fa84 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetSampleController.java @@ -0,0 +1,104 @@ +package com.bonus.ai.controller; + +import com.bonus.ai.domain.DataSetSampleEntity; +import com.bonus.ai.service.DataSetSampleService; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +/** + * Controller + * + * @author bonus + * @date 2024-11-01 + */ +@RestController +@RequestMapping("/sample") +public class DataSetSampleController extends BaseController { + + @Resource + private DataSetSampleService sampleService; + + /** + * 查询列表 + */ + @RequiresPermissions("dataCenter:sample:list") + @GetMapping("/list") + public TableDataInfo list(DataSetSampleEntity entity) + { + try { + startPage(); + List list = sampleService.selectSampleList(entity); + return getDataTable(list); + }catch (Exception e) { + return getDataTable(new ArrayList<>()); + } + + } + + /** + * 导出列表 + */ + @RequiresPermissions("dataCenter:sample:export") + @PostMapping("/export") + @SysLog(title = "样本类型管理", businessType = OperaType.EXPORT,logType = 0,module = "样本类型管理",details = "导出列表") + public void export(HttpServletResponse response, DataSetSampleEntity entity) + { + List list = sampleService.selectSampleList(entity); + ExcelUtil util = new ExcelUtil(DataSetSampleEntity.class); + util.exportExcel(response, list, "样本类型管理数据"); + } + + /** + * 获取详细信息 + */ + @RequiresPermissions("dataCenter:sample:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return sampleService.selectSampleById(id); + } + + /** + * 新增 + */ + @RequiresPermissions("dataCenter:sample:add") + @PostMapping + @SysLog(title = "样本类型管理", businessType = OperaType.INSERT,logType = 0,module = "样本类型管理",details = "新增数据") + public AjaxResult add(@RequestBody DataSetSampleEntity entity) + { + return sampleService.insertSample(entity); + } + + /** + * 修改 + */ + @RequiresPermissions("dataCenter:sample:edit") + @PutMapping + @SysLog(title = "样本类型管理", businessType = OperaType.UPDATE,logType = 0,module = "样本类型管理",details = "修改数据") + public AjaxResult edit(@RequestBody DataSetSampleEntity entity) + { + return sampleService.updateSample(entity); + } + + /** + * 删除 + */ + @RequiresPermissions("dataCenter:sample:remove") + @DeleteMapping("/{ids}") + @SysLog(title = "样本类型管理", businessType = OperaType.DELETE,logType = 0,module = "样本类型管理",details = "删除数据") + public AjaxResult remove(@PathVariable Long[] ids) + { + return sampleService.deleteSampleByIds(ids); + } +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetTeamMemberController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetTeamMemberController.java new file mode 100644 index 0000000..55322bc --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetTeamMemberController.java @@ -0,0 +1,112 @@ +package com.bonus.ai.controller; + +import com.bonus.ai.domain.DataSetTeamMemberEntity; +import com.bonus.ai.service.DataSetTeamMemberService; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +/** + * @author bonus + */ +@RestController +@RequestMapping("/teamMember") +public class DataSetTeamMemberController extends BaseController { + + @Resource + private DataSetTeamMemberService dataSetTeamMemberService; + + /** + * 查询标注人员列表 + */ + @RequiresPermissions("dataCenter:member:list") + @GetMapping("/list") + public TableDataInfo list(DataSetTeamMemberEntity entity) + { + try { + startPage(); + List list = dataSetTeamMemberService.selectTeamMemberList(entity); + return getDataTable(list); + }catch (Exception e){ + return getDataTable(new ArrayList<>()); + } + + } + + /** + * 导出标注人员列表 + */ + @RequiresPermissions("dataCenter:member:export") + @PostMapping("/export") + @SysLog(title = "标注人员管理", businessType = OperaType.EXPORT,logType = 0,module = "标注人员",details = "导出标注人员列表") + public void export(HttpServletResponse response, DataSetTeamMemberEntity entity) + { + List list = dataSetTeamMemberService.selectTeamMemberList(entity); + ExcelUtil util = new ExcelUtil(DataSetTeamMemberEntity.class); + util.exportExcel(response, list, "标注人员数据"); + } + + /** + * 获取标注人员详细信息 + */ + @RequiresPermissions("dataCenter:member:query") + @GetMapping(value = "/{memberId}") + public AjaxResult getInfo(@PathVariable("memberId") Long memberId) + { + return dataSetTeamMemberService.selectTeamMemberByMemberId(memberId); + } + + /** + * 新增标注人员 + */ + @RequiresPermissions("dataCenter:member:add") + @PostMapping + @SysLog(title = "标注人员管理", businessType = OperaType.INSERT,logType = 0,module = "标注人员",details = "插入标注人员列表") + public AjaxResult add(@RequestBody DataSetTeamMemberEntity entity) + { + return dataSetTeamMemberService.insertTeamMember(entity); + } + + /** + * 修改标注人员 + */ + @RequiresPermissions("dataCenter:member:edit") + @PutMapping + @SysLog(title = "标注人员管理", businessType = OperaType.UPDATE,logType = 0,module = "标注人员",details = "导出标注人员列表") + public AjaxResult edit(@RequestBody DataSetTeamMemberEntity entity) + { + return dataSetTeamMemberService.updateTeamMember(entity); + } + + /** + * 删除标注人员 + */ + @RequiresPermissions("dataCenter:member:remove") + @DeleteMapping("/{memberIds}") + @SysLog(title = "标注人员管理", businessType = OperaType.DELETE,logType = 0,module = "标注人员",details = "删除标注人员列表") + public AjaxResult remove(@PathVariable Long[] memberIds) + { + return dataSetTeamMemberService.deleteTeamMemberByMemberIds(memberIds); + } + + /** + * 获取部门树 + * @return 树 + */ + @PostMapping("/buildDeptTreeWithUsers") + @SysLog(title = "标注人员管理", businessType = OperaType.DELETE,logType = 0,module = "标注人员",details = "删除标注人员列表") + public AjaxResult buildDeptTreeWithUsers(){ + return dataSetTeamMemberService.buildDeptTreeWithUsers(); + } +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DatasetController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DatasetController.java deleted file mode 100644 index 1dc7f23..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DatasetController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.bonus.ai.controller; - -import com.bonus.ai.domain.AiDataSet; -import com.bonus.ai.domain.ReleaseVersion; -import com.bonus.common.core.web.domain.AjaxResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 数据集管理控制层，标注任务创建等 - * @author wangvivi - */ -@RestController -@RequestMapping("/dataset") -@Slf4j -public class DatasetController { - /** - * 查看由我创建的数据集和公共数据集 - * 统一获取文件列表 - * @param type 参数类型：my - 当前用户创建的文件, public - 公共文件, all - 用户创建和公共文件 - * @return 返回满足条件的数据集列表 - */ - @GetMapping("/list") - public AjaxResult list(@RequestParam String type) { - return AjaxResult.success(); - } - - /** - * 根据数据集编号获取数据集详情 - * @param datasetId 数据集编号 - * @return 返回数据集详情 - */ - @GetMapping(value = "/{datasetId}") - public AjaxResult getInfo(@PathVariable Long datasetId) { - return AjaxResult.success(new AiDataSet()); - } - - /** - * 设置或取消数据集的公共状态 - * @param datasetId 数据集的ID - * @param isPublic 是否设置为公共文件：true - 设置为公共文件, false - 取消公共状态 - * @return 操作结果 - */ - @PostMapping("/set-public") - public AjaxResult setDatasetPublicStatus(@RequestParam Long datasetId, @RequestParam Boolean isPublic){ - return AjaxResult.success(); - } - - /**发布数据集 - * @param version 发布数据集的版本信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping("/release") - public AjaxResult release(@Validated @RequestBody ReleaseVersion version) { - return AjaxResult.success(); - } - - /**导出发布版本的数据集 - * @param versionId 发布数据集的版本id - * @return 返回影响的行数或错误信 - */ - @GetMapping(value = "/export/{versionId}") - public AjaxResult export(@PathVariable Long versionId) { - return AjaxResult.success(); - } - - /**新增数据集 - * @param dataSet 新增的数据集信息，并且建立和文件的关联关系 - * @return 返回影响的行数或错误信 - */ - @PostMapping - public AjaxResult add(@Validated @RequestBody AiDataSet dataSet) { - return AjaxResult.success(); - } - - /**修改数据集 - * @param dataSet 修改的数据集信息 - * @return 返回影响的行数或错误信 - */ - @PutMapping - public AjaxResult edit(@Validated @RequestBody AiDataSet dataSet) { - return AjaxResult.success(); - } - - /** - * 删除的数据集 - * @param dataSetId 修改的数据集信息 - * @return 返回影响的行数或错误信 - */ - @DeleteMapping("/{dataSetId}") - public AjaxResult remove(@PathVariable Long dataSetId) { - return AjaxResult.success(); - } - - -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/LabelController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/LabelController.java deleted file mode 100644 index ccc042e..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/LabelController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.bonus.ai.controller; - -import com.bonus.ai.domain.AiDataSet; -import com.bonus.ai.domain.Label; -import com.bonus.common.core.web.domain.AjaxResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 标签管理控制层 - * @author wangvivi - */ -@RestController -@RequestMapping("/label") -@Slf4j -public class LabelController { - /** - * 获取所有标签列表 - * @return 返回所有的标签 - */ - @GetMapping("/list/") - public AjaxResult list() { - return AjaxResult.success(); - } - - /** - * 获取所有标签列表树 - * @return 返回所有的标签树 - */ - @GetMapping("/tree") - public AjaxResult tree() { - return AjaxResult.success(); - } - - /** - * 根据标签编号获取标签详情 - * @param labelId 标签编号 - * @return 返回标签详情 - */ - @GetMapping(value = "/{labelId}") - public AjaxResult getInfo(@PathVariable Long labelId) { - return AjaxResult.success(new Label()); - } - - /**新增标签 - * @param label 新增的标签信息 - * @return 返回影响的行数或错误信 - */ - @PostMapping - public AjaxResult add(@Validated @RequestBody Label label) { - return AjaxResult.success(); - } - - /**修改标签 - * @param label 修改的标签信息 - * @return 返回影响的行数或错误信 - */ - @PutMapping - public AjaxResult edit(@Validated @RequestBody Label label) { - return AjaxResult.success(); - } - - /** - * 删除的标签 - * @param labelId 修改的标签信息 - * @return 返回影响的行数或错误信 - */ - @DeleteMapping("/{labelId}") - public AjaxResult remove(@PathVariable Long labelId) { - return AjaxResult.success(); - } - - -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AiDataSet.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AiDataSet.java deleted file mode 100644 index 1308f1a..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AiDataSet.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.common.core.web.domain.BaseEntity; - -import java.util.ArrayList; -import java.util.List; - -/** - * 数据集类 - * @author wangvivi - */ -public class AiDataSet extends BaseEntity { - - /**数据集ID*/ - private Long datasetId; - /**数据集UUID*/ - private String datasetUuid; - /**数据集名称*/ - private String datasetName; - /**数据集描述*/ - private String datasetDesc; - /** 数据类型:0图片,1视频 ,2音频，3自由格式*/ - private String dataType; - private String inputPath; - private String outputPath; - - /** 是否公开(0代表未标注 1代表已标注）*/ - private String annotationStatus; - - /** 是否公开(0代表不公开 1代表公开）*/ - private String isPublic; - /**删除标志（0代表存在 1代表删除） */ - private String delFlag; - - private List files; - - public Long getDatasetId() { - return datasetId; - } - - public void setDatasetId(Long datasetId) { - this.datasetId = datasetId; - } - - public String getDatasetName() { - return datasetName; - } - - public void setDatasetName(String datasetName) { - this.datasetName = datasetName; - } - - public String getDatasetDesc() { - return datasetDesc; - } - - public void setDatasetDesc(String datasetDesc) { - this.datasetDesc = datasetDesc; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } - - public String getInputPath() { - return inputPath; - } - - public void setInputPath(String inputPath) { - this.inputPath = inputPath; - } - - public String getOutputPath() { - return outputPath; - } - - public void setOutputPath(String outputPath) { - this.outputPath = outputPath; - } - - public String getIsPublic() { - return isPublic; - } - - public void setIsPublic(String isPublic) { - this.isPublic = isPublic; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public List getFiles() { - return files; - } - - public void setFiles(List files) { - this.files = files; - } - - public String getAnnotationStatus() { - return annotationStatus; - } - - public void setAnnotationStatus(String annotationStatus) { - this.annotationStatus = annotationStatus; - } -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationFile.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationFile.java deleted file mode 100644 index eb6e1f3..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationFile.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.ai.domain.enums.AnnotationFileStatus; - -import java.util.Date; - -public class AnnotationFile { - AnnotationFile(Long taskId, Long datasetId, Long annotatorId, Long reviewerId, Long fileId){ - this.taskId = taskId; - this.datasetId = datasetId; - this.annotatorId = annotatorId; - this.reviewerId = reviewerId; - this.fileId = fileId; - } - /**任务名称*/ - private Long taskId; - /**数据集id*/ - private Long datasetId; - /**标注人员id*/ - private Long annotatorId; - /**审核人员id*/ - private Long reviewerId; - /**文件id*/ - private Long fileId; - - /**文件标注状态*/ - private AnnotationFileStatus annotateFileStatus; - /**标注结果*/ - private String annotationResult; - /**标注来源，0人工标注，1智能标注*/ - private String annotationSource; - - /**审核驳回原因*/ - private String auditFailedReason; - - /**标注时间*/ - private java.util.Date annotationTime; - /**审核时间*/ - private java.util.Date reviewTime;; - - public AnnotationFileStatus getAnnotateFileStatus() { - return annotateFileStatus; - } - - public void setAnnotateFileStatus(AnnotationFileStatus annotateFileStatus) { - this.annotateFileStatus = annotateFileStatus; - } - - public String getAnnotationResult() { - return annotationResult; - } - - public void setAnnotationResult(String annotationResult) { - this.annotationResult = annotationResult; - } - - public String getAnnotationSource() { - return annotationSource; - } - - public void setAnnotationSource(String annotationSource) { - this.annotationSource = annotationSource; - } - - public Date getAnnotationTime() { - return annotationTime; - } - - public void setAnnotationTime(Date annotationTime) { - this.annotationTime = annotationTime; - } - - public Date getReviewTime() { - return reviewTime; - } - - public void setReviewTime(Date reviewTime) { - this.reviewTime = reviewTime; - } - - public Long getAnnotatorId() { - return annotatorId; - } - - public void setAnnotatorId(Long annotatorId) { - this.annotatorId = annotatorId; - } - - public Long getReviewerId() { - return reviewerId; - } - - public void setReviewerId(Long reviewerId) { - this.reviewerId = reviewerId; - } - - public Long getFileId() { - return fileId; - } - - public void setFileId(Long fileId) { - this.fileId = fileId; - } - - public Long getTaskId() { - return taskId; - } - - public void setTaskId(Long taskId) { - this.taskId = taskId; - } - - public Long getDatasetId() { - return datasetId; - } - - public void setDatasetId(Long datasetId) { - this.datasetId = datasetId; - } - - public String getAuditFailedReason() { - return auditFailedReason; - } - - public void setAuditFailedReason(String auditFailedReason) { - this.auditFailedReason = auditFailedReason; - } -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTask.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTask.java deleted file mode 100644 index ead28c3..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTask.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.ai.domain.enums.AnnotationFileStatus; -import com.bonus.ai.domain.enums.AnnotationTaskStatus; -import com.bonus.common.core.web.domain.BaseEntity; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public class AnnotationTask extends BaseEntity { - - /**任务名称*/ - private Long taskId; - /**数据集id*/ - private Long datasetId; - /**任务uuid*/ - private String taskUuid ; - /**标注团队id,为0表示未启用标注团队，否则启用标注团队的关联id*/ - private Long annotationTeamId; - /**任务名称*/ - private String taskName; - /**任务描述*/ - private String taskDesc; - /**标注场景 数据类型:0图片,1视频 ,2音频，3自由格式*/ - private String annotateScene; - /**标注类型：图像分类，物体检测等*/ - private String annotateType; - /**标签集合，标签之间用逗号分隔*/ - private String labels; - - AnnotationTaskStatus annotateTaskStatus; - - /**删除标志（0代表存在 1代表删除） */ - private String delFlag; - - /**分配前标注人员列表和每人分配的文件数*/ - private Map annotators; - - /**分配前审核人员列表和每人分配的文件数*/ - private Map reviewers; - /**分配后子任务*/ - private List subAnnotationTasks; - - public AnnotationTaskStatus getAnnotationTaskStatus() { - return annotateTaskStatus; - } - - public void setAnnotationTaskStatus(AnnotationTaskStatus annotateTaskStatus) { - this.annotateTaskStatus = annotateTaskStatus; - } - - public List getSubAnnotationTasks() { - return subAnnotationTasks; - } - - public void setSubAnnotationTasks(List subAnnotationTasks) { - this.subAnnotationTasks = subAnnotationTasks; - } - - - public Long getTaskId() { - return taskId; - } - - public void setTaskId(Long taskId) { - this.taskId = taskId; - } - - public Long getDatasetId() { - return datasetId; - } - - public void setDatasetId(Long datasetId) { - this.datasetId = datasetId; - } - - public Long getAnnotationTeamId() { - return annotationTeamId; - } - - public void setAnnotationTeamId(Long annotationTeamId) { - this.annotationTeamId = annotationTeamId; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getTaskDesc() { - return taskDesc; - } - - public void setTaskDesc(String taskDesc) { - this.taskDesc = taskDesc; - } - - public String getAnnotateScene() { - return annotateScene; - } - - public void setAnnotateScene(String annotateScene) { - this.annotateScene = annotateScene; - } - - public String getAnnotateType() { - return annotateType; - } - - public void setAnnotateType(String annotateType) { - this.annotateType = annotateType; - } - - public String getLabels() { - return labels; - } - - public void setLabels(String labels) { - this.labels = labels; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - -// /**自动分配任务*/ -// public void assignFilesToSubTasks(List fileIds){ -// int annotatorSize = annotators.size(); -// int reviewerSize = reviewers.size(); -// -// for (int i = 0; i < fileIds.size(); i++) { -// Long fileId = fileIds.get(i); -// -// // 通过轮询分配标注人和审核人 -// Long annotatorId = annotators.get(i % annotatorSize); -// Long reviewerId = reviewers.get(i % reviewerSize); -// -// // 创建子任务 -// AnnotationFile subTask = new AnnotationFile(taskId,datasetId, annotatorId, reviewerId, fileId); -// subAnnotationTasks.add(subTask); -// } -// } - - public void assignFilesToSubTasks(List fileIds){ - int annotatorSize = annotators.size(); - int reviewerSize = reviewers.size(); - - for (int i = 0; i < fileIds.size(); i++) { - Long fileId = fileIds.get(i); - - // 通过轮询分配标注人和审核人 - Long annotatorId = Long.valueOf(annotators.get(i % annotatorSize)); - Long reviewerId = Long.valueOf(reviewers.get(i % reviewerSize)); - - // 创建子任务 - AnnotationFile subTask = new AnnotationFile(taskId,datasetId, annotatorId, reviewerId, fileId); - subAnnotationTasks.add(subTask); - } - } - - /**添加标注人*/ - public void addAnnotator(Long userId, Integer fileCount){ - annotators.put(userId, fileCount); - } - - /**添加审核人*/ - public void addReviewer(Long userId, Integer fileCount){ - reviewers.put(userId, fileCount); - } - - /**删除标注人*/ - public void removeAnnotator(Long userId){ - annotators.remove(userId); - } - - /**删除审核人*/ - public void removeReviewer(Long userId){ - reviewers.remove(userId); - } - - public String getTaskUuid() { - return taskUuid; - } - - public void setTaskUuid(String taskUuid) { - this.taskUuid = taskUuid; - } - - public void setAnnotators(Map annotators) { - this.annotators = annotators; - } - - public Map getAnnotators() { - return this.annotators; - } - - public void setReviewers(Map reviewers) { - this.reviewers = reviewers; - } - - - public Map getReviewers() { - return this.reviewers; - } -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTeam.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTeam.java deleted file mode 100644 index eb431f6..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/AnnotationTeam.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.system.api.domain.SysUser; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author wangvivi - */ -public class AnnotationTeam extends BaseEntity{ - - private Long userId; - /**0标注，1审核*/ - private String roleId; -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/BasicFile.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/BasicFile.java deleted file mode 100644 index a18d40f..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/BasicFile.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.common.core.web.domain.BaseEntity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class BasicFile extends BaseEntity { - private Long fileId; - private String fileName; - private String filePath; - private Long fileSize; - /**文件最后修改时间*/ - private java.util.Date lastModifyTime; - /**上传时间*/ - private java.util.Date uploadTime;; - /** 是否公开(0代表不公开 1代表公开）*/ - private String isPublic; - - /**文件的标签集合 */ - private List labels; - - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 父节点名称 */ - private String parentName; - - /** 子部门 */ - private List children = new ArrayList(); - - public Long getFileId() { - return fileId; - } - - public void setFileId(Long fileId) { - this.fileId = fileId; - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public String getFilePath() { - return filePath; - } - - public void setFilePath(String filePath) { - this.filePath = filePath; - } - - public Long getFileSize() { - return fileSize; - } - - public void setFileSize(Long fileSize) { - this.fileSize = fileSize; - } - - public Date getLastModifyTime() { - return lastModifyTime; - } - - public void setLastModifyTime(Date lastModifyTime) { - this.lastModifyTime = lastModifyTime; - } - - public Date getUploadTime() { - return uploadTime; - } - - public void setUploadTime(Date uploadTime) { - this.uploadTime = uploadTime; - } - - public String getIsPublic() { - return isPublic; - } - - public void setIsPublic(String isPublic) { - this.isPublic = isPublic; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public String getParentName() { - return parentName; - } - - public void setParentName(String parentName) { - this.parentName = parentName; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } -} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetSampleEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetSampleEntity.java new file mode 100644 index 0000000..6d391cd --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetSampleEntity.java @@ -0,0 +1,28 @@ +package com.bonus.ai.domain; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author bonus + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class DataSetSampleEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + /** 主键 */ + private Long id; + + /** 样本类型名称 */ + @Excel(name = "样本类型名称") + private String sampleName; + + /** 样本格式 */ + @Excel(name = "样本格式") + private String sampleFormat; + + /** 是否删除(0代表存在,1代表删除) */ + private String delFlag; +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetTeamMemberEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetTeamMemberEntity.java new file mode 100644 index 0000000..604156a --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetTeamMemberEntity.java @@ -0,0 +1,32 @@ +package com.bonus.ai.domain; + +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * @author bonus + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class DataSetTeamMemberEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 成员id */ + private Long memberId; + + /** 角色标志（0 标注，1审核，2管理） */ + private String roleId; + + /** 是否删除(0代表存在,1代表删除) */ + private String delFlag; + + private String[] selectedData; + + private String userName; + + private String sex; + +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/Label.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/Label.java deleted file mode 100644 index 1189da9..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/Label.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.bonus.ai.domain; - -import com.bonus.common.core.web.domain.BaseEntity; - -import java.util.ArrayList; -import java.util.List; -/** - * 标签类 - * @author wangvivi - */ -public class Label extends BaseEntity { - private Long labelId; - private String labelName; - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 父节点名称 */ - private String parentName; - - /** 子部门 */ - private List