From 9733882fabe5e36c1b50f9e9675cb8669ae9d7c2 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 15 May 2024 11:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D=E5=8F=8A?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IIntegrationTaskLivingDetailsDao.java | 15 ---- .../IntegrationTaskLivingDetailsDaoImpl.java | 17 ----- .../dao/IIntegrationTaskLogDao.java | 15 ++++ .../dao/impl/IntegrationTaskLogDaoImpl.java | 17 +++++ .../entity/IntegrationTaskLogEntity.java} | 6 +- .../entity/IntegrationTaskLogEntity.xml} | 40 +++++------ .../service/IIntegrationTaskLogService.java} | 8 +-- .../impl/IntegrationTaskLogServiceImpl.java} | 30 ++++---- .../frame/web/quartz/QuartzJobFactory.java | 72 +++++++++---------- 9 files changed, 105 insertions(+), 115 deletions(-) delete mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/IIntegrationTaskLogDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/impl/IntegrationTaskLogDaoImpl.java rename service/src/main/java/com/hzya/frame/sysnew/{integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java => integtationTaskLog/entity/IntegrationTaskLogEntity.java} (91%) rename service/src/main/java/com/hzya/frame/sysnew/{integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml => integtationTaskLog/entity/IntegrationTaskLogEntity.xml} (93%) rename service/src/main/java/com/hzya/frame/sysnew/{integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java => integtationTaskLog/service/IIntegrationTaskLogService.java} (66%) rename service/src/main/java/com/hzya/frame/sysnew/{integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java => integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java} (56%) diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java deleted file mode 100644 index c6c91d37..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao; - -import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 集成任务-实例详情(integration_task_living_details: table)表数据库访问层 - * - * @author makejava - * @since 2024-05-06 15:37:55 - */ -public interface IIntegrationTaskLivingDetailsDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java deleted file mode 100644 index 44e93fb8..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.impl; - -import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 集成任务-实例详情(IntegrationTaskLivingDetails)表数据库访问层 - * - * @author makejava - * @since 2024-05-06 15:37:55 - */ -@Repository(value = "IntegrationTaskLivingDetailsDaoImpl") -public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDetailsDao{ - -} - diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/IIntegrationTaskLogDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/IIntegrationTaskLogDao.java new file mode 100644 index 00000000..3b80c374 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/IIntegrationTaskLogDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.sysnew.integtationTaskLog.dao; + +import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 集成任务-实例详情(integration_task_living_details: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +public interface IIntegrationTaskLogDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/impl/IntegrationTaskLogDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/impl/IntegrationTaskLogDaoImpl.java new file mode 100644 index 00000000..67a03548 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/dao/impl/IntegrationTaskLogDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.sysnew.integtationTaskLog.dao.impl; + +import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity; +import com.hzya.frame.sysnew.integtationTaskLog.dao.IIntegrationTaskLogDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 集成任务-实例详情(IntegrationTaskLog)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +@Repository(value = "IntegrationTaskLogDaoImpl") +public class IntegrationTaskLogDaoImpl extends MybatisGenericDao implements IIntegrationTaskLogDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java similarity index 91% rename from service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java index 5b90c88e..d2f73683 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java @@ -1,14 +1,14 @@ -package com.hzya.frame.sysnew.integtationTaskLivingDetails.entity; +package com.hzya.frame.sysnew.integtationTaskLog.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; /** - * 集成任务-实例详情(IntegrationTaskLivingDetails)实体类 + * 集成任务-实例详情(IntegrationTaskLog)实体类 * * @author makejava * @since 2024-05-06 15:37:55 */ -public class IntegrationTaskLivingDetailsEntity extends BaseEntity { +public class IntegrationTaskLogEntity extends BaseEntity { /** 集成任务-实例_id */ private String taskLinvingId; diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml similarity index 93% rename from service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml index 661668c2..0cf2df4e 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - + id ,task_linving_id ,task_id @@ -45,16 +45,16 @@ ,company_id - select - + from integration_task_living_details where id = #{id} and sts = 'Y' - select - + from integration_task_living_details and id = #{id} @@ -83,7 +83,7 @@ - select - + from integration_task_living_details and id like concat('%',#{id},'%') @@ -148,10 +148,10 @@ - select - + from integration_task_living_details or id = #{id} @@ -180,7 +180,7 @@ + parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity"> insert into integration_task_living_details( id , @@ -269,7 +269,7 @@ + parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity"> update integration_task_living_details set task_linving_id = #{taskLinvingId}, @@ -294,13 +294,13 @@ + parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity"> update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity"> update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java index 49393331..32bcfd0c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java @@ -1,17 +1,17 @@ -package com.hzya.frame.sysnew.integtationTaskLivingDetails.service; +package com.hzya.frame.sysnew.integtationTaskLog.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.web.entity.JsonResultEntity; /** - * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口 + * 集成任务-实例详情(IntegrationTaskLog)表服务接口 * * @author makejava * @since 2024-05-06 15:37:55 */ -public interface IIntegrationTaskLivingDetailsService extends IBaseService{ +public interface IIntegrationTaskLogService extends IBaseService{ /** * @param jsonObject * @return com.hzya.frame.web.entity.JsonResultEntity diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java similarity index 56% rename from service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java index 365a712d..0cf7b360 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java @@ -1,35 +1,33 @@ -package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl; +package com.hzya.frame.sysnew.integtationTaskLog.service.impl; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; -import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; -import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity; +import com.hzya.frame.sysnew.integtationTaskLog.dao.IIntegrationTaskLogDao; +import com.hzya.frame.sysnew.integtationTaskLog.service.IIntegrationTaskLogService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; import java.util.List; /** - * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类 + * 集成任务-实例详情(IntegrationTaskLog)表服务实现类 * * @author makejava * @since 2024-05-06 15:37:55 */ -@Service(value = "integrationTaskLivingDetailsService") -public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingDetailsService { +@Service(value = "integrationTaskLogService") +public class IntegrationTaskLogServiceImpl extends BaseService implements IIntegrationTaskLogService { - private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; + private IIntegrationTaskLogDao integrationTaskLogDao; @Autowired - public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { - this.integrationTaskLivingDetailsDao = dao; + public void setIntegrationTaskLogDao(IIntegrationTaskLogDao dao) { + this.integrationTaskLogDao = dao; this.dao = dao; } @@ -42,13 +40,13 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService list = integrationTaskLivingDetailsDao.queryByLike(entity); + List list = integrationTaskLogDao.queryByLike(entity); PageInfo pageInfo = new PageInfo(list); return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); } @@ -63,14 +61,14 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService