diff --git a/collect-sdry/pom.xml b/collect-sdry/pom.xml index ab35174..5465387 100644 --- a/collect-sdry/pom.xml +++ b/collect-sdry/pom.xml @@ -109,6 +109,7 @@ bin/*.xml bin/*.bat *.yml + *.ftl diff --git a/collect-sdry/src/main/java/com/docus/server/CodeGenerator.java b/collect-sdry/src/main/java/com/docus/server/CodeGenerator.java new file mode 100644 index 0000000..925d0b7 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/CodeGenerator.java @@ -0,0 +1,33 @@ +package com.docus.server; + +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.docus.infrastructure.generator.BaseCodeGenerator; + +import java.util.HashMap; +import java.util.Map; + +public class CodeGenerator { + public static void main(String[] args) { + //字段名和枚举名的映射，不区分表名 + Map enumColumnMap = new HashMap<>(); + enumColumnMap.put("PROFILE_ITЕM", "AdminProfileItemEnum"); + + enumColumnMap.put("ORGANIZATION_TYPE", "OrganizationTypeEnum "); + enumColumnMap.put("OPERATE_STATUS", "OperateStatusEnum"); + enumColumnMap.put("STATE", "StateEnum"); + enumColumnMap.put("PRIVILEGE_LEVEL", "PrivilegeLevelEnum"); + enumColumnMap.put("FLAG", "FlagEnum"); + enumColumnMap.put("collect_type", "CollectTypeEnum"); + BaseCodeGenerator.setEnumColumnMap(enumColumnMap); + BaseCodeGenerator.setModuleName("common-docus/docus-archivefile");//多个module，需要指定modulename + //指定entity生成到独立module里，并生成 api interface + BaseCodeGenerator.setClientInterfaceModuleName("docus-client-interface"); + BaseCodeGenerator.setClientInterfaceSubFolder("auth");//文件夹 + BaseCodeGenerator.setClientInterfaceBasePackage("com.docus.server"); + AutoGenerator defaultConfig = BaseCodeGenerator.getDefaultConfig(); + defaultConfig.getGlobalConfig().setSwagger2(true); + defaultConfig.getStrategy().setEntityLombokModel(true); + defaultConfig.getStrategy().setInclude("task_config_test");//需要生成的表，可指定多个，留空为全部生成 + BaseCodeGenerator.generate(defaultConfig); + } +} diff --git a/collect-sdry/src/main/resources/application.properties b/collect-sdry/src/main/resources/application.properties new file mode 100644 index 0000000..5305aad --- /dev/null +++ b/collect-sdry/src/main/resources/application.properties @@ -0,0 +1,9 @@ +#当前项目的根package +api.base-package=com.docus.server.archivefile + +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.username=docus +spring.datasource.password=docus702 + +mybatis-plus.type-enums-package=com.docus.server.enums diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java new file mode 100644 index 0000000..892ded1 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java @@ -0,0 +1,80 @@ +package com.docus.server.archivefile.controller; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.api.auth.TaskConfigTestApi; +import com.docus.server.archivefile.service.ITaskConfigTestService; +import com.docus.server.entity.auth.TaskConfigTest; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 主动任务测试对象 TaskConfigTestController 控制器类 + *

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ +@RestController +public class TaskConfigTestController implements TaskConfigTestApi { + @Resource + private ITaskConfigTestService iTaskConfigTestService; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ + @Override + public TaskConfigTest findById(String id) { + return iTaskConfigTestService.findById(id); + } + + /** + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + return iTaskConfigTestService.search(searchRequest); + } + + /** + * 新增 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(TaskConfigTest taskConfigTest) { + return iTaskConfigTestService.add(taskConfigTest); + } + + /** + * 编辑 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(TaskConfigTest taskConfigTest) { + return iTaskConfigTestService.edit(taskConfigTest); + } + + /** + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return iTaskConfigTestService.delete(ids); + } +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigTestDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigTestDao.java new file mode 100644 index 0000000..98bd380 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigTestDao.java @@ -0,0 +1,27 @@ +package com.docus.server.archivefile.infrastructure.dao; +import com.docus.server.entity.auth.TaskConfigTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + *

+ * 主动任务测试对象 ITaskConfigTestDao 数据访问接口 + *

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ +public interface ITaskConfigTestDao extends IBaseDao { + + TaskConfigTest findById(String id); + + boolean add(TaskConfigTest taskConfigTest); + + boolean edit(TaskConfigTest taskConfigTest); + + int delete(List ids); + + PageResult search(SearchRequest searchRequest); + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigTestDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigTestDaoImpl.java new file mode 100644 index 0000000..0b3cde7 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigTestDaoImpl.java @@ -0,0 +1,99 @@ +package com.docus.server.archivefile.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.auth.TaskConfigTest; +import com.docus.server.archivefile.infrastructure.mapper.TaskConfigTestMapper; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; +/** + *

+ * 主动任务测试对象 TaskConfigTestDaoImpl 数据访问实现类 + *

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ +@Repository +public class TaskConfigTestDaoImpl extends BaseDaoImpl implements ITaskConfigTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public TaskConfigTest findById(String id) { + return super.findById(id); + } + + /** + * 新增 + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(TaskConfigTest taskConfigTest) { + return super.save(taskConfigTest); + } + + /** + * 编辑 + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(TaskConfigTest taskConfigTest) { + return super.updateById(taskConfigTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + //分页 + PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchRequest.getBeginTime() != null) { + query.ge(TaskConfigTest::getCreateTime, searchRequest.getBeginTime()); + } + if (searchRequest. getEndTime() != null) { + Date endTime = searchRequest.getEndTime(); + query.le(TaskConfigTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //单个列用like + //query. like(TaskConfigTest::getxxx, searchRequest. getKeyword()); + //多个列用like + //query. and(sub -> sub.like(TaskConfigTest::getxx1, searchRequest. getKeyword()) + // оr(). like(TaskConfigTest::getXX2, searchRequest. getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(TaskConfigTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigTestMapper.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigTestMapper.java new file mode 100644 index 0000000..d2ee942 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigTestMapper.java @@ -0,0 +1,18 @@ +package com.docus.server.archivefile.infrastructure.mapper; + +import com.docus.server.entity.auth.TaskConfigTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +*

+* 主动任务测试对象 TaskConfigTestMapper 接口 +*

+* +* @author AutoGenerator +* @since 2023-07-05 +*/ +@Mapper +public interface TaskConfigTestMapper extends BaseMapper { + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigTestService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigTestService.java new file mode 100644 index 0000000..9e6f418 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigTestService.java @@ -0,0 +1,29 @@ +package com.docus.server.archivefile.service; + +import com.docus.server.entity.auth.TaskConfigTest; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +*

+* 主动任务测试对象 ITaskConfigTestService 服务接口 +*

+* +* @author AutoGenerator +* @since 2023-07-05 +*/ +public interface ITaskConfigTestService { + + TaskConfigTest findById(String id); + + boolean add(TaskConfigTest taskConfigTest); + + boolean edit(TaskConfigTest taskConfigTest); + + int delete(List ids); + + PageResult search(SearchRequest searchRequest); +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java index 53ea7fe..943df98 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java @@ -100,7 +100,7 @@ public class TaskConfigServiceImpl implements ITaskConfigService { @Transactional(rollbackFor = Exception.class) @Override public int deleteTaskConfig(List ids) { - return taskConfigDao.deleteByIdList(ids); + return taskConfigDao.deleteByIds(ids); } public PageResult searchTaskMessage(SearchRequest request) { diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigTestServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigTestServiceImpl.java new file mode 100644 index 0000000..39b2d97 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigTestServiceImpl.java @@ -0,0 +1,74 @@ +package com.docus.server.archivefile.service.impl; + + import com.docus.server.entity.auth.TaskConfigTest; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigTestDao; +import com.docus.server.archivefile.service.ITaskConfigTestService; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 主动任务测试对象 TaskConfigTestServiceImpl 服务实现类 + *

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ +@Service +public class TaskConfigTestServiceImpl implements ITaskConfigTestService { + @Resource + private ITaskConfigTestDao iTaskConfigTestDao; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public TaskConfigTest findById(String id) { + return iTaskConfigTestDao.findById(id); + } + + /** + * 关键字搜素 + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchRequest searchRequest) { + return iTaskConfigTestDao.search(searchRequest); + } + + /** + * 新增 + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(TaskConfigTest taskConfigTest) { + return iTaskConfigTestDao.add(taskConfigTest); + } + + /** + * 编辑 + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(TaskConfigTest taskConfigTest) { + return iTaskConfigTestDao.edit(taskConfigTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return iTaskConfigTestDao.delete(ids); + } +} + diff --git a/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigTestMapper.xml b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigTestMapper.xml new file mode 100644 index 0000000..26dc51e --- /dev/null +++ b/common-docus/docus-archivefile/src/main/resources/mapper/TaskConfigTestMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, name, retry_key, type, memo, start_time, end_time, all_pointer_time, page_size, spilt_period, inc_pointer_time, param, state, last_error_msg, create_time, update_time + + + diff --git a/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java new file mode 100644 index 0000000..41a6c8a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java @@ -0,0 +1,82 @@ +package com.docus.server.api.auth; + +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.auth.TaskConfigTest; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + + +/** + *

+ * 主动任务测试对象 API + *

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ +@Api(value = "主动任务测试对象任务管理接口", tags = "主动任务测试对象任务管理接口") +@FeignClient(value = "common-docus/docus-archivefile", contextId = "common-docus/docus-archivefile.TaskConfigTestApi") +@RequestMapping("/taskConfigTest") +public interface TaskConfigTestApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @ApiOperation("按主键查询") + @GetMapping("/find/{id}") + TaskConfigTest findById(@PathVariable(value = "id") String id); + + /** + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜素") + @PostMapping("/search") + PageResult search(@RequestBody SearchRequest searchRequest); + + /** + * 新增 + * + * @param taskConfigTest 新增参数 + * @return 成功或失败 + */ + @ApiOperation("新增") + @PostMapping("/add") + boolean add(@RequestBody TaskConfigTest taskConfigTest); + + /** + * 编辑 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @ApiOperation("编辑") + @PutMapping("/edit") + boolean edit(@RequestBody TaskConfigTest taskConfigTest); + + /** + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @DeleteMapping("/delete") + int delete(@RequestBody List ids); +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/auth/TaskConfigTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/auth/TaskConfigTest.java new file mode 100644 index 0000000..caa3cff --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/auth/TaskConfigTest.java @@ -0,0 +1,95 @@ +package com.docus.server.entity.auth; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.docus.server.enums.CollectTypeEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +*

+ * 主动任务测试对象 + *

+* +* @author AutoGenerator +* @since 2023-07-05 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("task_config_test") +@ApiModel(value="TaskConfigTest对象", description="主动任务测试对象") +public class TaskConfigTest implements Serializable { + + @ApiModelProperty(value = "") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "任务名字") + @TableField("name") + private String name; + + @ApiModelProperty(value = "任务重试键") + @TableField("retry_key") + private String retryKey; + + @ApiModelProperty(value = "任务类型。 dept，user....") + @TableField("type") + private CollectTypeEnum type; + + @ApiModelProperty(value = "任务描述") + @TableField("memo") + private String memo; + + @ApiModelProperty(value = "数据起始时间范围") + @TableField("start_time") + private LocalDateTime startTime; + + @ApiModelProperty(value = "数据结束时间范围") + @TableField("end_time") + private LocalDateTime endTime; + + @ApiModelProperty(value = "指针时间，当前全量任务的任务执行到的时间") + @TableField("all_pointer_time") + private LocalDateTime allPointerTime; + + @ApiModelProperty(value = "每页大小") + @TableField("page_size") + private Double pageSize; + + @ApiModelProperty(value = "时间分割周期，把起始时间结束时间进行分割，单位为秒") + @TableField("spilt_period") + private String spiltPeriod; + + @ApiModelProperty(value = "指针时间，当前增量任务的执行到的时间") + @TableField("inc_pointer_time") + private LocalDateTime incPointerTime; + + @ApiModelProperty(value = "任务其他参数配置") + @TableField("param") + private String param; + + @ApiModelProperty(value = "执行状态") + @TableField("state") + private Integer state; + + @ApiModelProperty(value = "上回失败信息") + @TableField("last_error_msg") + private String lastErrorMsg; + + @ApiModelProperty(value = "入库时间") + @TableField("create_time") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/pom.xml b/pom.xml index 6e4414f..273ee40 100644 --- a/pom.xml +++ b/pom.xml @@ -234,6 +234,12 @@ ${org.mapstruct.version} + + com.docus + docus-generator-starter + 1.0-SNAPSHOT + + @@ -249,27 +255,4 @@ - - - - - - - - - - - - - - - - - - - - - - -