From 6b634c4d617976e3c4e382c0d3afb5ad49d2cf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Thu, 22 Aug 2024 19:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-task-client/pom.xml | 1 + .../src/main/java/com/muyu/Main.java | 7 -- .../main/java/com/muyu/domain/TaskInfo.java | 62 ++++++++++++++ .../java/com/muyu/domain/TaskInputInfo.java | 71 ++++++++++++++++ cloud-task-server/pom.xml | 69 ++++++++++++++++ .../src/main/java/com/muyu/Main.java | 7 -- .../main/java/com/muyu/TaskApplication.java | 12 +++ .../com/muyu/controller/TaskController.java | 78 ++++++++++++++++++ .../main/java/com/muyu/mapper/TaskMapper.java | 9 +++ .../java/com/muyu/service/TaskService.java | 23 ++++++ .../muyu/service/impl/TaskServiceImpl.java | 63 +++++++++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 61 ++++++++++++++ .../src/main/resources/logback/dev.xml | 74 +++++++++++++++++ .../src/main/resources/logback/prod.xml | 81 +++++++++++++++++++ .../src/main/resources/logback/test.xml | 81 +++++++++++++++++++ 16 files changed, 687 insertions(+), 14 deletions(-) delete mode 100644 cloud-task-common/src/main/java/com/muyu/Main.java create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java create mode 100644 cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java delete mode 100644 cloud-task-server/src/main/java/com/muyu/Main.java create mode 100644 cloud-task-server/src/main/java/com/muyu/TaskApplication.java create mode 100644 cloud-task-server/src/main/java/com/muyu/controller/TaskController.java create mode 100644 cloud-task-server/src/main/java/com/muyu/mapper/TaskMapper.java create mode 100644 cloud-task-server/src/main/java/com/muyu/service/TaskService.java create mode 100644 cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java create mode 100644 cloud-task-server/src/main/resources/banner.txt create mode 100644 cloud-task-server/src/main/resources/bootstrap.yml create mode 100644 cloud-task-server/src/main/resources/logback/dev.xml create mode 100644 cloud-task-server/src/main/resources/logback/prod.xml create mode 100644 cloud-task-server/src/main/resources/logback/test.xml diff --git a/cloud-task-client/pom.xml b/cloud-task-client/pom.xml index 163d931..eeffc46 100644 --- a/cloud-task-client/pom.xml +++ b/cloud-task-client/pom.xml @@ -25,4 +25,5 @@ UTF-8 + diff --git a/cloud-task-common/src/main/java/com/muyu/Main.java b/cloud-task-common/src/main/java/com/muyu/Main.java deleted file mode 100644 index 95690d4..0000000 --- a/cloud-task-common/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.muyu; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java new file mode 100644 index 0000000..c3d7d86 --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/TaskInfo.java @@ -0,0 +1,62 @@ +package com.muyu.domain; + +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * @PackageName:com.muyu.domain + * @ClassName:TaskInfo + * @Description: 任务信息表 + * @author: ￥陈思豪￥ + * @date: 2024/8/22 16:32 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class TaskInfo extends BaseEntity { + + private Integer id; + + /** + * 任务名称 + */ + private String name; + + /** + * 任务优先级 + */ + private Integer weigh; + + /** + * 任务状态 + */ + private Integer status; + + /** + * 总处理条数 + */ + private Integer total; + + /** + * 已处理条数 + */ + private Integer processTotal; + + /** + * 错误条数 + */ + private Integer errorTotal; + + /** + * 需执行次数 + */ + private Integer executeCount; + + /** + * 已结束的执行次数 + */ + private Integer overCount; +} diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java new file mode 100644 index 0000000..a0b66ff --- /dev/null +++ b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java @@ -0,0 +1,71 @@ +package com.muyu.domain; + +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @PackageName:com.muyu.domain + * @ClassName:TaskInputInfo + * @Description: 数据输入表 + * @author: ￥陈思豪￥ + * @date: 2024/8/22 16:49 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class TaskInputInfo extends BaseEntity { + + private Integer id; + + /** + * 节点id + */ + private Integer nodeId; + + /** + * 节点名称 + */ + private String nodeName; + + /** + * 任务id(taskInfo) + */ + private Integer taskId; + + /** + * 数据库id + */ + private Integer databaseId; + + /** + * 表名称 + */ + private String tableName; + + /** + * 表别名 + */ + private String tableAsName; + + /** + * 表字段 + */ + private Integer tableField; + + /** + * 表字段别名 + */ + private String ableAsField; + + /** + * 字段规则 + */ + private String fieldAsEngineId; + +} diff --git a/cloud-task-server/pom.xml b/cloud-task-server/pom.xml index 1ef334c..f3647c5 100644 --- a/cloud-task-server/pom.xml +++ b/cloud-task-server/pom.xml @@ -17,6 +17,75 @@ UTF-8 + + + com.muyu + cloud-task-common + 1.0.0 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + 3.6.3 + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + 3.6.3 + + + cloud-task diff --git a/cloud-task-server/src/main/java/com/muyu/Main.java b/cloud-task-server/src/main/java/com/muyu/Main.java deleted file mode 100644 index 95690d4..0000000 --- a/cloud-task-server/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.muyu; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/cloud-task-server/src/main/java/com/muyu/TaskApplication.java b/cloud-task-server/src/main/java/com/muyu/TaskApplication.java new file mode 100644 index 0000000..fba53f0 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/TaskApplication.java @@ -0,0 +1,12 @@ +package com.muyu; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TaskApplication { + public static void main (String[] args) { + SpringApplication.run(TaskApplication.class, args); + } + +} diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java new file mode 100644 index 0000000..7558ad3 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java @@ -0,0 +1,78 @@ +package com.muyu.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.TaskInfo; +import com.muyu.service.TaskService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static com.muyu.common.core.utils.PageUtils.startPage; + +/** + * @PackageName:com.muyu.controller + * @ClassName:TaskController + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/22 17:09 + */ +@RestController +@RequestMapping("/task") +public class TaskController { + + @Autowired + private TaskService taskService; + + @RequestMapping(path = "/list", method = RequestMethod.POST) + @Operation(summary = "查看指定任务", description = "根据任务的名称或者状态 ，进行模糊查询") + public Result> selectList( + @Validated @RequestBody TaskInfo taskInfo) { + startPage(); + return Result.success( + taskService.selectList(taskInfo) + ); + } + + + /** + * 添加新任务 + */ + @RequestMapping(path = "/addTask", method = RequestMethod.POST) + @Operation(summary = "添加任务", description = "根据传来的数据进行任务添加") + public Result addTask( + @Validated @RequestBody TaskInfo taskInfo) { + + return Result.success(taskService.addTask(taskInfo),"添加成功"); + } + + /** + * 修改任务信息 + */ + @RequestMapping(path = "/updateById", method = RequestMethod.POST) + @Operation(summary = "对指定任务进行修改", description = "根据传来的数据进行相应的修改") + public Result updateById( + @Validated @RequestBody TaskInfo taskInfo) { + return Result.success( + taskService.updById(taskInfo),"修改成功" + ); + } + + /** + * 删除任务 + */ + @RequestMapping(path = "/deleteById/{id}", method = RequestMethod.POST) + @Operation(summary = "对指定任务进行删除", description = "根据传来的id进行删除") + public Result deleteById(@PathVariable(name = "id") Integer id) { + return Result.success( + taskService.deleteById(id), "删除成功" + ); + } + +} diff --git a/cloud-task-server/src/main/java/com/muyu/mapper/TaskMapper.java b/cloud-task-server/src/main/java/com/muyu/mapper/TaskMapper.java new file mode 100644 index 0000000..fc37201 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/mapper/TaskMapper.java @@ -0,0 +1,9 @@ +package com.muyu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.TaskInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TaskMapper extends BaseMapper { +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskService.java b/cloud-task-server/src/main/java/com/muyu/service/TaskService.java new file mode 100644 index 0000000..e48ccb5 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/TaskService.java @@ -0,0 +1,23 @@ +package com.muyu.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.TaskInfo; + +import java.util.List; + +/** + * @PackageName:com.muyu.service + * @ClassName:TaskService + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/22 17:15 + */ +public interface TaskService extends IService { + List selectList(TaskInfo taskInfo); + + String addTask(TaskInfo taskInfo); + + String updById(TaskInfo taskInfo); + + String deleteById(Integer id); +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java new file mode 100644 index 0000000..3580edb --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -0,0 +1,63 @@ +package com.muyu.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.TaskInfo; +import com.muyu.mapper.TaskMapper; +import com.muyu.service.TaskService; +import io.swagger.v3.oas.annotations.Operation; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import java.util.List; + +/** + * @PackageName:com.muyu.service.impl + * @ClassName:TaskServiceImpl + * @Description: + * @author: ￥陈思豪￥ + * @date: 2024/8/22 17:15 + */ +@Service +public class TaskServiceImpl extends ServiceImpl implements TaskService { + + + + @Override + public List selectList(TaskInfo taskInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(taskInfo.getName()), + TaskInfo::getName, taskInfo.getName() + ); + return this.list(queryWrapper); + } + + @Override + public String addTask(TaskInfo taskInfo) { + this.save(taskInfo); + return "success"; + } + + @Override + public String updById(TaskInfo taskInfo) { + this.updateById(taskInfo); + return "success"; + } + + @Override + public String deleteById(Integer id) { + this.deleteById(id); + return "success"; + } + +} diff --git a/cloud-task-server/src/main/resources/banner.txt b/cloud-task-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-task-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-task-server/src/main/resources/bootstrap.yml b/cloud-task-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ed6aa9a --- /dev/null +++ b/cloud-task-server/src/main/resources/bootstrap.yml @@ -0,0 +1,61 @@ +# Tomcat +server: + port: 10012 + +# nacos线上地址 +nacos: + addr: 47.116.184.54:8848 + user-name: nacos + password: nacos + namespace: text +# Spring +spring: + + application: + # 应用名称 + name: cloud-task + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 配置 MyBatis 的日志输出实现类，这里是输出到控制台 + mapper-locations: classpath:/mapper/*.xml # MyBatis Mapper 文件的位置，这里假设是 XML 形式的 Mapper + global-config: + db-config: + id-type: auto # 主键生成策略，这里设置为自动增长 + logic-delete-value: 1 # 逻辑删除标记值，例如设置为 1 表示已删除 + logic-not-delete-value: 0 # 逻辑未删除标记值，例如设置为 0 表示未删除 + banner: false # 关闭控制台打印的 MyBatis-Plus Banner diff --git a/cloud-task-server/src/main/resources/logback/dev.xml b/cloud-task-server/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..100deef --- /dev/null +++ b/cloud-task-server/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-task-server/src/main/resources/logback/prod.xml b/cloud-task-server/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..bcab75a --- /dev/null +++ b/cloud-task-server/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-task-server/src/main/resources/logback/test.xml b/cloud-task-server/src/main/resources/logback/test.xml new file mode 100644 index 0000000..6ca2751 --- /dev/null +++ b/cloud-task-server/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + +