diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiProjectController.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectController.java similarity index 90% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiProjectController.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectController.java index ca46633..5120434 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiProjectController.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectController.java @@ -1,4 +1,4 @@ -package com.ruoyi.info.collection.controller; +package com.ruoyi.ccdi.project.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; @@ -6,10 +6,10 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.info.collection.domain.dto.CcdiProjectQueryDTO; -import com.ruoyi.info.collection.domain.dto.CcdiProjectSaveDTO; -import com.ruoyi.info.collection.domain.vo.CcdiProjectVO; -import com.ruoyi.info.collection.service.ICcdiProjectService; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectQueryDTO; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectSaveDTO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO; +import com.ruoyi.ccdi.project.service.ICcdiProjectService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiModelParam.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiModelParam.java index a236302..0b3e584 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiModelParam.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiModelParam.java @@ -1,6 +1,8 @@ package com.ruoyi.ccdi.project.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -46,15 +48,19 @@ public class CcdiModelParam { private Integer sortOrder; /** 创建者 */ + @TableField(fill = FieldFill.INSERT) private String createBy; /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) private Date createTime; /** 更新者 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** 备注 */ diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiProject.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiProject.java similarity index 97% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiProject.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiProject.java index 88c6c94..3be6310 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiProject.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/CcdiProject.java @@ -1,4 +1,4 @@ -package com.ruoyi.info.collection.domain; +package com.ruoyi.ccdi.project.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectQueryDTO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectQueryDTO.java similarity index 82% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectQueryDTO.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectQueryDTO.java index de8ce5e..6644b4c 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectQueryDTO.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.info.collection.domain.dto; +package com.ruoyi.ccdi.project.domain.dto; import lombok.Data; diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectSaveDTO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSaveDTO.java similarity index 86% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectSaveDTO.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSaveDTO.java index 0882745..13dc394 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiProjectSaveDTO.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/dto/CcdiProjectSaveDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.info.collection.domain.dto; +package com.ruoyi.ccdi.project.domain.dto; import lombok.Data; @@ -12,6 +12,9 @@ import org.hibernate.validator.constraints.Length; */ @Data public class CcdiProjectSaveDTO { + /** 项目ID(更新时必填) */ + private Long projectId; + /** 项目名称(必填) */ @NotBlank(message = "项目名称不能为空") @Length(max = 200, message = "项目名称长度不能超过200个字符") diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectVO.java similarity index 95% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectVO.java index e246d0c..80458ef 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiProjectVO.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.info.collection.domain.vo; +package com.ruoyi.ccdi.project.domain.vo; import lombok.Data; diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiProjectMapper.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectMapper.java similarity index 73% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiProjectMapper.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectMapper.java index 57a254a..5e86c80 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiProjectMapper.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.info.collection.mapper; +package com.ruoyi.ccdi.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.info.collection.domain.CcdiProject; -import com.ruoyi.info.collection.domain.dto.CcdiProjectQueryDTO; -import com.ruoyi.info.collection.domain.vo.CcdiProjectVO; +import com.ruoyi.ccdi.project.domain.CcdiProject; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectQueryDTO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiProjectService.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectService.java similarity index 81% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiProjectService.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectService.java index e3ccf3f..c72dd58 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiProjectService.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectService.java @@ -1,9 +1,9 @@ -package com.ruoyi.info.collection.service; +package com.ruoyi.ccdi.project.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.info.collection.domain.dto.CcdiProjectQueryDTO; -import com.ruoyi.info.collection.domain.dto.CcdiProjectSaveDTO; -import com.ruoyi.info.collection.domain.vo.CcdiProjectVO; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectQueryDTO; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectSaveDTO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO; /** * 项目Service接口 diff --git a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiProjectServiceImpl.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectServiceImpl.java similarity index 60% rename from ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiProjectServiceImpl.java rename to ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectServiceImpl.java index 21e0fb0..76e5e35 100644 --- a/ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiProjectServiceImpl.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectServiceImpl.java @@ -1,12 +1,13 @@ -package com.ruoyi.info.collection.service.impl; +package com.ruoyi.ccdi.project.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.info.collection.domain.CcdiProject; -import com.ruoyi.info.collection.domain.dto.CcdiProjectQueryDTO; -import com.ruoyi.info.collection.domain.dto.CcdiProjectSaveDTO; -import com.ruoyi.info.collection.domain.vo.CcdiProjectVO; -import com.ruoyi.info.collection.mapper.CcdiProjectMapper; -import com.ruoyi.info.collection.service.ICcdiProjectService; +import com.ruoyi.ccdi.project.domain.CcdiProject; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectQueryDTO; +import com.ruoyi.ccdi.project.domain.dto.CcdiProjectSaveDTO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO; +import com.ruoyi.ccdi.project.mapper.CcdiProjectMapper; +import com.ruoyi.ccdi.project.service.ICcdiProjectService; +import com.ruoyi.common.exception.ServiceException; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -44,8 +45,25 @@ public class CcdiProjectServiceImpl implements ICcdiProjectService { @Override public CcdiProjectVO updateProject(CcdiProjectSaveDTO dto) { - // TODO: 实现更新逻辑 - return null; + if (dto.getProjectId() == null) { + throw new ServiceException("项目ID不能为空"); + } + + CcdiProject existingProject = projectMapper.selectById(dto.getProjectId()); + if (existingProject == null) { + throw new ServiceException("项目不存在"); + } + + // 只更新允许修改的字段 + existingProject.setProjectName(dto.getProjectName()); + existingProject.setDescription(dto.getDescription()); + existingProject.setConfigType(dto.getConfigType()); + + projectMapper.updateById(existingProject); + + CcdiProjectVO vo = new CcdiProjectVO(); + BeanUtils.copyProperties(existingProject, vo); + return vo; } @Override diff --git a/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectMapper.xml similarity index 92% rename from ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml rename to ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectMapper.xml index 2ea0131..fb97c8e 100644 --- a/ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiProjectMapper.xml +++ b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/doc/创建项目功能/task.md b/doc/创建项目功能/task.md index e69de29..6061512 100644 --- a/doc/创建项目功能/task.md +++ b/doc/创建项目功能/task.md @@ -0,0 +1 @@ +新增创建项目的功能。在首页点击新建项目按钮后,出现的弹窗为ScreenShot_2026-02-26_153149_900.png 图片展示的弹窗。项目字段需要参考首页的项目列表。 \ No newline at end of file