diff --git a/collect-sdry/src/main/resources/bin/jenkins-update.bat b/collect-sdry/src/main/resources/bin/jenkins-update.bat index 8bf21eb..19d3f53 100644 --- a/collect-sdry/src/main/resources/bin/jenkins-update.bat +++ b/collect-sdry/src/main/resources/bin/jenkins-update.bat @@ -11,6 +11,7 @@ cd %curr_file% rd/s/q %deployDir%\lib rd/s/q %deployDir%\dataConfig rd/s/q %deployDir%\config +rd/s/q %deployDir%\mybatis.mapper del /s/q %deployDir%\*.jar xcopy /Y/E/I * %deployDir% 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 index 98bd380..4c413df 100644 --- 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 @@ -1,9 +1,12 @@ 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 com.docus.server.entity.auth.TaskConfigTest; + import java.util.List; + /** *

* 主动任务测试对象 ITaskConfigTestDao 数据访问接口 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 index 0b3cde7..bbcc968 100644 --- 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 @@ -5,13 +5,15 @@ 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.docus.server.archivefile.infrastructure.mapper.TaskConfigTestMapper; +import com.docus.server.entity.auth.TaskConfigTest; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; + import java.util.Date; import java.util.List; + /** *

* 主动任务测试对象 TaskConfigTestDaoImpl 数据访问实现类 @@ -24,60 +26,65 @@ import java.util.List; public class TaskConfigTestDaoImpl extends BaseDaoImpl implements ITaskConfigTestDao { /** - *按主键查询 - * @param id 主键Id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ @Override public TaskConfigTest findById(String id) { return super.findById(id); } /** - * 新增 - * @param taskConfigTest 编辑参数 - * @return 成功或失败 - */ + * 新增 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(TaskConfigTest taskConfigTest) { + public boolean add(TaskConfigTest taskConfigTest) { return super.save(taskConfigTest); } /** - * 编辑 - * @param taskConfigTest 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(TaskConfigTest taskConfigTest) { + public boolean edit(TaskConfigTest taskConfigTest) { return super.updateById(taskConfigTest); } /** - * 批量删除 - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 - * @param searchRequest 搜索参数 - * @return 分页列表 - */ + * 关键字搜素 + * + * @param searchRequest 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchRequest searchRequest) { //分页 PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围,默认按createTime if (searchRequest.getBeginTime() != null) { query.ge(TaskConfigTest::getCreateTime, searchRequest.getBeginTime()); } - if (searchRequest. getEndTime() != null) { + if (searchRequest.getEndTime() != null) { Date endTime = searchRequest.getEndTime(); query.le(TaskConfigTest::getCreateTime, endTime); } 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 index 39b2d97..173771d 100644 --- 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 @@ -1,11 +1,12 @@ package com.docus.server.archivefile.service.impl; - import com.docus.server.entity.auth.TaskConfigTest; +import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.archivefile.infrastructure.dao.ITaskConfigTestDao; import com.docus.server.archivefile.service.ITaskConfigTestService; +import com.docus.server.entity.auth.TaskConfigTest; 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; @@ -21,54 +22,60 @@ import java.util.List; public class TaskConfigTestServiceImpl implements ITaskConfigTestService { @Resource private ITaskConfigTestDao iTaskConfigTestDao; + /** - *按主键查询 - * @param id 主键Id - * @return 实体 - */ - @Override - public TaskConfigTest findById(String id) { - return iTaskConfigTestDao.findById(id); - } + * 按主键查询 + * + * @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 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 add(TaskConfigTest taskConfigTest) { + return iTaskConfigTestDao.add(taskConfigTest); + } /** - * 编辑 - * @param taskConfigTest 编辑参数 - * @return 成功或失败 - */ - @Override - public boolean edit(TaskConfigTest taskConfigTest) { - return iTaskConfigTestDao.edit(taskConfigTest); - } + * 编辑 + * + * @param taskConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(TaskConfigTest taskConfigTest) { + return iTaskConfigTestDao.edit(taskConfigTest); + } /** - * 批量删除 - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { - return iTaskConfigTestDao.delete(ids); + return iTaskConfigTestDao.delete(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 index caa3cff..cc93423 100644 --- 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 @@ -14,17 +14,17 @@ import java.io.Serializable; import java.time.LocalDateTime; /** -*

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

-* -* @author AutoGenerator -* @since 2023-07-05 -*/ + *

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

+ * + * @author AutoGenerator + * @since 2023-07-05 + */ @Data @EqualsAndHashCode(callSuper = false) @TableName("task_config_test") -@ApiModel(value="TaskConfigTest对象", description="主动任务测试对象") +@ApiModel(value = "TaskConfigTest对象", description = "主动任务测试对象") public class TaskConfigTest implements Serializable { @ApiModelProperty(value = "")