Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
This commit is contained in:
YunaiV
commit
d8451b004e
|
|
@ -2,10 +2,12 @@ package cn.iocoder.yudao.framework.signature.core.aop;
|
|||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import cn.hutool.core.util.BooleanUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.crypto.digest.DigestUtil;
|
||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
|
||||
import cn.iocoder.yudao.framework.signature.core.annotation.ApiSignature;
|
||||
import cn.iocoder.yudao.framework.signature.core.redis.ApiSignatureRedisDAO;
|
||||
|
|
@ -69,13 +71,17 @@ public class ApiSignatureAspect {
|
|||
|
||||
// 3. 将 nonce 记入缓存，防止重复使用（重点二：此处需要将 ttl 设定为允许 timestamp 时间差的值 x 2 ）
|
||||
String nonce = request.getHeader(signature.nonce());
|
||||
signatureRedisDAO.setNonce(appId, nonce, signature.timeout() * 2, signature.timeUnit());
|
||||
if (BooleanUtil.isFalse(signatureRedisDAO.setNonce(appId, nonce, signature.timeout() * 2, signature.timeUnit()))) {
|
||||
String timestamp = request.getHeader(signature.timestamp());
|
||||
log.info("[verifySignature][appId({}) timestamp({}) nonce({}) sign({}) 存在重复请求]", appId, timestamp, nonce, clientSignature);
|
||||
throw new ServiceException(GlobalErrorCodeConstants.REPEATED_REQUESTS.getCode(), "存在重复请求");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验请求头加签参数
|
||||
*
|
||||
* <p>
|
||||
* 1. appId 是否为空
|
||||
* 2. timestamp 是否为空，请求是否已经超时，默认 10 分钟
|
||||
* 3. nonce 是否为空，随机数是否 10 位以上，是否在规定时间内已经访问过了
|
||||
|
|
@ -118,7 +124,7 @@ public class ApiSignatureAspect {
|
|||
|
||||
/**
|
||||
* 构建签名字符串
|
||||
*
|
||||
* <p>
|
||||
* 格式为 = 请求参数 + 请求体 + 请求头 + 密钥
|
||||
*
|
||||
* @param signature signature
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public class ApiSignatureRedisDAO {
|
|||
|
||||
/**
|
||||
* 验签随机数
|
||||
*
|
||||
* <p>
|
||||
* KEY 格式：signature_nonce:%s // 参数为 随机数
|
||||
* VALUE 格式：String
|
||||
* 过期时间：不固定
|
||||
|
|
@ -26,7 +26,7 @@ public class ApiSignatureRedisDAO {
|
|||
|
||||
/**
|
||||
* 签名密钥
|
||||
*
|
||||
* <p>
|
||||
* HASH 结构
|
||||
* KEY 格式：%s // 参数为 appid
|
||||
* VALUE 格式：String
|
||||
|
|
@ -40,8 +40,8 @@ public class ApiSignatureRedisDAO {
|
|||
return stringRedisTemplate.opsForValue().get(formatNonceKey(appId, nonce));
|
||||
}
|
||||
|
||||
public void setNonce(String appId, String nonce, int time, TimeUnit timeUnit) {
|
||||
stringRedisTemplate.opsForValue().set(formatNonceKey(appId, nonce), "", time, timeUnit);
|
||||
public Boolean setNonce(String appId, String nonce, int time, TimeUnit timeUnit) {
|
||||
return stringRedisTemplate.opsForValue().setIfAbsent(formatNonceKey(appId, nonce), "", time, timeUnit);
|
||||
}
|
||||
|
||||
private static String formatNonceKey(String appId, String nonce) {
|
||||
|
|
|
|||
|
|
@ -123,6 +123,18 @@
|
|||
<groupId>dev.tinyflow</groupId>
|
||||
<artifactId>tinyflow-java-core</artifactId>
|
||||
<version>${tinyflow.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<!-- 解决 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1318/ 问题 -->
|
||||
<groupId>com.agentsflex</groupId>
|
||||
<artifactId>agents-flex-store-elasticsearch</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<!-- TODO @芋艿：暂时移除 groovy，和 iot 冲突 -->
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy-all</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Test 测试相关 -->
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import org.springframework.core.ParameterizedTypeReference;
|
|||
import org.springframework.http.HttpRequest;
|
||||
import org.springframework.http.HttpStatusCode;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.LinkedMultiValueMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
|
@ -24,18 +25,17 @@ import java.util.Objects;
|
|||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
// TODO @新：要不改成 WenDuoDuoPptApi
|
||||
/**
|
||||
* 文多多 API
|
||||
*
|
||||
* @see <a href="https://docmee.cn/open-platform/api">PPT 生成 API</a>
|
||||
*
|
||||
* @author xiaoxin
|
||||
* @see <a href="https://docmee.cn/open-platform/api">PPT 生成 API</a>
|
||||
*/
|
||||
@Slf4j
|
||||
public class WddPptApi {
|
||||
public class WenDuoDuoPptApi {
|
||||
|
||||
public static final String BASE_URL = "https://docmee.cn";
|
||||
public static final String TOKEN_NAME = "token";
|
||||
|
||||
private final WebClient webClient;
|
||||
|
||||
|
|
@ -44,17 +44,19 @@ public class WddPptApi {
|
|||
private final Function<Object, Function<ClientResponse, Mono<? extends Throwable>>> EXCEPTION_FUNCTION =
|
||||
reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> {
|
||||
HttpRequest request = response.request();
|
||||
log.error("[wdd-api] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]",
|
||||
log.error("[WenDuoDuoPptApi] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]",
|
||||
request.getMethod(), request.getURI(), reqParam, responseBody);
|
||||
sink.error(new IllegalStateException("[wdd-api] 调用失败！"));
|
||||
sink.error(new IllegalStateException("[WenDuoDuoPptApi] 调用失败！"));
|
||||
});
|
||||
|
||||
// TODO @新：是不是不用 baseUrl 哈
|
||||
public WddPptApi(String baseUrl) {
|
||||
public WenDuoDuoPptApi(String token) {
|
||||
Assert.hasText(token, "token 不能为空");
|
||||
this.webClient = WebClient.builder()
|
||||
.baseUrl(baseUrl)
|
||||
// TODO @新：建议，token 作为 defaultHeader
|
||||
.defaultHeaders((headers) -> headers.setContentType(MediaType.APPLICATION_JSON))
|
||||
.baseUrl(BASE_URL)
|
||||
.defaultHeaders((headers) -> {
|
||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||
headers.add(TOKEN_NAME, token);
|
||||
})
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
@ -82,37 +84,16 @@ public class WddPptApi {
|
|||
.block();
|
||||
}
|
||||
|
||||
// TODO @xin：是不是给个 API 连接，这样 type、content、files 都不用写注释太细了
|
||||
/**
|
||||
* 创建任务
|
||||
*
|
||||
* @param type 类型
|
||||
* 1.智能生成（主题、要求）
|
||||
* 2.上传文件生成
|
||||
* 3.上传思维导图生成
|
||||
* 4.通过word精准转ppt
|
||||
* 5.通过网页链接生成
|
||||
* 6.粘贴文本内容生成
|
||||
* 7.Markdown大纲生成
|
||||
* @param content 内容
|
||||
* type=1 用户输入主题或要求（不超过1000字符）
|
||||
* type=2、4 不传
|
||||
* type=3 幕布等分享链接
|
||||
* type=5 网页链接地址（http/https）
|
||||
* type=6 粘贴文本内容（不超过20000字符）
|
||||
* type=7 大纲内容（markdown）
|
||||
* @param files 文件列表
|
||||
* 文件列表（文件数不超过5个，总大小不超过50M）：
|
||||
* type=1 上传参考文件（非必传，支持多个）
|
||||
* type=2 上传文件（支持多个）
|
||||
* type=3 上传思维导图（xmind/mm/md）（仅支持一个）
|
||||
* type=4 上传word文件（仅支持一个）
|
||||
* type=5、6、7 不传
|
||||
* <p>
|
||||
* 支持格式：doc/docx/pdf/ppt/pptx/txt/md/xls/xlsx/csv/html/epub/mobi/xmind/mm
|
||||
* @return 任务 ID
|
||||
* @see <a href="https://docmee.cn/open-platform/api#%E5%88%9B%E5%BB%BA%E4%BB%BB%E5%8A%A1">创建任务</a>
|
||||
*/
|
||||
public ApiResponse createTask(String token, Integer type, String content, List<MultipartFile> files) {
|
||||
public ApiResponse createTask(Integer type, String content, List<MultipartFile> files) {
|
||||
MultiValueMap<String, Object> formData = new LinkedMultiValueMap<>();
|
||||
formData.add("type", type);
|
||||
if (content != null) {
|
||||
|
|
@ -125,7 +106,6 @@ public class WddPptApi {
|
|||
}
|
||||
return this.webClient.post()
|
||||
.uri("/api/ppt/v2/createTask")
|
||||
.header("token", token)
|
||||
.contentType(MediaType.MULTIPART_FORM_DATA)
|
||||
.body(BodyInserters.fromMultipartData(formData))
|
||||
.retrieve()
|
||||
|
|
@ -168,10 +148,9 @@ public class WddPptApi {
|
|||
* @param request 请求体
|
||||
* @return 模板列表
|
||||
*/
|
||||
public PagePptTemplateInfo getTemplatePage(String token, TemplateQueryRequest request) {
|
||||
public PagePptTemplateInfo getTemplatePage(TemplateQueryRequest request) {
|
||||
return this.webClient.post()
|
||||
.uri("/api/ppt/templates")
|
||||
.header("token", token)
|
||||
.bodyValue(request)
|
||||
.retrieve()
|
||||
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
|
||||
|
|
@ -185,10 +164,9 @@ public class WddPptApi {
|
|||
*
|
||||
* @return 大纲内容流
|
||||
*/
|
||||
public Flux<Map<String, Object>> createOutline(String token, CreateOutlineRequest request) {
|
||||
public Flux<Map<String, Object>> createOutline(CreateOutlineRequest request) {
|
||||
return this.webClient.post()
|
||||
.uri("/api/ppt/v2/generateContent")
|
||||
.header("token", token)
|
||||
.body(Mono.just(request), CreateOutlineRequest.class)
|
||||
.retrieve()
|
||||
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
|
||||
|
|
@ -202,10 +180,9 @@ public class WddPptApi {
|
|||
* @param request 请求体
|
||||
* @return 大纲内容流
|
||||
*/
|
||||
public Flux<Map<String, Object>> updateOutline(String token, UpdateOutlineRequest request) {
|
||||
public Flux<Map<String, Object>> updateOutline(UpdateOutlineRequest request) {
|
||||
return this.webClient.post()
|
||||
.uri("/api/ppt/v2/updateContent")
|
||||
.header("token", token)
|
||||
.body(Mono.just(request), UpdateOutlineRequest.class)
|
||||
.retrieve()
|
||||
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
|
||||
|
|
@ -218,11 +195,10 @@ public class WddPptApi {
|
|||
*
|
||||
* @return PPT信息
|
||||
*/
|
||||
public PptInfo create(String token, CreatePptRequest request) {
|
||||
public PptInfo create(PptCreateRequest request) {
|
||||
return this.webClient.post()
|
||||
.uri("/api/ppt/v2/generatePptx")
|
||||
.header("token", token)
|
||||
.body(Mono.just(request), CreatePptRequest.class)
|
||||
.body(Mono.just(request), PptCreateRequest.class)
|
||||
.retrieve()
|
||||
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
|
||||
.bodyToMono(ApiResponse.class)
|
||||
|
|
@ -236,7 +212,9 @@ public class WddPptApi {
|
|||
.block();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 创建 Token 请求参数
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record CreateTokenRequest(
|
||||
String apiKey,
|
||||
|
|
@ -258,7 +236,8 @@ public class WddPptApi {
|
|||
Integer code,
|
||||
String message,
|
||||
Map<String, Object> data
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建任务
|
||||
|
|
@ -268,7 +247,8 @@ public class WddPptApi {
|
|||
Integer type,
|
||||
String content,
|
||||
List<MultipartFile> files
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成大纲内容请求
|
||||
|
|
@ -281,7 +261,8 @@ public class WddPptApi {
|
|||
String audience,
|
||||
String lang,
|
||||
String prompt
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改大纲内容请求
|
||||
|
|
@ -291,20 +272,23 @@ public class WddPptApi {
|
|||
String id,
|
||||
String markdown,
|
||||
String question
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成 PPT 请求
|
||||
* 生成 PPT 请求参数
|
||||
*/
|
||||
// TODO @新：要不按照 PptCreateRequest 这样的风格
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record CreatePptRequest(
|
||||
public record PptCreateRequest(
|
||||
String id,
|
||||
String templateId,
|
||||
String markdown
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
// TODO @新：要不写下类注释
|
||||
/**
|
||||
* PPT 信息
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record PptInfo(
|
||||
String id,
|
||||
|
|
@ -323,9 +307,12 @@ public class WddPptApi {
|
|||
LocalDateTime createTime,
|
||||
String createUser,
|
||||
String updateUser
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
// TODO @新：要不写下类注释
|
||||
/**
|
||||
* 模板查询请求参数
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record TemplateQueryRequest(
|
||||
int page,
|
||||
|
|
@ -333,25 +320,33 @@ public class WddPptApi {
|
|||
Filter filters
|
||||
) {
|
||||
|
||||
/**
|
||||
* 模板查询过滤条件
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record Filter(
|
||||
int type,
|
||||
String category,
|
||||
String style,
|
||||
String themeColor
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// TODO @新：要不写下类注释
|
||||
/**
|
||||
* PPT模板分页信息
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record PagePptTemplateInfo(
|
||||
List<PptTemplateInfo> data,
|
||||
String total
|
||||
) {}
|
||||
) {
|
||||
}
|
||||
|
||||
|
||||
// TODO @新：要不写下类注释
|
||||
/**
|
||||
* PPT模板信息
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record PptTemplateInfo(
|
||||
String id,
|
||||
|
|
@ -380,6 +375,7 @@ public class WddPptApi {
|
|||
LocalDateTime createTime,
|
||||
String createUser,
|
||||
String updateUser
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,45 +1,44 @@
|
|||
package cn.iocoder.yudao.framework.ai.core.model.xinghuo.api;
|
||||
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.crypto.SecureUtil;
|
||||
import cn.hutool.crypto.digest.HmacAlgorithm;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import lombok.Builder;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
import org.springframework.http.HttpStatusCode;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.util.LinkedMultiValueMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.reactive.function.BodyInserters;
|
||||
import org.springframework.web.reactive.function.client.ClientResponse;
|
||||
import org.springframework.web.reactive.function.client.WebClient;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
// TODO @新：要不改成 XunFeiPptApi
|
||||
/**
|
||||
* 讯飞智能 PPT 生成 API
|
||||
*
|
||||
* @see <a href="https://www.xfyun.cn/doc/spark/PPTv2.html">智能 PPT 生成 API</a>
|
||||
*
|
||||
* @author xiaoxin
|
||||
* @see <a href="https://www.xfyun.cn/doc/spark/PPTv2.html">智能 PPT 生成 API</a>
|
||||
*/
|
||||
@Slf4j
|
||||
public class XunfeiPptApi {
|
||||
public class XunFeiPptApi {
|
||||
|
||||
public static final String BASE_URL = "https://zwapi.xfyun.cn/api/ppt/v2";
|
||||
private static final String HEADER_APP_ID = "appId";
|
||||
private static final String HEADER_TIMESTAMP = "timestamp";
|
||||
private static final String HEADER_SIGNATURE = "signature";
|
||||
|
||||
private final WebClient webClient;
|
||||
private final String appId;
|
||||
|
|
@ -49,18 +48,21 @@ public class XunfeiPptApi {
|
|||
|
||||
private final Function<Object, Function<ClientResponse, Mono<? extends Throwable>>> EXCEPTION_FUNCTION =
|
||||
reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> {
|
||||
log.error("[xunfei-ppt-api] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody);
|
||||
sink.error(new IllegalStateException("[xunfei-ppt-api] 调用失败！"));
|
||||
log.error("[XunFeiPptApi] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody);
|
||||
sink.error(new IllegalStateException("[XunFeiPptApi] 调用失败！"));
|
||||
});
|
||||
|
||||
// TODO @新：是不是不用 baseUrl 哈
|
||||
public XunfeiPptApi(String baseUrl, String appId, String apiSecret) {
|
||||
// TODO @新：建议，增加 defaultheaders，例如说 appid 之类的；或者每个请求，通过 headers customer 处理。
|
||||
this.webClient = WebClient.builder()
|
||||
.baseUrl(baseUrl)
|
||||
.build();
|
||||
public XunFeiPptApi(String appId, String apiSecret) {
|
||||
this.appId = appId;
|
||||
this.apiSecret = apiSecret;
|
||||
this.webClient = WebClient.builder()
|
||||
.baseUrl(BASE_URL)
|
||||
.defaultHeaders((headers) -> {
|
||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||
headers.add(HEADER_APP_ID, appId);
|
||||
})
|
||||
.build();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -72,7 +74,7 @@ public class XunfeiPptApi {
|
|||
long timestamp = System.currentTimeMillis() / 1000;
|
||||
String ts = String.valueOf(timestamp);
|
||||
String signature = generateSignature(appId, apiSecret, timestamp);
|
||||
return new SignatureInfo(appId, ts, signature);
|
||||
return new SignatureInfo(ts, signature);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -84,43 +86,8 @@ public class XunfeiPptApi {
|
|||
* @return 签名
|
||||
*/
|
||||
private String generateSignature(String appId, String apiSecret, long timestamp) {
|
||||
try {
|
||||
// TODO @新：使用 hutool 简化
|
||||
String auth = md5(appId + timestamp);
|
||||
return hmacSHA1Encrypt(auth, apiSecret);
|
||||
} catch (NoSuchAlgorithmException | InvalidKeyException e) {
|
||||
log.error("[xunfei-ppt-api] 生成签名失败", e);
|
||||
throw new IllegalStateException("[xunfei-ppt-api] 生成签名失败");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* HMAC SHA1 加密
|
||||
*/
|
||||
private String hmacSHA1Encrypt(String encryptText, String encryptKey)
|
||||
throws NoSuchAlgorithmException, InvalidKeyException {
|
||||
SecretKeySpec keySpec = new SecretKeySpec(
|
||||
encryptKey.getBytes(StandardCharsets.UTF_8), "HmacSHA1");
|
||||
|
||||
Mac mac = Mac.getInstance("HmacSHA1");
|
||||
mac.init(keySpec);
|
||||
byte[] result = mac.doFinal(encryptText.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
return Base64.getEncoder().encodeToString(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* MD5 哈希
|
||||
*/
|
||||
private String md5(String text) throws NoSuchAlgorithmException {
|
||||
MessageDigest md = MessageDigest.getInstance("MD5");
|
||||
byte[] digest = md.digest(text.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (byte b : digest) {
|
||||
sb.append(String.format("%02x", b));
|
||||
}
|
||||
return sb.toString();
|
||||
String auth = SecureUtil.md5(appId + timestamp);
|
||||
return SecureUtil.hmac(HmacAlgorithm.HmacSHA1, apiSecret).digestBase64(auth, false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -134,13 +101,11 @@ public class XunfeiPptApi {
|
|||
SignatureInfo signInfo = getSignature();
|
||||
Map<String, Object> requestBody = new HashMap<>();
|
||||
requestBody.put("style", style);
|
||||
// TODO @新：可以使用 ObjUtil.defaultIfNull
|
||||
requestBody.put("pageSize", pageSize != null ? pageSize : 10);
|
||||
requestBody.put("pageSize", ObjUtil.defaultIfNull(pageSize, 20));
|
||||
return this.webClient.post()
|
||||
.uri("/template/list")
|
||||
.header("appId", signInfo.appId)
|
||||
.header("timestamp", signInfo.timestamp)
|
||||
.header("signature", signInfo.signature)
|
||||
.header(HEADER_TIMESTAMP, signInfo.timestamp)
|
||||
.header(HEADER_SIGNATURE, signInfo.signature)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(requestBody)
|
||||
.retrieve()
|
||||
|
|
@ -161,9 +126,8 @@ public class XunfeiPptApi {
|
|||
formData.add("query", query);
|
||||
return this.webClient.post()
|
||||
.uri("/createOutline")
|
||||
.header("appId", signInfo.appId)
|
||||
.header("timestamp", signInfo.timestamp)
|
||||
.header("signature", signInfo.signature)
|
||||
.header(HEADER_TIMESTAMP, signInfo.timestamp)
|
||||
.header(HEADER_SIGNATURE, signInfo.signature)
|
||||
.contentType(MediaType.MULTIPART_FORM_DATA)
|
||||
.body(BodyInserters.fromMultipartData(formData))
|
||||
.retrieve()
|
||||
|
|
@ -207,12 +171,11 @@ public class XunfeiPptApi {
|
|||
*/
|
||||
public CreateResponse create(CreatePptRequest request) {
|
||||
SignatureInfo signInfo = getSignature();
|
||||
MultiValueMap<String, Object> formData = buildCreateFormData(request);
|
||||
MultiValueMap<String, Object> formData = buildCreatePptFormData(request);
|
||||
return this.webClient.post()
|
||||
.uri("/create")
|
||||
.header("appId", signInfo.appId)
|
||||
.header("timestamp", signInfo.timestamp)
|
||||
.header("signature", signInfo.signature)
|
||||
.header(HEADER_TIMESTAMP, signInfo.timestamp)
|
||||
.header(HEADER_SIGNATURE, signInfo.signature)
|
||||
.contentType(MediaType.MULTIPART_FORM_DATA)
|
||||
.body(BodyInserters.fromMultipartData(formData))
|
||||
.retrieve()
|
||||
|
|
@ -247,9 +210,8 @@ public class XunfeiPptApi {
|
|||
SignatureInfo signInfo = getSignature();
|
||||
return this.webClient.post()
|
||||
.uri("/createPptByOutline")
|
||||
.header("appId", signInfo.appId)
|
||||
.header("timestamp", signInfo.timestamp)
|
||||
.header("signature", signInfo.signature)
|
||||
.header(HEADER_TIMESTAMP, signInfo.timestamp)
|
||||
.header(HEADER_SIGNATURE, signInfo.signature)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(request)
|
||||
.retrieve()
|
||||
|
|
@ -271,9 +233,8 @@ public class XunfeiPptApi {
|
|||
.path("/progress")
|
||||
.queryParam("sid", sid)
|
||||
.build())
|
||||
.header("appId", signInfo.appId)
|
||||
.header("timestamp", signInfo.timestamp)
|
||||
.header("signature", signInfo.signature)
|
||||
.header(HEADER_TIMESTAMP, signInfo.timestamp)
|
||||
.header(HEADER_SIGNATURE, signInfo.signature)
|
||||
.retrieve()
|
||||
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(sid))
|
||||
.bodyToMono(ProgressResponse.class)
|
||||
|
|
@ -285,10 +246,10 @@ public class XunfeiPptApi {
|
|||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
private record SignatureInfo(
|
||||
String appId,
|
||||
String timestamp,
|
||||
String signature
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板列表响应
|
||||
|
|
@ -300,7 +261,8 @@ public class XunfeiPptApi {
|
|||
String desc,
|
||||
Integer count,
|
||||
TemplatePageData data
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板列表数据
|
||||
|
|
@ -310,7 +272,8 @@ public class XunfeiPptApi {
|
|||
String total,
|
||||
List<TemplateInfo> records,
|
||||
Integer pageNum
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板信息
|
||||
|
|
@ -324,7 +287,8 @@ public class XunfeiPptApi {
|
|||
String industry,
|
||||
String style,
|
||||
String detailImage
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建响应
|
||||
|
|
@ -336,7 +300,8 @@ public class XunfeiPptApi {
|
|||
String desc,
|
||||
Integer count,
|
||||
CreateResponseData data
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建响应数据
|
||||
|
|
@ -348,7 +313,8 @@ public class XunfeiPptApi {
|
|||
String title,
|
||||
String subTitle,
|
||||
OutlineData outline
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 大纲数据结构
|
||||
|
|
@ -375,7 +341,8 @@ public class XunfeiPptApi {
|
|||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
public record ChapterContent(
|
||||
String chapterTitle
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -397,7 +364,8 @@ public class XunfeiPptApi {
|
|||
int code,
|
||||
String desc,
|
||||
ProgressResponseData data
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 进度响应数据
|
||||
|
|
@ -407,13 +375,12 @@ public class XunfeiPptApi {
|
|||
int process,
|
||||
String pptId,
|
||||
String pptUrl,
|
||||
// TODO @新：字段注释，去掉
|
||||
String pptStatus, // PPT构建状态：building（构建中），done（已完成），build_failed（生成失败）
|
||||
String aiImageStatus, // ai配图状态：building（构建中），done（已完成）
|
||||
String cardNoteStatus, // 演讲备注状态：building（构建中），done（已完成）
|
||||
String errMsg, // 生成PPT的失败信息
|
||||
Integer totalPages, // 生成PPT的总页数
|
||||
Integer donePages // 生成PPT的完成页数
|
||||
String pptStatus,
|
||||
String aiImageStatus,
|
||||
String cardNoteStatus,
|
||||
String errMsg,
|
||||
Integer totalPages,
|
||||
Integer donePages
|
||||
) {
|
||||
|
||||
/**
|
||||
|
|
@ -454,6 +421,7 @@ public class XunfeiPptApi {
|
|||
* 通过大纲创建 PPT 请求参数
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
@Builder
|
||||
public record CreatePptByOutlineRequest(
|
||||
String query, // 用户生成PPT要求（最多8000字）
|
||||
String outlineSid, // 已生成大纲后，响应返回的请求大纲唯一id
|
||||
|
|
@ -469,109 +437,8 @@ public class XunfeiPptApi {
|
|||
Boolean isFigure, // 是否自动配图
|
||||
String aiImage // ai配图类型：normal、advanced
|
||||
) {
|
||||
|
||||
/**
|
||||
* 创建构建器
|
||||
*
|
||||
* @return 构建器
|
||||
*/
|
||||
public static Builder builder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
// TODO @新：这个可以用 lombok 简化么？
|
||||
/**
|
||||
* 构建器类
|
||||
*/
|
||||
public static class Builder {
|
||||
|
||||
private String query;
|
||||
private String outlineSid;
|
||||
private OutlineData outline;
|
||||
private String templateId;
|
||||
private String businessId;
|
||||
private String author;
|
||||
private Boolean isCardNote;
|
||||
private Boolean search;
|
||||
private String language;
|
||||
private String fileUrl;
|
||||
private String fileName;
|
||||
private Boolean isFigure;
|
||||
private String aiImage;
|
||||
|
||||
public Builder query(String query) {
|
||||
this.query = query;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder outlineSid(String outlineSid) {
|
||||
this.outlineSid = outlineSid;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder outline(OutlineData outline) {
|
||||
this.outline = outline;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder templateId(String templateId) {
|
||||
this.templateId = templateId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder businessId(String businessId) {
|
||||
this.businessId = businessId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder author(String author) {
|
||||
this.author = author;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder isCardNote(Boolean isCardNote) {
|
||||
this.isCardNote = isCardNote;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder search(Boolean search) {
|
||||
this.search = search;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder language(String language) {
|
||||
this.language = language;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder fileUrl(String fileUrl) {
|
||||
this.fileUrl = fileUrl;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder fileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder isFigure(Boolean isFigure) {
|
||||
this.isFigure = isFigure;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder aiImage(String aiImage) {
|
||||
this.aiImage = aiImage;
|
||||
return this;
|
||||
}
|
||||
|
||||
public CreatePptByOutlineRequest build() {
|
||||
return new CreatePptByOutlineRequest(
|
||||
query, outlineSid, outline, templateId, businessId, author,
|
||||
isCardNote, search, language, fileUrl, fileName, isFigure, aiImage
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建创建 PPT 的表单数据
|
||||
|
|
@ -579,12 +446,8 @@ public class XunfeiPptApi {
|
|||
* @param request 请求参数
|
||||
* @return 表单数据
|
||||
*/
|
||||
private MultiValueMap<String, Object> buildCreateFormData(CreatePptRequest request) {
|
||||
private MultiValueMap<String, Object> buildCreatePptFormData(CreatePptRequest request) {
|
||||
MultiValueMap<String, Object> formData = new LinkedMultiValueMap<>();
|
||||
// 添加请求参数
|
||||
if (request.query() != null) {
|
||||
formData.add("query", request.query());
|
||||
}
|
||||
if (request.file() != null) {
|
||||
try {
|
||||
formData.add("file", new ByteArrayResource(request.file().getBytes()) {
|
||||
|
|
@ -594,48 +457,51 @@ public class XunfeiPptApi {
|
|||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
log.error("[xunfei-ppt-api] 文件处理失败", e);
|
||||
throw new IllegalStateException("[xunfei-ppt-api] 文件处理失败", e);
|
||||
log.error("[XunFeiPptApi] 文件处理失败", e);
|
||||
throw new IllegalStateException("[XunFeiPptApi] 文件处理失败", e);
|
||||
}
|
||||
}
|
||||
// TODO @新：要不搞个 MapUtil.addIfPresent 方法？
|
||||
if (request.fileUrl() != null) {
|
||||
formData.add("fileUrl", request.fileUrl());
|
||||
}
|
||||
if (request.fileName() != null) {
|
||||
formData.add("fileName", request.fileName());
|
||||
}
|
||||
if (request.templateId() != null) {
|
||||
formData.add("templateId", request.templateId());
|
||||
}
|
||||
if (request.businessId() != null) {
|
||||
formData.add("businessId", request.businessId());
|
||||
}
|
||||
if (request.author() != null) {
|
||||
formData.add("author", request.author());
|
||||
}
|
||||
if (request.isCardNote() != null) {
|
||||
formData.add("isCardNote", request.isCardNote().toString());
|
||||
}
|
||||
if (request.search() != null) {
|
||||
formData.add("search", request.search().toString());
|
||||
}
|
||||
if (request.language() != null) {
|
||||
formData.add("language", request.language());
|
||||
}
|
||||
if (request.isFigure() != null) {
|
||||
formData.add("isFigure", request.isFigure().toString());
|
||||
}
|
||||
if (request.aiImage() != null) {
|
||||
formData.add("aiImage", request.aiImage());
|
||||
}
|
||||
Map<String, Object> param = new HashMap<>();
|
||||
addIfPresent(param, "query", request.query());
|
||||
addIfPresent(param, "fileUrl", request.fileUrl());
|
||||
addIfPresent(param, "fileName", request.fileName());
|
||||
addIfPresent(param, "templateId", request.templateId());
|
||||
addIfPresent(param, "businessId", request.businessId());
|
||||
addIfPresent(param, "author", request.author());
|
||||
addIfPresent(param, "isCardNote", request.isCardNote());
|
||||
addIfPresent(param, "search", request.search());
|
||||
addIfPresent(param, "language", request.language());
|
||||
addIfPresent(param, "isFigure", request.isFigure());
|
||||
addIfPresent(param, "aiImage", request.aiImage());
|
||||
param.forEach(formData::add);
|
||||
return formData;
|
||||
}
|
||||
|
||||
public static <K, V> void addIfPresent(Map<K, V> map, K key, V value) {
|
||||
if (ObjUtil.isNull(key) || ObjUtil.isNull(map)) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isPresent = false;
|
||||
if (ObjUtil.isNotNull(value)) {
|
||||
if (value instanceof String) {
|
||||
// 字符串：需要有实际内容
|
||||
isPresent = StringUtils.hasText((String) value);
|
||||
} else {
|
||||
// 其他类型：非 null 即视为存在
|
||||
isPresent = true;
|
||||
}
|
||||
}
|
||||
if (isPresent) {
|
||||
map.put(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 直接生成PPT请求参数
|
||||
*/
|
||||
@JsonInclude(value = JsonInclude.Include.NON_NULL)
|
||||
@Builder
|
||||
public record CreatePptRequest(
|
||||
String query, // 用户生成PPT要求（最多8000字）
|
||||
MultipartFile file, // 上传文件
|
||||
|
|
@ -651,109 +517,6 @@ public class XunfeiPptApi {
|
|||
String aiImage // ai配图类型：normal、advanced
|
||||
) {
|
||||
|
||||
/**
|
||||
* 创建构建器
|
||||
*
|
||||
* @return 构建器
|
||||
*/
|
||||
public static Builder builder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建器类
|
||||
*/
|
||||
public static class Builder {
|
||||
|
||||
private String query;
|
||||
private MultipartFile file;
|
||||
private String fileUrl;
|
||||
private String fileName;
|
||||
private String templateId;
|
||||
private String businessId;
|
||||
private String author;
|
||||
private Boolean isCardNote;
|
||||
private Boolean search;
|
||||
private String language;
|
||||
private Boolean isFigure;
|
||||
private String aiImage;
|
||||
|
||||
// TODO @新：这个可以用 lombok 简化么？
|
||||
|
||||
public Builder query(String query) {
|
||||
this.query = query;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder file(MultipartFile file) {
|
||||
this.file = file;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder fileUrl(String fileUrl) {
|
||||
this.fileUrl = fileUrl;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder fileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder templateId(String templateId) {
|
||||
this.templateId = templateId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder businessId(String businessId) {
|
||||
this.businessId = businessId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder author(String author) {
|
||||
this.author = author;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder isCardNote(Boolean isCardNote) {
|
||||
this.isCardNote = isCardNote;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder search(Boolean search) {
|
||||
this.search = search;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder language(String language) {
|
||||
this.language = language;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder isFigure(Boolean isFigure) {
|
||||
this.isFigure = isFigure;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder aiImage(String aiImage) {
|
||||
this.aiImage = aiImage;
|
||||
return this;
|
||||
}
|
||||
|
||||
public CreatePptRequest build() {
|
||||
// 验证参数
|
||||
if (query == null && file == null && fileUrl == null) {
|
||||
throw new IllegalArgumentException("query、file、fileUrl必填其一");
|
||||
}
|
||||
if ((file != null || fileUrl != null) && fileName == null) {
|
||||
throw new IllegalArgumentException("如果传file或者fileUrl，fileName必填");
|
||||
}
|
||||
return new CreatePptRequest(
|
||||
query, file, fileUrl, fileName, templateId, businessId, author,
|
||||
isCardNote, search, language, isFigure, aiImage
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
package cn.iocoder.yudao.framework.ai.mcp;
|
||||
|
||||
import cn.iocoder.yudao.framework.ai.core.model.doubao.DouBaoChatModel;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.ai.chat.client.ChatClient;
|
||||
import org.springframework.ai.openai.OpenAiChatModel;
|
||||
import org.springframework.ai.openai.OpenAiChatOptions;
|
||||
import org.springframework.ai.openai.api.OpenAiApi;
|
||||
import org.springframework.ai.tool.annotation.Tool;
|
||||
import org.springframework.ai.tool.method.MethodToolCallbackProvider;
|
||||
|
||||
public class DouBaoMcpTests {
|
||||
|
||||
private final OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
|
||||
.openAiApi(OpenAiApi.builder()
|
||||
.baseUrl(DouBaoChatModel.BASE_URL)
|
||||
.apiKey("5c1b5747-26d2-4ebd-a4e0-dd0e8d8b4272") // apiKey
|
||||
.build())
|
||||
.defaultOptions(OpenAiChatOptions.builder()
|
||||
.model("doubao-1-5-lite-32k-250115") // 模型（doubao）
|
||||
.temperature(0.7)
|
||||
.build())
|
||||
.build();
|
||||
|
||||
private final DouBaoChatModel chatModel = new DouBaoChatModel(openAiChatModel);
|
||||
|
||||
private final MethodToolCallbackProvider provider = MethodToolCallbackProvider.builder()
|
||||
.toolObjects(new UserService())
|
||||
.build();
|
||||
|
||||
private final ChatClient chatClient = ChatClient.builder(chatModel)
|
||||
.defaultTools(provider)
|
||||
.build();
|
||||
|
||||
@Test
|
||||
public void testMcpGetUserInfo() {
|
||||
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("目前有哪些工具可以使用")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("小新的年龄是多少")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("获取小新的基本信息")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("小新是什么职业的")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("小新的教育背景")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
// 打印结果
|
||||
System.out.println(chatClient.prompt()
|
||||
.user("小新的兴趣爱好是什么")
|
||||
.call()
|
||||
.content());
|
||||
System.out.println("====================================");
|
||||
|
||||
}
|
||||
|
||||
|
||||
static class UserService {
|
||||
|
||||
@Tool(name = "getUserAge", description = "获取用户年龄")
|
||||
public String getUserAge(String userName) {
|
||||
return "《" + userName + "》的年龄为：18";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserSex", description = "获取用户性别")
|
||||
public String getUserSex(String userName) {
|
||||
return "《" + userName + "》的性别为：男";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserBasicInfo", description = "获取用户基本信息，包括姓名、年龄、性别等")
|
||||
public String getUserBasicInfo(String userName) {
|
||||
return "《" + userName + "》的基本信息：\n姓名：" + userName + "\n年龄：18\n性别：男\n身高：175cm\n体重：65kg";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserContact", description = "获取用户联系方式，包括电话、邮箱等")
|
||||
public String getUserContact(String userName) {
|
||||
return "《" + userName + "》的联系方式：\n电话：138****1234\n邮箱：" + userName.toLowerCase() + "@example.com\nQQ：123456789";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserAddress", description = "获取用户地址信息")
|
||||
public String getUserAddress(String userName) {
|
||||
return "《" + userName + "》的地址信息：北京市朝阳区科技园区88号";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserJob", description = "获取用户职业信息")
|
||||
public String getUserJob(String userName) {
|
||||
return "《" + userName + "》的职业信息：软件工程师，就职于ABC科技有限公司，工作年限5年";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserHobbies", description = "获取用户兴趣爱好")
|
||||
public String getUserHobbies(String userName) {
|
||||
return "《" + userName + "》的兴趣爱好：编程、阅读、旅游、摄影、打篮球";
|
||||
}
|
||||
|
||||
@Tool(name = "getUserEducation", description = "获取用户教育背景")
|
||||
public String getUserEducation(String userName) {
|
||||
return "《" + userName + "》的教育背景：\n本科：计算机科学与技术专业，北京大学\n硕士：软件工程专业，清华大学";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.ai.ppt.wdd;
|
||||
|
||||
import cn.iocoder.yudao.framework.ai.core.model.wenduoduo.api.WddPptApi;
|
||||
import cn.iocoder.yudao.framework.ai.core.model.wenduoduo.api.WenDuoDuoPptApi;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -10,24 +10,23 @@ import java.util.Map;
|
|||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* {@link WddPptApi} 集成测试
|
||||
* {@link WenDuoDuoPptApi} 集成测试
|
||||
*
|
||||
* @author xiaoxin
|
||||
*/
|
||||
public class WddPptApiTests {
|
||||
|
||||
private final WddPptApi wddPptApi = new WddPptApi("https://docmee.cn");
|
||||
public class WenDuoDuoPptApiTests {
|
||||
|
||||
private final String token = ""; // API Token
|
||||
private final WenDuoDuoPptApi wenDuoDuoPptApi = new WenDuoDuoPptApi(token);
|
||||
|
||||
@Test
|
||||
@Disabled
|
||||
public void testCreateApiToken() {
|
||||
// 准备参数
|
||||
String apiKey = "";
|
||||
WddPptApi.CreateTokenRequest request = new WddPptApi.CreateTokenRequest(apiKey);
|
||||
WenDuoDuoPptApi.CreateTokenRequest request = new WenDuoDuoPptApi.CreateTokenRequest(apiKey);
|
||||
// 调用方法
|
||||
String token = wddPptApi.createApiToken(request);
|
||||
String token = wenDuoDuoPptApi.createApiToken(request);
|
||||
// 打印结果
|
||||
System.out.println(token);
|
||||
}
|
||||
|
|
@ -38,7 +37,7 @@ public class WddPptApiTests {
|
|||
@Test
|
||||
@Disabled
|
||||
public void testCreateTask() {
|
||||
WddPptApi.ApiResponse apiResponse = wddPptApi.createTask(token, 1, "dify 介绍", null);
|
||||
WenDuoDuoPptApi.ApiResponse apiResponse = wenDuoDuoPptApi.createTask(1, "dify 介绍", null);
|
||||
System.out.println(apiResponse);
|
||||
}
|
||||
|
||||
|
|
@ -46,10 +45,10 @@ public class WddPptApiTests {
|
|||
@Test // 创建大纲
|
||||
@Disabled
|
||||
public void testGenerateOutlineRequest() {
|
||||
WddPptApi.CreateOutlineRequest request = new WddPptApi.CreateOutlineRequest(
|
||||
WenDuoDuoPptApi.CreateOutlineRequest request = new WenDuoDuoPptApi.CreateOutlineRequest(
|
||||
"1901539019628613632", "medium", null, null, null, null);
|
||||
// 调用
|
||||
Flux<Map<String, Object>> flux = wddPptApi.createOutline(token, request);
|
||||
Flux<Map<String, Object>> flux = wenDuoDuoPptApi.createOutline(request);
|
||||
StringBuffer contentBuffer = new StringBuffer();
|
||||
flux.doOnNext(chunk -> {
|
||||
contentBuffer.append(chunk.get("text"));
|
||||
|
|
@ -69,10 +68,10 @@ public class WddPptApiTests {
|
|||
@Test
|
||||
@Disabled
|
||||
public void testUpdateOutlineRequest() {
|
||||
WddPptApi.UpdateOutlineRequest request = new WddPptApi.UpdateOutlineRequest(
|
||||
WenDuoDuoPptApi.UpdateOutlineRequest request = new WenDuoDuoPptApi.UpdateOutlineRequest(
|
||||
"1901539019628613632", TEST_OUT_LINE_CONTENT, "精简一点，三个章节即可");
|
||||
// 调用
|
||||
Flux<Map<String, Object>> flux = wddPptApi.updateOutline(token, request);
|
||||
Flux<Map<String, Object>> flux = wenDuoDuoPptApi.updateOutline(request);
|
||||
StringBuffer contentBuffer = new StringBuffer();
|
||||
flux.doOnNext(chunk -> {
|
||||
contentBuffer.append(chunk.get("text"));
|
||||
|
|
@ -94,11 +93,11 @@ public class WddPptApiTests {
|
|||
@Disabled
|
||||
public void testGetPptTemplatePage() {
|
||||
// 准备参数
|
||||
WddPptApi.TemplateQueryRequest.Filter filter = new WddPptApi.TemplateQueryRequest.Filter(
|
||||
WenDuoDuoPptApi.TemplateQueryRequest.Filter filter = new WenDuoDuoPptApi.TemplateQueryRequest.Filter(
|
||||
1, null, null, null);
|
||||
WddPptApi.TemplateQueryRequest request = new WddPptApi.TemplateQueryRequest(1, 10, filter);
|
||||
WenDuoDuoPptApi.TemplateQueryRequest request = new WenDuoDuoPptApi.TemplateQueryRequest(1, 10, filter);
|
||||
// 调用
|
||||
WddPptApi.PagePptTemplateInfo pptTemplatePage = wddPptApi.getTemplatePage(token, request);
|
||||
WenDuoDuoPptApi.PagePptTemplateInfo pptTemplatePage = wenDuoDuoPptApi.getTemplatePage(request);
|
||||
// 打印结果
|
||||
System.out.println(pptTemplatePage);
|
||||
}
|
||||
|
|
@ -110,9 +109,9 @@ public class WddPptApiTests {
|
|||
@Disabled
|
||||
public void testGeneratePptx() {
|
||||
// 准备参数
|
||||
WddPptApi.CreatePptRequest request = new WddPptApi.CreatePptRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
|
||||
WenDuoDuoPptApi.PptCreateRequest request = new WenDuoDuoPptApi.PptCreateRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
|
||||
// 调用
|
||||
WddPptApi.PptInfo pptInfo = wddPptApi.create(token, request);
|
||||
WenDuoDuoPptApi.PptInfo pptInfo = wenDuoDuoPptApi.create(request);
|
||||
// 打印结果
|
||||
System.out.println(pptInfo);
|
||||
}
|
||||
|
|
@ -309,6 +308,7 @@ public class WddPptApiTests {
|
|||
#### 7.2.2 合作共赢
|
||||
期待与更多的企业和机构合作，共同推动AI技术的应用。
|
||||
#### 7.2.3 共创未来
|
||||
让我们一起用AI技术改变世界，共创美好未来。""";
|
||||
让我们一起用AI技术改变世界，共创美好未来。
|
||||
""";
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.ai.ppt.xunfei;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.iocoder.yudao.framework.ai.core.model.xinghuo.api.XunfeiPptApi;
|
||||
import cn.iocoder.yudao.framework.ai.core.model.xinghuo.api.XunFeiPptApi;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -11,17 +11,17 @@ import org.springframework.web.multipart.MultipartFile;
|
|||
import java.io.File;
|
||||
|
||||
/**
|
||||
* {@link XunfeiPptApi} 集成测试
|
||||
* {@link XunFeiPptApi} 集成测试
|
||||
*
|
||||
* @author xiaoxin
|
||||
*/
|
||||
public class XunfeiPptApiTests {
|
||||
public class XunFeiPptApiTests {
|
||||
|
||||
// 讯飞 API 配置信息，实际使用时请替换为您的应用信息
|
||||
private static final String APP_ID = "";
|
||||
private static final String API_SECRET = "";
|
||||
private static final String APP_ID = "6c8ac023";
|
||||
private static final String API_SECRET = "Y2RjM2Q1MWJjZTdkYmFiODc0OGE5NmRk";
|
||||
|
||||
private final XunfeiPptApi xunfeiPptApi = new XunfeiPptApi(XunfeiPptApi.BASE_URL, APP_ID, API_SECRET);
|
||||
private final XunFeiPptApi xunfeiPptApi = new XunFeiPptApi(APP_ID, API_SECRET);
|
||||
|
||||
/**
|
||||
* 获取 PPT 模板列表
|
||||
|
|
@ -30,7 +30,7 @@ public class XunfeiPptApiTests {
|
|||
@Disabled
|
||||
public void testGetTemplatePage() {
|
||||
// 调用方法
|
||||
XunfeiPptApi.TemplatePageResponse response = xunfeiPptApi.getTemplatePage("商务", 10);
|
||||
XunFeiPptApi.TemplatePageResponse response = xunfeiPptApi.getTemplatePage("商务", 10);
|
||||
// 打印结果
|
||||
System.out.println("模板列表响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ public class XunfeiPptApiTests {
|
|||
|
||||
// 打印第一个模板的信息（如果存在）
|
||||
if (!response.data().records().isEmpty()) {
|
||||
XunfeiPptApi.TemplateInfo firstTemplate = response.data().records().get(0);
|
||||
XunFeiPptApi.TemplateInfo firstTemplate = response.data().records().get(0);
|
||||
System.out.println("模板ID：" + firstTemplate.templateIndexId());
|
||||
System.out.println("模板风格：" + firstTemplate.style());
|
||||
System.out.println("模板颜色：" + firstTemplate.color());
|
||||
|
|
@ -56,7 +56,7 @@ public class XunfeiPptApiTests {
|
|||
@Test
|
||||
@Disabled
|
||||
public void testCreateOutline() {
|
||||
XunfeiPptApi.CreateResponse response = getCreateResponse();
|
||||
XunFeiPptApi.CreateResponse response = getCreateResponse();
|
||||
// 打印结果
|
||||
System.out.println("创建大纲响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -75,9 +75,10 @@ public class XunfeiPptApiTests {
|
|||
|
||||
/**
|
||||
* 创建大纲（通过文本）
|
||||
*
|
||||
* @return 创建大纲响应
|
||||
*/
|
||||
private XunfeiPptApi.CreateResponse getCreateResponse() {
|
||||
private XunFeiPptApi.CreateResponse getCreateResponse() {
|
||||
String param = "智能体平台 Dify 介绍";
|
||||
return xunfeiPptApi.createOutline(param);
|
||||
}
|
||||
|
|
@ -89,9 +90,9 @@ public class XunfeiPptApiTests {
|
|||
@Disabled
|
||||
public void testCreatePptByOutlineWithFullParams() {
|
||||
// 创建大纲对象
|
||||
XunfeiPptApi.CreateResponse createResponse = getCreateResponse();
|
||||
XunFeiPptApi.CreateResponse createResponse = getCreateResponse();
|
||||
// 调用方法
|
||||
XunfeiPptApi.CreateResponse response = xunfeiPptApi.createPptByOutline(createResponse.data().outline(), "精简一些，不要超过6个章节");
|
||||
XunFeiPptApi.CreateResponse response = xunfeiPptApi.createPptByOutline(createResponse.data().outline(), "精简一些，不要超过6个章节");
|
||||
// 打印结果
|
||||
System.out.println("通过大纲创建 PPT 响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -114,13 +115,13 @@ public class XunfeiPptApiTests {
|
|||
String sid = "e96dac09f2ec4ee289f029a5fb874ecd"; // 替换为实际的sid
|
||||
|
||||
// 调用方法
|
||||
XunfeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
|
||||
XunFeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
|
||||
// 打印结果
|
||||
System.out.println("检查进度响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
// 安全地访问响应数据
|
||||
if (response != null && response.data() != null) {
|
||||
XunfeiPptApi.ProgressResponseData data = response.data();
|
||||
XunFeiPptApi.ProgressResponseData data = response.data();
|
||||
|
||||
// 打印PPT生成状态
|
||||
System.out.println("PPT 构建状态: " + data.pptStatus());
|
||||
|
|
@ -160,7 +161,7 @@ public class XunfeiPptApiTests {
|
|||
@Disabled
|
||||
public void testPollCheckProgress() throws InterruptedException {
|
||||
// 准备参数 - 使用之前创建 PP T时返回的 sid
|
||||
String sid = "fa36e926f2ed434987fcb4c1f0776ffb"; // 替换为实际的sid
|
||||
String sid = "1690ef6ee0344e72b5c5434f403b8eaa"; // 替换为实际的sid
|
||||
|
||||
// 最大轮询次数
|
||||
int maxPolls = 20;
|
||||
|
|
@ -171,11 +172,11 @@ public class XunfeiPptApiTests {
|
|||
System.out.println("第" + (i + 1) + "次查询进度...");
|
||||
|
||||
// 调用方法
|
||||
XunfeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
|
||||
XunFeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
|
||||
|
||||
// 安全地访问响应数据
|
||||
if (response != null && response.data() != null) {
|
||||
XunfeiPptApi.ProgressResponseData data = response.data();
|
||||
XunFeiPptApi.ProgressResponseData data = response.data();
|
||||
|
||||
// 打印进度信息
|
||||
System.out.println("PPT 构建状态: " + data.pptStatus());
|
||||
|
|
@ -218,7 +219,7 @@ public class XunfeiPptApiTests {
|
|||
String query = "合肥天气趋势分析，包括近5年的气温变化、降水量变化、极端天气事件，以及对城市生活的影响";
|
||||
|
||||
// 调用方法
|
||||
XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(query);
|
||||
XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(query);
|
||||
// 打印结果
|
||||
System.out.println("直接创建 PPT 响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -244,7 +245,7 @@ public class XunfeiPptApiTests {
|
|||
MultipartFile multipartFile = convertFileToMultipartFile(file);
|
||||
|
||||
// 调用方法
|
||||
XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(multipartFile, file.getName());
|
||||
XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(multipartFile, file.getName());
|
||||
// 打印结果
|
||||
System.out.println("通过文件创建PPT响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -269,7 +270,7 @@ public class XunfeiPptApiTests {
|
|||
String query = "合肥天气趋势分析，包括近 5 年的气温变化、降水量变化、极端天气事件，以及对城市生活的影响";
|
||||
|
||||
// 创建请求对象
|
||||
XunfeiPptApi.CreatePptRequest request = XunfeiPptApi.CreatePptRequest.builder()
|
||||
XunFeiPptApi.CreatePptRequest request = XunFeiPptApi.CreatePptRequest.builder()
|
||||
.query(query)
|
||||
.language("cn")
|
||||
.isCardNote(true)
|
||||
|
|
@ -280,7 +281,7 @@ public class XunfeiPptApiTests {
|
|||
.build();
|
||||
|
||||
// 调用方法
|
||||
XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(request);
|
||||
XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(request);
|
||||
// 打印结果
|
||||
System.out.println("使用完整参数创建 PPT 响应：" + JsonUtils.toJsonString(response));
|
||||
|
||||
|
|
@ -296,9 +297,9 @@ public class XunfeiPptApiTests {
|
|||
|
||||
// 立即查询一次进度
|
||||
System.out.println("立即查询进度...");
|
||||
XunfeiPptApi.ProgressResponse progressResponse = xunfeiPptApi.checkProgress(sid);
|
||||
XunFeiPptApi.ProgressResponse progressResponse = xunfeiPptApi.checkProgress(sid);
|
||||
if (progressResponse != null && progressResponse.data() != null) {
|
||||
XunfeiPptApi.ProgressResponseData progressData = progressResponse.data();
|
||||
XunFeiPptApi.ProgressResponseData progressData = progressResponse.data();
|
||||
System.out.println("PPT 构建状态: " + progressData.pptStatus());
|
||||
if (progressData.totalPages() != null && progressData.donePages() != null) {
|
||||
System.out.println("完成进度: " + progressData.donePages() + "/" + progressData.totalPages()
|
||||
|
|
@ -10,6 +10,8 @@ import javax.annotation.Resource;
|
|||
import java.time.Duration;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.hutool.core.date.DatePattern.*;
|
||||
|
||||
/**
|
||||
* BPM 流程 Id 编码的 Redis DAO
|
||||
*
|
||||
|
|
@ -32,16 +34,16 @@ public class BpmProcessIdRedisDAO {
|
|||
String infix = "";
|
||||
switch (processIdRule.getInfix()) {
|
||||
case "DAY":
|
||||
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDD");
|
||||
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN);
|
||||
break;
|
||||
case "HOUR":
|
||||
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHH");
|
||||
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HH");
|
||||
break;
|
||||
case "MINUTE":
|
||||
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmm");
|
||||
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HHmm");
|
||||
break;
|
||||
case "SECOND":
|
||||
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmmss");
|
||||
infix = DateUtil.format(LocalDateTime.now(), PURE_DATETIME_PATTERN);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import org.flowable.engine.runtime.ProcessInstance;
|
|||
import org.flowable.task.service.delegate.DelegateTask;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ import lombok.Getter;
|
|||
@Getter
|
||||
public enum CodegenFrontTypeEnum {
|
||||
|
||||
VUE2(10), // Vue2 Element UI 标准模版
|
||||
VUE3(20), // Vue3 Element Plus 标准模版
|
||||
VUE3_VBEN(30), // Vue3 VBEN 模版
|
||||
VUE2_ELEMENT_UI(10), // Vue2 Element UI 标准模版
|
||||
VUE3_ELEMENT_PLUS(20), // Vue3 Element Plus 标准模版
|
||||
VUE3_VBEN2_ANTD_SCHEMA(30), // Vue3 VBEN2 + ANTD + Schema 模版
|
||||
VUE3_VBEN5_ANTD_SCHEMA(40), // Vue3 VBEN5 + ANTD + schema 模版
|
||||
;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -101,49 +101,68 @@ public class CodegenEngine {
|
|||
* value：生成的路径
|
||||
*/
|
||||
private static final Table<Integer, String, String> FRONT_TEMPLATES = ImmutableTable.<Integer, String, String>builder()
|
||||
// Vue2 标准模版
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/index.vue"),
|
||||
// VUE2_ELEMENT_UI
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/index.vue"),
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("api/api.js"),
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("api/api.js"),
|
||||
vueFilePath("api/${table.moduleName}/${table.businessName}/index.js"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/form.vue"),
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/form.vue"),
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
|
||||
// Vue3 标准模版
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
|
||||
// VUE3_ELEMENT_PLUS
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/index.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/form.vue"),
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/form.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
|
||||
.put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("api/api.ts"),
|
||||
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
|
||||
// Vue3 vben 模版
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/data.ts"),
|
||||
// VUE3_VBEN2_ANTD_SCHEMA
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/data.ts"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/${classNameVar}.data.ts"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/index.vue"),
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/index.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/form.vue"),
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/form.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Modal.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("api/api.ts"),
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("api/api.ts"),
|
||||
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
|
||||
// VUE3_VBEN5_ANTD_SCHEMA
|
||||
// TODO @puhui999：目录改成 vue3_vben5_antd；然后里面有 schema（目前我们在写的）和 general（你微信里提的，原生的，感觉也要搞！）
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/data.ts"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/index.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/form.vue"),
|
||||
vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
|
||||
.put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("api/api.ts"),
|
||||
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
|
||||
// 主子表模板配置 - Vue3 vben5 schema 模版
|
||||
//.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/master_slave_data.ts"),
|
||||
// vue3FilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
|
||||
//.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/master_slave_index.vue"),
|
||||
// vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
|
||||
//.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/modules/master_slave_form.vue"),
|
||||
// vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
|
||||
//.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/modules/sub_table.vue"),
|
||||
// vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/sub_table.vue"))
|
||||
.build();
|
||||
|
||||
@Resource
|
||||
|
|
@ -496,6 +515,10 @@ public class CodegenEngine {
|
|||
return "codegen/vue3_vben/" + path + ".vm";
|
||||
}
|
||||
|
||||
private static String vue3VbenNextSchemaTemplatePath(String path) {
|
||||
return "codegen/vue3_vben_next/schema/" + path + ".vm";
|
||||
}
|
||||
|
||||
private static boolean isSubTemplate(String path) {
|
||||
return path.contains("_sub");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
import type { PageParam, PageResult } from '@vben/request';
|
||||
|
||||
import { requestClient } from '#/api/request';
|
||||
#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
|
||||
|
||||
export namespace ${simpleClassName}Api {
|
||||
/** ${table.classComment}信息 */
|
||||
export interface ${simpleClassName} {
|
||||
#foreach ($column in $columns)
|
||||
#if ($column.createOperation || $column.updateOperation)
|
||||
#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "short" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
|
||||
${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: number; // ${column.columnComment}
|
||||
#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate" || ${column.javaType.toLowerCase()} == "localdatetime")
|
||||
${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: Date; // ${column.columnComment}
|
||||
#else
|
||||
${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: ${column.javaType.toLowerCase()}; // ${column.columnComment}
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
#if ( $table.templateType == 2 )
|
||||
children?: ${simpleClassName}[];
|
||||
#end
|
||||
}
|
||||
}
|
||||
|
||||
#if ( $table.templateType != 2 )
|
||||
/** 查询${table.classComment}分页 */
|
||||
export function get${simpleClassName}Page(params: PageParam) {
|
||||
return requestClient.get<PageResult<${simpleClassName}Api.${simpleClassName}>>('${baseURL}/page', { params });
|
||||
}
|
||||
#else
|
||||
/** 查询${table.classComment}列表 */
|
||||
export function get${simpleClassName}List(params: any) {
|
||||
return requestClient.get<${simpleClassName}Api.${simpleClassName}[]>('${baseURL}/list', { params });
|
||||
}
|
||||
#end
|
||||
|
||||
/** 查询${table.classComment}详情 */
|
||||
export function get${simpleClassName}(id: number) {
|
||||
return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/get?id=${id}`);
|
||||
}
|
||||
|
||||
/** 新增${table.classComment} */
|
||||
export function create${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
|
||||
return requestClient.post('${baseURL}/create', data);
|
||||
}
|
||||
|
||||
/** 修改${table.classComment} */
|
||||
export function update${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
|
||||
return requestClient.put('${baseURL}/update', data);
|
||||
}
|
||||
|
||||
/** 删除${table.classComment} */
|
||||
export function delete${simpleClassName}(id: number) {
|
||||
return requestClient.delete(`${baseURL}/delete?id=${id}`);
|
||||
}
|
||||
|
||||
/** 导出${table.classComment} */
|
||||
export function export${simpleClassName}(params: any) {
|
||||
return requestClient.download('${baseURL}/export-excel', params);
|
||||
}
|
||||
|
||||
## 特殊：主子表专属逻辑
|
||||
#foreach ($subTable in $subTables)
|
||||
#set ($index = $foreach.count - 1)
|
||||
#set ($subSimpleClassName = $subSimpleClassNames.get($index))
|
||||
#set ($subPrimaryColumn = $subPrimaryColumns.get($index))##当前 primary 字段
|
||||
#set ($subJoinColumn = $subJoinColumns.get($index))##当前 join 字段
|
||||
#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
|
||||
#set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
|
||||
#set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
|
||||
#set ($subClassNameVar = $subClassNameVars.get($index))
|
||||
|
||||
// ==================== 子表（$subTable.classComment） ====================
|
||||
## 情况一：MASTER_ERP 时，需要分查询页子表
|
||||
#if ( $table.templateType == 11 )
|
||||
/** 获得${subTable.classComment}分页 */
|
||||
export function get${subSimpleClassName}Page(params: PageParam) {
|
||||
return requestClient.get<PageResult<${simpleClassName}Api.${simpleClassName}>>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params });
|
||||
}
|
||||
## 情况二：非 MASTER_ERP 时，需要列表查询子表
|
||||
#else
|
||||
#if ( $subTable.subJoinMany )
|
||||
/** 获得${subTable.classComment}列表 */
|
||||
export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
|
||||
return requestClient.get<${simpleClassName}Api.${simpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
|
||||
}
|
||||
#else
|
||||
/** 获得${subTable.classComment} */
|
||||
export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
|
||||
return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
|
||||
}
|
||||
#end
|
||||
#end
|
||||
## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
|
||||
#if ( $table.templateType == 11 )
|
||||
/** 新增${subTable.classComment} */
|
||||
export function create${subSimpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
|
||||
return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data);
|
||||
}
|
||||
|
||||
/** 修改${subTable.classComment} */
|
||||
export function update${subSimpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
|
||||
return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data);
|
||||
}
|
||||
|
||||
/** 删除${subTable.classComment} */
|
||||
export function delete${subSimpleClassName}(id: number) {
|
||||
return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`);
|
||||
}
|
||||
|
||||
/** 获得${subTable.classComment} */
|
||||
export function get${subSimpleClassName}(id: number) {
|
||||
return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`);
|
||||
}
|
||||
#end
|
||||
#end
|
||||
|
||||
|
|
@ -0,0 +1,276 @@
|
|||
import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
|
||||
import type { VbenFormSchema } from '#/adapter/form';
|
||||
import type { OnActionClickFn } from '#/adapter/vxe-table';
|
||||
import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
|
||||
import { z } from '#/adapter/form';
|
||||
#if(${table.templateType} == 2)## 树表需要导入这些
|
||||
import { get${simpleClassName}List } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
import { handleTree } from '#/utils/tree';
|
||||
#end
|
||||
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
|
||||
import { useAccess } from '@vben/access';
|
||||
|
||||
const { hasAccessByCodes } = useAccess();
|
||||
|
||||
/** 新增/修改的表单 */
|
||||
export function useFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
{
|
||||
fieldName: 'id',
|
||||
component: 'Input',
|
||||
dependencies: {
|
||||
triggerFields: [''],
|
||||
show: () => false,
|
||||
},
|
||||
},
|
||||
#if(${table.templateType} == 2)## 树表特有字段：上级
|
||||
{
|
||||
fieldName: '${treeParentColumn.javaField}',
|
||||
label: '上级${table.classComment}',
|
||||
component: 'ApiTreeSelect',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
api: async () => {
|
||||
const data = await get${simpleClassName}List({});
|
||||
data.unshift({
|
||||
id: 0,
|
||||
${treeNameColumn.javaField}: '顶级${table.classComment}',
|
||||
});
|
||||
return handleTree(data);
|
||||
},
|
||||
class: 'w-full',
|
||||
labelField: '${treeNameColumn.javaField}',
|
||||
valueField: 'id',
|
||||
childrenField: 'children',
|
||||
placeholder: '请选择上级${table.classComment}',
|
||||
treeDefaultExpandAll: true,
|
||||
},
|
||||
rules: 'selectRequired',
|
||||
},
|
||||
#end
|
||||
#foreach($column in $columns)
|
||||
#if ($column.createOperation || $column.updateOperation)
|
||||
#if (!$column.primaryKey && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
|
||||
#set ($dictType = $column.dictType)
|
||||
#set ($javaType = $column.javaType)
|
||||
#set ($javaField = $column.javaField)
|
||||
#set ($comment = $column.columnComment)
|
||||
#if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
|
||||
#set ($dictMethod = "number")
|
||||
#elseif ($javaType == "String")
|
||||
#set ($dictMethod = "string")
|
||||
#elseif ($javaType == "Boolean")
|
||||
#set ($dictMethod = "boolean")
|
||||
#end
|
||||
{
|
||||
fieldName: '${javaField}',
|
||||
label: '${comment}',
|
||||
#if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
|
||||
rules: 'required',
|
||||
#end
|
||||
#if ($column.htmlType == "input")
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
placeholder: '请输入${comment}',
|
||||
},
|
||||
#elseif($column.htmlType == "imageUpload")## 图片上传
|
||||
component: 'FileUpload',
|
||||
componentProps: {
|
||||
fileType: 'image',
|
||||
maxCount: 1,
|
||||
},
|
||||
#elseif($column.htmlType == "fileUpload")## 文件上传
|
||||
component: 'FileUpload',
|
||||
componentProps: {
|
||||
fileType: 'file',
|
||||
maxCount: 1,
|
||||
},
|
||||
#elseif($column.htmlType == "editor")## 文本编辑器
|
||||
component: 'Editor',
|
||||
#elseif($column.htmlType == "select")## 下拉框
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
#if ("" != $dictType)## 有数据字典
|
||||
options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
|
||||
#else##没数据字典
|
||||
options: [],
|
||||
#end
|
||||
placeholder: '请选择${comment}',
|
||||
class: 'w-full',
|
||||
},
|
||||
#elseif($column.htmlType == "checkbox")## 多选框
|
||||
component: 'Checkbox',
|
||||
componentProps: {
|
||||
#if ("" != $dictType)## 有数据字典
|
||||
options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
|
||||
#else##没数据字典
|
||||
options: [],
|
||||
#end
|
||||
},
|
||||
#elseif($column.htmlType == "radio")## 单选框
|
||||
component: 'RadioGroup',
|
||||
componentProps: {
|
||||
#if ("" != $dictType)## 有数据字典
|
||||
options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
|
||||
#else##没数据字典
|
||||
options: [],
|
||||
#end
|
||||
buttonStyle: 'solid',
|
||||
optionType: 'button',
|
||||
},
|
||||
#elseif($column.htmlType == "datetime")## 时间框
|
||||
component: 'DatePicker',
|
||||
componentProps: {
|
||||
showTime: true,
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'x',
|
||||
},
|
||||
#elseif($column.htmlType == "textarea")## 文本域
|
||||
component: 'Textarea',
|
||||
componentProps: {
|
||||
placeholder: '请输入${comment}',
|
||||
},
|
||||
#elseif($column.htmlType == "inputNumber")## 数字输入框
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
min: 0,
|
||||
class: 'w-full',
|
||||
controlsPosition: 'right',
|
||||
placeholder: '请输入${comment}',
|
||||
},
|
||||
#end
|
||||
},
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
];
|
||||
}
|
||||
|
||||
/** 列表的搜索表单 */
|
||||
export function useGridFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
#foreach($column in $columns)
|
||||
#if ($column.listOperation)
|
||||
#set ($dictType = $column.dictType)
|
||||
#set ($javaType = $column.javaType)
|
||||
#set ($javaField = $column.javaField)
|
||||
#set ($comment = $column.columnComment)
|
||||
#if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
|
||||
#set ($dictMethod = "number")
|
||||
#elseif ($javaType == "String")
|
||||
#set ($dictMethod = "string")
|
||||
#elseif ($javaType == "Boolean")
|
||||
#set ($dictMethod = "boolean")
|
||||
#end
|
||||
{
|
||||
fieldName: '${javaField}',
|
||||
label: '${comment}',
|
||||
#if ($column.htmlType == "input")
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
placeholder: '请输入${comment}',
|
||||
},
|
||||
#elseif ($column.htmlType == "select")
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
#if ("" != $dictType)## 设置了 dictType 数据字典的情况
|
||||
options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
|
||||
#else## 未设置 dictType 数据字典的情况
|
||||
options: [],
|
||||
#end
|
||||
placeholder: '请选择${comment}',
|
||||
},
|
||||
#elseif ($column.htmlType == "radio")
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
#if ("" != $dictType)## 设置了 dictType 数据字典的情况
|
||||
options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
|
||||
#else## 未设置 dictType 数据字典的情况
|
||||
options: [],
|
||||
#end
|
||||
},
|
||||
#elseif($column.htmlType == "datetime")
|
||||
component: 'RangePicker',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
},
|
||||
#end
|
||||
},
|
||||
#end
|
||||
#end
|
||||
];
|
||||
}
|
||||
|
||||
/** 列表的字段 */
|
||||
export function useGridColumns(
|
||||
onActionClick?: OnActionClickFn<${simpleClassName}Api.${simpleClassName}>,
|
||||
): VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>['columns'] {
|
||||
return [
|
||||
#foreach($column in $columns)
|
||||
#if ($column.listOperationResult)
|
||||
#set ($dictType = $column.dictType)
|
||||
#set ($javaField = $column.javaField)
|
||||
#set ($comment = $column.columnComment)
|
||||
{
|
||||
field: '${javaField}',
|
||||
title: '${comment}',
|
||||
minWidth: 120,
|
||||
#if ($column.javaType == "LocalDateTime")## 时间类型
|
||||
formatter: 'formatDateTime',
|
||||
#elseif("" != $dictType)## 数据字典
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.$dictType.toUpperCase() },
|
||||
},
|
||||
#end
|
||||
#if (${table.templateType} == 2 && $column.id == $treeNameColumn.id)## 树表特有:标记树节点列
|
||||
treeNode: true,
|
||||
#end
|
||||
},
|
||||
#end
|
||||
#end
|
||||
{
|
||||
field: 'operation',
|
||||
title: '操作',
|
||||
minWidth: 200,
|
||||
align: 'right',
|
||||
fixed: 'right',
|
||||
headerAlign: 'center',
|
||||
showOverflow: false,
|
||||
cellRender: {
|
||||
attrs: {
|
||||
nameField: '${columns[0].javaField}',
|
||||
nameTitle: '${table.classComment}',
|
||||
onClick: onActionClick,
|
||||
},
|
||||
name: 'CellOperation',
|
||||
options: [
|
||||
#if (${table.templateType} == 2)## 树表特有操作
|
||||
{
|
||||
code: 'add_child',
|
||||
text: '新增下级',
|
||||
show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:create']),
|
||||
},
|
||||
#end
|
||||
{
|
||||
code: 'edit',
|
||||
show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:update']),
|
||||
},
|
||||
{
|
||||
code: 'delete',
|
||||
show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:delete']),
|
||||
#if (${table.templateType} == 2)## 树表禁止删除带有子节点的数据
|
||||
disabled: (row: ${simpleClassName}Api.${simpleClassName}) => {
|
||||
return !!(row.children && row.children.length > 0);
|
||||
},
|
||||
#end
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
];
|
||||
}
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
<script lang="ts" setup>
|
||||
import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
|
||||
import { useVbenModal } from '@vben/common-ui';
|
||||
import { message } from 'ant-design-vue';
|
||||
|
||||
import { computed, ref } from 'vue';
|
||||
import { $t } from '#/locales';
|
||||
import { useVbenForm } from '#/adapter/form';
|
||||
import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
|
||||
import { useFormSchema } from '../data';
|
||||
|
||||
const emit = defineEmits(['success']);
|
||||
const formData = ref<${simpleClassName}Api.${simpleClassName}>();
|
||||
#if (${table.templateType} == 2)## 树表特有：父ID处理
|
||||
const parentId = ref<number>(); // 新增下级时的父级 ID
|
||||
|
||||
const getTitle = computed(() => {
|
||||
if (formData.value?.id) {
|
||||
return $t('ui.actionTitle.edit', ['${table.classComment}']);
|
||||
}
|
||||
return parentId.value
|
||||
? $t('ui.actionTitle.create', ['下级${table.classComment}'])
|
||||
: $t('ui.actionTitle.create', ['${table.classComment}']);
|
||||
});
|
||||
#else## 标准表标题
|
||||
const getTitle = computed(() => {
|
||||
return formData.value?.id
|
||||
? $t('ui.actionTitle.edit', ['${table.classComment}'])
|
||||
: $t('ui.actionTitle.create', ['${table.classComment}']);
|
||||
});
|
||||
#end
|
||||
|
||||
const [Form, formApi] = useVbenForm({
|
||||
layout: 'horizontal',
|
||||
schema: useFormSchema(),
|
||||
showDefaultActions: false
|
||||
});
|
||||
|
||||
const [Modal, modalApi] = useVbenModal({
|
||||
async onConfirm() {
|
||||
const { valid } = await formApi.validate();
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
// 提交表单
|
||||
const data = (await formApi.getValues()) as ${simpleClassName}Api.${simpleClassName};
|
||||
try {
|
||||
await (formData.value?.id ? update${simpleClassName}(data) : create${simpleClassName}(data));
|
||||
// 关闭并提示
|
||||
await modalApi.close();
|
||||
emit('success');
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.operationSuccess'),
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
} finally {
|
||||
modalApi.lock(false);
|
||||
}
|
||||
},
|
||||
async onOpenChange(isOpen: boolean) {
|
||||
if (!isOpen) {
|
||||
return;
|
||||
}
|
||||
// 加载数据
|
||||
#if (${table.templateType} == 2)## 树表处理传入的父ID
|
||||
let data = modalApi.getData<${simpleClassName}Api.${simpleClassName}>();
|
||||
#else## 标准表直接获取
|
||||
const data = modalApi.getData<${simpleClassName}Api.${simpleClassName}>();
|
||||
#end
|
||||
if (!data) {
|
||||
return;
|
||||
}
|
||||
|
||||
#if (${table.templateType} == 2)## 树表特有：处理新增下级的情况
|
||||
// 处理新增下级的情况
|
||||
if (!data.id && data.${treeParentColumn.javaField}) {
|
||||
parentId.value = data.${treeParentColumn.javaField};
|
||||
formData.value = { ${treeParentColumn.javaField}: parentId.value } as ${simpleClassName}Api.${simpleClassName};
|
||||
await formApi.setValues(formData.value);
|
||||
return;
|
||||
}
|
||||
#end
|
||||
|
||||
if (data.id) {
|
||||
// 编辑
|
||||
modalApi.lock();
|
||||
try {
|
||||
#if (${table.templateType} == 2)## 树表获取数据后重新赋值
|
||||
data = await get${simpleClassName}(data.id);
|
||||
formData.value = data;
|
||||
#else## 标准表设置表单数据
|
||||
formData.value = await get${simpleClassName}(data.id as number);
|
||||
#end
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
modalApi.lock(false);
|
||||
}
|
||||
} else {
|
||||
// 新增
|
||||
#if (${table.templateType} == 2)## 树表特有：设置顶级ID
|
||||
formData.value = { ${treeParentColumn.javaField}: 0 } as ${simpleClassName}Api.${simpleClassName};
|
||||
#else## 标准表：设置空值
|
||||
formData.value = data;
|
||||
#end
|
||||
await formApi.setValues(formData.value || {});
|
||||
}
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Modal :title="getTitle">
|
||||
<Form class="mx-4" />
|
||||
</Modal>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,181 @@
|
|||
<script lang="ts" setup>
|
||||
import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||
import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
|
||||
import { Page, useVbenModal } from '@vben/common-ui';
|
||||
import { Button, message } from 'ant-design-vue';
|
||||
import { Download, Plus } from '@vben/icons';
|
||||
import Form from './modules/form.vue';
|
||||
|
||||
import { ref } from 'vue';
|
||||
import { $t } from '#/locales';
|
||||
import { useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||
#if (${table.templateType} == 2)## 树表接口
|
||||
import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
#else## 标准表接口
|
||||
import { get${simpleClassName}Page, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
|
||||
#end
|
||||
import { downloadByData } from '#/utils/download';
|
||||
|
||||
import { useGridColumns, useGridFormSchema } from './data';
|
||||
|
||||
const [FormModal, formModalApi] = useVbenModal({
|
||||
connectedComponent: Form,
|
||||
destroyOnClose: true,
|
||||
});
|
||||
|
||||
#if (${table.templateType} == 2)## 树表特有：控制表格展开收缩
|
||||
/** 切换树形展开/收缩状态 */
|
||||
const isExpanded = ref(true);
|
||||
function toggleExpand() {
|
||||
isExpanded.value = !isExpanded.value;
|
||||
gridApi.grid.setAllTreeExpand(isExpanded.value);
|
||||
}
|
||||
#end
|
||||
|
||||
/** 刷新表格 */
|
||||
function onRefresh() {
|
||||
gridApi.query();
|
||||
}
|
||||
|
||||
/** 导出表格 */
|
||||
async function onExport() {
|
||||
const data = await export${simpleClassName}(await gridApi.formApi.getValues());
|
||||
downloadByData(data, '${table.classComment}.xls');
|
||||
}
|
||||
|
||||
/** 创建${table.classComment} */
|
||||
function onCreate() {
|
||||
formModalApi.setData(null).open();
|
||||
}
|
||||
|
||||
/** 编辑${table.classComment} */
|
||||
function onEdit(row: ${simpleClassName}Api.${simpleClassName}) {
|
||||
formModalApi.setData(row).open();
|
||||
}
|
||||
|
||||
#if (${table.templateType} == 2)## 树表特有：新增下级
|
||||
/** 新增下级${table.classComment} */
|
||||
function onAddChild(row: ${simpleClassName}Api.${simpleClassName}) {
|
||||
formModalApi.setData({ ${treeParentColumn.javaField}: row.id }).open();
|
||||
}
|
||||
#end
|
||||
|
||||
/** 删除${table.classComment} */
|
||||
async function onDelete(row: ${simpleClassName}Api.${simpleClassName}) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.id]),
|
||||
duration: 0,
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
try {
|
||||
await delete${simpleClassName}(row.id as number);
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
onRefresh();
|
||||
} catch {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
/** 表格操作按钮的回调函数 */
|
||||
function onActionClick({
|
||||
code,
|
||||
row,
|
||||
}: OnActionClickParams<${simpleClassName}Api.${simpleClassName}>) {
|
||||
switch (code) {
|
||||
case 'edit': {
|
||||
onEdit(row);
|
||||
break;
|
||||
}
|
||||
case 'delete': {
|
||||
onDelete(row);
|
||||
break;
|
||||
}
|
||||
#if (${table.templateType} == 2)## 树表特有：新增下级
|
||||
case 'add_child': {
|
||||
onAddChild(row);
|
||||
break;
|
||||
}
|
||||
#end
|
||||
}
|
||||
}
|
||||
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
formOptions: {
|
||||
schema: useGridFormSchema(),
|
||||
},
|
||||
gridOptions: {
|
||||
columns: useGridColumns(onActionClick),
|
||||
height: 'auto',
|
||||
#if (${table.templateType} == 2)## 树表设置
|
||||
treeConfig: {
|
||||
parentField: '${treeParentColumn.javaField}',
|
||||
rowField: 'id',
|
||||
transform: true,
|
||||
expandAll: true,
|
||||
reserve: true,
|
||||
},
|
||||
pagerConfig: {
|
||||
enabled: false,
|
||||
},
|
||||
#else## 标准表设置
|
||||
pagerConfig: {
|
||||
enabled: true,
|
||||
},
|
||||
#end
|
||||
proxyConfig: {
|
||||
ajax: {
|
||||
#if (${table.templateType} == 2)## 树表数据加载
|
||||
query: async (_, formValues) => {
|
||||
return await get${simpleClassName}List(formValues);
|
||||
},
|
||||
#else## 标准表数据加载
|
||||
query: async ({ page }, formValues) => {
|
||||
const { items, total } = await get${simpleClassName}Page({
|
||||
pageNo: page.currentPage,
|
||||
pageSize: page.pageSize,
|
||||
...formValues,
|
||||
});
|
||||
return { items, total };
|
||||
},
|
||||
#end
|
||||
},
|
||||
},
|
||||
rowConfig: {
|
||||
keyField: 'id',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
refresh: { code: 'query' },
|
||||
search: true,
|
||||
},
|
||||
} as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>,
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Page auto-content-height>
|
||||
<FormModal @success="onRefresh" />
|
||||
|
||||
<Grid table-title="${table.classComment}列表">
|
||||
<template #toolbar-tools>
|
||||
#if (${table.templateType} == 2)## 树表特有：展开/收缩按钮
|
||||
<Button @click="toggleExpand" class="mr-2">
|
||||
{{ isExpanded ? '收缩' : '展开' }}
|
||||
</Button>
|
||||
#end
|
||||
<Button type="primary" @click="onCreate" v-access:code="['${table.moduleName}:${simpleClassName_strikeCase}:create']">
|
||||
<Plus class="size-5" />
|
||||
{{ $t('ui.actionTitle.create', ['${table.classComment}']) }}
|
||||
</Button>
|
||||
<Button type="primary" class="ml-2" @click="onExport" v-access:code="['${table.moduleName}:${simpleClassName_strikeCase}:export']">
|
||||
<Download class="size-5" />
|
||||
{{ $t('ui.actionTitle.export') }}
|
||||
</Button>
|
||||
</template>
|
||||
</Grid>
|
||||
</Page>
|
||||
</template>
|
||||
|
|
@ -105,7 +105,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
|
|||
when(codegenBuilder.buildColumns(eq(table.getId()), same(fields)))
|
||||
.thenReturn(columns);
|
||||
// mock 方法（CodegenProperties）
|
||||
when(codegenProperties.getFrontType()).thenReturn(CodegenFrontTypeEnum.VUE3.getType());
|
||||
when(codegenProperties.getFrontType()).thenReturn(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType());
|
||||
|
||||
// 调用
|
||||
List<Long> result = codegenService.createCodegenList(userId, reqVO);
|
||||
|
|
@ -116,7 +116,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
|
|||
assertPojoEquals(table, dbTable);
|
||||
assertEquals(1L, dbTable.getDataSourceConfigId());
|
||||
assertEquals(CodegenSceneEnum.ADMIN.getScene(), dbTable.getScene());
|
||||
assertEquals(CodegenFrontTypeEnum.VUE3.getType(), dbTable.getFrontType());
|
||||
assertEquals(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), dbTable.getFrontType());
|
||||
assertEquals("芋头", dbTable.getAuthor());
|
||||
// 断言（CodegenColumnDO）
|
||||
List<CodegenColumnDO> dbColumns = codegenColumnMapper.selectList();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
|
|||
public void testExecute_vue2_one() {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("student")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
|
||||
.setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("student");
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
|
|||
public void testExecute_vue2_tree() {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("category")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
|
||||
.setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("category");
|
||||
|
||||
|
|
@ -71,19 +71,19 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
|
|||
String path) {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("student")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
|
||||
.setTemplateType(templateType.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("student");
|
||||
// 准备参数（子表）
|
||||
CodegenTableDO contactTable = getTable("contact")
|
||||
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
|
||||
.setSubJoinColumnId(100L).setSubJoinMany(true);
|
||||
List<CodegenColumnDO> contactColumns = getColumnList("contact");
|
||||
// 准备参数（班主任）
|
||||
CodegenTableDO teacherTable = getTable("teacher")
|
||||
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
|
||||
.setSubJoinColumnId(200L).setSubJoinMany(false);
|
||||
List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
|
|||
public void testExecute_vue3_one() {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("student")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
|
||||
.setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("student");
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
|
|||
public void testExecute_vue3_tree() {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("category")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
|
||||
.setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("category");
|
||||
|
||||
|
|
@ -71,19 +71,19 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
|
|||
String path) {
|
||||
// 准备参数
|
||||
CodegenTableDO table = getTable("student")
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
|
||||
.setTemplateType(templateType.getType());
|
||||
List<CodegenColumnDO> columns = getColumnList("student");
|
||||
// 准备参数（子表）
|
||||
CodegenTableDO contactTable = getTable("contact")
|
||||
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
|
||||
.setSubJoinColumnId(100L).setSubJoinMany(true);
|
||||
List<CodegenColumnDO> contactColumns = getColumnList("contact");
|
||||
// 准备参数（班主任）
|
||||
CodegenTableDO teacherTable = getTable("teacher")
|
||||
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3.getType())
|
||||
.setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
|
||||
.setSubJoinColumnId(200L).setSubJoinMany(false);
|
||||
List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
package cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "用户 App - 客服消息 Response VO")
|
||||
@Data
|
||||
public class AppKeFuMessageRespVO {
|
||||
|
||||
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23202")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "会话编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12580")
|
||||
private Long conversationId;
|
||||
|
||||
@Schema(description = "发送人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24571")
|
||||
private Long senderId;
|
||||
|
||||
@Schema(description = "发送人类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Integer senderType;
|
||||
|
||||
@Schema(description = "接收人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "29124")
|
||||
private Long receiverId;
|
||||
|
||||
@Schema(description = "接收人类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
||||
private Integer receiverType;
|
||||
|
||||
@Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Integer contentType;
|
||||
|
||||
@Schema(description = "消息", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String content;
|
||||
|
||||
@Schema(description = "是否已读", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Boolean readStatus;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
|
|
@ -7,7 +7,9 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
|
|||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
|
||||
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
|
||||
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
|
||||
import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageListReqVO;
|
||||
import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
|
||||
import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageSendReqVO;
|
||||
import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessagePageReqVO;
|
||||
import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessageSendReqVO;
|
||||
|
|
@ -15,12 +17,13 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuConversationDO;
|
|||
import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
|
||||
import cn.iocoder.yudao.module.promotion.dal.mysql.kefu.KeFuMessageMapper;
|
||||
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
||||
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -66,9 +69,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
|
|||
conversationService.updateConversationLastMessage(kefuMessage);
|
||||
|
||||
// 3.1 发送消息给会员
|
||||
getSelf().sendAsyncMessageToMember(conversation.getUserId(), KEFU_MESSAGE_TYPE, kefuMessage);
|
||||
AdminUserRespDTO user = adminUserApi.getUser(kefuMessage.getSenderId());
|
||||
KeFuMessageRespVO message = BeanUtils.toBean(kefuMessage, KeFuMessageRespVO.class).setSenderAvatar(user.getAvatar());
|
||||
getSelf().sendAsyncMessageToMember(conversation.getUserId(), KEFU_MESSAGE_TYPE, message);
|
||||
// 3.2 通知所有管理员更新对话
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, kefuMessage);
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, message);
|
||||
return kefuMessage.getId();
|
||||
}
|
||||
|
||||
|
|
@ -84,7 +89,9 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
|
|||
// 2. 更新会话消息冗余
|
||||
conversationService.updateConversationLastMessage(kefuMessage);
|
||||
// 3. 通知所有管理员更新对话
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, kefuMessage);
|
||||
MemberUserRespDTO user = memberUserApi.getUser(kefuMessage.getSenderId());
|
||||
KeFuMessageRespVO message = BeanUtils.toBean(kefuMessage, KeFuMessageRespVO.class).setSenderAvatar(user.getAvatar());
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, message);
|
||||
return kefuMessage.getId();
|
||||
}
|
||||
|
||||
|
|
@ -112,9 +119,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
|
|||
// 2.3 发送消息通知会员，管理员已读 -> 会员更新发送的消息状态
|
||||
KeFuMessageDO keFuMessage = getFirst(filterList(messageList, message -> UserTypeEnum.MEMBER.getValue().equals(message.getSenderType())));
|
||||
assert keFuMessage != null; // 断言避免警告
|
||||
getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ, conversation.getId());
|
||||
getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ,
|
||||
new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId()));
|
||||
// 2.4 通知所有管理员消息已读
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ, conversation.getId());
|
||||
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ,
|
||||
new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId()));
|
||||
}
|
||||
|
||||
private void validateReceiverExist(Long receiverId, Integer receiverType) {
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
|
|||
}
|
||||
double totalChargeValue = getTotalChargeValue(orderItems, chargeMode);
|
||||
double totalPrice = TradePriceCalculatorHelper.calculateTotalPayPrice(orderItems);
|
||||
return totalChargeValue >= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice();
|
||||
return totalChargeValue <= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice();
|
||||
}
|
||||
|
||||
private double getTotalChargeValue(List<OrderItem> orderItems, Integer chargeMode) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue