Commit 425da2ea authored by alex yao's avatar alex yao

refactor(domain): 修正包名路径并添加文档类型验证

- 将 domian 包重命名为 domain
- 在 AiSoftWareCopyRightEnum 中添加 DOC_TYPE 验证方法
- 更新所有相关文件中的包引用路径
- 移除未使用的导入语句
- 在 REST 接口实现中添加文档类型校验逻辑
parent 90a1ad8b
...@@ -26,8 +26,8 @@ import cn.com.gsst.dify_client.model.file.FileInfo; ...@@ -26,8 +26,8 @@ import cn.com.gsst.dify_client.model.file.FileInfo;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisKey; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisKey;
import cn.com.poc.ai_software_copyright.domain.GeneratedDoc; import cn.com.poc.ai_software_copyright.domain.GeneratedDoc;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.utils.SoftwareCopyRightUtils; import cn.com.poc.ai_software_copyright.utils.SoftwareCopyRightUtils;
import cn.com.poc.common.pool.CommonThreadPoolExecutor; import cn.com.poc.common.pool.CommonThreadPoolExecutor;
import cn.com.poc.common.utils.DateUtils; import cn.com.poc.common.utils.DateUtils;
......
...@@ -6,8 +6,8 @@ import java.util.Map; ...@@ -6,8 +6,8 @@ import java.util.Map;
import cn.com.gsst.dify_client.exception.DifyApiException; import cn.com.gsst.dify_client.exception.DifyApiException;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
import cn.com.poc.ai_software_copyright.entity.CallbackEntity; import cn.com.poc.ai_software_copyright.entity.CallbackEntity;
......
...@@ -21,8 +21,8 @@ import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent; ...@@ -21,8 +21,8 @@ import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent;
import cn.com.poc.ai_software_copyright.aggregate.SoftwareCopyRightService; import cn.com.poc.ai_software_copyright.aggregate.SoftwareCopyRightService;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert; import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
import cn.com.poc.ai_software_copyright.entity.CallbackEntity; import cn.com.poc.ai_software_copyright.entity.CallbackEntity;
......
...@@ -46,7 +46,16 @@ public class AiSoftWareCopyRightEnum { ...@@ -46,7 +46,16 @@ public class AiSoftWareCopyRightEnum {
information, information,
pc_operating_manual, pc_operating_manual,
ph_operating_manual, ph_operating_manual,
source_code source_code;
public static boolean isValid(String type) {
for (DOC_TYPE value : DOC_TYPE.values()) {
if (value.name().equals(type)) {
return true;
}
}
return false;
}
} }
} }
...@@ -3,8 +3,8 @@ package cn.com.poc.ai_software_copyright.convert; ...@@ -3,8 +3,8 @@ package cn.com.poc.ai_software_copyright.convert;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto; import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto;
import cn.com.poc.ai_software_copyright.model.BizSoftwareCopyrightModel; import cn.com.poc.ai_software_copyright.model.BizSoftwareCopyrightModel;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
......
package cn.com.poc.ai_software_copyright.domian; package cn.com.poc.ai_software_copyright.domain;
import java.util.Map; import java.util.Map;
......
package cn.com.poc.ai_software_copyright.domian; package cn.com.poc.ai_software_copyright.domain;
/** /**
* @author alex.yao * @author alex.yao
......
...@@ -2,9 +2,6 @@ package cn.com.poc.ai_software_copyright.domain; ...@@ -2,9 +2,6 @@ package cn.com.poc.ai_software_copyright.domain;
import java.util.List; import java.util.List;
import cn.com.poc.ai_software_copyright.domian.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent;
/** /**
* @author alex.yao * @author alex.yao
* @date 2026/1/7 * @date 2026/1/7
......
package cn.com.poc.ai_software_copyright.domian; package cn.com.poc.ai_software_copyright.domain;
/** /**
* @author alex.yao * @author alex.yao
......
...@@ -2,8 +2,8 @@ package cn.com.poc.ai_software_copyright.dto; ...@@ -2,8 +2,8 @@ package cn.com.poc.ai_software_copyright.dto;
import java.util.List; import java.util.List;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
......
...@@ -2,7 +2,6 @@ package cn.com.poc.ai_software_copyright.rest.impl; ...@@ -2,7 +2,6 @@ package cn.com.poc.ai_software_copyright.rest.impl;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -11,18 +10,15 @@ import cn.com.poc.ai_software_copyright.aggregate.SoftwareCopyRightService; ...@@ -11,18 +10,15 @@ import cn.com.poc.ai_software_copyright.aggregate.SoftwareCopyRightService;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert; import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert;
import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightDocRecordConvert; import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightDocRecordConvert;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.dto.CallbackDto; import cn.com.poc.ai_software_copyright.dto.CallbackDto;
import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightAssistantDto; import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightAssistantDto;
import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto; import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto;
import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightFilesDto; import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightFilesDto;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
import cn.com.poc.ai_software_copyright.entity.CallbackEntity; import cn.com.poc.ai_software_copyright.entity.CallbackEntity;
import cn.com.poc.ai_software_copyright.query.SoftwareCopyrightQueryCondition;
import cn.com.poc.ai_software_copyright.query.SoftwareCopyrightQueryItem;
import cn.com.poc.ai_software_copyright.rest.BizSoftwareCopyrightRest; import cn.com.poc.ai_software_copyright.rest.BizSoftwareCopyrightRest;
import cn.com.poc.ai_software_copyright.service.BizSoftwareCopyrightService; import cn.com.poc.ai_software_copyright.service.BizSoftwareCopyrightService;
import cn.com.poc.common.utils.StringUtils;
import cn.com.yict.framemax.data.model.PagingInfo; import cn.com.yict.framemax.data.model.PagingInfo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -48,6 +44,9 @@ public class BizSoftwareCopyrightRestImpl implements BizSoftwareCopyrightRest { ...@@ -48,6 +44,9 @@ public class BizSoftwareCopyrightRestImpl implements BizSoftwareCopyrightRest {
Assert.notNull(dto.getBaseInfo(), "基础信息不能为空"); Assert.notNull(dto.getBaseInfo(), "基础信息不能为空");
Assert.notNull(dto.getTechnicalContent(), "技术内容不能为空"); Assert.notNull(dto.getTechnicalContent(), "技术内容不能为空");
Assert.notNull(dto.getGeneratedDocType(), "文档类型不能为空"); Assert.notNull(dto.getGeneratedDocType(), "文档类型不能为空");
for (String docType : dto.getGeneratedDocType()) {
Assert.isTrue(AiSoftWareCopyRightEnum.DOC_TYPE.isValid(docType), "文档类型错误:" + docType + "类型不存在");
}
return BizSoftwareCopyrightConvert.entityToDto( return BizSoftwareCopyrightConvert.entityToDto(
softwareCopyRightService.save( softwareCopyRightService.save(
dto.getBaseInfo(), dto.getBaseInfo(),
......
...@@ -11,9 +11,8 @@ import static cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisK ...@@ -11,9 +11,8 @@ import static cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisK
import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent; import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert; import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightConvert;
import cn.com.poc.ai_software_copyright.convert.BizSoftwareCopyrightDocRecordConvert; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent;
import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto; import cn.com.poc.ai_software_copyright.dto.SoftwareCopyRightDto;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightDocRecordEntity;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
...@@ -23,7 +22,6 @@ import cn.com.poc.common.constant.CommonConstant; ...@@ -23,7 +22,6 @@ import cn.com.poc.common.constant.CommonConstant;
import cn.com.poc.common.service.BosConfigService; import cn.com.poc.common.service.BosConfigService;
import cn.com.poc.common.service.RedisService; import cn.com.poc.common.service.RedisService;
import cn.com.poc.common.utils.JsonUtils; import cn.com.poc.common.utils.JsonUtils;
import cn.com.poc.common.utils.ListUtils;
import cn.com.poc.common.utils.StringUtils; import cn.com.poc.common.utils.StringUtils;
import cn.com.poc.message.entity.SoftwareCopyRightMessage; import cn.com.poc.message.entity.SoftwareCopyRightMessage;
import cn.com.poc.message.service.SoftwareCopyRightProduceService; import cn.com.poc.message.service.SoftwareCopyRightProduceService;
......
...@@ -4,17 +4,13 @@ import javax.annotation.Resource; ...@@ -4,17 +4,13 @@ import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent; import cn.com.poc.ai_software_copyright.agent.SoftwareCopyRightAgent;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightEnum;
import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisKey; import cn.com.poc.ai_software_copyright.contant.AiSoftWareCopyRightRedisKey;
import cn.com.poc.ai_software_copyright.domain.GeneratedDoc; import cn.com.poc.ai_software_copyright.domain.GeneratedDoc;
import cn.com.poc.ai_software_copyright.domian.BaseInfo; import cn.com.poc.ai_software_copyright.domain.BaseInfo;
import cn.com.poc.ai_software_copyright.domian.TechnicalContent; import cn.com.poc.ai_software_copyright.domain.TechnicalContent;
import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity; import cn.com.poc.ai_software_copyright.entity.BizSoftwareCopyrightEntity;
import cn.com.poc.ai_software_copyright.service.BizSoftwareCopyrightService; import cn.com.poc.ai_software_copyright.service.BizSoftwareCopyrightService;
import cn.com.poc.common.service.RedisService; import cn.com.poc.common.service.RedisService;
...@@ -24,7 +20,6 @@ import cn.com.poc.message.entity.SoftwareCopyRightMessage; ...@@ -24,7 +20,6 @@ import cn.com.poc.message.entity.SoftwareCopyRightMessage;
import cn.com.poc.message.service.SoftwareCopyRightConsumerService; import cn.com.poc.message.service.SoftwareCopyRightConsumerService;
import cn.com.poc.message.service.SoftwareCopyRightProduceService; import cn.com.poc.message.service.SoftwareCopyRightProduceService;
import cn.com.poc.message.topic.SoftwareCopyRightTopic; import cn.com.poc.message.topic.SoftwareCopyRightTopic;
import cn.com.yict.framemax.core.exception.BusinessException;
import cn.com.yict.framemax.tumbleweed.client.annotation.Consumer; import cn.com.yict.framemax.tumbleweed.client.annotation.Consumer;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment