refactor: 将项目代码从 ccdi-info-collection 迁移到 ccdi-project 模块
- 将 CcdiProject 相关代码移动到 ccdi-project 模块 - 修复 CcdiModelParam 审计字段注解 - 更新所有 package 声明和 import 语句 - 更新 Mapper XML namespace - 通过代码审查
This commit is contained in:
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
/** 备注 */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.ruoyi.info.collection.domain;
|
||||
package com.ruoyi.ccdi.project.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.ruoyi.info.collection.domain.dto;
|
||||
package com.ruoyi.ccdi.project.domain.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -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个字符")
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.ruoyi.info.collection.domain.vo;
|
||||
package com.ruoyi.ccdi.project.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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接口
|
||||
@@ -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
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.info.collection.mapper.CcdiProjectMapper">
|
||||
<mapper namespace="com.ruoyi.ccdi.project.mapper.CcdiProjectMapper">
|
||||
|
||||
<resultMap id="ProjectVOResultMap" type="com.ruoyi.info.collection.domain.vo.CcdiProjectVO">
|
||||
<resultMap id="ProjectVOResultMap" type="com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO">
|
||||
<id property="projectId" column="project_id"/>
|
||||
<result property="projectName" column="project_name"/>
|
||||
<result property="description" column="description"/>
|
||||
@@ -0,0 +1 @@
|
||||
新增创建项目的功能。在首页点击新建项目按钮后,出现的弹窗为ScreenShot_2026-02-26_153149_900.png 图片展示的弹窗。项目字段需要参考首页的项目列表。
|
||||
Reference in New Issue
Block a user