From d1f757ecab6813b359359e97dee2206b62a801ec Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Tue, 28 Dec 2021 00:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A=201=E3=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=AE=9E=E7=8E=B0=202?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E6=9C=89=E4=BA=9B=E7=B1=BB=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../english/api/RemoteCopyWritingFeign.java | 6 ---- .../english/api/domain/CopyWriting.java | 11 ++++++- .../main/java/com/ruoyi/job/task/RyTask.java | 28 ---------------- .../com/xjs/job/task/CopyWritingTask.java | 33 +++++++++++++++++++ .../copywriting/CopyWritingController.java | 7 ++-- .../main/java/com/xjs/log/domain/ApiLog.java | 1 - 6 files changed, 46 insertions(+), 40 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java index e8a7f79a..b8801b71 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java @@ -2,16 +2,10 @@ package com.xjs.business.english.api; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; import com.xjs.business.english.api.domain.CopyWriting; import com.xjs.business.english.api.factory.RemoteCopyWritingFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; /** * @author xiejs diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java index 54c44f84..d6127bf7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java @@ -1,7 +1,6 @@ package com.xjs.business.english.api.domain; import java.io.Serializable; -import java.util.Date; /** * @author xiejs @@ -53,4 +52,14 @@ public class CopyWriting implements Serializable { public void setCreateTime(String createTime) { this.createTime = createTime; } + + @Override + public String toString() { + return "CopyWriting{" + + "id=" + id + + ", content='" + content + '\'' + + ", source='" + source + '\'' + + ", createTime='" + createTime + '\'' + + '}'; + } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java deleted file mode 100644 index 01bd14a8..00000000 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ruoyi.job.task; - -import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.StringUtils; - -/** - * 定时任务调度测试 - * - * @author ruoyi - */ -@Component("ryTask") -public class RyTask -{ - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { - System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i)); - } - - public void ryParams(String params) - { - System.out.println("执行有参方法：" + params); - } - - public void ryNoParams() - { - System.out.println("执行无参方法"); - } -} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java new file mode 100644 index 00000000..d2b35080 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java @@ -0,0 +1,33 @@ +package com.xjs.job.task; + +import com.ruoyi.common.core.domain.R; +import com.xjs.business.english.api.RemoteCopyWritingFeign; +import com.xjs.business.english.api.domain.CopyWriting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @author xiejs + * @desc 调用文案定时任务 + * @create 2021-12-27 + */ +@Component("CopyWritingTask") +public class CopyWritingTask { + + @Resource + private RemoteCopyWritingFeign remoteCopyWritingFeign; + + private static final Logger log = LoggerFactory.getLogger(CopyWritingTask.class); + + /** + * 任务执行 + */ + public void execute() { + log.info("文案定时任务Start"); + R r = remoteCopyWritingFeign.copyWriting(); + log.info("文案定时任务结果:code={},msg={},data={}",r.getCode(),r.getMsg(),r.getData()); + } +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java index 058bec94..1c537658 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java @@ -9,16 +9,15 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.copywriting.domain.CopyWriting; import com.xjs.copywriting.domain.RequestBody; import com.xjs.copywriting.factory.CopyWritingFactory; -import com.xjs.translation.domain.qo.translation.TranslationQo; -import com.xjs.translation.domain.vo.translation.TranslationVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; -import java.util.List; import java.util.Optional; /** diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java index 30b27e79..641206e3 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.xjs.common.enums.StatusEnum; import lombok.Data; import com.ruoyi.common.core.annotation.Excel;