diff --git a/ruoyi-ui/src/views/business/openapi/translation/index.vue b/ruoyi-ui/src/views/business/openapi/translation/index.vue index fb5678f1..2410dcbf 100644 --- a/ruoyi-ui/src/views/business/openapi/translation/index.vue +++ b/ruoyi-ui/src/views/business/openapi/translation/index.vue @@ -11,7 +11,7 @@
{{responseCopyWriting.source}} - +
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ApiConst.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ApiConst.java index 956e3a7e..939b3ce8 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ApiConst.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ApiConst.java @@ -21,6 +21,8 @@ public class ApiConst { public static final String TIANXING_MMMY= "天行-名人名言"; + public static final String TEN_YY= "Ten-一言"; + //-------------------url------------------------------ @@ -36,4 +38,6 @@ public class ApiConst { public static final String TIANXING_MMMY_URL= "http://api.tianapi.com/mingyan/index"; + public static final String TEN_YY_URL= "https://tenapi.cn/yiyan/"; + } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ReqConst.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ReqConst.java index e950c13c..fa97a312 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ReqConst.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/ReqConst.java @@ -2,7 +2,7 @@ package com.xjs.common.consts; /** * @author xiejs - * @desc + * @desc 请求是否成功常量 * @create 2021-12-26 */ public class ReqConst { diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TianXingConst.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TianXingConst.java index cd8f9519..9e96129c 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TianXingConst.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TianXingConst.java @@ -2,7 +2,7 @@ package com.xjs.common.consts; /** * @author xiejs - * @desc 天行数据平台常量类 + * @desc 各个数据平台常量类 * @create 2021-12-28 */ public class TianXingConst { @@ -15,4 +15,6 @@ public class TianXingConst { public static final Integer JDTC= 3; //名人名言 public static final Integer MMMY= 4; + //Ten-API 一言 + public static final Integer YY= 5; } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TranslationTypeConst.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TranslationTypeConst.java index 2cfac94c..5f4401df 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TranslationTypeConst.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/consts/TranslationTypeConst.java @@ -2,7 +2,7 @@ package com.xjs.common.consts; /** * @author xiejs - * @desc + * @desc 翻译类型常量 * @create 2021-12-25 */ public interface TranslationTypeConst { diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java index f9155f7e..2994d2fd 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java @@ -154,6 +154,4 @@ public class CopyWritingController extends BaseController { } - - } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java index 794b0c89..a98bbb5b 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java @@ -33,7 +33,7 @@ public class CopyWriting implements Serializable { @Excel(name = "文案来源") private String source; - @Excel(name = "创建时间") + @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/RequestBody.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/RequestBody.java index 7c5c6a4b..033da45f 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/RequestBody.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/RequestBody.java @@ -13,4 +13,10 @@ public class RequestBody { * 平台key密钥 */ private String key; + + + /** + * 请求类型 json/js/text + */ + private String format; } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/CopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/CopyWritingFactory.java index 3dfdd649..d2ad61b7 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/CopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/CopyWritingFactory.java @@ -13,8 +13,8 @@ public interface CopyWritingFactory { /** * 统一调用第三方api接口 * - * @param requestBody - * @return + * @param requestBody 请求体 + * @return CopyWriting */ CopyWriting productCopyWriting(RequestBody requestBody); diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java index a62ecb22..d333baa0 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java @@ -50,7 +50,7 @@ public class TianXingJDTCCopyWritingFactory implements CopyWritingFactory { }else { //调用服务失败的降级之后的处理 if (jsonObject.containsKey("error")) { - return copyWritingMapper.getOneToNew(); + return copyWritingMapper.getOneToRandom(); } return new CopyWriting(); } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java index 81f4fcb8..1d74511c 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java @@ -50,7 +50,7 @@ public class TianXingMMMYCopyWritingFactory implements CopyWritingFactory { }else { //调用服务失败的降级之后的处理 if (jsonObject.containsKey("error")) { - return copyWritingMapper.getOneToNew(); + return copyWritingMapper.getOneToRandom(); } return new CopyWriting(); } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java index 0602a15b..64a3baea 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java @@ -52,7 +52,7 @@ public class TianXingPYQCopyWritingFactory implements CopyWritingFactory { }else { //调用服务失败的降级之后的处理 if (jsonObject.containsKey("error")) { - return copyWritingMapper.getOneToNew(); + return copyWritingMapper.getOneToRandom(); } return new CopyWriting(); } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java index 21c190de..a3c086e2 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java @@ -52,7 +52,7 @@ public class TianXingWYYCopyWritingFactory implements CopyWritingFactory { }else { //调用服务失败的降级之后的处理 if (jsonObject.containsKey("error")) { - return copyWritingMapper.getOneToNew(); + return copyWritingMapper.getOneToRandom(); } return new CopyWriting(); }