diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml index 3f3f2407..da168c31 100644 --- a/buildpackage/pom.xml +++ b/buildpackage/pom.xml @@ -69,6 +69,12 @@ llg + + yuqh + + yuqh + + xel diff --git a/buildpackage/src/main/resources/application-yuqh.yml b/buildpackage/src/main/resources/application-yuqh.yml new file mode 100644 index 00000000..47544edc --- /dev/null +++ b/buildpackage/src/main/resources/application-yuqh.yml @@ -0,0 +1,23 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: E:\yongansystem\log +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: bd993088e8a7c3dc5f44441617f9b4bf + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: E:\yongansystem\log +ax: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/IIntegrationTaskLogDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/IIntegrationTaskLogDetailsDao.java deleted file mode 100644 index 15d13bff..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/IIntegrationTaskLogDetailsDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sysnew.integrationTaskLogDetails.dao; - -import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 集成任务-日志详情(integration_task_log_details: table)表数据库访问层 - * - * @author makejava - * @since 2024-05-15 10:14:46 - */ -public interface IIntegrationTaskLogDetailsDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/impl/IntegrationTaskLogDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/impl/IntegrationTaskLogDetailsDaoImpl.java deleted file mode 100644 index 3710503c..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/dao/impl/IntegrationTaskLogDetailsDaoImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.sysnew.integrationTaskLogDetails.dao.impl; - -import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity; -import com.hzya.frame.sysnew.integrationTaskLogDetails.dao.IIntegrationTaskLogDetailsDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 集成任务-日志详情(IntegrationTaskLogDetails)表数据库访问层 - * - * @author makejava - * @since 2024-05-15 10:14:46 - */ -@Repository(value = "IntegrationTaskLogDetailsDaoImpl") -public class IntegrationTaskLogDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskLogDetailsDao{ - -} - diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/IIntegrationTaskLogDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/IIntegrationTaskLogDetailsService.java deleted file mode 100644 index ca025460..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/IIntegrationTaskLogDetailsService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzya.frame.sysnew.integrationTaskLogDetails.service; - -import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity; -import com.hzya.frame.basedao.service.IBaseService; -/** - * 集成任务-日志详情(IntegrationTaskLogDetails)表服务接口 - * - * @author makejava - * @since 2024-05-15 10:14:46 - */ -public interface IIntegrationTaskLogDetailsService extends IBaseService{ -} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/impl/IntegrationTaskLogDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/impl/IntegrationTaskLogDetailsServiceImpl.java deleted file mode 100644 index 7e5f70e0..00000000 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/service/impl/IntegrationTaskLogDetailsServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzya.frame.sysnew.integrationTaskLogDetails.service.impl; - -import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity; -import com.hzya.frame.sysnew.integrationTaskLogDetails.dao.IIntegrationTaskLogDetailsDao; -import com.hzya.frame.sysnew.integrationTaskLogDetails.service.IIntegrationTaskLogDetailsService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; -/** - * 集成任务-日志详情(IntegrationTaskLogDetails)表服务实现类 - * - * @author makejava - * @since 2024-05-15 10:14:46 - */ -@Service(value = "integrationTaskLogDetailsService") -public class IntegrationTaskLogDetailsServiceImpl extends BaseService implements IIntegrationTaskLogDetailsService { - - private IIntegrationTaskLogDetailsDao integrationTaskLogDetailsDao; - - @Autowired - public void setIntegrationTaskLogDetailsDao(IIntegrationTaskLogDetailsDao dao) { - this.integrationTaskLogDetailsDao = dao; - this.dao = dao; - } -} 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 new file mode 100644 index 00000000..3e94afda --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java @@ -0,0 +1,15 @@ +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-15 14:06:30 + */ +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 new file mode 100644 index 00000000..ae4c6839 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java @@ -0,0 +1,17 @@ +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-15 14:06:34 + */ +@Repository(value = "IntegrationTaskLivingDetailsDaoImpl") +public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDetailsDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java similarity index 62% rename from service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java index 0fa40134..c85adbd5 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java @@ -1,14 +1,14 @@ -package com.hzya.frame.sysnew.integrationTaskLogDetails.entity; +package com.hzya.frame.sysnew.integtationTaskLivingDetails.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; /** - * 集成任务-日志详情(IntegrationTaskLogDetails)实体类 + * 集成任务-实例详情(IntegrationTaskLivingDetails)实体类 * * @author makejava - * @since 2024-05-15 10:14:46 + * @since 2024-05-15 14:06:41 */ -public class IntegrationTaskLogDetailsEntity extends BaseEntity { +public class IntegrationTaskLivingDetailsEntity extends BaseEntity { /** 集成任务-实例_id */ private String taskLinvingId; @@ -26,24 +26,28 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity { private String newTransmitInfo; /** 最新推送时间 */ private Date newPushDate; - /** 源系统编码 */ - private String rootAppCode; - /** 业务日期 */ - private String businessTime; - /** 最新推送状态 */ - private String newPushState; - /** 处理人 */ - private String processor; - /** 处理时间 */ - private String processorTime; - /** 处理备注 */ - private String processorRemark; - /** 最新元数据 */ - private String newMetadata; /** 是否补推(Y是N不是) */ private String repairPust; - /** 公司id */ - private String companyId; + /** 场景id */ + private String senceId; + /** 最新推送状态 */ + private String newState; + /** 单据业务日期 */ + private String businessDate; + /** 插件id */ + private String pluginId; + /** 处理时间 */ + private Date processingTime; + /** 处理备注 */ + private String processingRemarks; + /** 处理⼈名称 */ + private String processorName; + /** 处理⼈ */ + private String processor; + /** 下游系统单号 */ + private String newSystemNumber; + /** 下游系统主键 */ + private String newSystemPrimary; /** 备注 */ private String remark; /** 扩展1 */ @@ -122,28 +126,68 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity { this.newPushDate = newPushDate; } - public String getRootAppCode() { - return rootAppCode; + public String getRepairPust() { + return repairPust; } - public void setRootAppCode(String rootAppCode) { - this.rootAppCode = rootAppCode; + public void setRepairPust(String repairPust) { + this.repairPust = repairPust; } - public String getBusinessTime() { - return businessTime; + public String getSenceId() { + return senceId; } - public void setBusinessTime(String businessTime) { - this.businessTime = businessTime; + public void setSenceId(String senceId) { + this.senceId = senceId; } - public String getNewPushState() { - return newPushState; + public String getNewState() { + return newState; } - public void setNewPushState(String newPushState) { - this.newPushState = newPushState; + public void setNewState(String newState) { + this.newState = newState; + } + + public String getBusinessDate() { + return businessDate; + } + + public void setBusinessDate(String businessDate) { + this.businessDate = businessDate; + } + + public String getPluginId() { + return pluginId; + } + + public void setPluginId(String pluginId) { + this.pluginId = pluginId; + } + + public Date getProcessingTime() { + return processingTime; + } + + public void setProcessingTime(Date processingTime) { + this.processingTime = processingTime; + } + + public String getProcessingRemarks() { + return processingRemarks; + } + + public void setProcessingRemarks(String processingRemarks) { + this.processingRemarks = processingRemarks; + } + + public String getProcessorName() { + return processorName; + } + + public void setProcessorName(String processorName) { + this.processorName = processorName; } public String getProcessor() { @@ -154,44 +198,20 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity { this.processor = processor; } - public String getProcessorTime() { - return processorTime; + public String getNewSystemNumber() { + return newSystemNumber; } - public void setProcessorTime(String processorTime) { - this.processorTime = processorTime; + public void setNewSystemNumber(String newSystemNumber) { + this.newSystemNumber = newSystemNumber; } - public String getProcessorRemark() { - return processorRemark; + public String getNewSystemPrimary() { + return newSystemPrimary; } - public void setProcessorRemark(String processorRemark) { - this.processorRemark = processorRemark; - } - - public String getNewMetadata() { - return newMetadata; - } - - public void setNewMetadata(String newMetadata) { - this.newMetadata = newMetadata; - } - - public String getRepairPust() { - return repairPust; - } - - public void setRepairPust(String repairPust) { - this.repairPust = repairPust; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; + public void setNewSystemPrimary(String newSystemPrimary) { + this.newSystemPrimary = newSystemPrimary; } public String getRemark() { diff --git a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml similarity index 62% rename from service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml index 7489df86..d620468c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integrationTaskLogDetails/entity/IntegrationTaskLogDetailsEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -12,22 +12,23 @@ - - - - - - - - - - + + - - + + + + + + + + + + + @@ -36,7 +37,7 @@ - + id ,task_linving_id ,result @@ -46,22 +47,23 @@ ,root_app_new_data ,new_transmit_info ,new_push_date - ,root_app_code - ,business_time - ,new_push_state - ,processor - ,processor_time - ,processor_remark - ,new_metadata ,repair_pust - ,sorts - ,create_user_id ,create_time - ,modify_user_id + ,create_user_id ,modify_time + ,modify_user_id ,sts - ,org_id - ,company_id + ,sorts + ,sence_id + ,new_state + ,business_date + ,plugin_id + ,processing_time + ,processing_remarks + ,processor_name + ,processor + ,new_system_number + ,new_system_primary ,remark ,def1 ,def2 @@ -70,10 +72,10 @@ ,def5 - select - - from integration_task_log_details + + from integration_task_living_details and id = #{id} and task_linving_id = #{taskLinvingId} @@ -84,22 +86,23 @@ and root_app_new_data = #{rootAppNewData} and new_transmit_info = #{newTransmitInfo} and new_push_date = #{newPushDate} - and root_app_code = #{rootAppCode} - and business_time = #{businessTime} - and new_push_state = #{newPushState} - and processor = #{processor} - and processor_time = #{processorTime} - and processor_remark = #{processorRemark} - and new_metadata = #{newMetadata} and repair_pust = #{repairPust} - and sorts = #{sorts} - and create_user_id = #{create_user_id} and create_time = #{create_time} - and modify_user_id = #{modify_user_id} + and create_user_id = #{create_user_id} and modify_time = #{modify_time} + and modify_user_id = #{modify_user_id} and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} + and sorts = #{sorts} + and sence_id = #{senceId} + and new_state = #{newState} + and business_date = #{businessDate} + and plugin_id = #{pluginId} + and processing_time = #{processingTime} + and processing_remarks = #{processingRemarks} + and processor_name = #{processorName} + and processor = #{processor} + and new_system_number = #{newSystemNumber} + and new_system_primary = #{newSystemPrimary} and remark = #{remark} and def1 = #{def1} and def2 = #{def2} @@ -113,8 +116,8 @@ - + select count(1) from integration_task_living_details and id = #{id} and task_linving_id = #{taskLinvingId} @@ -125,22 +128,23 @@ and root_app_new_data = #{rootAppNewData} and new_transmit_info = #{newTransmitInfo} and new_push_date = #{newPushDate} - and root_app_code = #{rootAppCode} - and business_time = #{businessTime} - and new_push_state = #{newPushState} - and processor = #{processor} - and processor_time = #{processorTime} - and processor_remark = #{processorRemark} - and new_metadata = #{newMetadata} and repair_pust = #{repairPust} - and sorts = #{sorts} - and create_user_id = #{create_user_id} and create_time = #{create_time} - and modify_user_id = #{modify_user_id} + and create_user_id = #{create_user_id} and modify_time = #{modify_time} + and modify_user_id = #{modify_user_id} and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} + and sorts = #{sorts} + and sence_id = #{senceId} + and new_state = #{newState} + and business_date = #{businessDate} + and plugin_id = #{pluginId} + and processing_time = #{processingTime} + and processing_remarks = #{processingRemarks} + and processor_name = #{processorName} + and processor = #{processor} + and new_system_number = #{newSystemNumber} + and new_system_primary = #{newSystemPrimary} and remark = #{remark} and def1 = #{def1} and def2 = #{def2} @@ -154,10 +158,10 @@ - select - - from integration_task_log_details + + from integration_task_living_details and id like concat('%',#{id},'%') and task_linving_id like concat('%',#{taskLinvingId},'%') @@ -168,22 +172,23 @@ and root_app_new_data like concat('%',#{rootAppNewData},'%') and new_transmit_info like concat('%',#{newTransmitInfo},'%') and new_push_date like concat('%',#{newPushDate},'%') - and root_app_code like concat('%',#{rootAppCode},'%') - and business_time like concat('%',#{businessTime},'%') - and new_push_state like concat('%',#{newPushState},'%') - and processor like concat('%',#{processor},'%') - and processor_time like concat('%',#{processorTime},'%') - and processor_remark like concat('%',#{processorRemark},'%') - and new_metadata like concat('%',#{newMetadata},'%') and repair_pust like concat('%',#{repairPust},'%') - and sorts like concat('%',#{sorts},'%') - and create_user_id like concat('%',#{create_user_id},'%') and create_time like concat('%',#{create_time},'%') - and modify_user_id like concat('%',#{modify_user_id},'%') + and create_user_id like concat('%',#{create_user_id},'%') and modify_time like concat('%',#{modify_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') and sts like concat('%',#{sts},'%') - and org_id like concat('%',#{org_id},'%') - and company_id like concat('%',#{companyId},'%') + and sorts like concat('%',#{sorts},'%') + and sence_id like concat('%',#{senceId},'%') + and new_state like concat('%',#{newState},'%') + and business_date like concat('%',#{businessDate},'%') + and plugin_id like concat('%',#{pluginId},'%') + and processing_time like concat('%',#{processingTime},'%') + and processing_remarks like concat('%',#{processingRemarks},'%') + and processor_name like concat('%',#{processorName},'%') + and processor like concat('%',#{processor},'%') + and new_system_number like concat('%',#{newSystemNumber},'%') + and new_system_primary like concat('%',#{newSystemPrimary},'%') and remark like concat('%',#{remark},'%') and def1 like concat('%',#{def1},'%') and def2 like concat('%',#{def2},'%') @@ -197,10 +202,10 @@ - select - - from integration_task_log_details + + from integration_task_living_details or id = #{id} or task_linving_id = #{taskLinvingId} @@ -211,22 +216,23 @@ or root_app_new_data = #{rootAppNewData} or new_transmit_info = #{newTransmitInfo} or new_push_date = #{newPushDate} - or root_app_code = #{rootAppCode} - or business_time = #{businessTime} - or new_push_state = #{newPushState} - or processor = #{processor} - or processor_time = #{processorTime} - or processor_remark = #{processorRemark} - or new_metadata = #{newMetadata} or repair_pust = #{repairPust} - or sorts = #{sorts} - or create_user_id = #{create_user_id} - or create_time = #{create_time} - or modify_user_id = #{modify_user_id} + or create_time = #{create_time} + or create_user_id = #{create_user_id} or modify_time = #{modify_time} + or modify_user_id = #{modify_user_id} or sts = #{sts} - or org_id = #{org_id} - or company_id = #{companyId} + or sorts = #{sorts} + or sence_id = #{senceId} + or new_state = #{newState} + or business_date = #{businessDate} + or plugin_id = #{pluginId} + or processing_time = #{processingTime} + or processing_remarks = #{processingRemarks} + or processor_name = #{processorName} + or processor = #{processor} + or new_system_number = #{newSystemNumber} + or new_system_primary = #{newSystemPrimary} or remark = #{remark} or def1 = #{def1} or def2 = #{def2} @@ -240,8 +246,8 @@ - - insert into integration_task_log_details( + + insert into integration_task_living_details( id , task_linving_id , @@ -252,22 +258,23 @@ root_app_new_data , new_transmit_info , new_push_date , - root_app_code , - business_time , - new_push_state , - processor , - processor_time , - processor_remark , - new_metadata , repair_pust , - sorts , - create_user_id , create_time , - modify_user_id , + create_user_id , modify_time , + modify_user_id , sts , - org_id , - company_id , + sorts , + sence_id , + new_state , + business_date , + plugin_id , + processing_time , + processing_remarks , + processor_name , + processor , + new_system_number , + new_system_primary , remark , def1 , def2 , @@ -288,47 +295,48 @@ #{rootAppNewData} , #{newTransmitInfo} , #{newPushDate} , - #{rootAppCode} , - #{businessTime} , - #{newPushState} , - #{processor} , - #{processorTime} , - #{processorRemark} , - #{newMetadata} , #{repairPust} , - #{sorts} , - #{create_user_id} , #{create_time} , - #{modify_user_id} , + #{create_user_id} , #{modify_time} , + #{modify_user_id} , #{sts} , - #{org_id} , - #{companyId} , + #{sorts} , + #{senceId} , + #{newState} , + #{businessDate} , + #{pluginId} , + #{processingTime} , + #{processingRemarks} , + #{processorName} , + #{processor} , + #{newSystemNumber} , + #{newSystemPrimary} , #{remark} , #{def1} , #{def2} , #{def3} , #{def4} , #{def5} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_log_details a WHERE a.sts = 'Y' ), + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ), 'Y', ) - - insert into integration_task_log_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, root_app_code, business_time, new_push_state, processor, processor_time, processor_remark, new_metadata, repair_pust, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, remark, def1, def2, def3, def4, def5, sts) + + insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5, sts) values - (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.rootAppCode},#{entity.businessTime},#{entity.newPushState},#{entity.processor},#{entity.processorTime},#{entity.processorRemark},#{entity.newMetadata},#{entity.repairPust},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y') + (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y') - - insert into integration_task_log_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, root_app_code, business_time, new_push_state, processor, processor_time, processor_remark, new_metadata, repair_pust, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, remark, def1, def2, def3, def4, def5) + + insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5) values - (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.rootAppCode},#{entity.businessTime},#{entity.newPushState},#{entity.processor},#{entity.processorTime},#{entity.processorRemark},#{entity.newMetadata},#{entity.repairPust},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}) + (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}) on duplicate key update task_linving_id = values(task_linving_id), @@ -339,21 +347,22 @@ root_app_new_data = values(root_app_new_data), new_transmit_info = values(new_transmit_info), new_push_date = values(new_push_date), - root_app_code = values(root_app_code), - business_time = values(business_time), - new_push_state = values(new_push_state), - processor = values(processor), - processor_time = values(processor_time), - processor_remark = values(processor_remark), - new_metadata = values(new_metadata), repair_pust = values(repair_pust), - create_user_id = values(create_user_id), create_time = values(create_time), - modify_user_id = values(modify_user_id), + create_user_id = values(create_user_id), modify_time = values(modify_time), + modify_user_id = values(modify_user_id), sts = values(sts), - org_id = values(org_id), - company_id = values(company_id), + sence_id = values(sence_id), + new_state = values(new_state), + business_date = values(business_date), + plugin_id = values(plugin_id), + processing_time = values(processing_time), + processing_remarks = values(processing_remarks), + processor_name = values(processor_name), + processor = values(processor), + new_system_number = values(new_system_number), + new_system_primary = values(new_system_primary), remark = values(remark), def1 = values(def1), def2 = values(def2), @@ -361,8 +370,8 @@ def4 = values(def4), def5 = values(def5) - -update integration_task_log_details set + +update integration_task_living_details set task_linving_id = #{taskLinvingId}, result = #{result}, @@ -372,21 +381,22 @@ update integration_task_log_details set root_app_new_data = #{rootAppNewData}, new_transmit_info = #{newTransmitInfo}, new_push_date = #{newPushDate}, - root_app_code = #{rootAppCode}, - business_time = #{businessTime}, - new_push_state = #{newPushState}, - processor = #{processor}, - processor_time = #{processorTime}, - processor_remark = #{processorRemark}, - new_metadata = #{newMetadata}, repair_pust = #{repairPust}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, + create_time = #{create_time}, + create_user_id = #{create_user_id}, modify_time = #{modify_time}, + modify_user_id = #{modify_user_id}, sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, + sence_id = #{senceId}, + new_state = #{newState}, + business_date = #{businessDate}, + plugin_id = #{pluginId}, + processing_time = #{processingTime}, + processing_remarks = #{processingRemarks}, + processor_name = #{processorName}, + processor = #{processor}, + new_system_number = #{newSystemNumber}, + new_system_primary = #{newSystemPrimary}, remark = #{remark}, def1 = #{def1}, def2 = #{def2}, @@ -397,13 +407,13 @@ update integration_task_log_details set where id = #{id} - -update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + +update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - -update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + +update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} and task_linving_id = #{taskLinvingId} @@ -414,17 +424,19 @@ update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time}, and root_app_new_data = #{rootAppNewData} and new_transmit_info = #{newTransmitInfo} and new_push_date = #{newPushDate} - and root_app_code = #{rootAppCode} - and business_time = #{businessTime} - and new_push_state = #{newPushState} - and processor = #{processor} - and processor_time = #{processorTime} - and processor_remark = #{processorRemark} - and new_metadata = #{newMetadata} and repair_pust = #{repairPust} - and sorts = #{sorts} and sts = #{sts} - and company_id = #{companyId} + and sorts = #{sorts} + and sence_id = #{senceId} + and new_state = #{newState} + and business_date = #{businessDate} + and plugin_id = #{pluginId} + and processing_time = #{processingTime} + and processing_remarks = #{processingRemarks} + and processor_name = #{processorName} + and processor = #{processor} + and new_system_number = #{newSystemNumber} + and new_system_primary = #{newSystemPrimary} and remark = #{remark} and def1 = #{def1} and def2 = #{def2} @@ -436,7 +448,7 @@ update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time}, - delete from integration_task_log_details where id = #{id} + delete from integration_task_living_details where id = #{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/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java new file mode 100644 index 00000000..1e3d9edd --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service; + +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口 + * + * @author makejava + * @since 2024-05-15 14:06:43 + */ +public interface IIntegrationTaskLivingDetailsService extends IBaseService{ +} 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/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java new file mode 100644 index 00000000..34b21725 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl; + +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 org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类 + * + * @author makejava + * @since 2024-05-15 14:06:46 + */ +@Service(value = "integrationTaskLivingDetailsService") +public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingDetailsService { + + private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; + + @Autowired + public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { + this.integrationTaskLivingDetailsDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java index d2f73683..ef3fc571 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java @@ -6,30 +6,60 @@ import com.hzya.frame.web.entity.BaseEntity; * 集成任务-实例详情(IntegrationTaskLog)实体类 * * @author makejava - * @since 2024-05-06 15:37:55 + * @since 2024-05-15 14:06:41 */ public class IntegrationTaskLogEntity extends BaseEntity { /** 集成任务-实例_id */ private String taskLinvingId; - /** integration_task_id */ - private String taskId; - /** 任务编码 */ - private String taskCode; - /** 任务名称 */ - private String taskName; - /** 任务状态1、执行中2、执行成功 3、执行失败 4\当前任务已停止*/ - private String taskStatus; - /** 当前任务开始时间 */ - private Date startTime; - /** 结束时间 */ - private Date endTime; - /** 耗时 */ - private String diffTime; - /** 公司id */ - private String companyId; + /** 返回结果 */ + private String result; + /** 原始查询条件 */ + private String queryCondition; + /** 源系统主键 */ + private String rootAppPk; + /** 原系统单据 */ + private String rootAppBill; + /** 最新源系统数据详情 */ + private String rootAppNewData; + /** 最新传输信息 */ + private String newTransmitInfo; + /** 最新推送时间 */ + private Date newPushDate; + /** 是否补推(Y是N不是) */ + private String repairPust; + /** 场景id */ + private String senceId; + /** 最新推送状态 */ + private String newState; + /** 单据业务日期 */ + private String businessDate; + /** 插件id */ + private String pluginId; + /** 处理时间 */ + private Date processingTime; + /** 处理备注 */ + private String processingRemarks; + /** 处理⼈名称 */ + private String processorName; + /** 处理⼈ */ + private String processor; + /** 下游系统单号 */ + private String newSystemNumber; + /** 下游系统主键 */ + private String newSystemPrimary; /** 备注 */ private String remark; + /** 扩展1 */ + private String def1; + /** 扩展2 */ + private String def2; + /** 扩展3 */ + private String def3; + /** 扩展4 */ + private String def4; + /** 扩展5 */ + private String def5; public String getTaskLinvingId() { @@ -40,68 +70,148 @@ public class IntegrationTaskLogEntity extends BaseEntity { this.taskLinvingId = taskLinvingId; } - public String getTaskId() { - return taskId; + public String getResult() { + return result; } - public void setTaskId(String taskId) { - this.taskId = taskId; + public void setResult(String result) { + this.result = result; } - public String getTaskCode() { - return taskCode; + public String getQueryCondition() { + return queryCondition; } - public void setTaskCode(String taskCode) { - this.taskCode = taskCode; + public void setQueryCondition(String queryCondition) { + this.queryCondition = queryCondition; } - public String getTaskName() { - return taskName; + public String getRootAppPk() { + return rootAppPk; } - public void setTaskName(String taskName) { - this.taskName = taskName; + public void setRootAppPk(String rootAppPk) { + this.rootAppPk = rootAppPk; } - public String getTaskStatus() { - return taskStatus; + public String getRootAppBill() { + return rootAppBill; } - public void setTaskStatus(String taskStatus) { - this.taskStatus = taskStatus; + public void setRootAppBill(String rootAppBill) { + this.rootAppBill = rootAppBill; } - public Date getStartTime() { - return startTime; + public String getRootAppNewData() { + return rootAppNewData; } - public void setStartTime(Date startTime) { - this.startTime = startTime; + public void setRootAppNewData(String rootAppNewData) { + this.rootAppNewData = rootAppNewData; } - public Date getEndTime() { - return endTime; + public String getNewTransmitInfo() { + return newTransmitInfo; } - public void setEndTime(Date endTime) { - this.endTime = endTime; + public void setNewTransmitInfo(String newTransmitInfo) { + this.newTransmitInfo = newTransmitInfo; } - public String getDiffTime() { - return diffTime; + public Date getNewPushDate() { + return newPushDate; } - public void setDiffTime(String diffTime) { - this.diffTime = diffTime; + public void setNewPushDate(Date newPushDate) { + this.newPushDate = newPushDate; } - public String getCompanyId() { - return companyId; + public String getRepairPust() { + return repairPust; } - public void setCompanyId(String companyId) { - this.companyId = companyId; + public void setRepairPust(String repairPust) { + this.repairPust = repairPust; + } + + public String getSenceId() { + return senceId; + } + + public void setSenceId(String senceId) { + this.senceId = senceId; + } + + public String getNewState() { + return newState; + } + + public void setNewState(String newState) { + this.newState = newState; + } + + public String getBusinessDate() { + return businessDate; + } + + public void setBusinessDate(String businessDate) { + this.businessDate = businessDate; + } + + public String getPluginId() { + return pluginId; + } + + public void setPluginId(String pluginId) { + this.pluginId = pluginId; + } + + public Date getProcessingTime() { + return processingTime; + } + + public void setProcessingTime(Date processingTime) { + this.processingTime = processingTime; + } + + public String getProcessingRemarks() { + return processingRemarks; + } + + public void setProcessingRemarks(String processingRemarks) { + this.processingRemarks = processingRemarks; + } + + public String getProcessorName() { + return processorName; + } + + public void setProcessorName(String processorName) { + this.processorName = processorName; + } + + public String getProcessor() { + return processor; + } + + public void setProcessor(String processor) { + this.processor = processor; + } + + public String getNewSystemNumber() { + return newSystemNumber; + } + + public void setNewSystemNumber(String newSystemNumber) { + this.newSystemNumber = newSystemNumber; + } + + public String getNewSystemPrimary() { + return newSystemPrimary; + } + + public void setNewSystemPrimary(String newSystemPrimary) { + this.newSystemPrimary = newSystemPrimary; } public String getRemark() { @@ -111,5 +221,46 @@ public class IntegrationTaskLogEntity extends BaseEntity { public void setRemark(String remark) { this.remark = remark; } + + public String getDef1() { + return def1; + } + + public void setDef1(String def1) { + this.def1 = def1; + } + + public String getDef2() { + return def2; + } + + public void setDef2(String def2) { + this.def2 = def2; + } + + public String getDef3() { + return def3; + } + + public void setDef3(String def3) { + this.def3 = def3; + } + + public String getDef4() { + return def4; + } + + public void setDef4(String def4) { + this.def4 = def4; + } + + public String getDef5() { + return def5; + } + + public void setDef5(String def5) { + this.def5 = def5; + } + } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml index afa0e568..d620468c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml @@ -1,328 +1,454 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id ,task_linving_id - ,task_id - ,task_code - ,task_name - ,remark - ,task_status - ,start_time - ,end_time - ,diff_time - ,sorts - ,create_user_id + ,result + ,query_condition + ,root_app_pk + ,root_app_bill + ,root_app_new_data + ,new_transmit_info + ,new_push_date + ,repair_pust ,create_time - ,modify_user_id + ,create_user_id ,modify_time + ,modify_user_id ,sts - ,org_id - ,company_id + ,sorts + ,sence_id + ,new_state + ,business_date + ,plugin_id + ,processing_time + ,processing_remarks + ,processor_name + ,processor + ,new_system_number + ,new_system_primary + ,remark + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 - - - - + select + + from integration_task_living_details + + and id = #{id} + and task_linving_id = #{taskLinvingId} + and result = #{result} + and query_condition = #{queryCondition} + and root_app_pk = #{rootAppPk} + and root_app_bill = #{rootAppBill} + and root_app_new_data = #{rootAppNewData} + and new_transmit_info = #{newTransmitInfo} + and new_push_date = #{newPushDate} + and repair_pust = #{repairPust} + and create_time = #{create_time} + and create_user_id = #{create_user_id} + and modify_time = #{modify_time} + and modify_user_id = #{modify_user_id} + and sts = #{sts} + and sorts = #{sorts} + and sence_id = #{senceId} + and new_state = #{newState} + and business_date = #{businessDate} + and plugin_id = #{pluginId} + and processing_time = #{processingTime} + and processing_remarks = #{processingRemarks} + and processor_name = #{processorName} + and processor = #{processor} + and new_system_number = #{newSystemNumber} + and new_system_primary = #{newSystemPrimary} + and remark = #{remark} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + - + select + + from integration_task_living_details + + and id like concat('%',#{id},'%') + and task_linving_id like concat('%',#{taskLinvingId},'%') + and result like concat('%',#{result},'%') + and query_condition like concat('%',#{queryCondition},'%') + and root_app_pk like concat('%',#{rootAppPk},'%') + and root_app_bill like concat('%',#{rootAppBill},'%') + and root_app_new_data like concat('%',#{rootAppNewData},'%') + and new_transmit_info like concat('%',#{newTransmitInfo},'%') + and new_push_date like concat('%',#{newPushDate},'%') + and repair_pust like concat('%',#{repairPust},'%') + and create_time like concat('%',#{create_time},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and sts like concat('%',#{sts},'%') + and sorts like concat('%',#{sorts},'%') + and sence_id like concat('%',#{senceId},'%') + and new_state like concat('%',#{newState},'%') + and business_date like concat('%',#{businessDate},'%') + and plugin_id like concat('%',#{pluginId},'%') + and processing_time like concat('%',#{processingTime},'%') + and processing_remarks like concat('%',#{processingRemarks},'%') + and processor_name like concat('%',#{processorName},'%') + and processor like concat('%',#{processor},'%') + and new_system_number like concat('%',#{newSystemNumber},'%') + and new_system_primary like concat('%',#{newSystemPrimary},'%') + and remark like concat('%',#{remark},'%') + and def1 like concat('%',#{def1},'%') + and def2 like concat('%',#{def2},'%') + and def3 like concat('%',#{def3},'%') + and def4 like concat('%',#{def4},'%') + and def5 like concat('%',#{def5},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from integration_task_living_details + + or id = #{id} + or task_linving_id = #{taskLinvingId} + or result = #{result} + or query_condition = #{queryCondition} + or root_app_pk = #{rootAppPk} + or root_app_bill = #{rootAppBill} + or root_app_new_data = #{rootAppNewData} + or new_transmit_info = #{newTransmitInfo} + or new_push_date = #{newPushDate} + or repair_pust = #{repairPust} + or create_time = #{create_time} + or create_user_id = #{create_user_id} + or modify_time = #{modify_time} + or modify_user_id = #{modify_user_id} + or sts = #{sts} + or sorts = #{sorts} + or sence_id = #{senceId} + or new_state = #{newState} + or business_date = #{businessDate} + or plugin_id = #{pluginId} + or processing_time = #{processingTime} + or processing_remarks = #{processingRemarks} + or processor_name = #{processorName} + or processor = #{processor} + or new_system_number = #{newSystemNumber} + or new_system_primary = #{newSystemPrimary} + or remark = #{remark} + or def1 = #{def1} + or def2 = #{def2} + or def3 = #{def3} + or def4 = #{def4} + or def5 = #{def5} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into integration_task_log( - - id , - task_linving_id , - task_id , - task_code , - task_name , - remark , - task_status , - start_time , - end_time , - diff_time , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sts, - - )values( - - #{id} , - #{taskLinvingId} , - #{taskId} , - #{taskCode} , - #{taskName} , - #{remark} , - #{taskStatus} , - #{startTime} , - #{endTime} , - #{diffTime} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - - 'Y', - - ) - - - - insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status, - start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, - company_id, sts) - values - - (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, - 'Y') - - - - - insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status, - start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, - company_id) - values - - (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) - - on duplicate key update - task_linving_id = values(task_linving_id), - task_id = values(task_id), - task_code = values(task_code), - task_name = values(task_name), - remark = values(remark), - task_status = values(task_status), - start_time = values(start_time), - end_time = values(end_time), - diff_time = values(diff_time), - sorts = values(sorts), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - - - update integration_task_log set - - task_linving_id = #{taskLinvingId}, - task_id = #{taskId}, - task_code = #{taskCode}, - task_name = #{taskName}, - remark = #{remark}, - task_status = #{taskStatus}, - start_time = #{startTime}, - end_time = #{endTime}, - diff_time = #{diffTime}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - - where id = #{id} - - - -update integration_task_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + + insert into integration_task_living_details( + + id , + task_linving_id , + result , + query_condition , + root_app_pk , + root_app_bill , + root_app_new_data , + new_transmit_info , + new_push_date , + repair_pust , + create_time , + create_user_id , + modify_time , + modify_user_id , + sts , + sorts , + sence_id , + new_state , + business_date , + plugin_id , + processing_time , + processing_remarks , + processor_name , + processor , + new_system_number , + new_system_primary , + remark , + def1 , + def2 , + def3 , + def4 , + def5 , + sorts, + sts, + + )values( + + #{id} , + #{taskLinvingId} , + #{result} , + #{queryCondition} , + #{rootAppPk} , + #{rootAppBill} , + #{rootAppNewData} , + #{newTransmitInfo} , + #{newPushDate} , + #{repairPust} , + #{create_time} , + #{create_user_id} , + #{modify_time} , + #{modify_user_id} , + #{sts} , + #{sorts} , + #{senceId} , + #{newState} , + #{businessDate} , + #{pluginId} , + #{processingTime} , + #{processingRemarks} , + #{processorName} , + #{processor} , + #{newSystemNumber} , + #{newSystemPrimary} , + #{remark} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5, sts) + values + + (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y') + + + + + insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5) + values + + (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}) + + on duplicate key update + task_linving_id = values(task_linving_id), + result = values(result), + query_condition = values(query_condition), + root_app_pk = values(root_app_pk), + root_app_bill = values(root_app_bill), + root_app_new_data = values(root_app_new_data), + new_transmit_info = values(new_transmit_info), + new_push_date = values(new_push_date), + repair_pust = values(repair_pust), + create_time = values(create_time), + create_user_id = values(create_user_id), + modify_time = values(modify_time), + modify_user_id = values(modify_user_id), + sts = values(sts), + sence_id = values(sence_id), + new_state = values(new_state), + business_date = values(business_date), + plugin_id = values(plugin_id), + processing_time = values(processing_time), + processing_remarks = values(processing_remarks), + processor_name = values(processor_name), + processor = values(processor), + new_system_number = values(new_system_number), + new_system_primary = values(new_system_primary), + remark = values(remark), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5) + + +update integration_task_living_details set + + task_linving_id = #{taskLinvingId}, + result = #{result}, + query_condition = #{queryCondition}, + root_app_pk = #{rootAppPk}, + root_app_bill = #{rootAppBill}, + root_app_new_data = #{rootAppNewData}, + new_transmit_info = #{newTransmitInfo}, + new_push_date = #{newPushDate}, + repair_pust = #{repairPust}, + create_time = #{create_time}, + create_user_id = #{create_user_id}, + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id}, + sts = #{sts}, + sence_id = #{senceId}, + new_state = #{newState}, + business_date = #{businessDate}, + plugin_id = #{pluginId}, + processing_time = #{processingTime}, + processing_remarks = #{processingRemarks}, + processor_name = #{processorName}, + processor = #{processor}, + new_system_number = #{newSystemNumber}, + new_system_primary = #{newSystemPrimary}, + remark = #{remark}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + where id = #{id} - - - update integration_task_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id = - #{modify_user_id} - - and id = #{id} - and task_linving_id = #{taskLinvingId} - and task_id = #{taskId} - and task_code = #{taskCode} - and task_name = #{taskName} - and remark = #{remark} - and task_status = #{taskStatus} - and start_time = #{startTime} - and end_time = #{endTime} - and diff_time = #{diffTime} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + +update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and task_linving_id = #{taskLinvingId} + and result = #{result} + and query_condition = #{queryCondition} + and root_app_pk = #{rootAppPk} + and root_app_bill = #{rootAppBill} + and root_app_new_data = #{rootAppNewData} + and new_transmit_info = #{newTransmitInfo} + and new_push_date = #{newPushDate} + and repair_pust = #{repairPust} + and sts = #{sts} + and sorts = #{sorts} + and sence_id = #{senceId} + and new_state = #{newState} + and business_date = #{businessDate} + and plugin_id = #{pluginId} + and processing_time = #{processingTime} + and processing_remarks = #{processingRemarks} + and processor_name = #{processorName} + and processor = #{processor} + and new_system_number = #{newSystemNumber} + and new_system_primary = #{newSystemPrimary} + and remark = #{remark} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} and sts='Y' - - - - - delete from integration_task_log where id = #{id} + + + + + delete from integration_task_living_details where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java index 32bcfd0c..1e3d9edd 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java @@ -1,33 +1,12 @@ -package com.hzya.frame.sysnew.integtationTaskLog.service; +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.web.entity.JsonResultEntity; - /** - * 集成任务-实例详情(IntegrationTaskLog)表服务接口 + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口 * * @author makejava - * @since 2024-05-06 15:37:55 + * @since 2024-05-15 14:06:43 */ -public interface IIntegrationTaskLogService extends IBaseService{ - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询任务日志列表分页 - * @Date 11:52 上午 2024/3/27 - **/ - JsonResultEntity queryEntityPage(JSONObject jsonObject); - - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取任务 - * @Date 2:36 下午 2024/3/27 - **/ - JsonResultEntity getEntity(JSONObject jsonObject); +public interface IIntegrationTaskLivingDetailsService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java index 0cf7b360..34b21725 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java @@ -1,77 +1,26 @@ -package com.hzya.frame.sysnew.integtationTaskLog.service.impl; +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -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 com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +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; - /** - * 集成任务-实例详情(IntegrationTaskLog)表服务实现类 + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类 * * @author makejava - * @since 2024-05-06 15:37:55 + * @since 2024-05-15 14:06:46 */ -@Service(value = "integrationTaskLogService") -public class IntegrationTaskLogServiceImpl extends BaseService implements IIntegrationTaskLogService { +@Service(value = "integrationTaskLivingDetailsService") +public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingDetailsService { - private IIntegrationTaskLogDao integrationTaskLogDao; + private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; @Autowired - public void setIntegrationTaskLogDao(IIntegrationTaskLogDao dao) { - this.integrationTaskLogDao = dao; + public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { + this.integrationTaskLivingDetailsDao = dao; this.dao = dao; } - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询任务日志列表分页 - * @Date 11:52 上午 2024/3/27 - **/ - @Override - public JsonResultEntity queryEntityPage(JSONObject jsonObject) { - IntegrationTaskLogEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class); - //判断分页 - if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - List list = integrationTaskLogDao.queryByLike(entity); - PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - } - - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取任务日志 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity getEntity(JSONObject jsonObject) { - IntegrationTaskLogEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity = integrationTaskLogDao.get(entity.getId()); - if (entity == null) { - return BaseResult.getFailureMessageEntity("获取任务日志失败"); - } - return BaseResult.getSuccessMessageEntity("获取任务日志成功", entity); - } }