From b7c9ddd1b7293e5dc9631e923a66203d0b918fae Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 8 May 2024 14:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E4=BB=BB=E5=8A=A1=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysMessageManageLogPluginInitializer.java | 10 +- .../frame/base/SystemPluginInitializer.java | 5 +- .../service/impl/BipV32207ServiceImpl.java | 6 +- .../IIntegrationTaskClassificationDao.java | 15 - .../IntegrationTaskClassificationDaoImpl.java | 18 - .../IntegrationTaskClassificationEntity.java | 101 ---- .../IntegrationTaskClassificationEntity.xml | 235 -------- ...IIntegrationTaskClassificationService.java | 28 - ...egrationTaskClassificationServiceImpl.java | 163 ----- .../dao/IIntegrationTaskDao.java | 15 - .../dao/IIntegrationTaskDetailsDao.java | 15 - .../dao/impl/IntegrationTaskDaoImpl.java | 18 - .../impl/IntegrationTaskDetailsDaoImpl.java | 18 - .../entity/IntegrationTaskDetailsEntity.java | 65 -- .../entity/IntegrationTaskDetailsEntity.xml | 211 ------- .../entity/IntegrationTaskEntity.java | 204 ------- .../entity/IntegrationTaskEntity.xml | 349 ----------- .../living/dao/IIntegrationTaskLivingDao.java | 15 - .../dao/IIntegrationTaskLivingDetailsDao.java | 25 - .../impl/IntegrationTaskLivingDaoImpl.java | 18 - .../IntegrationTaskLivingDetailsDaoImpl.java | 38 -- .../IntegrationTaskLivingDetailsEntity.java | 350 ----------- .../IntegrationTaskLivingDetailsEntity.xml | 559 ------------------ .../IntegrationTaskLivingDetailsVo.java | 356 ----------- .../entity/IntegrationTaskLivingEntity.java | 154 ----- .../entity/IntegrationTaskLivingEntity.xml | 309 ---------- .../IIntegrationTaskLivingDetailsService.java | 71 --- .../IIntegrationTaskLivingService.java | 38 -- ...tegrationTaskLivingDetailsServiceImpl.java | 209 ------- .../IntegrationTaskLivingServiceImpl.java | 274 --------- .../log/dao/IIntegrationTaskLogDao.java | 15 - .../log/dao/IIntegrationTaskLogDetailDao.java | 15 - .../dao/impl/IntegrationTaskLogDaoImpl.java | 18 - .../impl/IntegrationTaskLogDetailDaoImpl.java | 18 - .../IntegrationTaskLogDetailEntity.java | 247 -------- .../entity/IntegrationTaskLogDetailEntity.xml | 411 ------------- .../log/entity/IntegrationTaskLogEntity.java | 167 ------ .../log/entity/IntegrationTaskLogEntity.xml | 309 ---------- .../IIntegrationTaskLogDetailService.java | 15 - .../service/IIntegrationTaskLogService.java | 35 -- .../IntegrationTaskLogDetailServiceImpl.java | 27 - .../impl/IntegrationTaskLogServiceImpl.java | 278 --------- .../dao/IIntegrationTaskMonitoringDao.java | 16 - .../IntegrationTaskMonitoringDaoImpl.java | 29 - .../IntegrationTaskMonitoringEntity.java | 139 ----- .../IntegrationTaskMonitoringEntity.xml | 297 ---------- .../IIntegrationTaskMonitoringService.java | 37 -- .../IntegrationTaskMonitoringServiceImpl.java | 208 ------- .../IIntegrationTaskDetailsService.java | 15 - .../service/IIntegrationTaskService.java | 48 -- .../IntegrationTaskDetailsServiceImpl.java | 27 - .../impl/IntegrationTaskServiceImpl.java | 549 ----------------- .../dao/IIntegrationTaskWorkshopDao.java | 15 - .../IIntegrationTaskWorkshopDetailsDao.java | 15 - .../impl/IntegrationTaskWorkshopDaoImpl.java | 17 - ...IntegrationTaskWorkshopDetailsDaoImpl.java | 18 - .../IntegrationTaskWorkshopDetailsEntity.java | 53 -- .../IntegrationTaskWorkshopDetailsEntity.xml | 230 ------- .../entity/IntegrationTaskWorkshopEntity.java | 89 --- .../entity/IntegrationTaskWorkshopEntity.xml | 274 --------- ...IntegrationTaskWorkshopDetailsService.java | 13 - .../IIntegrationTaskWorkshopService.java | 26 - ...grationTaskWorkshopDetailsServiceImpl.java | 26 - .../IntegrationTaskWorkshopServiceImpl.java | 226 ------- .../impl/SysApplicationServiceImpl.java | 30 +- .../IIntegrationTaskCacheableService.java | 36 ++ .../dao/IIntegrationTaskDao.java | 5 +- .../dao/impl/IntegrationTaskDaoImpl.java | 11 +- .../entity/IntegrationTaskEntity.java | 10 - .../entity/IntegrationTaskEntity.xml | 544 +++++++++-------- .../IntegrationTaskCacheableServiceImpl.java | 105 ++++ .../impl/IntegrationTaskServiceImpl.java | 483 ++++++++------- .../entity/IntegrationTaskLivingEntity.java | 2 +- .../entity/IntegrationTaskLivingEntity.xml | 16 +- .../IntegrationTaskLivingDetailsEntity.java | 11 +- .../IntegrationTaskLivingDetailsEntity.xml | 39 +- .../IIntegrationTaskLivingDetailsService.java | 2 +- .../service/impl/PluginServiceImpl.java | 2 +- .../frame/web/quartz/QuartzJobFactory.java | 242 ++++---- .../web/quartz/QuartzJobFactoryUtils.java | 417 +++++++------ .../frame/web/init/MyApplicationListener.java | 273 ++------- .../service/impl/EntranceServiceImpl.java | 10 +- 82 files changed, 1182 insertions(+), 8870 deletions(-) delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/IIntegrationTaskClassificationDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/impl/IntegrationTaskClassificationDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/IIntegrationTaskClassificationService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDetailsDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDetailsDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDetailsDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsVo.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingDetailsService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingDetailsServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDetailDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDetailDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogDetailService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogDetailServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/IIntegrationTaskMonitoringDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/IIntegrationTaskMonitoringService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/impl/IntegrationTaskMonitoringServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskDetailsService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskDetailsServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDetailsDao.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDetailsDaoImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.xml delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopDetailsService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopService.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopDetailsServiceImpl.java delete mode 100644 service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/IIntegrationTaskCacheableService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskCacheableServiceImpl.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java index f2d8ed97..ed6f5231 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java @@ -2,6 +2,8 @@ package com.hzya.frame.plugin.sysMessageManageLogBack.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,20 +40,20 @@ public class SysMessageManageLogPluginInitializer extends PluginBaseEntity { public String getPluginLabel() { return "ESB消息日志备份"; } - @Override public String getPluginType() { return "1"; } @Override - public String executeBusiness(JSONObject requestJson) throws Exception { + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { try { - return "备份成功"; + logger.info("执行成功"); + return BaseResult.getSuccessMessageEntity("执行成功"); }catch (Exception e){ e.printStackTrace(); } - return null; + return BaseResult.getSuccessMessageEntity("执行成功"); } } diff --git a/core/src/main/java/com/hzya/frame/base/SystemPluginInitializer.java b/core/src/main/java/com/hzya/frame/base/SystemPluginInitializer.java index 49018944..5def7bc0 100644 --- a/core/src/main/java/com/hzya/frame/base/SystemPluginInitializer.java +++ b/core/src/main/java/com/hzya/frame/base/SystemPluginInitializer.java @@ -1,6 +1,8 @@ package com.hzya.frame.base; import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.hzya.frame.web.entity.JsonResultEntity; /** * @Content插件基类接口 @@ -70,5 +72,6 @@ public interface SystemPluginInitializer { * @param requestJson 执行业务代码的参数 * @return void **/ - String executeBusiness(JSONObject requestJson) throws Exception; + @DSTransactional() + JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception; } diff --git a/service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207ServiceImpl.java b/service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207ServiceImpl.java index b570fa64..b5c86542 100644 --- a/service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207ServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207ServiceImpl.java @@ -20,14 +20,11 @@ import com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity; import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity; import com.hzya.frame.bip.v3.v2207.service.IBipV32207Service; import com.hzya.frame.dateutil.DateUtil; -import com.hzya.frame.seeyon.service.impl.SeeYonInterFaceImpl; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; import com.hzya.frame.util.PluginUtils; import com.hzya.frame.util.bipV3.Encryption; import com.hzya.frame.util.bipV3.SHA256Util; import com.hzya.frame.util.oldNcc.CompressUtil; import com.hzya.frame.util.oldNcc.Decryption; -import com.hzya.frame.util.oldNcc.ResultMessageUtil; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.lang3.StringUtils; @@ -39,7 +36,6 @@ import org.slf4j.LoggerFactory; import java.net.URLEncoder; import java.util.*; -import java.util.stream.Collectors; @Service(value = "bipV32207Service") @@ -368,7 +364,7 @@ public class BipV32207ServiceImpl extends BaseService public JsonResultEntity thirdInterfaceSendOa(JSONObject jsonObject) throws Exception { JSONObject jsonObjectStr = getstrObj("jsonStr", jsonObject); PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id")); - String s = pluginBaseEntity.executeBusiness(jsonObjectStr); + JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObjectStr); return BaseResult.getSuccessMessageEntity("传递成功"); } diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/IIntegrationTaskClassificationDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/IIntegrationTaskClassificationDao.java deleted file mode 100644 index 53e19efb..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/IIntegrationTaskClassificationDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.classification.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.classification.entity.IntegrationTaskClassificationEntity; - -/** - * @description: 任务分类 dao - * @tableName: integration_task_classification - * @entityName: IntegrationTaskClassificationEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskClassificationDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/impl/IntegrationTaskClassificationDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/impl/IntegrationTaskClassificationDaoImpl.java deleted file mode 100644 index b50a8330..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/dao/impl/IntegrationTaskClassificationDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.classification.dao.impl; - -import com.hzya.frame.sys.integrationtask.classification.dao.IIntegrationTaskClassificationDao; -import com.hzya.frame.sys.integrationtask.classification.entity.IntegrationTaskClassificationEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; - -/** - * @description: 任务分类 dao - * @tableName: integration_task_classification - * @entityName: IntegrationTaskClassificationEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_classificationdao") -public class IntegrationTaskClassificationDaoImpl extends MybatisGenericDao implements IIntegrationTaskClassificationDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.java deleted file mode 100644 index bc535e43..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.hzya.frame.sys.integrationtask.classification.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import java.util.List; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 任务分类 entity - * @tableName: integration_task_classification - * @entityName: IntegrationTaskClassificationEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskClassificationEntity extends BaseEntity { - - /** 分类编码 */ - private String class_code; - /** 分类名称 */ - private String class_name; - /** 上级分类 */ - private String class_superiors; - /** 排序 */ - private Long sorts; - /** 组织机构ID */ - private String org_id; - /** 等级 */ - private String lvl; - /** 下级结构 */ - private List childClassifications; - - public List getChildClassifications() { - return childClassifications; - } - - public void setChildClassifications(List childClassifications) { - this.childClassifications = childClassifications; - } - - public String getLvl() { - return lvl; - } - - public void setLvl(String lvl) { - this.lvl = lvl; - } - - /** 分类编码 */ - public void setClass_code(String class_code) { - this.class_code = class_code; - } - /** 分类编码 */ - public String getClass_code() { - return class_code; - } - - - /** 分类名称 */ - public void setClass_name(String class_name) { - this.class_name = class_name; - } - /** 分类名称 */ - public String getClass_name() { - return class_name; - } - - - /** 上级分类 */ - public void setClass_superiors(String class_superiors) { - this.class_superiors = class_superiors; - } - /** 上级分类 */ - public String getClass_superiors() { - return class_superiors; - } - - - /** 排序 */ - public void setSorts(Long sorts) { - this.sorts = sorts; - } - /** 排序 */ - public Long getSorts() { - return sorts; - } - - - /** 组织机构ID */ - public void setOrg_id(String org_id) { - this.org_id = org_id; - } - /** 组织机构ID */ - public String getOrg_id() { - return org_id; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.xml deleted file mode 100644 index fc433b98..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/entity/IntegrationTaskClassificationEntity.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - class_code, - class_name, - class_superiors, - sorts, - create_user_id, - create_time, - modify_user_id, - modify_time, - sts, - org_id, - lvl - - - - - - - - - - - - - - - - - - - insert into integration_task_classification( - - id, - class_code, - class_name, - class_superiors, - sorts, - create_user_id, - modify_user_id, - org_id, - sorts, - lvl, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{class_code}, - #{class_name}, - #{class_superiors}, - #{sorts}, - #{create_user_id}, - #{modify_user_id}, - #{org_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_classification a WHERE a.sts = 'Y' ), - #{lvl}, - #{create_time} , - now() , - #{modify_time}, - now() , - 'Y' - - ) - - - - - update integration_task_classification set - - id = #{id}, - class_code = #{class_code}, - class_name = #{class_name}, - class_superiors = #{class_superiors}, - lvl = #{lvl}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - org_id = #{org_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_classification set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - update integration_task_classification set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id = #{id} - and class_code = #{class_code} - and class_name = #{class_name} - and class_superiors = #{class_superiors} - and lvl = #{lvl} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - - - - - - delete from integration_task_classification where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/IIntegrationTaskClassificationService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/IIntegrationTaskClassificationService.java deleted file mode 100644 index 646d5367..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/IIntegrationTaskClassificationService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzya.frame.sys.integrationtask.classification.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.classification.entity.IntegrationTaskClassificationEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -/** - * @description: 任务分类 service - * @tableName: integration_task_classification - * @entityName: IntegrationTaskClassificationEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskClassificationService extends IBaseService { - - //新增任务分类 - JsonResultEntity saveTaskClassification(JSONObject jsonObject); - - //修改任务分类 - JsonResultEntity updateTaskClassification(JSONObject jsonObject); - - //删除任务分类 - JsonResultEntity updateTaskClassificationSts(JSONObject jsonObject); - - //查询任务分类 - JsonResultEntity queryTaskClassification(JSONObject jsonObject); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java deleted file mode 100644 index 693bef86..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.hzya.frame.sys.integrationtask.classification.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.integrationtask.classification.dao.IIntegrationTaskClassificationDao; -import com.hzya.frame.sys.integrationtask.classification.entity.IntegrationTaskClassificationEntity; -import com.hzya.frame.sys.integrationtask.classification.service.IIntegrationTaskClassificationService; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.basedao.service.impl.BaseService; - -import java.util.List; - -/** - * @description: 任务分类 service - * @tableName: integration_task_classification - * @entityName: IntegrationTaskClassificationEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integrationTaskClassificationService") -public class IntegrationTaskClassificationServiceImpl extends BaseService implements IIntegrationTaskClassificationService { - - protected IIntegrationTaskClassificationDao integrationtaskclassificationDao; - - //@Autowired - public void setIntegrationTaskClassificationDao(IIntegrationTaskClassificationDao dao) { - this.integrationtaskclassificationDao = dao; - this.dao = dao; - } - - /** - * 新增任务分类 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity saveTaskClassification(JSONObject jsonObject) { - IntegrationTaskClassificationEntity integrationTaskClassificationEntity = getData("jsonStr", jsonObject, IntegrationTaskClassificationEntity.class); - //分类id - long uuid = UUIDLong.longUUID(); - integrationTaskClassificationEntity.setId(String.valueOf(uuid)); - if(null==integrationTaskClassificationEntity.getClass_name()||"".equals(integrationTaskClassificationEntity.getClass_name())){ - return BaseResult.getFailureMessageEntity("任务分类名称不能为空"); - } - if(null==integrationTaskClassificationEntity.getClass_code()||"".equals(integrationTaskClassificationEntity.getClass_code())){ - return BaseResult.getFailureMessageEntity("任务分类编码不能为空"); - } - if(integrationtaskclassificationDao.getCount(integrationTaskClassificationEntity)>0){ - return BaseResult.getFailureMessageEntity("任务分类编码已经存在"); - } - IntegrationTaskClassificationEntity taskClassificationEntity = integrationtaskclassificationDao.save(integrationTaskClassificationEntity); - return BaseResult.getSuccessMessageEntity("任务分类保存成功",taskClassificationEntity); - } - - /** - * 修改任务分类 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateTaskClassification(JSONObject jsonObject) { - IntegrationTaskClassificationEntity integrationTaskClassificationEntity = getData("jsonStr", jsonObject, IntegrationTaskClassificationEntity.class); - if(null==integrationTaskClassificationEntity||"".equals(integrationTaskClassificationEntity)){ - return BaseResult.getFailureMessageEntity("需要修改的菜单树为空"); - } - if(null==integrationTaskClassificationEntity.getClass_code()||"".equals(integrationTaskClassificationEntity.getClass_code())){ - return BaseResult.getFailureMessageEntity("修改时分类编码不能为空"); - } - if(null==integrationTaskClassificationEntity.getClass_name()||"".equals(integrationTaskClassificationEntity.getClass_name())){ - return BaseResult.getFailureMessageEntity("修改时分类名称不能为空"); - } - if(integrationtaskclassificationDao.getCount(integrationTaskClassificationEntity)>0){ - return BaseResult.getFailureMessageEntity("任务分类编码已经存在"); - } - integrationtaskclassificationDao.update("IntegrationTaskClassificationEntity_update",integrationTaskClassificationEntity); - return BaseResult.getSuccessMessageEntity("修改成功",integrationTaskClassificationEntity); - } - - /** - * 删除任务分类 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateTaskClassificationSts(JSONObject jsonObject) { - IntegrationTaskClassificationEntity integrationTaskClassificationEntity = getData("jsonStr", jsonObject, IntegrationTaskClassificationEntity.class); - if(null==integrationTaskClassificationEntity||"".equals(integrationTaskClassificationEntity)){ - return BaseResult.getFailureMessageEntity("需要删除的菜单树为空"); - } - if(null==integrationTaskClassificationEntity.getId()||"".equals(integrationTaskClassificationEntity.getId())){ - return BaseResult.getFailureMessageEntity("需要删除的菜单树id为空"); - } - IntegrationTaskClassificationEntity integrationTaskClassification=new IntegrationTaskClassificationEntity(); - integrationTaskClassification.setId(integrationTaskClassificationEntity.getId()); - integrationTaskClassification.setSts("Y"); - //根据id查询数据 - List integrationTaskClassificationEntities = integrationtaskclassificationDao.query(integrationTaskClassification); - //递归删除数据 - recursiveDeleteTaskClassification(integrationTaskClassificationEntities); - return BaseResult.getSuccessMessageEntity("任务分类删除成功",integrationTaskClassificationEntity.getId()); - } - - /** - * 递归删除任务分类 - * @param Classifications - */ - private void recursiveDeleteTaskClassification(List Classifications){ - if(null!=Classifications && Classifications.size()>0){ - for (int i=0;i integrationTaskClassificationEntities = integrationtaskclassificationDao.query(integrationTaskClassificationEntity); - if(null !=integrationTaskClassificationEntities && integrationTaskClassificationEntities.size()>0){ - recursiveDeleteTaskClassification(integrationTaskClassificationEntities); - } - //删除节点 - IntegrationTaskClassificationEntity integrationTaskClassification=new IntegrationTaskClassificationEntity(); - integrationTaskClassification.setId(Classifications.get(i).getId()); - integrationtaskclassificationDao.update("IntegrationTaskClassificationEntity_logicDelete",integrationTaskClassification); - } - } - } - - /** - * 查询任务分类 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskClassification(JSONObject jsonObject) { - IntegrationTaskClassificationEntity integrationTaskClassificationEntity=new IntegrationTaskClassificationEntity(); - integrationTaskClassificationEntity.setSts("Y"); - integrationTaskClassificationEntity.setLvl("0"); - List integrationTaskClassificationEntities = integrationtaskclassificationDao.query(integrationTaskClassificationEntity); - recursiveQueryTaskClassification(integrationTaskClassificationEntities); - return BaseResult.getSuccessMessageEntity("查询成功",integrationTaskClassificationEntities); - } - - /** - * 递归查询数据 - * @param Classifications - */ - private void recursiveQueryTaskClassification(List Classifications){ - //判断是否有数据 - if(Classifications.size()>0 && Classifications !=null){ - for (int i=0;i integrationTaskClassificationEntities = integrationtaskclassificationDao.query(integrationTaskClassificationEntity); - //判断查询出来的下级数据是否有数据 - if(integrationTaskClassificationEntities.size()>0 && integrationTaskClassificationEntities !=null){ - recursiveQueryTaskClassification(integrationTaskClassificationEntities); - Classifications.get(i).setChildClassifications(integrationTaskClassificationEntities); - } - } - } - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDao.java deleted file mode 100644 index 0772e385..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; - -/** - * @description: 集成任务 dao - * @tableName: integration_task - * @entityName: IntegrationTaskEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDetailsDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDetailsDao.java deleted file mode 100644 index 64a0a39f..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/IIntegrationTaskDetailsDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; - -/** - * @description: 集成任务-任务详细策略 dao - * @tableName: integration_task_details - * @entityName: IntegrationTaskDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskDetailsDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDaoImpl.java deleted file mode 100644 index 2a43b1c1..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.dao.impl; - -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDao; - -/** - * @description: 集成任务 dao - * @tableName: integration_task - * @entityName: IntegrationTaskEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_taskdao") -public class IntegrationTaskDaoImpl extends MybatisGenericDao implements IIntegrationTaskDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDetailsDaoImpl.java deleted file mode 100644 index 5054887c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/dao/impl/IntegrationTaskDetailsDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.dao.impl; - -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDetailsDao; - -/** - * @description: 集成任务-任务详细策略 dao - * @tableName: integration_task_details - * @entityName: IntegrationTaskDetailsEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_detailsdao") -public class IntegrationTaskDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskDetailsDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.java deleted file mode 100644 index 0470c1a1..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzya.frame.sys.integrationtask.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务-任务详细策略 entity - * @tableName: integration_task_details - * @entityName: IntegrationTaskDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskDetailsEntity extends BaseEntity { - - /** integration_task_id */ - private String parent_id; - /** 执行策略 */ - private String task_cron; - /** N定时Y立即执行 - */ - private String now_execution; - - private Integer sorts; - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - /** integration_task_id */ - public void setParent_id(String parent_id) { - this.parent_id = parent_id; - } - /** integration_task_id */ - public String getParent_id() { - return parent_id; - } - - - /** 执行策略 */ - public void setTask_cron(String task_cron) { - this.task_cron = task_cron; - } - /** 执行策略 */ - public String getTask_cron() { - return task_cron; - } - - - /** N定时Y立即执行 - */ - public void setNow_execution(String now_execution) { - this.now_execution = now_execution; - } - /** N定时Y立即执行 - */ - public String getNow_execution() { - return now_execution; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.xml deleted file mode 100644 index 9802b6ad..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskDetailsEntity.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id, - parent_id, - task_cron, - now_execution, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - sorts - - - - - - - - - - - - - - - - - - - insert into integration_task_details( - - id, - parent_id, - task_cron, - now_execution, - create_user_id, - modify_user_id, - sorts, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{parent_id}, - #{task_cron}, - #{now_execution}, - #{create_user_id}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_details a WHERE a.sts = 'Y' ), - #{create_time} , - now() , - #{modify_time}, - now(), - 'Y' - - ) - - - - - update integration_task_details set - - parent_id = #{parent_id}, - task_cron = #{task_cron}, - now_execution = #{now_execution}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - update integration_task_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - parent_id = #{parent_id} - - - - - update integration_task_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and parent_id = #{parent_id} - and task_cron = #{task_cron} - and now_execution = #{now_execution} - 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} - - - - - - delete from integration_task_details where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.java deleted file mode 100644 index 5fdfab98..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.hzya.frame.sys.integrationtask.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import java.util.List; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务 entity - * @tableName: integration_task - * @entityName: IntegrationTaskEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskEntity extends BaseEntity { - - /** 任务编码 */ - private String task_code; - /** 任务名称 */ - private String task_name; - /** 任务分类 */ - private String task_classes; - /** 任务策略 */ - private String task_cron; - /** 任务标识 */ - private String task_tag; - /** 功能介绍/任务描述 */ - private String fun_info; - /** 场景id */ - private String sence_id; - /** 备注 */ - private String remark; - /** 任务状态 */ - private String task_status; - /** 无备注 */ - private Integer user_id; - /** 部署公司 */ - private String org_id; - /** 服务名称 */ - private String server_name; - - private Integer sorts; - //任务ID集合 - private List taskIdList; - - /*是否插件*/ - private String plug; - /*插件id*/ - private String plug_id; - - public String getPlug() { - return plug; - } - - public void setPlug(String plug) { - this.plug = plug; - } - - public String getPlug_id() { - return plug_id; - } - - public void setPlug_id(String plug_id) { - this.plug_id = plug_id; - } - - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - /** 任务编码 */ - public void setTask_code(String task_code) { - this.task_code = task_code; - } - /** 任务编码 */ - public String getTask_code() { - return task_code; - } - - - /** 任务名称 */ - public void setTask_name(String task_name) { - this.task_name = task_name; - } - /** 任务名称 */ - public String getTask_name() { - return task_name; - } - - - /** 任务分类 */ - public void setTask_classes(String task_classes) { - this.task_classes = task_classes; - } - /** 任务分类 */ - public String getTask_classes() { - return task_classes; - } - - - /** 任务策略 */ - public void setTask_cron(String task_cron) { - this.task_cron = task_cron; - } - /** 任务策略 */ - public String getTask_cron() { - return task_cron; - } - - - /** 任务标识 */ - public void setTask_tag(String task_tag) { - this.task_tag = task_tag; - } - /** 任务标识 */ - public String getTask_tag() { - return task_tag; - } - - - /** 功能介绍/任务描述 */ - public void setFun_info(String fun_info) { - this.fun_info = fun_info; - } - /** 功能介绍/任务描述 */ - public String getFun_info() { - return fun_info; - } - - - /** 场景id */ - public void setSence_id(String sence_id) { - this.sence_id = sence_id; - } - /** 场景id */ - public String getSence_id() { - return sence_id; - } - - - /** 备注 */ - public void setRemark(String remark) { - this.remark = remark; - } - /** 备注 */ - public String getRemark() { - return remark; - } - - - /** 任务状态 */ - public void setTask_status(String task_status) { - this.task_status = task_status; - } - /** 任务状态 */ - public String getTask_status() { - return task_status; - } - - - /** 无备注 */ - public void setUser_id(Integer user_id) { - this.user_id = user_id; - } - /** 无备注 */ - public Integer getUser_id() { - return user_id; - } - - - /** 部署公司 */ - @Override - public void setOrg_id(String org_id) { - this.org_id = org_id; - } - /** 部署公司 */ - @Override - public String getOrg_id() { - return org_id; - } - - - /** 服务名称 */ - public void setServer_name(String server_name) { - this.server_name = server_name; - } - /** 服务名称 */ - public String getServer_name() { - return server_name; - } - - public List getTaskIdList() { - return taskIdList; - } - - public void setTaskIdList(List taskIdList) { - this.taskIdList = taskIdList; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.xml deleted file mode 100644 index f334d1a8..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/entity/IntegrationTaskEntity.xml +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - task_code, - task_name, - task_classes, - task_cron, - task_tag, - fun_info, - sence_id, - remark, - task_status, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - user_id, - org_id, - server_name, - sorts, - plug, - plug_id - - - - - - - - - - - - - - - - - - - - - - insert into integration_task( - - id, - task_code, - task_name, - task_classes, - task_cron, - task_tag, - fun_info, - sence_id, - remark, - task_status, - create_user_id, - modify_user_id, - user_id, - org_id, - server_name, - plug, - plug_id, - sorts, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{task_code}, - #{task_name}, - #{task_classes}, - #{task_cron}, - #{task_tag}, - #{fun_info}, - #{sence_id}, - #{remark}, - #{task_status}, - #{create_user_id}, - #{modify_user_id}, - #{user_id}, - #{org_id}, - #{server_name}, - #{plug}, - #{plug_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task a WHERE a.sts = 'Y' ), - #{create_time} , - now() , - #{modify_time}, - now() , - 'Y' - - ) - - - - - update integration_task set - - task_code = #{task_code}, - task_name = #{task_name}, - task_classes = #{task_classes}, - task_cron = #{task_cron}, - task_tag = #{task_tag}, - fun_info = #{fun_info}, - sence_id = #{sence_id}, - remark = #{remark}, - task_status = #{task_status}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - user_id = #{user_id}, - org_id = #{org_id}, - server_name = #{server_name}, - plug = #{plug}, - plug_id = #{plug_id}, - plug_id = null, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - update integration_task set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_code = #{task_code} - and task_name = #{task_name} - and task_classes = #{task_classes} - and task_cron = #{task_cron} - and task_tag = #{task_tag} - and fun_info = #{fun_info} - and sence_id = #{sence_id} - and remark = #{remark} - and task_status = #{task_status} - 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 user_id = #{user_id} - and org_id = #{org_id} - and server_name = #{server_name} - and plug = #{plug} - and plug_id = #{plug_id} - - - - - - delete from integration_task where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDao.java deleted file mode 100644 index 133da9f9..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingEntity; - -/** - * @description: 集成任务实例 dao - * @tableName: integration_task_living - * @entityName: IntegrationTaskLivingEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLivingDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDetailsDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDetailsDao.java deleted file mode 100644 index 3b4cda3a..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/IIntegrationTaskLivingDetailsDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsVo; - -import java.util.List; - -/** - * @description: 集成任务实例详情 dao - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLivingDetailsDao extends IBaseDao { - - List queryPageLeftTask(IntegrationTaskLivingDetailsVo entity); - - Integer entity_updatebyid(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity); - - List queryFastIntegrationTaskLivingDetails(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity); - -// List queryErrorDetailsId(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) throws Exception; -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDaoImpl.java deleted file mode 100644 index e486898e..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.dao.impl; - -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.living.dao.IIntegrationTaskLivingDao; - -/** - * @description: 集成任务实例 dao - * @tableName: integration_task_living - * @entityName: IntegrationTaskLivingEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_livingdao") -public class IntegrationTaskLivingDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java deleted file mode 100644 index be3692a5..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.dao.impl; - -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsVo; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.living.dao.IIntegrationTaskLivingDetailsDao; - -import java.util.List; - -/** - * @description: 集成任务实例详情 dao - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_living_detailsdao") -public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDetailsDao { - - @Override - public List queryPageLeftTask(IntegrationTaskLivingDetailsVo entity) { - List o = (List) super.selectList(getSqlIdPrifx() + "queryPageLeftTask", entity); - return o; - } - - @Override - public Integer entity_updatebyid(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { - return super.update(getSqlIdPrifx() + "entity_updatebyid", integrationTaskLivingDetailsEntity); - } - - @Override - public List queryFastIntegrationTaskLivingDetails(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { - return (List) super.selectList(getSqlIdPrifx() + "queryFastIntegrationTaskLivingDetails", integrationTaskLivingDetailsEntity); - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.java deleted file mode 100644 index 7ac210c8..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.java +++ /dev/null @@ -1,350 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.entity; - -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.math.BigDecimal; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务实例详情 entity - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskLivingDetailsEntity extends BaseEntity { - - /** - * 集成任务-实例_id - */ - private String task_linving_id; - /** - * 返回结果 - */ - private String result; - /** - * 原始查询条件 - */ - private String query_condition; - /** - * 源系统主键 - */ - private String root_app_pk; - - /** - * 批量查询 - */ - private String root_app_pk_s; - - /** - * 原系统单据 - */ - private String root_app_bill; - /** - * 最新源系统数据详情(上游系统入参) - */ - private String root_app_new_data; - /** - * 最新传输信息(下游系统返回结果) - */ - private String new_transmit_info; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date new_push_date; - /** - * 是否补推(Y是N不是) - */ - private String repair_pust; - - private Integer sorts; - - //场景id - private String sence_id; - - // 插件id - private String plugin_id; - - /** - * 推送状态 - */ - private String new_state; - - /** - * 作为查询条件的推送状态 - */ - private String param_new_state; - - /** - * 单据业务日期 - */ - private String business_date; - - /** - * 下游系统主键 - */ - private String new_system_primary; - /** - * 下游系统单号 - */ - private String new_system_number; - /** - * 处理⼈ - */ - private String processor; - - /** - * 处理⼈名称 - */ - private String processor_name; - - /** - * 处理备注 - */ - private String processing_remarks; - /** - * 处理时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date processing_time; - - public String getParam_new_state() { - return param_new_state; - } - - public void setParam_new_state(String param_new_state) { - this.param_new_state = param_new_state; - } - - public String getBusiness_date() { - return business_date; - } - - public void setBusiness_date(String business_date) { - this.business_date = business_date; - } - - public String getNew_state() { - return new_state; - } - - public void setNew_state(String new_state) { - this.new_state = new_state; - } - - public String getSence_id() { - return sence_id; - } - - public void setSence_id(String sence_id) { - this.sence_id = sence_id; - } - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - - /** - * 集成任务-实例_id - */ - public void setTask_linving_id(String task_linving_id) { - this.task_linving_id = task_linving_id; - } - - /** - * 集成任务-实例_id - */ - public String getTask_linving_id() { - return task_linving_id; - } - - - /** - * 返回结果 - */ - public void setResult(String result) { - this.result = result; - } - - /** - * 返回结果 - */ - public String getResult() { - return result; - } - - - /** - * 原始查询条件 - */ - public void setQuery_condition(String query_condition) { - this.query_condition = query_condition; - } - - /** - * 原始查询条件 - */ - public String getQuery_condition() { - return query_condition; - } - - - /** - * 源系统主键 - */ - public void setRoot_app_pk(String root_app_pk) { - this.root_app_pk = root_app_pk; - } - - /** - * 源系统主键 - */ - public String getRoot_app_pk() { - return root_app_pk; - } - - - /** - * 原系统单据 - */ - public void setRoot_app_bill(String root_app_bill) { - this.root_app_bill = root_app_bill; - } - - /** - * 原系统单据 - */ - public String getRoot_app_bill() { - return root_app_bill; - } - - - /** - * 最新源系统数据详情 - */ - public void setRoot_app_new_data(String root_app_new_data) { - this.root_app_new_data = root_app_new_data; - } - - /** - * 最新源系统数据详情 - */ - public String getRoot_app_new_data() { - return root_app_new_data; - } - - - /** - * 最新传输信息 - */ - public void setNew_transmit_info(String new_transmit_info) { - this.new_transmit_info = new_transmit_info; - } - - /** - * 最新传输信息 - */ - public String getNew_transmit_info() { - return new_transmit_info; - } - - - /** - * 最新推送时间 - */ - public void setNew_push_date(Date new_push_date) { - this.new_push_date = new_push_date; - } - - /** - * 最新推送时间 - */ - public Date getNew_push_date() { - return new_push_date; - } - - - /** - * 是否补推(Y是N不是) - */ - public void setRepair_pust(String repair_pust) { - this.repair_pust = repair_pust; - } - - /** - * 是否补推(Y是N不是) - */ - public String getRepair_pust() { - return repair_pust; - } - - public String getPlugin_id() { - return plugin_id; - } - - public void setPlugin_id(String plugin_id) { - this.plugin_id = plugin_id; - } - - public String getRoot_app_pk_s() { - return root_app_pk_s; - } - - public void setRoot_app_pk_s(String root_app_pk_s) { - this.root_app_pk_s = root_app_pk_s; - } - - public String getNew_system_primary() { - return new_system_primary; - } - - public void setNew_system_primary(String new_system_primary) { - this.new_system_primary = new_system_primary; - } - - public String getNew_system_number() { - return new_system_number; - } - - public void setNew_system_number(String new_system_number) { - this.new_system_number = new_system_number; - } - - public String getProcessor() { - return processor; - } - - public void setProcessor(String processor) { - this.processor = processor; - } - - public String getProcessor_name() { - return processor_name; - } - - public void setProcessor_name(String processor_name) { - this.processor_name = processor_name; - } - - public String getProcessing_remarks() { - return processing_remarks; - } - - public void setProcessing_remarks(String processing_remarks) { - this.processing_remarks = processing_remarks; - } - - public Date getProcessing_time() { - return processing_time; - } - - public void setProcessing_time(Date processing_time) { - this.processing_time = processing_time; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.xml deleted file mode 100644 index aae3e33d..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsEntity.xml +++ /dev/null @@ -1,559 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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, - sence_id, - plugin_id, - new_state, - business_date, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - new_system_primary, - new_system_number, - processor, - processor_name, - processing_remarks, - processing_time - - - - - - - - - - - - - - - - - - - - - - - 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, - sence_id, - plugin_id, - new_state, - business_date, - create_user_id, - modify_user_id, - sorts, - new_system_primary, - new_system_number, - processor, - processor_name, - processing_remarks, - processing_time, - create_time, - modify_time, - sts - - )values - ( - - #{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}, - #{sence_id}, - #{plugin_id}, - #{new_state}, - #{business_date}, - #{create_user_id}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ), - #{new_system_primary}, - #{new_system_number}, - #{processor}, - #{processor_name}, - #{processing_remarks}, - #{processing_time}, - #{create_time} , - now() , - #{modify_time}, - now() , - 'Y' - - ) - - - - - update integration_task_living_details set - - result = #{result}, - query_condition = #{query_condition}, - root_app_pk = #{root_app_pk}, - root_app_bill = #{root_app_bill}, - root_app_new_data = #{root_app_new_data}, - new_transmit_info = #{new_transmit_info}, - new_push_date = #{new_push_date}, - repair_pust = #{repair_pust}, - sence_id = #{sence_id}, - plugin_id = #{plugin_id}, - new_state = #{new_state}, - business_date = #{business_date}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - new_system_primary = #{new_system_primary}, - new_system_number = #{new_system_number}, - processor = #{processor}, - processor_name = #{processor_name}, - processing_remarks = #{processing_remarks}, - processing_time = #{processing_time}, - modify_time =#{modify_time} - modify_time = now() - - - where task_linving_id = #{task_linving_id} - - - - - update integration_task_living_details set - - result = #{result}, - query_condition = #{query_condition}, - root_app_pk = #{root_app_pk}, - root_app_bill = #{root_app_bill}, - root_app_new_data = #{root_app_new_data}, - new_transmit_info = #{new_transmit_info}, - new_push_date = #{new_push_date}, - repair_pust = #{repair_pust}, - sence_id = #{sence_id}, - plugin_id = #{plugin_id}, - new_state = #{new_state}, - business_date = #{business_date}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - new_system_primary = #{new_system_primary}, - new_system_number = #{new_system_number}, - processor = #{processor}, - processor_name = #{processor_name}, - processing_remarks = #{processing_remarks}, - processing_time = #{processing_time}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_living_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - where - id = #{id} - - - - - - update integration_task_living_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_linving_id = #{task_linving_id} - and result = #{result} - and query_condition = #{query_condition} - and root_app_pk = #{root_app_pk} - and root_app_bill = #{root_app_bill} - and root_app_new_data = #{root_app_new_data} - and new_transmit_info = #{new_transmit_info} - and new_push_date = #{new_push_date} - and repair_pust = #{repair_pust} - and sence_id = #{sence_id} - and plugin_id = #{plugin_id} - and new_state = #{new_state} - and business_date = #{business_date} - 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 new_system_primary = #{new_system_primary} - and new_system_number = #{new_system_number} - and processor = #{processor} - and processor_name = #{processor_name} - and processing_remarks = #{processing_remarks} - and processing_time = #{processing_time} - - - - - - delete from integration_task_living_details where id =#{id} - - - - - - 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, - sence_id, - plugin_id, - new_state, - business_date, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - new_system_primary, - new_system_number, - processor, - processor_name, - processing_remarks, - processing_time - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsVo.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsVo.java deleted file mode 100644 index 3ed3d3b9..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingDetailsVo.java +++ /dev/null @@ -1,356 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzya.frame.web.entity.BaseEntity; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @description: 集成任务实例详情 entity - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskLivingDetailsVo extends BaseEntity{ - - /** task_name */ - private String task_name; - /** integration_task_id */ - private String task_id; - /** - * 集成任务-实例_id - */ - private String task_linving_id; - /** - * 返回结果 - */ - private String result; - /** - * 原始查询条件 - */ - private String query_condition; - /** - * 源系统主键 - */ - private String root_app_pk; - /** - * 原系统单据 - */ - private String root_app_bill; - /** - * 最新源系统数据详情(上游系统入参) - */ - private String root_app_new_data; - /** - * 最新传输信息(下游系统返回结果) - */ - private String new_transmit_info; - private String new_push_date; - /** - * 是否补推(Y是N不是) - */ - private String repair_pust; - - private Integer sorts; - - //场景id - private String sence_id; - - // 插件id - private String plugin_id; - - // 插件名称 - private String plugin_name; - /** - * 推送状态 - */ - private String new_state; - - /** - * 作为查询条件的推送状态 - */ - private String param_new_state; - - /** - * 单据业务日期 - */ - private String business_date; - - - /** - * 下游系统主键 - */ - private String new_system_primary; - /** - * 下游系统单号 - */ - private String new_system_number; - /** - * 处理⼈ - */ - private String processor; - - /** - * 处理⼈名称 - */ - private String processor_name; - - /** - * 处理备注 - */ - private String processing_remarks; - /** - * 处理时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date processing_time; - - - public String getParam_new_state() { - return param_new_state; - } - - public void setParam_new_state(String param_new_state) { - this.param_new_state = param_new_state; - } - - public String getBusiness_date() { - return business_date; - } - - public void setBusiness_date(String business_date) { - this.business_date = business_date; - } - - public String getNew_state() { - return new_state; - } - - public void setNew_state(String new_state) { - this.new_state = new_state; - } - - public String getSence_id() { - return sence_id; - } - - public void setSence_id(String sence_id) { - this.sence_id = sence_id; - } - - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - - /** - * 集成任务-实例_id - */ - public void setTask_linving_id(String task_linving_id) { - this.task_linving_id = task_linving_id; - } - - /** - * 集成任务-实例_id - */ - public String getTask_linving_id() { - return task_linving_id; - } - - - /** - * 返回结果 - */ - public void setResult(String result) { - this.result = result; - } - - /** - * 返回结果 - */ - public String getResult() { - return result; - } - - - /** - * 原始查询条件 - */ - public void setQuery_condition(String query_condition) { - this.query_condition = query_condition; - } - - /** - * 原始查询条件 - */ - public String getQuery_condition() { - return query_condition; - } - - - /** - * 源系统主键 - */ - public void setRoot_app_pk(String root_app_pk) { - this.root_app_pk = root_app_pk; - } - - /** - * 源系统主键 - */ - public String getRoot_app_pk() { - return root_app_pk; - } - - - /** - * 原系统单据 - */ - public void setRoot_app_bill(String root_app_bill) { - this.root_app_bill = root_app_bill; - } - - /** - * 原系统单据 - */ - public String getRoot_app_bill() { - return root_app_bill; - } - - - /** - * 最新源系统数据详情 - */ - public void setRoot_app_new_data(String root_app_new_data) { - this.root_app_new_data = root_app_new_data; - } - - /** - * 最新源系统数据详情 - */ - public String getRoot_app_new_data() { - return root_app_new_data; - } - - - /** - * 最新传输信息 - */ - public void setNew_transmit_info(String new_transmit_info) { - this.new_transmit_info = new_transmit_info; - } - - /** - * 最新传输信息 - */ - public String getNew_transmit_info() { - return new_transmit_info; - } - - public String getNew_push_date() { - return new_push_date; - } - - public void setNew_push_date(String new_push_date) { - this.new_push_date = new_push_date; - } - - /** - * 是否补推(Y是N不是) - */ - public void setRepair_pust(String repair_pust) { - this.repair_pust = repair_pust; - } - - /** - * 是否补推(Y是N不是) - */ - public String getRepair_pust() { - return repair_pust; - } - - public String getPlugin_id() { - return plugin_id; - } - - public void setPlugin_id(String plugin_id) { - this.plugin_id = plugin_id; - } - - public String getTask_name() { - return task_name; - } - - public void setTask_name(String task_name) { - this.task_name = task_name; - } - - public String getTask_id() { - return task_id; - } - - public void setTask_id(String task_id) { - this.task_id = task_id; - } - - public String getPlugin_name() { - return plugin_name; - } - - public void setPlugin_name(String plugin_name) { - this.plugin_name = plugin_name; - } - - public String getNew_system_primary() { - return new_system_primary; - } - - public void setNew_system_primary(String new_system_primary) { - this.new_system_primary = new_system_primary; - } - - public String getNew_system_number() { - return new_system_number; - } - - public void setNew_system_number(String new_system_number) { - this.new_system_number = new_system_number; - } - - public String getProcessor() { - return processor; - } - - public void setProcessor(String processor) { - this.processor = processor; - } - - public String getProcessor_name() { - return processor_name; - } - - public void setProcessor_name(String processor_name) { - this.processor_name = processor_name; - } - - public String getProcessing_remarks() { - return processing_remarks; - } - - public void setProcessing_remarks(String processing_remarks) { - this.processing_remarks = processing_remarks; - } - - public Date getProcessing_time() { - return processing_time; - } - - public void setProcessing_time(Date processing_time) { - this.processing_time = processing_time; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.java deleted file mode 100644 index af43184c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务实例 entity - * @tableName: integration_task_living - * @entityName: IntegrationTaskLivingEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskLivingEntity extends BaseEntity { - - /** integration_task_id */ - private String task_id; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date start_time; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date end_time; - /** 耗时 */ - private String diff_time; - /** 返回结果 */ - private String result; - /** 服务器名称 */ - private String server_name; - /** 服务实例名称 */ - private String server_living; - /** 说明 - */ - private String instructions; - - private Integer sorts; - private String task_code; - private String task_name; - private String task_type; - - public String getTask_type() { - return task_type; - } - - public void setTask_type(String task_type) { - this.task_type = task_type; - } - - public String getTask_code() { - return task_code; - } - - public void setTask_code(String task_code) { - this.task_code = task_code; - } - - public String getTask_name() { - return task_name; - } - - public void setTask_name(String task_name) { - this.task_name = task_name; - } - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - /** integration_task_id */ - public void setTask_id(String task_id) { - this.task_id = task_id; - } - /** integration_task_id */ - public String getTask_id() { - return task_id; - } - - - /** 开始时间 */ - public void setStart_time(Date start_time) { - this.start_time = start_time; - } - /** 开始时间 */ - public Date getStart_time() { - return start_time; - } - - - /** 结束时间 */ - public void setEnd_time(Date end_time) { - this.end_time = end_time; - } - /** 结束时间 */ - public Date getEnd_time() { - return end_time; - } - - - /** 耗时 */ - public void setDiff_time(String diff_time) { - this.diff_time = diff_time; - } - /** 耗时 */ - public String getDiff_time() { - return diff_time; - } - - - /** 返回结果 */ - public void setResult(String result) { - this.result = result; - } - /** 返回结果 */ - public String getResult() { - return result; - } - - - /** 服务器名称 */ - public void setServer_name(String server_name) { - this.server_name = server_name; - } - /** 服务器名称 */ - public String getServer_name() { - return server_name; - } - - - /** 服务实例名称 */ - public void setServer_living(String server_living) { - this.server_living = server_living; - } - /** 服务实例名称 */ - public String getServer_living() { - return server_living; - } - - - /** 说明 - */ - public void setInstructions(String instructions) { - this.instructions = instructions; - } - /** 说明 - */ - public String getInstructions() { - return instructions; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.xml deleted file mode 100644 index 5c152df4..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/entity/IntegrationTaskLivingEntity.xml +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - task_id, - start_time, - end_time, - diff_time, - result, - server_name, - server_living, - instructions, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - task_type - - - - task.id as task_id, -living.id as id, -task.task_code as task_code, -task.task_name as task_name, -living.start_time as start_time, -living.end_time as end_time, -living.diff_time as diff_time, -living.result as result, -living.task_type, -living.server_name as server_name, -living.server_living as server_living, -living.instructions, -living.sts, -living.sorts - - - - - - - - - - - - - - - - - - - - - - - - - insert into integration_task_living( - - id, - task_id, - start_time, - end_time, - diff_time, - result, - task_type, - server_name, - server_living, - instructions, - create_user_id, - modify_user_id, - sorts, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{task_id}, - #{start_time}, - #{end_time}, - #{diff_time}, - #{result}, - #{task_type}, - #{server_name}, - #{server_living}, - #{instructions}, - #{create_user_id}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living a WHERE a.sts = 'Y' ), - #{create_time} , - now() , - #{modify_time}, - now(), - 'Y' - - ) - - - - - update integration_task_living set - - task_id = #{task_id}, - start_time = #{start_time}, - end_time = #{end_time}, - diff_time = #{diff_time}, - result = #{result}, - task_type = #{task_type}, - server_name = #{server_name}, - server_living = #{server_living}, - instructions = #{instructions}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_living set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - - update integration_task_living set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_id = #{task_id} - and start_time = #{start_time} - and end_time = #{end_time} - and diff_time = #{diff_time} - and result = #{result} - and task_type = #{task_type} - and server_name = #{server_name} - and server_living = #{server_living} - and instructions = #{instructions} - 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} - - - - - - delete from integration_task_living where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingDetailsService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingDetailsService.java deleted file mode 100644 index 6dd6e3b2..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingDetailsService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -/** - * @description: 集成任务实例详情 service - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLivingDetailsService extends IBaseService { - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询列表 分页 - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity queryPage(JSONObject jsonObject); - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取数据 根据id - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity queryEntity(JSONObject jsonObject); - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 批量推送 - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity batchPush(JSONObject jsonObject); - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 重新推送 - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity repush(JSONObject jsonObject); - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 手工处理 - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity manualProcessing(JSONObject jsonObject); - - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 删除 - * @Date 2:18 下午 2023/7/17 - **/ - JsonResultEntity deleteEntity(JSONObject jsonObject); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingService.java deleted file mode 100644 index b167bb16..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/IIntegrationTaskLivingService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -import java.util.List; - -/** - * @description: 集成任务实例 service - * @tableName: integration_task_living - * @entityName: IntegrationTaskLivingEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLivingService extends IBaseService { - - //保存任务实例以及任务实例明细 - JsonResultEntity saveIntegrationTaskLiving(JSONObject jsonObject); - - //根据task_id查询id - JsonResultEntity queryIntegrationTaskLiving(IntegrationTaskLivingEntity integrationTaskLivingEntity); - - - //实例补推 更新实例数据，新增日志数据 - JsonResultEntity updateIntegrationTaskLivingRetrofit(JSONObject jsonObject); - - //根据实例id修改实例数据 - JsonResultEntity updateIntegrationTaskLiving(JSONObject jsonObject); - - //查询单个实例 - JsonResultEntity queryTaskLivingOne(JSONObject jsonObject); - - //筛选明细数据正常与删除 - JsonResultEntity queryTaskLivingDetails(JSONObject jsonObject); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingDetailsServiceImpl.java deleted file mode 100644 index ebafed1c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingDetailsServiceImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.service.impl; - -import cn.dev33.satoken.stp.StpUtil; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.basedao.entity.ConditionType; -import com.hzya.frame.basedao.entity.ConnectType; -import com.hzya.frame.basedao.entity.WhereCriterion; -import com.hzya.frame.basedao.service.impl.BaseDaoUtilImpl; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsVo; -import com.hzya.frame.util.PluginUtils; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sys.integrationtask.living.service.IIntegrationTaskLivingDetailsService; -import com.hzya.frame.sys.integrationtask.living.dao.IIntegrationTaskLivingDetailsDao; -import com.hzya.frame.basedao.service.impl.BaseService; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -/** - * @description: 集成任务实例详情 service - * @tableName: integration_task_living_details - * @entityName: IntegrationTaskLivingDetailsEntity - * @author: gjh - * @history: 1.0 - */ -@Service(value = "integration_task_living_detailsService") -public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingDetailsService { - - protected IIntegrationTaskLivingDetailsDao integrationtasklivingdetailsDao; - - //@Autowired - private BaseDaoUtilImpl baseDaoUtilImpl; - - @Autowired - public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { - this.integrationtasklivingdetailsDao = dao; - this.dao = dao; - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询列表 分页 - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity queryPage(JSONObject object) { - IntegrationTaskLivingDetailsVo entity = getData("jsonStr", object, IntegrationTaskLivingDetailsVo.class); - //判断分页 - if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - List integrationTaskLivingDetailsEntityList = integrationtasklivingdetailsDao.queryPageLeftTask(entity); - if (integrationTaskLivingDetailsEntityList != null && integrationTaskLivingDetailsEntityList.size() > 0) { - for (int i = 0; i < integrationTaskLivingDetailsEntityList.size(); i++) { - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(integrationTaskLivingDetailsEntityList.get(i).getPlugin_id()); - if (pluginBaseEntity != null) { - integrationTaskLivingDetailsEntityList.get(i).setPlugin_name(pluginBaseEntity.getPluginName()); - } - } - } - PageInfo pageInfo = new PageInfo(integrationTaskLivingDetailsEntityList); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取数据 根据id - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity queryEntity(JSONObject object) { - IntegrationTaskLivingDetailsEntity entity = getData("jsonStr", object, IntegrationTaskLivingDetailsEntity.class); - //判断分页 - if (entity == null || entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("请先传递请求主键"); - } - IntegrationTaskLivingDetailsEntity appApi = integrationtasklivingdetailsDao.queryOne(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", appApi); - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 批量推送 - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity batchPush(JSONObject object) { - JSONObject jsonObject = getstrObj("jsonStr", object); - String plugin_id = "com.hzya.frame.plugin.sowow.plugin.sales.SoSalePluginInitializerToB"; - - - String id = jsonObject.getString("id"); - if (!checkStr(id)) { - return BaseResult.getFailureMessageEntity("请先选择要推送的数据"); - } - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(plugin_id); - JSONObject send = new JSONObject(); - send.put("type", "detailid"); - send.put("param", id); - - try { - pluginBaseEntity.executeBusiness(send); - return BaseResult.getSuccessMessageEntity("批量推送成功"); - } catch (Exception e) { - return BaseResult.getFailureMessageEntity("批量推送失败"); - } - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 重新推送 - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity repush(JSONObject object) { - JSONObject jsonObject = getstrObj("jsonStr", object); - String plugin_id = jsonObject.getString("plugin_id");//"com.hzya.frame.plugin.sowow.plugin.sales.SoSalePluginInitializerToB"; - String id = jsonObject.getString("id"); - if (!checkStr(id)) { - return BaseResult.getFailureMessageEntity("请先选择要推送的数据"); - } - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(plugin_id); - JSONObject send = new JSONObject(); - send.put("type", "details_error"); - send.put("pluginId", plugin_id); - send.put("integration_task_living_details_id", id); - - - try { - pluginBaseEntity.executeBusiness(send); - return BaseResult.getSuccessMessageEntity("重新推送成功"); - } catch (Exception e) { - return BaseResult.getFailureMessageEntity("重新推送失败"); - } - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 手工处理 - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity manualProcessing(JSONObject object) { - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = getData("jsonStr", object, IntegrationTaskLivingDetailsEntity.class); - if (integrationTaskLivingDetailsEntity == null && integrationTaskLivingDetailsEntity.getId() != null && !"".equals(integrationTaskLivingDetailsEntity.getId())) { - return BaseResult.getFailureMessageEntity("请求参数不存在"); - } - integrationTaskLivingDetailsEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - integrationTaskLivingDetailsEntity.setModify_time(new Date()); - integrationTaskLivingDetailsEntity.setProcessor(StpUtil.getLoginIdAsString()); - //检查用户名密码是否正确 - List whereList = new ArrayList<>(); - WhereCriterion passwordCondition = new WhereCriterion("", "id", ConditionType.等于.getValue(), StpUtil.getLoginIdAsString(), "", ConnectType.AND); - whereList.add(passwordCondition); - HashMap userMap = baseDaoUtilImpl.selectOne("sys_user", whereList); - integrationTaskLivingDetailsEntity.setProcessor_name(userMap.get("login_code").toString()); - integrationTaskLivingDetailsEntity.setProcessing_time(new Date()); - integrationTaskLivingDetailsEntity.setNew_state("H"); - integrationtasklivingdetailsDao.entity_updatebyid(integrationTaskLivingDetailsEntity); - return BaseResult.getSuccessMessageEntity("手工处理成功"); - } - - /** - * @param object - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 删除 - * @Date 2:18 下午 2023/7/17 - **/ - @Override - public JsonResultEntity deleteEntity(JSONObject object) { - IntegrationTaskLivingDetailsEntity entity = getData("jsonStr", object, IntegrationTaskLivingDetailsEntity.class); - //判断编码是否重复 - if (entity == null) { - return BaseResult.getFailureMessageEntity("请先选择数据"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("请先选择数据"); - } - //删除 - IntegrationTaskLivingDetailsEntity deleteEntity = new IntegrationTaskLivingDetailsEntity(); - deleteEntity.setId(entity.getId()); - deleteEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - deleteEntity.setModify_time(new Date()); - deleteEntity.setSts("Y"); - integrationtasklivingdetailsDao.logicRemove(deleteEntity); - return BaseResult.getSuccessMessageEntity("删除成功"); - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingServiceImpl.java deleted file mode 100644 index c9881223..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/service/impl/IntegrationTaskLivingServiceImpl.java +++ /dev/null @@ -1,274 +0,0 @@ -package com.hzya.frame.sys.integrationtask.living.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.dynamic.datasource.annotation.DSTransactional; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sys.integrationtask.living.dao.IIntegrationTaskLivingDao; -import com.hzya.frame.sys.integrationtask.living.dao.IIntegrationTaskLivingDetailsDao; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; -import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingEntity; -import com.hzya.frame.sys.integrationtask.living.service.IIntegrationTaskLivingService; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogEntity; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @description: 集成任务实例 service - * @tableName: integration_task_living - * @entityName: IntegrationTaskLivingEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integrationTaskLivingService") -public class IntegrationTaskLivingServiceImpl extends BaseService implements IIntegrationTaskLivingService { - - protected IIntegrationTaskLivingDao integrationtasklivingDao; - //@Autowired - private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; - - //@Autowired - public void setIntegrationTaskLivingDao(IIntegrationTaskLivingDao dao) { - this.integrationtasklivingDao = dao; - this.dao = dao; - } - - /** - * 实例保存 - * - * @param jsonObject - * @return - */ - @Override - - public JsonResultEntity saveIntegrationTaskLiving(JSONObject jsonObject) { - IntegrationTaskLivingEntity integrationTaskLivingEntity =jsonObject.toJavaObject(IntegrationTaskLivingEntity.class); - String msg=null; - String instructions=null; - if(null!=jsonObject.getString("instructions")){ - instructions=jsonObject.getString("instructions"); - } - //判断是否是插件执行 1:是插件 2：不是插件 - if("2".equals(jsonObject.getString("plug"))){ - String info = jsonObject.getString("info"); - //如果info为null，说明返回错误， - if(null!=info && !"".equals(info)){ - JSONObject jsonObjectInfo = JSONObject.parseObject(info); - msg = jsonObjectInfo.getString("msg");//最新传输信息 - //获取attribute里面得数据 循环保存明细 - if("false".equals(jsonObjectInfo.getString("success"))){ - jsonObject.put("instructions",jsonObjectInfo.getString("message")); - jsonObject.put("msg",jsonObjectInfo.getString("message")); - saveMainAndDetails(integrationTaskLivingEntity,jsonObject); - } - if("1".equals(jsonObjectInfo.getString("status"))){ - jsonObject.put("msg",jsonObjectInfo.getString("headMsg")); - saveMainAndDetails(integrationTaskLivingEntity,jsonObject); - } - }else{ - jsonObject.put("instructions",instructions); - jsonObject.put("msg",msg); - saveMainAndDetails(integrationTaskLivingEntity,jsonObject); - } - } - //如果是插件执行 - else{ - jsonObject.put("instructions",instructions); - jsonObject.put("msg",msg); - saveMainAndDetails(integrationTaskLivingEntity,jsonObject); - } - return BaseResult.getSuccessMessageEntity("任务实例保存成功", integrationTaskLivingEntity); - } - - private void saveMainAndDetails(IntegrationTaskLivingEntity integrationTaskLivingEntity,JSONObject jsonObject){ - //实例id - long uuidLiving = UUIDLong.longUUID(); - integrationTaskLivingEntity.setId(String.valueOf(uuidLiving)); - integrationTaskLivingEntity.setInstructions(jsonObject.getString("instructions")); - IntegrationTaskLivingEntity integrationTaskLiving = integrationtasklivingDao.save(integrationTaskLivingEntity); - //实例明细id - long uuidDetails = UUIDLong.longUUID(); - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setId(String.valueOf(uuidDetails)); - integrationTaskLivingDetailsEntity.setTask_linving_id(String.valueOf(uuidLiving)); - integrationTaskLivingDetailsEntity.setCreate_user_id(jsonObject.getString("create_user_id")); - integrationTaskLivingDetailsEntity.setModify_user_id(jsonObject.getString("modify_user_id")); - integrationTaskLivingDetailsEntity.setResult(jsonObject.getString("result")); - integrationTaskLivingDetailsEntity.setNew_transmit_info(jsonObject.getString("msg")); - integrationTaskLivingDetailsEntity.setRoot_app_new_data(jsonObject.getString("msg")); - integrationTaskLivingDetailsEntity.setQuery_condition(jsonObject.getString("query_condition")); - integrationTaskLivingDetailsEntity.setNew_push_date(new Date()); - integrationTaskLivingDetailsEntity.setRepair_pust("N"); - IntegrationTaskLivingDetailsEntity taskLivingDetailsEntity = integrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); - } - - - /** - * 根据task_id查询实例id - * - * @param integrationTaskLivingEntity - * @return - */ - @Override - public JsonResultEntity queryIntegrationTaskLiving(IntegrationTaskLivingEntity integrationTaskLivingEntity) { - if(null==integrationTaskLivingEntity.getId()||"".equals(integrationTaskLivingEntity.getId())){ - return BaseResult.getFailureMessageEntity("请携带任务id"); - } - List integrationTaskLivingEntities = integrationtasklivingDao.queryList(integrationTaskLivingEntity, "IntegrationTaskLivingEntity_getIdByTaskId"); - for (IntegrationTaskLivingEntity taskLivingEntity : integrationTaskLivingEntities) { - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity=new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setTask_linving_id(taskLivingEntity.getId()); - integrationTaskLivingDetailsEntity.setModify_user_id(integrationTaskLivingEntity.getModify_user_id()); - //根据任务实例id修改任务实例明细id - integrationTaskLivingDetailsDao.update("entity_logicDelete_Multi_Condition", integrationTaskLivingDetailsEntity); - } - //根据task_id修改任务实例sts - integrationtasklivingDao.update("entity_logicDelete_Multi_Condition", integrationTaskLivingEntity); - return null; - } - - - /** - * 实例补推 - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateIntegrationTaskLivingRetrofit(JSONObject jsonObject) { - IntegrationTaskLivingEntity integrationTaskLivingEntity = getData("json", jsonObject, IntegrationTaskLivingEntity.class); - if (null == integrationTaskLivingEntity.getId() || "".equals(integrationTaskLivingEntity.getId())) { - return BaseResult.getFailureMessageEntity("补推的时候请携带补推数据的id"); - } - if (null == integrationTaskLivingEntity.getTask_id() || "".equals(integrationTaskLivingEntity.getTask_id())) { - return BaseResult.getFailureMessageEntity("补推的时候请携带需要补推任务的id"); - } - //补推返回结果不成功的 - if ("失败".equals(integrationTaskLivingEntity.getResult())) { - //调用触发器 触发器中更新实例数据 新增日志数据 - //IntegrationTaskLivingJobUnit.createJob(getJob(jsonObject)); - } - return null; - } - - /** - * 组装需要传递到定时任务中的参数 - * - * @param jsonObject - * @return - */ - private JSONObject getJob(JSONObject jsonObject) { - JSONObject jsonObjectMap = new JSONObject(); - jsonObjectMap.put("task_name", jsonObject.getString("task_name")); - jsonObjectMap.put("task_code", jsonObject.getString("task_code")); - jsonObjectMap.put("sence_id", jsonObject.getString("sence_id")); - jsonObjectMap.put("task_cron", jsonObject.getString("task_cron")); - jsonObjectMap.put("task_id", jsonObject.getString("task_id")); - jsonObjectMap.put("create_user_id", jsonObject.getString("create_user_id")); - jsonObjectMap.put("modify_user_id", jsonObject.getString("modify_user_id")); - jsonObjectMap.put("id", jsonObject.getString("id")); - return jsonObject; - } - - /** - * 根据实例id修改实例数据 - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateIntegrationTaskLiving(JSONObject jsonObject) { - IntegrationTaskLivingEntity integrationTaskLivingEntity = jsonObject.toJavaObject(IntegrationTaskLivingEntity.class); - //更新实例数据 - integrationtasklivingDao.update("entity_update", integrationTaskLivingEntity); - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setTask_linving_id(integrationTaskLivingEntity.getId()); - integrationTaskLivingDetailsEntity.setResult(integrationTaskLivingEntity.getResult()); - integrationTaskLivingDetailsEntity.setModify_user_id(integrationTaskLivingEntity.getModify_user_id()); - //更新实例明细数据 - integrationTaskLivingDetailsDao.update("entity_update", integrationTaskLivingDetailsEntity); - return BaseResult.getSuccessMessageEntity("任务实例修改成功"); - } - - /** - * 查询单个实例 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskLivingOne(JSONObject jsonObject) { - try { - IntegrationTaskLivingEntity integrationTaskLivingEntity = getData("jsonStr", jsonObject, IntegrationTaskLivingEntity.class); - if(null==integrationTaskLivingEntity.getId()||"".equals(integrationTaskLivingEntity.getId())){ - return BaseResult.getFailureMessageEntity("查看单个时请携带id"); - } - List integrationTaskLivingEntities = integrationtasklivingDao.queryByLike(integrationTaskLivingEntity); - if(integrationTaskLivingEntities.size()==0){ - return BaseResult.getFailureMessageEntity("查看单个实例为null"); - } - IntegrationTaskLivingEntity integrationTaskLiving = integrationTaskLivingEntities.get(0); - if(null==integrationTaskLiving){ - return BaseResult.getSuccessMessageEntity("查询成功",integrationTaskLiving); - } - //查询明细数据 - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity=new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setTask_linving_id(integrationTaskLiving.getId()); - List integrationTaskLivingDetailsEntities = integrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity); - JSONObject jsonObjectMap=new JSONObject(); - jsonObjectMap.put("main",integrationTaskLiving); - List list=new ArrayList<>(); - if(integrationTaskLivingDetailsEntities.size()>0){ - for (IntegrationTaskLivingDetailsEntity taskLivingDetailsEntity : integrationTaskLivingDetailsEntities) { - list.add(taskLivingDetailsEntity); - } - } - jsonObjectMap.put("details",list); - return BaseResult.getSuccessMessageEntity("查询单个成功",jsonObjectMap); - }catch (Exception e){ - logger.info("查询单个失败:"+e.getMessage()); - return BaseResult.getFailureMessageEntity("查询单个失败:"+e.getMessage()); - } - } - - /** - * 筛选明细数据为正常与删除 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskLivingDetails(JSONObject jsonObject) { - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity=new IntegrationTaskLivingDetailsEntity(); - List list=null; - String jsonStr = jsonObject.getString("jsonStr"); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonStr); - //判断刷选条件是正常还是删除 - String type = jsonObjectStr.getString("type"); - integrationTaskLivingDetailsEntity.setTask_linving_id(jsonObjectStr.getString("task_linving_id")); - switch (type){ - //正常 - case "1": - integrationTaskLivingDetailsEntity.setSts("Y"); - list = integrationTaskLivingDetailsDao.queryList(integrationTaskLivingDetailsEntity, "IntegrationTaskLivingDetailsEntity_list_sts"); - break; - //删除 - case "2": - integrationTaskLivingDetailsEntity.setSts("N"); - list = integrationTaskLivingDetailsDao.queryList(integrationTaskLivingDetailsEntity, "IntegrationTaskLivingDetailsEntity_list_sts"); - break; - //全部 - case "3": - list = integrationTaskLivingDetailsDao.queryList(integrationTaskLivingDetailsEntity, "IntegrationTaskLivingDetailsEntity_list_sts"); - break; - } - return BaseResult.getSuccessMessageEntity("查询成功",list); - } - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDao.java deleted file mode 100644 index ee7464a4..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogEntity; - -/** - * @description: 集成任务日志 dao - * @tableName: integration_task_log - * @entityName: IntegrationTaskLogEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLogDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDetailDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDetailDao.java deleted file mode 100644 index d32f2e3c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/IIntegrationTaskLogDetailDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; - -/** - * @description: 集成任务日志详情 dao - * @tableName: integration_task_log_details - * @entityName: IntegrationTaskLogDetailEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLogDetailDao extends IBaseDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDaoImpl.java deleted file mode 100644 index e2c99ef8..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.dao.impl; - -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.log.dao.IIntegrationTaskLogDao; - -/** - * @description: 集成任务日志 dao - * @tableName: integration_task_log - * @entityName: IntegrationTaskLogEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_logdao") -public class IntegrationTaskLogDaoImpl extends MybatisGenericDao implements IIntegrationTaskLogDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDetailDaoImpl.java deleted file mode 100644 index e6afcbfd..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/dao/impl/IntegrationTaskLogDetailDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.dao.impl; - -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.log.dao.IIntegrationTaskLogDetailDao; - -/** - * @description: 集成任务日志详情 dao - * @tableName: integration_task_log_details - * @entityName: IntegrationTaskLogDetailEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_log_detailsdao") -public class IntegrationTaskLogDetailDaoImpl extends MybatisGenericDao implements IIntegrationTaskLogDetailDao { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.java deleted file mode 100644 index c207d174..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.java +++ /dev/null @@ -1,247 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务日志详情 entity - * @tableName: integration_task_log_details - * @entityName: IntegrationTaskLogDetailEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskLogDetailEntity extends BaseEntity { - - /** 集成任务-实例_id */ - private String task_linving_id; - /** 返回结果 */ - private String result; - /** 原始查询条件 */ - private String query_condition; - /** 源系统主键 */ - private String root_app_pk; - /** 原系统单据 */ - private String root_app_bill; - /** 最新源系统数据详情 */ - private String root_app_new_data; - /** 最新传输信息 */ - private String new_transmit_info; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date new_push_date; - /** 是否补推(Y是N不是) */ - private String repair_pust; - - private Integer sorts; - - /*源系统编码*/ - private String root_app_code; - /*业务日期*/ - private String business_time; - /*最新推送状态*/ - private String new_push_state; - /*处理人*/ - private String processor; - /*处理时间*/ - private String processor_time; - /*处理备注*/ - private String processor_remark; - /*最新元数据*/ - private String new_metadata; - /*任务名称*/ - private String task_name; - /*任务编码*/ - private String task_code; - /*任务类型*/ - private String task_type; - /*说明*/ - private String instructions; - - public String getInstructions() { - return instructions; - } - - public void setInstructions(String instructions) { - this.instructions = instructions; - } - - public String getTask_name() { - return task_name; - } - - public void setTask_name(String task_name) { - this.task_name = task_name; - } - - public String getTask_code() { - return task_code; - } - - public void setTask_code(String task_code) { - this.task_code = task_code; - } - - public String getTask_type() { - return task_type; - } - - public void setTask_type(String task_type) { - this.task_type = task_type; - } - - public String getRoot_app_code() { - return root_app_code; - } - - public void setRoot_app_code(String root_app_code) { - this.root_app_code = root_app_code; - } - - public String getBusiness_time() { - return business_time; - } - - public void setBusiness_time(String business_time) { - this.business_time = business_time; - } - - public String getNew_push_state() { - return new_push_state; - } - - public void setNew_push_state(String new_push_state) { - this.new_push_state = new_push_state; - } - - public String getProcessor() { - return processor; - } - - public void setProcessor(String processor) { - this.processor = processor; - } - - public String getProcessor_time() { - return processor_time; - } - - public void setProcessor_time(String processor_time) { - this.processor_time = processor_time; - } - - public String getProcessor_remark() { - return processor_remark; - } - - public void setProcessor_remark(String processor_remark) { - this.processor_remark = processor_remark; - } - - public String getNew_metadata() { - return new_metadata; - } - - public void setNew_metadata(String new_metadata) { - this.new_metadata = new_metadata; - } - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - - /** 集成任务-实例_id */ - public void setTask_linving_id(String task_linving_id) { - this.task_linving_id = task_linving_id; - } - /** 集成任务-实例_id */ - public String getTask_linving_id() { - return task_linving_id; - } - - - /** 返回结果 */ - public void setResult(String result) { - this.result = result; - } - /** 返回结果 */ - public String getResult() { - return result; - } - - - /** 原始查询条件 */ - public void setQuery_condition(String query_condition) { - this.query_condition = query_condition; - } - /** 原始查询条件 */ - public String getQuery_condition() { - return query_condition; - } - - - /** 源系统主键 */ - public void setRoot_app_pk(String root_app_pk) { - this.root_app_pk = root_app_pk; - } - /** 源系统主键 */ - public String getRoot_app_pk() { - return root_app_pk; - } - - - /** 原系统单据 */ - public void setRoot_app_bill(String root_app_bill) { - this.root_app_bill = root_app_bill; - } - /** 原系统单据 */ - public String getRoot_app_bill() { - return root_app_bill; - } - - - /** 最新源系统数据详情 */ - public void setRoot_app_new_data(String root_app_new_data) { - this.root_app_new_data = root_app_new_data; - } - /** 最新源系统数据详情 */ - public String getRoot_app_new_data() { - return root_app_new_data; - } - - - /** 最新传输信息 */ - public void setNew_transmit_info(String new_transmit_info) { - this.new_transmit_info = new_transmit_info; - } - /** 最新传输信息 */ - public String getNew_transmit_info() { - return new_transmit_info; - } - - - /** 最新推送时间 */ - public void setNew_push_date(Date new_push_date) { - this.new_push_date = new_push_date; - } - /** 最新推送时间 */ - public Date getNew_push_date() { - return new_push_date; - } - - - /** 是否补推(Y是N不是) */ - public void setRepair_pust(String repair_pust) { - this.repair_pust = repair_pust; - } - /** 是否补推(Y是N不是) */ - public String getRepair_pust() { - return repair_pust; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.xml deleted file mode 100644 index a4cb5ab0..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogDetailEntity.xml +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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, - root_app_code, - business_time, - new_push_state, - processor, - processor_time, - processor_remark, - new_metadata - - - - task.id as task_id, -log.id as log_id, -details.id as id, -task.task_code as task_code, -task.task_name as task_name, -log.task_type as task_type, -details.result as result, -log.instructions, -details.query_condition as query_condition, -details.root_app_pk as root_app_pk, -details.root_app_bill as root_app_bill, -details.root_app_new_data as root_app_new_data, -details.new_transmit_info as new_transmit_info, -details.new_push_date, -details.root_app_code, -details.business_time, -details.new_push_state as new_push_state, -details.processor , -details.processor_time , -details.processor_remark , -details.new_metadata , -details.repair_pust , -details.create_time, -details.modify_time, -details.sts - - - - - - - - - - - - - - - - - - - - - - - - insert into integration_task_log_details( - - id, - 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, - modify_user_id, - sorts, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{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}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_log_details a WHERE a.sts = 'Y' ), - #{create_time} , - now() , - #{modify_time}, - now() , - 'Y' - - ) - - - - - update integration_task_log_details set - - task_linving_id = #{task_linving_id}, - result = #{result}, - query_condition = #{query_condition}, - root_app_pk = #{root_app_pk}, - root_app_bill = #{root_app_bill}, - root_app_new_data = #{root_app_new_data}, - new_transmit_info = #{new_transmit_info}, - new_push_date = #{new_push_date}, - root_app_code = #{root_app_code}, - business_time = #{business_time}, - new_push_state = #{new_push_state}, - processor = #{processor}, - processor_time = #{processor_time}, - processor_remark = #{processor_remark}, - new_metadata = #{new_metadata}, - repair_pust = #{repair_pust}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_log_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - - update integration_task_log_details set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_linving_id = #{task_linving_id} - and result = #{result} - and query_condition = #{query_condition} - and root_app_pk = #{root_app_pk} - and root_app_bill = #{root_app_bill} - and root_app_new_data = #{root_app_new_data} - and new_transmit_info = #{new_transmit_info} - and new_push_date = #{new_push_date} - and root_app_code = #{root_app_code} - and business_time = #{business_time} - and new_push_state = #{new_push_state} - and processor = #{processor} - and processor_time = #{processor_time} - and processor_remark = #{processor_remark} - and new_metadata = #{new_metadata} - and repair_pust = #{repair_pust} - 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} - - - - - - delete from integration_task_log_details where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.java deleted file mode 100644 index d7b275de..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务日志 entity - * @tableName: integration_task_log - * @entityName: IntegrationTaskLogEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskLogEntity extends BaseEntity { - - /** integration_task_id */ - private String task_id; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date start_time; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date end_time; - /** 耗时 */ - private String diff_time; - /** 返回结果 */ - private String result; - /** 服务器名称 */ - private String server_name; - /** 服务实例名称 */ - private String server_living; - /** 说明 - */ - private String instructions; - - private Integer sorts; - private String id; - - private String task_code; - private String task_name; - private String task_type; - - public String getTask_type() { - return task_type; - } - - public void setTask_type(String task_type) { - this.task_type = task_type; - } - - public String getTask_code() { - return task_code; - } - - public void setTask_code(String task_code) { - this.task_code = task_code; - } - - public String getTask_name() { - return task_name; - } - - public void setTask_name(String task_name) { - this.task_name = task_name; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - /** integration_task_id */ - public void setTask_id(String task_id) { - this.task_id = task_id; - } - /** integration_task_id */ - public String getTask_id() { - return task_id; - } - - - /** 开始时间 */ - public void setStart_time(Date start_time) { - this.start_time = start_time; - } - /** 开始时间 */ - public Date getStart_time() { - return start_time; - } - - - /** 结束时间 */ - public void setEnd_time(Date end_time) { - this.end_time = end_time; - } - /** 结束时间 */ - public Date getEnd_time() { - return end_time; - } - - - /** 耗时 */ - public void setDiff_time(String diff_time) { - this.diff_time = diff_time; - } - /** 耗时 */ - public String getDiff_time() { - return diff_time; - } - - - /** 返回结果 */ - public void setResult(String result) { - this.result = result; - } - /** 返回结果 */ - public String getResult() { - return result; - } - - - /** 服务器名称 */ - public void setServer_name(String server_name) { - this.server_name = server_name; - } - /** 服务器名称 */ - public String getServer_name() { - return server_name; - } - - - /** 服务实例名称 */ - public void setServer_living(String server_living) { - this.server_living = server_living; - } - /** 服务实例名称 */ - public String getServer_living() { - return server_living; - } - - - /** 说明 - */ - public void setInstructions(String instructions) { - this.instructions = instructions; - } - /** 说明 - */ - public String getInstructions() { - return instructions; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.xml deleted file mode 100644 index 39fa7a1d..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/entity/IntegrationTaskLogEntity.xml +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - task_id, - start_time, - end_time, - diff_time, - result, - task_type, - server_name, - server_living, - instructions, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts - - - - task.id as task_id, -log.id as id, -task.task_code as task_code, -task.task_name as task_name, -log.task_type as task_type, -log.start_time as start_time, -log.end_time as end_time, -log.diff_time as diff_time, -log.result as result, -log.server_name as server_name, -log.server_living as server_living, -log.instructions, -log.sts, -log.sorts - - - - - - - - - - - - - - - - - - - - - - - - - insert into integration_task_log( - - id, - task_id, - start_time, - end_time, - diff_time, - result, - task_type, - server_name, - server_living, - instructions, - create_user_id, - modify_user_id, - sorts, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{task_id}, - #{start_time}, - #{end_time}, - #{diff_time}, - #{result}, - #{task_type}, - #{server_name}, - #{server_living}, - #{instructions}, - #{create_user_id}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_log a WHERE a.sts = 'Y' ), - #{create_time} , - now() , - #{modify_time}, - now(), - 'Y' - - ) - - - - - update integration_task_log set - - task_id = #{task_id}, - start_time = #{start_time}, - end_time = #{end_time}, - diff_time = #{diff_time}, - result = #{result}, - task_type = #{task_type}, - server_name = #{server_name}, - server_living = #{server_living}, - instructions = #{instructions}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_log set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - - update integration_task_log set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_id = #{task_id} - and start_time = #{start_time} - and end_time = #{end_time} - and diff_time = #{diff_time} - and result = #{result} - and task_type = #{task_type} - and server_name = #{server_name} - and server_living = #{server_living} - and instructions = #{instructions} - 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} - - - - - - delete from integration_task_log where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogDetailService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogDetailService.java deleted file mode 100644 index 4e636755..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogDetailService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; - -/** - * @description: 集成任务日志详情 service - * @tableName: integration_task_log_details - * @entityName: IntegrationTaskLogDetailEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLogDetailService extends IBaseService { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogService.java deleted file mode 100644 index e56fc541..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/IIntegrationTaskLogService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -import java.util.List; - -/** - * @description: 集成任务日志 service - * @tableName: integration_task_log - * @entityName: IntegrationTaskLogEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskLogService extends IBaseService { - - //保存任务日志和任务日志明细 - JsonResultEntity saveIntegrationTaskLog(JSONObject jsonObject); - - //根据任务id task_id查询任务日志id - JsonResultEntity queryIntegrationTaskLog(IntegrationTaskLogEntity integrationTaskLogEntity); - - - //日志输出成excel表格 - JsonResultEntity queryTaskLogExcel(JSONObject jsonObject); - - //查询单个日志 - JsonResultEntity queryTaskLogOne(JSONObject jsonObject); - - //刷选出明细正常与删除数据 - JsonResultEntity queryTaskLogDetail(JSONObject jsonObject); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogDetailServiceImpl.java deleted file mode 100644 index 940c2b7c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogDetailServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.service.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; -import com.hzya.frame.sys.integrationtask.log.service.IIntegrationTaskLogDetailService; -import com.hzya.frame.sys.integrationtask.log.dao.IIntegrationTaskLogDetailDao; -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * @description: 集成任务日志详情 service - * @tableName: integration_task_log_details - * @entityName: IntegrationTaskLogDetailEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integration_task_log_detailsService") -public class IntegrationTaskLogDetailServiceImpl extends BaseService implements IIntegrationTaskLogDetailService { - - protected IIntegrationTaskLogDetailDao integrationtasklogdetailDao; - - //@Autowired - public void setIntegrationTaskLogDetailDao(IIntegrationTaskLogDetailDao dao) { - this.integrationtasklogdetailDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogServiceImpl.java deleted file mode 100644 index 4dda3b64..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/log/service/impl/IntegrationTaskLogServiceImpl.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.hzya.frame.sys.integrationtask.log.service.impl; - -import cn.hutool.core.io.IoUtil; -import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; -import com.hzya.frame.sys.integrationtask.log.dao.IIntegrationTaskLogDetailDao; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogDetailEntity; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.uuid.UUIDUtils; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.sys.integrationtask.log.entity.IntegrationTaskLogEntity; -import com.hzya.frame.sys.integrationtask.log.service.IIntegrationTaskLogService; -import com.hzya.frame.sys.integrationtask.log.dao.IIntegrationTaskLogDao; -import com.hzya.frame.basedao.service.impl.BaseService; - -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @description: 集成任务日志 service - * @tableName: integration_task_log - * @entityName: IntegrationTaskLogEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integrationTaskLogService") -public class IntegrationTaskLogServiceImpl extends BaseService implements IIntegrationTaskLogService { - - protected IIntegrationTaskLogDao integrationtasklogDao; - //@Autowired - private IIntegrationTaskLogDetailDao integrationTaskLogDetailDao; - //@Resource - private HttpServletResponse httpServletResponse; - - @Autowired - public void setIntegrationTaskLogDao(IIntegrationTaskLogDao dao) { - this.integrationtasklogDao = dao; - this.dao = dao; - } - - /** - * 查询单个日志 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskLogOne(JSONObject jsonObject) { - try { - IntegrationTaskLogEntity integrationTaskLogEntity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class); - if(null==integrationTaskLogEntity.getId()||"".equals(integrationTaskLogEntity.getId())){ - return BaseResult.getFailureMessageEntity("查看单个时请携带id"); - } - List integrationTaskLogEntities = integrationtasklogDao.queryByLike(integrationTaskLogEntity); - if(integrationTaskLogEntities.size()==0){ - return BaseResult.getFailureMessageEntity("查看单个为null"); - } - IntegrationTaskLogEntity integrationTaskLog = integrationTaskLogEntities.get(0); - //查询明细数据 - IntegrationTaskLogDetailEntity integrationTaskLogDetailEntity=new IntegrationTaskLogDetailEntity(); - integrationTaskLogDetailEntity.setTask_linving_id(integrationTaskLog.getId()); - List integrationTaskLogDetailEntityList = integrationTaskLogDetailDao.query(integrationTaskLogDetailEntity); - JSONObject jsonObjectMap=new JSONObject(); - jsonObjectMap.put("main",integrationTaskLog); - List list=new ArrayList<>(); - if(integrationTaskLogDetailEntityList.size()>0){ - for (IntegrationTaskLogDetailEntity taskLogDetailEntity : integrationTaskLogDetailEntityList) { - list.add(taskLogDetailEntity); - } - } - jsonObjectMap.put("details",list); - return BaseResult.getSuccessMessageEntity("查询单个成功",jsonObjectMap); - }catch (Exception e){ - logger.info("查询单个失败:"+e.getMessage()); - return BaseResult.getFailureMessageEntity("查询单个失败:"+e.getMessage()); - } - } - - /** - * 刷选明细正常与失败数据还有全部数据 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskLogDetail(JSONObject jsonObject) { - IntegrationTaskLogDetailEntity integrationTaskLogDetailEntity=new IntegrationTaskLogDetailEntity(); - List integrationTaskLogDetailEntityList=null; - String jsonStr = jsonObject.getString("jsonStr"); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonStr); - //判断刷选条件是正常还是删除 - String type = jsonObjectStr.getString("type"); - if(null==type||"".equals(type)){ - type="3"; - } - switch (type){ - //正常 - case "1": - integrationTaskLogDetailEntity.setResult("执行成功"); - integrationTaskLogDetailEntityList = integrationTaskLogDetailDao.queryByLike(integrationTaskLogDetailEntity); - break; - //失败 - case "2": - integrationTaskLogDetailEntity.setResult("执行失败"); - integrationTaskLogDetailEntityList = integrationTaskLogDetailDao.queryByLike(integrationTaskLogDetailEntity); - break; - //全部 - case "3": - integrationTaskLogDetailEntityList = integrationTaskLogDetailDao.queryByLike(integrationTaskLogDetailEntity); - break; - //查看单个 - case "4": - integrationTaskLogDetailEntity.setId(jsonObjectStr.getString("id")); - integrationTaskLogDetailEntityList = integrationTaskLogDetailDao.queryByLike(integrationTaskLogDetailEntity); - break; - } - return BaseResult.getSuccessMessageEntity("查询成功",integrationTaskLogDetailEntityList); - } - - - /** - * 保存日志和日志明细 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity saveIntegrationTaskLog(JSONObject jsonObject) { - IntegrationTaskLogEntity integrationTaskLogEntity = jsonObject.toJavaObject(IntegrationTaskLogEntity.class); - String msg=null; - String instructions=null; - if(null!=jsonObject.getString("instructions")){ - instructions=jsonObject.getString("instructions"); - } - if("2".equals(jsonObject.getString("plug"))){ - String info = jsonObject.getString("info"); - if(null!=info && !"".equals(info)){ - JSONObject jsonObjectInfo = JSONObject.parseObject(info); - msg = jsonObjectInfo.getString("msg");//最新传输信息 - //获取attribute里面得数据 循环保存明细 - if("false".equals(jsonObjectInfo.getString("success"))){ - jsonObject.put("instructions",jsonObjectInfo.getString("message")); - jsonObject.put("msg",jsonObjectInfo.getString("message")); - saveLog(integrationTaskLogEntity,jsonObject); - } - if("1".equals(jsonObjectInfo.getString("status"))){ - jsonObject.put("msg",jsonObjectInfo.getString("headMsg")); - saveLog(integrationTaskLogEntity,jsonObject); - } - }else{ - jsonObject.put("instructions",instructions); - jsonObject.put("msg",msg); - saveLog(integrationTaskLogEntity,jsonObject); - } - }else{ - jsonObject.put("instructions",instructions); - jsonObject.put("msg",msg); - saveLog(integrationTaskLogEntity,jsonObject); - } - return BaseResult.getSuccessMessageEntity("任务日志保存成功",integrationTaskLogEntity); - } - - private void saveLog(IntegrationTaskLogEntity integrationTaskLogEntity,JSONObject jsonObject){ - //日志id - long uuid = UUIDLong.longUUID(); - integrationTaskLogEntity.setId(String.valueOf(uuid)); - integrationTaskLogEntity.setInstructions(jsonObject.getString("instructions")); - integrationtasklogDao.save(integrationTaskLogEntity); - //日志明细id - long uuidDetails = UUIDLong.longUUID(); - IntegrationTaskLogDetailEntity integrationTaskLogDetailEntity=new IntegrationTaskLogDetailEntity(); - integrationTaskLogDetailEntity.setCreate_user_id(jsonObject.getString("create_user_id")); - integrationTaskLogDetailEntity.setModify_user_id(jsonObject.getString("modify_user_id")); - integrationTaskLogDetailEntity.setId(String.valueOf(uuidDetails)); - integrationTaskLogDetailEntity.setTask_linving_id(String.valueOf(uuid)); - integrationTaskLogDetailEntity.setResult(jsonObject.getString("result")); - integrationTaskLogDetailEntity.setNew_transmit_info(jsonObject.getString("msg")); - integrationTaskLogDetailEntity.setRoot_app_new_data(jsonObject.getString("msg")); - integrationTaskLogDetailEntity.setQuery_condition(jsonObject.getString("query_condition")); - integrationTaskLogDetailEntity.setNew_push_date(new Date()); - integrationTaskLogDetailEntity.setRepair_pust("N"); - integrationTaskLogDetailDao.save(integrationTaskLogDetailEntity); - } - - /** - * 根据任务id task_id查询任务日志id - * @param integrationTaskLogEntity - * @return - */ - @Override - public JsonResultEntity queryIntegrationTaskLog(IntegrationTaskLogEntity integrationTaskLogEntity) { - if(null==integrationTaskLogEntity.getTask_id()||"".equals(integrationTaskLogEntity.getId())){ - return BaseResult.getFailureMessageEntity("请携带任务id"); - } - List integrationTaskLogEntities = integrationtasklogDao.queryList(integrationTaskLogEntity, "IntegrationTaskLogEntity_getByTaskId"); - for (IntegrationTaskLogEntity taskLogEntity : integrationTaskLogEntities) { - IntegrationTaskLogDetailEntity integrationTaskLogDetailEntity=new IntegrationTaskLogDetailEntity(); - integrationTaskLogDetailEntity.setTask_linving_id(taskLogEntity.getTask_id()); - integrationTaskLogDetailEntity.setModify_user_id(integrationTaskLogEntity.getModify_user_id()); - //根据任务日志id修改任务日志明细sts - integrationTaskLogDetailDao.update("entity_logicDelete_Multi_Condition",integrationTaskLogDetailEntity); - } - //根基task_id修改任务日志sts - integrationtasklogDao.update("entity_logicDelete_Multi_Condition",integrationTaskLogEntity); - return null; - } - - - /** - * 日志输出成excel - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryTaskLogExcel(JSONObject jsonObject) { - try { - IntegrationTaskLogEntity integrationTaskLogEntity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class); - //查询任务与日志的连表查询语句 - List integrationTaskLogEntities = integrationtasklogDao.queryByLike(integrationTaskLogEntity); - if(integrationTaskLogEntities.size()==0){ - return BaseResult.getFailureMessageEntity("输出的数据为null"); - } - createExcel(integrationTaskLogEntity,integrationTaskLogEntities); - return BaseResult.getSuccessMessageEntity("日志输出成功"); - }catch (Exception e){ - logger.info("日志输出失败:"+e.getMessage()); - return BaseResult.getFailureMessageEntity("日志输出失败:"+e.getMessage()); - } - } - - /** - * 创建excel - * @param logEntity - * @param list - * @throws Exception - */ - private void createExcel(IntegrationTaskLogEntity logEntity, List list) throws Exception{ - // 通过工具类创建writer，默认创建xls格式 - ExcelWriter excelWriter= ExcelUtil.getWriter(true); - //设置列名称 - excelWriter.addHeaderAlias("id","日志id"); - excelWriter.addHeaderAlias("task_name","任务名称"); - excelWriter.addHeaderAlias("task_code","任务编码"); - excelWriter.addHeaderAlias("task_tag","任务标识"); - excelWriter.addHeaderAlias("task_classes","类型"); - excelWriter.addHeaderAlias("start_time","开始时间"); - excelWriter.addHeaderAlias("end_time","完成时间"); - excelWriter.addHeaderAlias("diff_time","耗时"); - excelWriter.addHeaderAlias("result","结果"); - excelWriter.addHeaderAlias("server_name","服务器名"); - excelWriter.addHeaderAlias("server_living","服务器实例"); - excelWriter.addHeaderAlias("sts","状态"); - excelWriter.addHeaderAlias("explain","说明"); - //从第1行开始 第0行为列名称 - excelWriter.setCurrentRow(0); - //导出有别名的表单 - excelWriter.setOnlyAlias(true); - excelWriter.write(list,true); - httpServletResponse.setContentType("application/vnd.ms-excel;charset=utf-8"); - //设置excel名称 - String encodeName = URLEncoder.encode(list.get(0).getTask_name(), "UTF-8"); - httpServletResponse.setHeader("Content-Disposition","attachment;filename="+encodeName+".xlsx"); - ServletOutputStream out=httpServletResponse.getOutputStream(); - excelWriter.flush(out, true); - // 关闭writer，释放内存 - excelWriter.close(); - IoUtil.close(out); - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/IIntegrationTaskMonitoringDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/IIntegrationTaskMonitoringDao.java deleted file mode 100644 index 459b511f..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/IIntegrationTaskMonitoringDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzya.frame.sys.integrationtask.monitoring.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; - -/** - * @description: 集成任务任务监控 dao - * @tableName: integration_task_monitoring - * @entityName: IntegrationTaskMonitoringEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskMonitoringDao extends IBaseDao { - Integer updateIntegrationTaskMonitoring(IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity); - IntegrationTaskMonitoringEntity queryIntegrationTaskMonitoringEntity_countMax(IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java deleted file mode 100644 index caa6ba3b..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzya.frame.sys.integrationtask.monitoring.dao.impl; - -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.monitoring.dao.IIntegrationTaskMonitoringDao; - - -/** - * @description: 集成任务任务监控 dao - * @tableName: integration_task_monitoring - * @entityName: IntegrationTaskMonitoringEntity - * @author: gjh - * @history: 1.0 - */ -@Repository("integration_task_monitoringdao") -public class IntegrationTaskMonitoringDaoImpl extends MybatisGenericDao implements IIntegrationTaskMonitoringDao { - - @Override - public Integer updateIntegrationTaskMonitoring(IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity) { - //修改最大执行次数 - return super.update("IntegrationTaskMonitoringEntity_updateRunnum",integrationTaskMonitoringEntity); - } - - public IntegrationTaskMonitoringEntity queryIntegrationTaskMonitoringEntity_countMax(IntegrationTaskMonitoringEntity entity) { - IntegrationTaskMonitoringEntity o = (IntegrationTaskMonitoringEntity) super.selectOne(getSqlIdPrifx() + "IntegrationTaskMonitoringEntity_countMax", entity); - return o; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.java deleted file mode 100644 index 80207028..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hzya.frame.sys.integrationtask.monitoring.entity; - -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.math.BigDecimal; -import com.hzya.frame.web.entity.BaseEntity; - -/** - * @description: 集成任务任务监控 entity - * @tableName: integration_task_monitoring - * @entityName: IntegrationTaskMonitoringEntity - * @author: gjh - * @history: 1.0 - */ -public class IntegrationTaskMonitoringEntity extends BaseEntity { - - /** integration_task_id */ - private String task_id; - /** 服务器名称 */ - private String server_name; - /** 运行次数 */ - private Integer run_num; - - private Integer sorts; - - private String task_code; - private String task_name; - private String task_tag; - private String org_name; - /*计划时间*/ - private Date plan_time - /*耗时*/; - private String diff_time; - /*执行与挂起状态*/ - private String type; - private String task_type; - - public String getTask_type() { - return task_type; - } - - public void setTask_type(String task_type) { - this.task_type = task_type; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Date getPlan_time() { - return plan_time; - } - - public void setPlan_time(Date plan_time) { - this.plan_time = plan_time; - } - - public String getDiff_time() { - return diff_time; - } - - public void setDiff_time(String diff_time) { - this.diff_time = diff_time; - } - - public String getTask_code() { - return task_code; - } - - public void setTask_code(String task_code) { - this.task_code = task_code; - } - - public String getTask_name() { - return task_name; - } - - public void setTask_name(String task_name) { - this.task_name = task_name; - } - - public String getTask_tag() { - return task_tag; - } - - public void setTask_tag(String task_tag) { - this.task_tag = task_tag; - } - - public String getOrg_name() { - return org_name; - } - - public void setOrg_name(String org_name) { - this.org_name = org_name; - } - - - public void setSorts(Integer sorts) { - this.sorts = sorts; - } - - - /** integration_task_id */ - public void setTask_id(String task_id) { - this.task_id = task_id; - } - /** integration_task_id */ - public String getTask_id() { - return task_id; - } - - - /** 服务器名称 */ - public void setServer_name(String server_name) { - this.server_name = server_name; - } - /** 服务器名称 */ - public String getServer_name() { - return server_name; - } - - - /** 运行次数 */ - public void setRun_num(Integer run_num) { - this.run_num = run_num; - } - /** 运行次数 */ - public Integer getRun_num() { - return run_num; - } - - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.xml deleted file mode 100644 index 6e05e93d..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - task_id, - server_name, - run_num, - create_time, - create_user_id, - modify_time, - modify_user_id, - sts, - plan_time, - diff_time, - type, - task_type - - - - task.id as task_id, -monitoring.id as id, -task.task_code as task_code, -task.task_name as task_name, -task.task_tag as task_tag, -org.organ_name as org_name, -monitoring.server_name as server_name, -monitoring.run_num, -monitoring.sts, -monitoring.type, -monitoring.task_type, -monitoring.sorts, -monitoring.plan_time, -monitoring.diff_time - - - - - - - - - - - - - - - - - - - - - - - - - - insert into integration_task_monitoring( - - id, - task_id, - server_name, - run_num, - task_type, - type, - diff_time, - create_user_id, - modify_user_id, - sorts, - plan_time, - create_time, - modify_time, - sts - - )values - ( - - #{id}, - #{task_id}, - #{server_name}, - #{run_num}, - #{task_type}, - #{type}, - #{diff_time}, - #{create_user_id}, - #{modify_user_id}, - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_monitoring a WHERE a.sts = 'Y' ), - #{plan_time}, - #{create_time} , - now() , - #{modify_time}, - now(), - 'Y' - - ) - - - - - update integration_task_monitoring set - - task_id = #{task_id}, - server_name = #{server_name}, - run_num = #{run_num}, - task_type = #{task_type}, - type = #{type}, - plan_time = #{plan_time}, - diff_time = #{diff_time}, - create_user_id = #{create_user_id}, - modify_user_id = #{modify_user_id}, - modify_time =#{modify_time} - modify_time = now() - - where id = #{id} - - - - - update integration_task_monitoring set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where - id = #{id} - - - - - - update integration_task_monitoring set - run_num=${run_num},diff_time=#{diff_time},modify_time = now(),plan_time=#{plan_time} where - task_id = #{task_id} and sts='Y' - - - - - update integration_task_monitoring set - sts='N',modify_time = now(),modify_user_id = #{modify_user_id} - - id=#{id} - and task_id = #{task_id} - and server_name = #{server_name} - and run_num = #{run_num} - and task_type = #{task_type} - and type = #{type} - and plan_time = #{plan_time} - and diff_time = #{diff_time} - 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} - - - - - - delete from integration_task_monitoring where id =#{id} - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/IIntegrationTaskMonitoringService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/IIntegrationTaskMonitoringService.java deleted file mode 100644 index 065c60af..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/IIntegrationTaskMonitoringService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzya.frame.sys.integrationtask.monitoring.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * @description: 集成任务任务监控 service - * @tableName: integration_task_monitoring - * @entityName: IntegrationTaskMonitoringEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskMonitoringService extends IBaseService { - //当触发器执行的时候，修改任务监控执行次数 - JsonResultEntity updateIntegrationTaskMonitoring(JSONObject jsonObject); - - //监控输出 - JsonResultEntity queryMonitoringExportation(JSONObject jsonObject) throws Exception; - - //保存监控 - JsonResultEntity saveIntegrationTaskMonitoring(JSONObject jsonObject); - - //任务关闭或者删除时候，修改监控sts为N - JsonResultEntity updateTaskMonitoringSts(JSONObject jsonObject); - - //根据taskid判断是否在监控中存在 - List queryTaskMonitoringOne(JSONObject jsonObject); - - //监控执行与挂起 - JsonResultEntity updateTaskMonitoringCarryAndHang(JSONObject jsonObject); - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/impl/IntegrationTaskMonitoringServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/impl/IntegrationTaskMonitoringServiceImpl.java deleted file mode 100644 index 335cb173..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/impl/IntegrationTaskMonitoringServiceImpl.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.hzya.frame.sys.integrationtask.monitoring.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDao; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.web.quartz.QuartzJobFactoryUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import com.hzya.frame.sys.integrationtask.monitoring.service.IIntegrationTaskMonitoringService; -import com.hzya.frame.sys.integrationtask.monitoring.dao.IIntegrationTaskMonitoringDao; -import com.hzya.frame.basedao.service.impl.BaseService; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.net.URLEncoder; -import java.util.List; - -/** - * @description: 集成任务任务监控 service - * @tableName: integration_task_monitoring - * @entityName: IntegrationTaskMonitoringEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integrationTaskMonitoringService") -public class IntegrationTaskMonitoringServiceImpl extends BaseService implements IIntegrationTaskMonitoringService { - - protected IIntegrationTaskMonitoringDao integrationtaskmonitoringDao; - //@Autowired - private IIntegrationTaskDao integrationTaskDao; - - //@Autowired - private HttpServletResponse httpServletResponse; - - //@Autowired - public void setIntegrationTaskMonitoringDao(IIntegrationTaskMonitoringDao dao) { - this.integrationtaskmonitoringDao = dao; - this.dao = dao; - } - - /** - * 当触发器执行的时候，修改任务监控执行次数 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateIntegrationTaskMonitoring(JSONObject jsonObject) { - String taskId = jsonObject.getString("task_id"); - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity=new IntegrationTaskMonitoringEntity(); - integrationTaskMonitoringEntity.setTask_id(taskId); - integrationTaskMonitoringEntity.setPlan_time(jsonObject.getDate("plan_time")); - integrationTaskMonitoringEntity.setDiff_time(jsonObject.getString("diff_time")); - //修改最大执行次数 - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntityCountMax = integrationtaskmonitoringDao.queryIntegrationTaskMonitoringEntity_countMax(integrationTaskMonitoringEntity); - integrationTaskMonitoringEntity.setRun_num(integrationTaskMonitoringEntityCountMax.getRun_num()); - integrationtaskmonitoringDao.updateIntegrationTaskMonitoring(integrationTaskMonitoringEntity); - return BaseResult.getSuccessMessageEntity("修改任务监控执行次数成功"); - } - - /** - * 监控输出 输出任务与监控连表查询的结果 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryMonitoringExportation(JSONObject jsonObject) throws Exception{ - try { - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = getData("jsonStr", jsonObject, IntegrationTaskMonitoringEntity.class); - //根据任务查询监控数据 - List integrationTaskMonitoringEntityListBase = integrationtaskmonitoringDao.queryByLike(integrationTaskMonitoringEntity); - if(integrationTaskMonitoringEntityListBase.size()==0){ - return BaseResult.getFailureMessageEntity("输出的数据为null"); - } - createExcel(integrationTaskMonitoringEntity,integrationTaskMonitoringEntityListBase); - return BaseResult.getSuccessMessageEntity("监控输出成功"); - }catch (Exception e){ - logger.info("监控输出失败:"+e.getMessage()); - return BaseResult.getFailureMessageEntity("监控输出失败:"+e.getMessage()); - } - } - - /** - * 监控保存 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity saveIntegrationTaskMonitoring(JSONObject jsonObject) { - //监控id - long uuidMonitor = UUIDLong.longUUID(); - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = jsonObject.toJavaObject(IntegrationTaskMonitoringEntity.class); - integrationTaskMonitoringEntity.setRun_num(0); - integrationTaskMonitoringEntity.setId(String.valueOf(uuidMonitor)); - integrationtaskmonitoringDao.save(integrationTaskMonitoringEntity); - return BaseResult.getSuccessMessageEntity("任务监控保存成功",integrationTaskMonitoringEntity); - } - - //修改监控sts为N - @Override - public JsonResultEntity updateTaskMonitoringSts(JSONObject jsonObject) { - String taskId = jsonObject.getString("task_id"); - if(null==taskId||"".equals(taskId)){ - return BaseResult.getFailureMessageEntity("删除时请携带任务id"); - } - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity=new IntegrationTaskMonitoringEntity(); - integrationTaskMonitoringEntity.setTask_id(taskId); - integrationTaskMonitoringEntity.setModify_user_id(jsonObject.getString("modify_user_id")); - integrationtaskmonitoringDao.update("IntegrationTaskMonitoringEntity_logicDelete_Multi_Condition",integrationTaskMonitoringEntity); - return BaseResult.getSuccessMessageEntity("监控删除成功"); - } - - //根据taskid判断在监控中是否存在 - @Override - public List queryTaskMonitoringOne(JSONObject jsonObject) { - String taskId = jsonObject.getString("task_id"); - List integrationTaskMonitoringEntities=null; - if(null!=taskId||!"".equals(taskId)){ - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity=new IntegrationTaskMonitoringEntity(); - integrationTaskMonitoringEntity.setTask_id(taskId); - integrationTaskMonitoringEntities = integrationtaskmonitoringDao.query(integrationTaskMonitoringEntity); - } - return integrationTaskMonitoringEntities; - } - - /** - * 监控执行与挂起 - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateTaskMonitoringCarryAndHang(JSONObject jsonObject) { - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = getData("jsonStr", jsonObject, IntegrationTaskMonitoringEntity.class); - //查询单个任务，用于判断任务是开启还是关闭，正常还是不正常 - IntegrationTaskEntity integrationTaskEntity = integrationTaskDao.get(integrationTaskMonitoringEntity.getTask_id()); - if(null==integrationTaskEntity||"".equals(integrationTaskEntity)){ - return BaseResult.getFailureMessageEntity("任务查询为null"); - } - //判断任务状态是否是开启状态 1:开启 2：关闭 - if("2".equals(integrationTaskEntity.getTask_status())){ - return BaseResult.getFailureMessageEntity("任务状态已经关闭"); - } - String jsonStr = jsonObject.getString("jsonStr"); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonStr); - jsonObjectStr.put("jobName",jsonObjectStr.getString("task_name")); - jsonObjectStr.put("jobCode",jsonObjectStr.getString("task_code")); - String type = jsonObjectStr.getString("type"); - //判断type是执行还是挂起 1：执行 2：挂起 - switch (type){ - //执行 定时器继续执行 - case "1": - integrationTaskMonitoringEntity.setType("1"); - integrationtaskmonitoringDao.update(integrationTaskMonitoringEntity); - QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr); - QuartzJobFactoryUtils.resumeTrigger(jsonObjectStr); - break; - //挂起 定时器关闭 - case "2": - integrationTaskMonitoringEntity.setType("2"); - integrationtaskmonitoringDao.update(integrationTaskMonitoringEntity); - QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr); - break; - } - return BaseResult.getSuccessMessageEntity("操作成功"); - } - - /** - * 创建excel - * @param monitoring - * @param list - * @throws Exception - */ - private void createExcel(IntegrationTaskMonitoringEntity monitoring,List list) throws Exception{ - // 通过工具类创建writer，默认创建xls格式 - ExcelWriter excelWriter= ExcelUtil.getWriter(true); - //设置列名称 - excelWriter.addHeaderAlias("id","监控id"); - excelWriter.addHeaderAlias("task_name","任务名称"); - excelWriter.addHeaderAlias("task_code","任务编码"); - excelWriter.addHeaderAlias("task_tag","任务标识"); - excelWriter.addHeaderAlias("org_id","部署公司"); - excelWriter.addHeaderAlias("server_name","服务器名称"); - excelWriter.addHeaderAlias("run_num","运行次数"); - excelWriter.addHeaderAlias("sts","状态"); - excelWriter.addHeaderAlias("sorts","序号"); - //从第1行开始 第0行为列名称 - excelWriter.setCurrentRow(0); - //导出有别名的表单 - excelWriter.setOnlyAlias(true); - excelWriter.write(list,true); - httpServletResponse.setContentType("application/vnd.ms-excel;charset=utf-8"); - //设置excel名称 - String encodeName = URLEncoder.encode(list.get(0).getTask_name(), "UTF-8"); - httpServletResponse.setHeader("Content-Disposition","attachment;filename="+encodeName+".xlsx"); - ServletOutputStream out=httpServletResponse.getOutputStream(); - excelWriter.flush(out, true); - // 关闭writer，释放内存 - excelWriter.close(); - IoUtil.close(out); - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskDetailsService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskDetailsService.java deleted file mode 100644 index 947ee4cf..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskDetailsService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; - -/** - * @description: 集成任务-任务详细策略 service - * @tableName: integration_task_details - * @entityName: IntegrationTaskDetailsEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskDetailsService extends IBaseService { - -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskService.java deleted file mode 100644 index 42fc1eeb..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/IIntegrationTaskService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzya.frame.sys.integrationtask.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.quartz.JobExecutionContext; - -import java.util.Date; -import java.util.List; - -/** - * @description: 集成任务 service - * @tableName: integration_task - * @entityName: IntegrationTaskEntity - * @author: gjh - * @history: 1.0 - */ -public interface IIntegrationTaskService extends IBaseService { - - //集成任务新增 - JsonResultEntity saveIntegrationTask(JSONObject jsonObject) throws Exception; - - //集成任务修改 - JsonResultEntity updateIntegrationTask(JSONObject jsonObject) throws Exception; - - //集成任务删除 将sts状态修改为N - JsonResultEntity updateIntegrationTaskSts(JSONObject jsonObject); - - - //查询单个 - JsonResultEntity queryIntegrationTaskById(JSONObject jsonObject); - - //保存日志和实例 - void saveLogAndLiving(JSONObject jsonObjectStr, Date dateStart); - - /*** - * 不同的项目工程内，需要初始化的插件不尽相同，需要按照自身项目组织初始化插件 - * @content: - * @author 👻👻👻👻👻👻👻👻 gjh - * @date 2023-09-22 15:45 - * @param taskIdList 需要初始化的ID集合 - * @return void - **/ - void initTaskByIds(List taskIdList); - - void thirdInterfaceSaveTest(JSONObject jsonObject); -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskDetailsServiceImpl.java deleted file mode 100644 index 50b78a0f..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskDetailsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzya.frame.sys.integrationtask.service.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; -import com.hzya.frame.sys.integrationtask.service.IIntegrationTaskDetailsService; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDetailsDao; -import com.hzya.frame.basedao.service.impl.BaseService; - -/** - * @description: 集成任务-任务详细策略 service - * @tableName: integration_task_details - * @entityName: IntegrationTaskDetailsEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integration_task_detailsService") -public class IntegrationTaskDetailsServiceImpl extends BaseService implements IIntegrationTaskDetailsService { - - protected IIntegrationTaskDetailsDao integrationtaskdetailsDao; - - //@Autowired - public void setIntegrationTaskDetailsDao(IIntegrationTaskDetailsDao dao) { - this.integrationtaskdetailsDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskServiceImpl.java deleted file mode 100644 index bd6f06f1..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/service/impl/IntegrationTaskServiceImpl.java +++ /dev/null @@ -1,549 +0,0 @@ -package com.hzya.frame.sys.integrationtask.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.baomidou.dynamic.datasource.annotation.DSTransactional; -import com.google.gson.JsonObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sys.apireflection.service.impl.ApiHandleServiceImpl; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDao; -import com.hzya.frame.sys.integrationtask.dao.IIntegrationTaskDetailsDao; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskDetailsEntity; -import com.hzya.frame.sys.integrationtask.entity.IntegrationTaskEntity; -import com.hzya.frame.sys.integrationtask.living.service.IIntegrationTaskLivingService; -import com.hzya.frame.sys.integrationtask.log.service.IIntegrationTaskLogService; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import com.hzya.frame.sys.integrationtask.monitoring.service.IIntegrationTaskMonitoringService; -import com.hzya.frame.sys.integrationtask.service.IIntegrationTaskService; -import com.hzya.frame.sys.sysenum.SysEnum; -import com.hzya.frame.util.PluginUtils; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.web.quartz.QuartzJobFactoryUtils; -import org.quartz.CronExpression; -import org.quartz.JobExecutionContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @description: 集成任务 service - * @tableName: integration_task - * @entityName: IntegrationTaskEntity - * @author: gjh - * @history: 1.0 - */ -//@Service(value = "integrationTaskService") -public class IntegrationTaskServiceImpl extends BaseService implements IIntegrationTaskService { - public static final String ATONCE = SysEnum.ATONCE.getValue();//执行策略 Y：立即执行 - public static final String TIMING = SysEnum.TIMING.getValue();//执行策略 N：定时 - public static final String OPEN = SysEnum.OPEN.getValue();//任务状态 1：开启 - public static final String SHUTDOWN = SysEnum.SHUTDOWN.getValue();//任务状态 2：关闭 - protected IIntegrationTaskDao integrationtaskDao; - Logger logger = LoggerFactory.getLogger(IntegrationTaskServiceImpl.class); - //@Autowired - private IIntegrationTaskDetailsDao integrationTaskDetailsDao;//任务明细 - //@Autowired - private IIntegrationTaskMonitoringService integrationTaskMonitoringService;//监控 - //@Autowired - private IIntegrationTaskLivingService integrationTaskLivingService;//实例 - //@Autowired - private IIntegrationTaskLogService integrationTaskLogService;//日志 - //@Autowired - private ApiHandleServiceImpl apiHandleService; - - //@Autowired - public void setIntegrationTaskDao(IIntegrationTaskDao dao) { - this.integrationtaskDao = dao; - this.dao = dao; - } - - /** - * 查询单个 - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity queryIntegrationTaskById(JSONObject jsonObject) { - IntegrationTaskEntity integrationTaskEntity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (null == integrationTaskEntity.getId() || "".equals(integrationTaskEntity.getId())) { - return BaseResult.getFailureMessageEntity("查看单个时请携带id"); - } - IntegrationTaskEntity integrationTaskEntityGet = integrationtaskDao.get(integrationTaskEntity.getId()); - if (null == integrationTaskEntityGet) { - return BaseResult.getSuccessMessageEntity("查询成功", integrationTaskEntityGet); - } - //查询明细数据 - IntegrationTaskDetailsEntity integrationTaskDetailsEntity = new IntegrationTaskDetailsEntity(); - integrationTaskDetailsEntity.setParent_id(integrationTaskEntityGet.getId()); - List integrationTaskDetailsEntityListBase = integrationTaskDetailsDao.query(integrationTaskDetailsEntity); - JSONObject jsonObjectMap = new JSONObject(); - jsonObjectMap.put("main", integrationTaskEntityGet); - List list = new ArrayList<>(); - if (integrationTaskDetailsEntityListBase.size() > 0) { - for (IntegrationTaskDetailsEntity taskDetailsEntity : integrationTaskDetailsEntityListBase) { - list.add(taskDetailsEntity); - } - } - jsonObjectMap.put("details", list); - return BaseResult.getSuccessMessageEntity("查询成功", jsonObjectMap); - } - - - /** - * 集成任务新增 - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity saveIntegrationTask(JSONObject jsonObject) throws Exception { - JSONObject jsonObjectResult = saveOrUpdateDetails(jsonObject); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonObjectResult.getString("jsonObjectStr")); - IntegrationTaskEntity integrationTaskEntity = JSONObject.parseObject(jsonObjectResult.getString("integrationTaskEntity")).toJavaObject(IntegrationTaskEntity.class); - //判断是否插件 - String plug = jsonObjectStr.getString("plug"); - jsonObjectStr.put("plug", plug); - //1：是插件 - String isPlug = "1"; - //2:不是插件 - String isNotPlug = "2"; - //集成任务执行策略 N定时Y立即执行 当为Y立即执行时候,新增集成任务，实例，监控，日志，当为N时候，新增任务和监控，实例与日志在任务执行之后再新增 - String status = jsonObjectResult.getString("status"); - //开始时间 - Date dateStart = new Date(); - try { - if (TIMING.equals(status)) { - //根据cron，定时执行任务 - QuartzJobFactoryUtils.createJob(getJob(jsonObjectStr)); - } - if (ATONCE.equals(status)) { - try { - JSONObject jsonObjectHand = new JSONObject(); - if (null == jsonObjectStr.getString("sence_id")) { - jsonObjectStr.put("sence_id", jsonObjectStr.getString("task_tag")); - } - jsonObjectHand.put("ref_id", jsonObjectStr.getString("sence_id")); - JSONObject req = new JSONObject(); - req.put("jsonStr", jsonObjectHand.toJSONString()); - //定义空的 调用场景方法有返回得话，取返回值 - jsonObjectStr.put("result", ""); - jsonObjectStr.put("info", ""); - jsonObjectStr.put("task_type", "后台任务"); - //保存监控数据 - List integrationTaskMonitoringEntities = integrationTaskMonitoringService.queryTaskMonitoringOne(jsonObjectStr); - if (integrationTaskMonitoringEntities.size() == 0 || null == integrationTaskMonitoringEntities) { - //触发时候，新增监控 - jsonObjectStr.put("plan_time", new Date()); - integrationTaskMonitoringService.saveIntegrationTaskMonitoring(jsonObjectStr); - } - //查询单个,得到上次修改时间，当前时间减去修改时间就是上次耗时时间 - int diff_timeMon = 0; - if (integrationTaskMonitoringEntities.size() == 0) { - diff_timeMon = 0; - } else { - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = integrationTaskMonitoringEntities.get(0); - diff_timeMon = Integer.valueOf((int) (dateStart.getTime() - integrationTaskMonitoringEntity.getModify_time().getTime())); - } - //将cron表达式转为时间 - CronExpression cronExpression = new CronExpression(jsonObjectStr.getString("task_cron")); - Date nextValidTimeAfter = cronExpression.getNextValidTimeAfter(new Date()); - String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(nextValidTimeAfter); - jsonObjectStr.put("plan_time", format); - jsonObjectStr.put("diff_time", diff_timeMon); - //触发时候，修改任务监控执行次数 - integrationTaskMonitoringService.updateIntegrationTaskMonitoring(jsonObjectStr); - if (isPlug.equalsIgnoreCase(plug)) { - try { - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id")); - String s = pluginBaseEntity.executeBusiness(req); - logger.info("执行插件executeBusiness"); - if ("执行成功".equals(s)) { - jsonObjectStr.put("result", "执行成功"); - } - } catch (Exception e) { - jsonObjectStr.put("result", "执行失败"); - jsonObjectStr.put("instructions", e.getMessage()); - } - } else { - JsonResultEntity jsonResultEntity = apiHandleService.executeApi(req); - if ("执行成功".equals(jsonResultEntity.getMsg())) { - jsonObjectStr.put("result", jsonResultEntity.getMsg()); - jsonObjectStr.put("info", jsonResultEntity.getAttribute()); - } else { - jsonObjectStr.put("result", "执行失败"); - jsonObjectStr.put("instructions", jsonResultEntity.getMsg()); - } - } - } catch (Exception e) { - jsonObjectStr.put("result", "执行失败"); - //保存错误说明 - jsonObjectStr.put("instructions", e.getMessage()); - return BaseResult.getFailureMessageEntity("任务保存失败:" + e.getMessage()); - } finally { - saveLogAndLiving(jsonObjectStr, dateStart); - } - } - IntegrationTaskEntity integrationTaskSave = integrationtaskDao.save(integrationTaskEntity); - return BaseResult.getSuccessMessageEntity("任务保存成功", integrationTaskSave); - } catch (Exception e) { - return BaseResult.getFailureMessageEntity("任务保存失败:" + e.getMessage()); - } - } - - /** - * 拼接组装参数，传到定时器中 - * - * @param jsonObject - * @return - */ - private JSONObject getJob(JSONObject jsonObject) { - JSONObject jsonObjectMap = new JSONObject(); - jsonObjectMap.put("jobName", jsonObject.getString("task_name")); - jsonObjectMap.put("jobCode", jsonObject.getString("task_code")); - jsonObjectMap.put("sceneId", jsonObject.getString("sence_id")); - jsonObjectMap.put("task_tag", jsonObject.getString("task_tag")); - jsonObjectMap.put("cronExpression", jsonObject.getString("task_cron")); - jsonObjectMap.put("task_id", jsonObject.getString("task_id")); - jsonObjectMap.put("create_user_id", jsonObject.getString("create_user_id")); - jsonObjectMap.put("modify_user_id", jsonObject.getString("modify_user_id")); - jsonObjectMap.put("plug_id", jsonObject.getString("plug_id")); - jsonObjectMap.put("plug", jsonObject.getString("plug")); - return jsonObjectMap; - } - - /** - * 拼接组装参数，传到定时器中 - * - * @param jsonObject - * @return - */ - private JSONObject getJobV2(JSONObject jsonObject) { - JSONObject jsonObjectMap = new JSONObject(); - jsonObjectMap.put("jobName", jsonObject.getString("task_name")); - jsonObjectMap.put("jobCode", jsonObject.getString("task_code")); - jsonObjectMap.put("sceneId", jsonObject.getString("sence_id")); - jsonObjectMap.put("task_tag", jsonObject.getString("task_tag")); - jsonObjectMap.put("cronExpression", jsonObject.getString("task_cron")); -// jsonObjectMap.put("task_id", jsonObject.getString("task_id")); - //TODO 没有task_id这个字段，通过com.hzya.frame.sys.integrationtask.service.impl.IntegrationTaskServiceImpl.initTask 调用 - jsonObjectMap.put("task_id", jsonObject.getString("id")); - jsonObjectMap.put("create_user_id", jsonObject.getString("create_user_id")); - jsonObjectMap.put("modify_user_id", jsonObject.getString("modify_user_id")); - jsonObjectMap.put("plug_id", jsonObject.getString("plug_id")); - jsonObjectMap.put("plug", jsonObject.getString("plug")); - return jsonObjectMap; - } - - /** - * 保存或者修改任务明细 - * - * @param jsonObject - * @return - */ - private JSONObject saveOrUpdateDetails(JSONObject jsonObject) { - IntegrationTaskEntity integrationTaskEntity = JSONObject.parseObject(jsonObject.getString("jsonStr")).toJavaObject(IntegrationTaskEntity.class); - String jsonStr = jsonObject.getString("jsonStr"); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonStr); - IntegrationTaskDetailsEntity integrationTaskDetailsEntity = new IntegrationTaskDetailsEntity(); - //如果任务code为空，则是新增，如果不为空，则是修改 - if (null == integrationTaskEntity.getTask_code() || "".equals(integrationTaskEntity.getTask_code())) { - //查询编码最大值 - IntegrationTaskEntity integrationTaskEntityMaxCode = integrationtaskDao.query(integrationTaskEntity, "IntegrationTaskEntity_maxCode"); - String taskCode = "Task-" + integrationTaskEntityMaxCode.getTask_code(); - integrationTaskEntity.setTask_code(taskCode); - //任务id - long uuid = UUIDLong.longUUID(); - integrationTaskEntity.setId(String.valueOf(uuid)); - jsonObjectStr.put("task_id", uuid);//将任务id存起来，定时触发时候需要传到任务实例与任务日志中 - jsonObjectStr.put("server_name", integrationTaskEntity.getServer_name()); - jsonObjectStr.put("task_code", taskCode); - } else { - jsonObjectStr.put("task_id", integrationTaskEntity.getId());//将任务id存起来，定时触发时候需要传到任务实例与任务日志中 - //修改任务主表数据 - IntegrationTaskEntity integrationTaskupdate = integrationtaskDao.update(integrationTaskEntity); - //在修改明细之前先删除明细数据,将明细数据sts修改为N - integrationTaskDetailsEntity.setParent_id(integrationTaskEntity.getId()); - integrationTaskDetailsEntity.setModify_user_id(jsonObject.getString("modify_user_id")); - integrationTaskDetailsDao.update("IntegrationTaskDetailsEntity_updateSts", integrationTaskDetailsEntity); - } - //重新保存任务明细数据 - //任务明细id - long uuidDetails = UUIDLong.longUUID(); - integrationTaskDetailsEntity.setId(String.valueOf(uuidDetails)); - integrationTaskDetailsEntity.setParent_id(integrationTaskEntity.getId()); - integrationTaskDetailsEntity.setTask_cron(jsonObjectStr.getString("task_cron")); - integrationTaskDetailsEntity.setNow_execution(jsonObjectStr.getString("now_execution")); - integrationTaskDetailsEntity.setCreate_user_id(jsonObjectStr.getString("create_user_id")); - integrationTaskDetailsEntity.setModify_user_id(jsonObjectStr.getString("modify_user_id")); - IntegrationTaskDetailsEntity taskDetailsEntity = integrationTaskDetailsDao.save(integrationTaskDetailsEntity); - JSONObject jsonObjectResult = new JSONObject(); - jsonObjectResult.put("jsonObjectStr", jsonObjectStr); - jsonObjectResult.put("status", taskDetailsEntity.getNow_execution()); - jsonObjectResult.put("integrationTaskEntity", JSONObject.toJSON(integrationTaskEntity)); - return jsonObjectResult; - } - - - /** - * 集成任务修改 - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateIntegrationTask(JSONObject jsonObject) throws Exception { - JSONObject jsonObjectResult = saveOrUpdateDetails(jsonObject); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonObjectResult.getString("jsonObjectStr")); - IntegrationTaskEntity integrationTaskEntity = JSONObject.parseObject(jsonObjectResult.getString("integrationTaskEntity")).toJavaObject(IntegrationTaskEntity.class); - //判断是否插件 - String plug = jsonObjectStr.getString("plug"); - //1：是插件 - String isPlug = "1"; - //如果任务状态为开启，则需要修改监控的修改时间，修改任务和任务明细数据 - //如果任务为关闭，也需要修改任务和任务明细数据，还需要调整监控sts为N，将监控和日志触发器停止 - //任务状态 - String taskState = integrationTaskEntity.getTask_status(); - //开始时间 - Date dateStart = new Date(); - try { - if (OPEN.equals(taskState)) { - //定义启动状态 N定时Y立即执行 当为Y立即执行时候,新增集成任务，实例，监控，日志，当为N时候，新增任务和监控，实例与日志在任务执行之后再新增 - String status = jsonObjectResult.getString("status"); - if (TIMING.equals(status)) { - //先关闭监控和日志定时器，然后再根据新的cron表达式开启新的定时器 - QuartzJobFactoryUtils.pauseJob(getJob(jsonObjectStr)); - //根据cron，定时执行任务 - QuartzJobFactoryUtils.createJob(getJob(jsonObjectStr)); - } - if (ATONCE.equals(status)) { - try { - jsonObjectStr.put("task_type", "后台任务"); - JSONObject jsonObjectHand = new JSONObject(); - if (null == jsonObjectStr.getString("sence_id")) { - jsonObjectStr.put("sence_id", jsonObjectStr.getString("task_tag")); - } - jsonObjectHand.put("ref_id", jsonObjectStr.getString("sence_id")); - JSONObject req = new JSONObject(); - req.put("jsonStr", jsonObjectHand.toJSONString()); - //立即执行的时候监控+1 查询单个得到上次修改时间，当前时间减去修改时间就是上次耗时时间 - List integrationTaskMonitoringEntities = integrationTaskMonitoringService.queryTaskMonitoringOne(jsonObjectStr); - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = integrationTaskMonitoringEntities.get(0); - int diff_timeMon = Integer.valueOf((int) (dateStart.getTime() - integrationTaskMonitoringEntity.getModify_time().getTime())); - jsonObjectStr.put("diff_time", diff_timeMon); - //将cron表达式转为时间 - CronExpression cronExpression = new CronExpression(jsonObjectStr.getString("task_cron")); - Date nextValidTimeAfter = cronExpression.getNextValidTimeAfter(new Date()); - String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(nextValidTimeAfter); - jsonObjectStr.put("plan_time", format); - //触发时候，修改任务监控执行次数 - integrationTaskMonitoringService.updateIntegrationTaskMonitoring(jsonObjectStr); - //判断是否是插件执行 - if (isPlug.equalsIgnoreCase(plug)) { - try { - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id")); - String s = pluginBaseEntity.executeBusiness(req); - logger.info("执行插件executeBusiness"); - if ("执行成功".equals(s)) { - jsonObjectStr.put("result", "执行成功"); - } - } catch (Exception e) { - jsonObjectStr.put("result", "执行失败"); - jsonObjectStr.put("instructions", e.getMessage()); - } - } else { - JsonResultEntity jsonResultEntity = apiHandleService.executeApi(req); - if ("执行成功".equals(jsonResultEntity.getMsg())) { - jsonObjectStr.put("result", jsonResultEntity.getMsg()); - jsonObjectStr.put("info", jsonResultEntity.getAttribute()); - } else { - jsonObjectStr.put("result", "执行失败"); - jsonObjectStr.put("instructions", jsonResultEntity.getMsg()); - } - } - } catch (Exception e) { - jsonObjectStr.put("result", "执行失败"); - jsonObjectStr.put("instructions", e.getMessage()); - return BaseResult.getFailureMessageEntity("修改失败:" + e.getMessage()); - } finally { - //根据场景返回结果新增日志和实例 - saveLogAndLiving(jsonObjectStr, dateStart); - } - } - } - if (SHUTDOWN.equals(taskState)) { - //关闭定时器 - QuartzJobFactoryUtils.pauseTrigger(getJob(jsonObjectStr)); - } - return BaseResult.getSuccessMessageEntity("修改成功", integrationTaskEntity.getId()); - } catch (Exception e) { - return BaseResult.getFailureMessageEntity("任务保存失败:" + e.getMessage()); - } - } - - /** - * 集成任务删除(修改sts状态为N) - * - * @param jsonObject - * @return - */ - @Override - public JsonResultEntity updateIntegrationTaskSts(JSONObject jsonObject) { - IntegrationTaskEntity integrationTaskEntity = JSONObject.parseObject(jsonObject.getString("jsonStr")).toJavaObject(IntegrationTaskEntity.class); - if (null == integrationTaskEntity.getId() || "".equals(integrationTaskEntity.getId())) { - return BaseResult.getFailureMessageEntity("删除时请携带id"); - } - //查询单个 得到任务编码与任务名称，用来停止定时器 - IntegrationTaskEntity integrationTaskEntityGet = integrationtaskDao.get(integrationTaskEntity.getId()); - String jsonStr = jsonObject.getString("jsonStr"); - JSONObject jsonObjectStr = JSONObject.parseObject(jsonStr); - jsonObjectStr.put("task_id", integrationTaskEntity.getId());//将任务id存起来，定时触发时候需要传到任务实例与任务日志中 - jsonObjectStr.put("task_name", integrationTaskEntityGet.getTask_name()); - jsonObjectStr.put("task_code", integrationTaskEntityGet.getTask_code()); - //删除时 需要将任务和任务明细以及监控STS修改为N，将实例和日志定时器取消 - //修改任务主表sts - integrationtaskDao.update("IntegrationTaskEntity_logicDelete", integrationTaskEntity); - //修改任务明细STS - IntegrationTaskDetailsEntity integrationTaskDetailsEntity = new IntegrationTaskDetailsEntity(); - integrationTaskDetailsEntity.setParent_id(integrationTaskEntity.getId()); - integrationTaskDetailsEntity.setModify_user_id(jsonObject.getString("modify_user_id")); - integrationTaskDetailsDao.update("IntegrationTaskDetailsEntity_updateSts", integrationTaskDetailsEntity); - //修改任务监控sts - integrationTaskMonitoringService.updateTaskMonitoringSts(jsonObjectStr); - //将实例和日志定时器取消掉 - QuartzJobFactoryUtils.pauseTrigger(getJob(jsonObjectStr)); - return BaseResult.getSuccessMessageEntity("删除成功", integrationTaskEntity.getId()); - } - - /** - * 根据返回的结果新增日志和实例 - */ - @Override - public void saveLogAndLiving(JSONObject jsonObjectStr, Date dateStart) { - //结束时间 - Date dateEndLiving = new Date(); - int diff_time = Integer.valueOf((int) (dateEndLiving.getTime() - dateStart.getTime())); - jsonObjectStr.put("start_time", dateStart); - jsonObjectStr.put("end_time", dateEndLiving); - jsonObjectStr.put("diff_time", diff_time); - integrationTaskLivingService.saveIntegrationTaskLiving(jsonObjectStr); - //根据返回值保存集成任务日志 - Date dateEndLog = new Date(); - int diff_timeLog = Integer.valueOf((int) (dateEndLog.getTime() - dateStart.getTime())); - jsonObjectStr.put("end_time", dateEndLog); - jsonObjectStr.put("diff_time", diff_timeLog); - integrationTaskLogService.saveIntegrationTaskLog(jsonObjectStr); - } - - - @Override - public void initTaskByIds(List taskIdList) { - if (taskIdList.size() == 0){ - return; - } - IntegrationTaskEntity integrationTaskEntity = new IntegrationTaskEntity(); - integrationTaskEntity.setTask_status("1"); - integrationTaskEntity.setTaskIdList(taskIdList); - List integrationTaskEntityList = integrationtaskDao.query(integrationTaskEntity); - if (null != integrationTaskEntityList && integrationTaskEntityList.size() > 0) { - logger.info("正在初始化任务计划>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); - for (IntegrationTaskEntity taskEntity : integrationTaskEntityList) { - String jsonObjectStr = JSON.toJSONString(taskEntity); - JSONObject jsonObject = com.alibaba.fastjson.JSON.parseObject(jsonObjectStr); - QuartzJobFactoryUtils.createJob(getJobV2(jsonObject)); - logger.info("初始化任务：" + taskEntity.getTask_name() + " 任务编号：" + taskEntity.getTask_code() + "完成"); - } - } - } - - @Override - public void thirdInterfaceSaveTest( JSONObject reqJsonObject) { - JSONObject reqObj = reqJsonObject.getJSONObject("jsonStr"); - - JobExecutionContext jobExecutionContext = JSON.parseObject(reqObj.getString("jobExecutionContext"),JobExecutionContext.class); - JSONObject jobDetails = JSON.parseObject(reqObj.getString("jobDetails"),JSONObject.class); - String sceneName = reqObj.getString("sceneName"); - String sceneId = reqObj.getString("sceneId"); - String isPlugin = reqObj.getString("isPlugin"); - String cronExpression = reqObj.getString("cronExpression"); - Date dateStart = reqObj.getDate("dateStart"); - try { - //TODO 此处需要执行二林哥场景调用方法 - JSONObject jsonObject = new JSONObject(); - if (null == sceneId) { - sceneId = jobDetails.getString("task_tag"); - } - jsonObject.put("ref_id", sceneId); - JSONObject req = new JSONObject(); - req.put("jsonStr", jsonObject.toJSONString()); - jobDetails.put("plan_time", new Date()); - jobDetails.put("task_type", "后台任务"); - List integrationTaskMonitoringEntities = integrationTaskMonitoringService.queryTaskMonitoringOne(jobDetails); - if (integrationTaskMonitoringEntities.size() == 0 || null == integrationTaskMonitoringEntities) { - //触发时候，新增监控 - jobDetails.put("plan_time", new Date()); - integrationTaskMonitoringService.saveIntegrationTaskMonitoring(jobDetails); - } - //查询单个,得到上次修改时间，当前时间减去修改时间就是上次耗时时间 - int diff_timeMon = 0; - if (integrationTaskMonitoringEntities.size() == 0) { - diff_timeMon = 0; - } else { - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = integrationTaskMonitoringEntities.get(0); - diff_timeMon = Integer.valueOf((int) (dateStart.getTime() - integrationTaskMonitoringEntity.getModify_time().getTime())); - } - jobDetails.put("diff_time", diff_timeMon); - //将cron表达式转为时间 - CronExpression cronExpressionPlan = new CronExpression(cronExpression); - Date nextValidTimeAfter = cronExpressionPlan.getNextValidTimeAfter(new Date()); - String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(nextValidTimeAfter); - jobDetails.put("plan_time", format); - //触发时候，修改任务监控执行次数 - integrationTaskMonitoringService.updateIntegrationTaskMonitoring(jobDetails); - // 是否是插件 1是 2否 - String plug = "1"; - if (plug.equalsIgnoreCase(isPlugin)) { - try { - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jobDetails.getString("plug_id")); - String s = pluginBaseEntity.executeBusiness(req); - logger.info("执行插件executeBusiness"); - if ("执行成功".equals(s)) { - jobDetails.put("result", "执行成功"); - } - } catch (Exception e) { - jobDetails.put("result", "执行失败"); - jobDetails.put("instructions", e.getMessage()); - } - } else { - JsonResultEntity jsonResultEntity = apiHandleService.executeApi(req); - if ("执行成功".equals(jsonResultEntity.getMsg())) { - jobDetails.put("result", jsonResultEntity.getMsg()); - jobDetails.put("info", jsonResultEntity.getAttribute()); - } else { - jobDetails.put("result", "执行失败"); - jobDetails.put("instructions", jsonResultEntity.getMsg()); - } - } - //System.out.println("正在执行定时任务…………"); - logger.info("当前执行的任务表达式：" + cronExpression + "当前执行的任务是：" + jobExecutionContext.getTrigger().getKey() + "场景名称： " + sceneName + "场景ID：" + sceneId); - } catch (Exception e) { - logger.info("执行任务失败：" + cronExpression + "当前执行的任务是：" + jobExecutionContext.getTrigger().getKey() + "场景名称： " + sceneName + "场景ID：" + sceneId); - jobDetails.put("result", "执行失败"); - //保存错误说明 - jobDetails.put("instructions", e.getMessage()); - e.printStackTrace(); - } finally { - //TODO 写入任务执行日志表 - saveLogAndLiving(jobDetails, dateStart); - } - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDao.java deleted file mode 100644 index 987bfdda..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.dao; - -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopEntity; -import com.hzya.frame.basedao.dao.IBaseDao; - -/** - * 任务工坊(integration_task_workshop: table)表数据库访问层 - * - * @author xiaoguo - * @since 2023-08-07 17:03:33 - */ -public interface IIntegrationTaskWorkshopDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDetailsDao.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDetailsDao.java deleted file mode 100644 index 833ce435..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/IIntegrationTaskWorkshopDetailsDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopDetailsEntity; - -/** - * 参数列表(integration_task_workshop_details: table)表数据库访问层 - * - * @author xiaoguo - * @since 2023-08-10 14:41:34 - */ -public interface IIntegrationTaskWorkshopDetailsDao extends IBaseDao { - -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDaoImpl.java deleted file mode 100644 index 7d01bad5..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDaoImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.dao.impl; - -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopEntity; -import com.hzya.frame.sys.integrationtask.workshop.dao.IIntegrationTaskWorkshopDao; -import org.springframework.stereotype.Repository; -import com.hzya.frame.basedao.dao.MybatisGenericDao; -/** - * 任务工坊(IntegrationTaskWorkshop)表数据库访问层 - * - * @author xiaoguo - * @since 2023-08-07 17:03:33 - */ -@Repository("IntegrationTaskWorkshopDaoImpl") -public class IntegrationTaskWorkshopDaoImpl extends MybatisGenericDao implements IIntegrationTaskWorkshopDao{ - -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDetailsDaoImpl.java deleted file mode 100644 index d70110cd..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/dao/impl/IntegrationTaskWorkshopDetailsDaoImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.dao.impl; - -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.integrationtask.workshop.dao.IIntegrationTaskWorkshopDetailsDao; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopDetailsEntity; -import org.springframework.stereotype.Repository; - -/** - * 参数列表(IntegrationTaskWorkshopDetails)表数据库访问层 - * - * @author xiaoguo - * @since 2023-08-10 14:41:34 - */ -@Repository("IntegrationTaskWorkshopDetailsDaoImpl") -public class IntegrationTaskWorkshopDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskWorkshopDetailsDao{ - -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.java deleted file mode 100644 index 9b1c041e..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.entity; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 参数列表(IntegrationTaskWorkshopDetails)实体类 - * - * @author xiaoguo - * @since 2023-08-10 15:17:41 - */ -public class IntegrationTaskWorkshopDetailsEntity extends BaseEntity { - - /** formmain_id */ - private String formmainId; - /** 参数名称 */ - private String code; - /** 参数值 */ - private String value; - private Long sorts; - - public String getFormmainId() { - return formmainId; - } - - public void setFormmainId(String formmainId) { - this.formmainId = formmainId; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public Long getSorts() { - return sorts; - } - - public void setSorts(Long sorts) { - this.sorts = sorts; - } -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.xml deleted file mode 100644 index e476be9d..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopDetailsEntity.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id - ,formmain_id - ,code - ,value - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into integration_task_workshop_details( - - id , - formmain_id , - code , - value , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sorts, - sts, - - )values( - - #{id} , - #{formmainId} , - #{code} , - #{value} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_workshop_details a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into integration_task_workshop_details(formmain_id, code, value, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.formmainId},#{entity.code},#{entity.value},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y') - - - - - insert into integration_task_workshop_details(formmain_id, code, value, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) - values - - (#{entity.formmainId},#{entity.code},#{entity.value},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - formmain_id = values(formmain_id), - code = values(code), - value = values(value), - 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) - - -update integration_task_workshop_details set - - formmain_id = #{formmainId}, - code = #{code}, - value = #{value}, - 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}, - -where id = #{id} - - - -update integration_task_workshop_details set sts= 'N' -where id = #{id} - - - -update integration_task_workshop_details set sts= 'N' - - and id = #{id} - and formmain_id = #{formmainId} - and code = #{code} - and value = #{value} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and sts='Y' - - - - - delete from integration_task_workshop_details where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.java deleted file mode 100644 index 8107ec70..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.entity; - -import com.hzya.frame.web.entity.BaseEntity; - -/** - * 任务工坊(IntegrationTaskWorkshop)实体类 - * - * @author xiaoguo - * @since 2023-08-10 14:41:03 - */ -public class IntegrationTaskWorkshopEntity extends BaseEntity { - - /** 工坊名称 */ - private String workshopName; - /** 描述 */ - private String workshopDescribe; - /** 场景ID */ - private String sceneid; - /** 推送人id */ - private String sendUserId; - /** 推送人名称 */ - private String sendUserName; - /** 参数数据 */ - private String parameter; - /** 备注 */ - private String remark; - private Long sorts; - - public String getWorkshopName() { - return workshopName; - } - - public void setWorkshopName(String workshopName) { - this.workshopName = workshopName; - } - - public String getWorkshopDescribe() { - return workshopDescribe; - } - - public void setWorkshopDescribe(String workshopDescribe) { - this.workshopDescribe = workshopDescribe; - } - - public String getSceneid() { - return sceneid; - } - - public void setSceneid(String sceneid) { - this.sceneid = sceneid; - } - - public String getSendUserId() { - return sendUserId; - } - - public void setSendUserId(String sendUserId) { - this.sendUserId = sendUserId; - } - - public String getSendUserName() { - return sendUserName; - } - - public void setSendUserName(String sendUserName) { - this.sendUserName = sendUserName; - } - - public String getParameter() { - return parameter; - } - - public void setParameter(String parameter) { - this.parameter = parameter; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public void setSorts(Long sorts) { - this.sorts = sorts; - } -} - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.xml b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.xml deleted file mode 100644 index f9c9ab25..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/entity/IntegrationTaskWorkshopEntity.xml +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id - ,workshop_name - ,workshop_describe - ,sceneid - ,send_user_id - ,send_user_name - ,parameter - ,remark - ,sorts - ,create_user_id - ,create_time - ,modify_user_id - ,modify_time - ,sts - ,org_id - - - - - - - - - - - - - - - - insert into integration_task_workshop( - - id , - workshop_name , - workshop_describe , - sceneid , - send_user_id , - send_user_name , - parameter , - remark , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - sorts, - sts, - - )values( - - #{id} , - #{workshopName} , - #{workshopDescribe} , - #{sceneid} , - #{sendUserId} , - #{sendUserName} , - #{parameter} , - #{remark} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_workshop a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into integration_task_workshop(workshop_name, workshop_describe, sceneid, send_user_id, send_user_name, parameter, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) - values - - (#{entity.workshopName},#{entity.workshopDescribe},#{entity.sceneid},#{entity.sendUserId},#{entity.sendUserName},#{entity.parameter},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y') - - - - - insert into integration_task_workshop(workshop_name, workshop_describe, sceneid, send_user_id, send_user_name, parameter, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) - values - - (#{entity.workshopName},#{entity.workshopDescribe},#{entity.sceneid},#{entity.sendUserId},#{entity.sendUserName},#{entity.parameter},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}) - - on duplicate key update - workshop_name = values(workshop_name), - workshop_describe = values(workshop_describe), - sceneid = values(sceneid), - send_user_id = values(send_user_id), - send_user_name = values(send_user_name), - parameter = values(parameter), - remark = values(remark), - 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) - - -update integration_task_workshop set - - workshop_name = #{workshopName}, - workshop_describe = #{workshopDescribe}, - sceneid = #{sceneid}, - send_user_id = #{sendUserId}, - send_user_name = #{sendUserName}, - parameter = #{parameter}, - remark = #{remark}, - 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}, - -where id = #{id} - - - -update integration_task_workshop set sts= 'N' -where id = #{id} - - - -update integration_task_workshop set sts= 'N' - - and id = #{id} - and workshop_name = #{workshopName} - and workshop_describe = #{workshopDescribe} - and sceneid = #{sceneid} - and send_user_id = #{sendUserId} - and send_user_name = #{sendUserName} - and parameter = #{parameter} - and remark = #{remark} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and sts='Y' - - - - - delete from integration_task_workshop where id = #{id} - - - - diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopDetailsService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopDetailsService.java deleted file mode 100644 index 3a9c521c..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopDetailsService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.service; - -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopDetailsEntity; - -/** - * 参数列表(IntegrationTaskWorkshopDetails)表服务接口 - * - * @author xiaoguo - * @since 2023-08-10 14:41:36 - */ -public interface IIntegrationTaskWorkshopDetailsService extends IBaseService{ -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopService.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopService.java deleted file mode 100644 index 9b96adc6..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/IIntegrationTaskWorkshopService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopEntity; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.web.entity.JsonResultEntity; - -/** - * 任务工坊(IntegrationTaskWorkshop)表服务接口 - * - * @author xiaoguo - * @since 2023-08-07 17:03:33 - */ -public interface IIntegrationTaskWorkshopService extends IBaseService{ - - /*** - * 推送场景集成任务 - * @content: - * @author 👻👻👻👻👻👻👻👻 gjh - * @date 2023-08-08 15:14 - * @param requestJsonObj - * @return com.hzya.frame.web.entity.JsonResultEntity - * @exception 场景任务调用时有可能发生异常 - **/ - JsonResultEntity pushBusinessInterface(JSONObject requestJsonObj) throws Exception; -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopDetailsServiceImpl.java deleted file mode 100644 index 7736af96..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopDetailsServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.service.impl; - -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sys.integrationtask.workshop.dao.IIntegrationTaskWorkshopDetailsDao; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopDetailsEntity; -import com.hzya.frame.sys.integrationtask.workshop.service.IIntegrationTaskWorkshopDetailsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 参数列表(IntegrationTaskWorkshopDetails)表服务实现类 - * - * @author xiaoguo - * @since 2023-08-10 14:41:37 - */ -//@Service("integrationTaskWorkshopDetailsService") -public class IntegrationTaskWorkshopDetailsServiceImpl extends BaseService implements IIntegrationTaskWorkshopDetailsService { - - private IIntegrationTaskWorkshopDetailsDao integrationTaskWorkshopDetailsDao; - - //@Autowired - public void setIntegrationTaskWorkshopDetailsDao(IIntegrationTaskWorkshopDetailsDao dao) { - this.integrationTaskWorkshopDetailsDao = dao; - this.dao = dao; - } -} diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopServiceImpl.java deleted file mode 100644 index fb3dd946..00000000 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/workshop/service/impl/IntegrationTaskWorkshopServiceImpl.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.hzya.frame.sys.integrationtask.workshop.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sys.apireflection.dao.IApiReflectionDao; -import com.hzya.frame.sys.apireflection.entity.ApiReflectionEntity; -import com.hzya.frame.sys.apireflection.service.impl.ApiHandleServiceImpl; -import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; -import com.hzya.frame.sys.integrationtask.monitoring.service.impl.IntegrationTaskMonitoringServiceImpl; -import com.hzya.frame.sys.integrationtask.service.IIntegrationTaskService; -import com.hzya.frame.sys.integrationtask.workshop.dao.IIntegrationTaskWorkshopDetailsDao; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopDetailsEntity; -import com.hzya.frame.sys.integrationtask.workshop.entity.IntegrationTaskWorkshopEntity; -import com.hzya.frame.sys.integrationtask.workshop.dao.IIntegrationTaskWorkshopDao; -import com.hzya.frame.sys.integrationtask.workshop.service.IIntegrationTaskWorkshopService; -import com.hzya.frame.util.PluginUtils; -import com.hzya.frame.uuid.UUIDLong; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.web.exception.BaseSystemException; -import org.quartz.CronExpression; -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.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * 任务工坊(IntegrationTaskWorkshop)表服务实现类 - * - * @author xiaoguo - * @since 2023-08-07 17:03:33 - */ -@Service("integrationTaskWorkshopService") -public class IntegrationTaskWorkshopServiceImpl extends BaseService implements IIntegrationTaskWorkshopService { - //@Resource - private ApiHandleServiceImpl apiHandleService; - //@Resource - private IApiReflectionDao apiReflectionDao; - //@Resource - private IntegrationTaskMonitoringServiceImpl integrationTaskMonitoringService; - //@Resource - private IIntegrationTaskService integrationTaskService; - - private IIntegrationTaskWorkshopDao integrationTaskWorkshopDao; - - //@Resource - private IIntegrationTaskWorkshopDetailsDao detailsDao; - - //@Autowired - public void setIntegrationTaskWorkshopDao(IIntegrationTaskWorkshopDao dao) { - this.integrationTaskWorkshopDao = dao; - this.dao = dao; - } - - /**** - * 重新保存方法，把明细表参数赋值给主表字段 - * @content: - * @author 👻👻👻👻👻👻👻👻 gjh - * @date 2023-08-10 10:29 - * @param - * @return com.hzya.frame.web.entity.JsonResultEntity - **/ - @Override - public JsonResultEntity saveJson(JSONObject object) { - JSONObject mainData = object.getJSONObject("jsonStr"); - JSONArray workshopDetails = mainData.getJSONArray("integration_task_workshop_details_Detail"); - IntegrationTaskWorkshopEntity integrationTaskWorkshopEntity = JSON.parseObject(mainData.toJSONString(),IntegrationTaskWorkshopEntity.class); - integrationTaskWorkshopEntity.setParameter(workshopDetails.toJSONString()); - integrationTaskWorkshopDao.save(integrationTaskWorkshopEntity); - //保存明细表 - for(Object detailsObj : workshopDetails){ - IntegrationTaskWorkshopDetailsEntity integrationTaskWorkshopDetailsEntity = JSON.parseObject(detailsObj.toString(),IntegrationTaskWorkshopDetailsEntity.class); - integrationTaskWorkshopDetailsEntity.setFormmainId(integrationTaskWorkshopEntity.getId()); - integrationTaskWorkshopDetailsEntity.setId( UUIDLong.absLongUUIDStr()); - detailsDao.save(integrationTaskWorkshopDetailsEntity); - } - return BaseResult.getSuccessMessageEntity("任务工坊保存成功"); - } - - @Override - public JsonResultEntity updateJson(JSONObject object) { - JSONObject mainData = object.getJSONObject("jsonStr"); - JSONArray workshopDetails = mainData.getJSONArray("integration_task_workshop_details_Detail"); - IntegrationTaskWorkshopEntity integrationTaskWorkshopEntity = JSON.parseObject(mainData.toJSONString(),IntegrationTaskWorkshopEntity.class); - integrationTaskWorkshopEntity.setParameter(workshopDetails.toJSONString()); - integrationTaskWorkshopDao.update(integrationTaskWorkshopEntity); - IntegrationTaskWorkshopDetailsEntity removeEntity = new IntegrationTaskWorkshopDetailsEntity(); - removeEntity.setFormmainId(integrationTaskWorkshopEntity.getId()); - detailsDao.logicRemoveMultiCondition(removeEntity); - //保存明细表 - for(Object detailsObj : workshopDetails){ - IntegrationTaskWorkshopDetailsEntity integrationTaskWorkshopDetailsEntity = JSON.parseObject(detailsObj.toString(),IntegrationTaskWorkshopDetailsEntity.class); - integrationTaskWorkshopDetailsEntity.setFormmainId(integrationTaskWorkshopEntity.getId()); - integrationTaskWorkshopDetailsEntity.setId( UUIDLong.absLongUUIDStr()); - detailsDao.save(integrationTaskWorkshopDetailsEntity); - } - return BaseResult.getSuccessMessageEntity("任务工坊修改成功"); - } - - /*** - * 推送接口方法,此处需要根据场景id调用二林哥接口，同时需要处理查询左边数据接口时传递参数 - * @content: - * @author 👻👻👻👻👻👻👻👻 gjh - * @date 2023-08-08 9:00 - * @param - * @return void - **/ - /*@Override - public JsonResultEntity pushBusinessInterface(JSONObject requestJsonObj) throws Exception { - - JSONObject jsonData = requestJsonObj.getJSONObject("jsonStr"); - String sceneId = jsonData.getString("sceneid"); - JSONObject parameters = jsonData.getJSONObject("parameter"); - ApiReflectionEntity apiReflectionEntity = apiReflectionDao.get(sceneId); - if(null == apiReflectionEntity){ - throw new BaseSystemException("根据场景ID未查询到场景集成！场景ID"+sceneId); - } - String plug = apiReflectionEntity.getPlug(); - String plug_id = apiReflectionEntity.getPlug_id(); - //是插件 - String isPlug = "1"; - // 如果是插件，调用插件方法，否则调用二林哥方法 - if(isPlug.equalsIgnoreCase(plug)){ - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(plug_id); - if(null != pluginBaseEntity){ - pluginBaseEntity.executeBusiness(jsonData); - } - }else{ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("ref_id",sceneId); - jsonObject.put("left_interface_parameters",parameters.toJSONString()); - JSONObject req = new JSONObject(); - req.put("jsonStr",jsonObject.toJSONString()); - apiHandleService.executeApi(req); - } - return BaseResult.getSuccessMessageEntity("推送成功！"); - - }*/ - - - @Override - public JsonResultEntity pushBusinessInterface(JSONObject requestJsonObj) throws Exception { - JSONObject jsonData = requestJsonObj.getJSONObject("jsonStr"); - String sceneId = jsonData.getString("sceneid"); - JSONObject parameters = jsonData.getJSONObject("parameter"); - ApiReflectionEntity apiReflectionEntity = apiReflectionDao.get(sceneId); - if(null == apiReflectionEntity){ - throw new BaseSystemException("根据场景ID未查询到场景集成！场景ID"+sceneId); - } - //定义空的 调用场景方法有返回得话，取返回值 - jsonData.put("result", ""); - jsonData.put("info", ""); - jsonData.put("task_type","前台任务"); - jsonData.put("task_id",jsonData.getString("id"));//将任务工坊id当作任务id - //保存监控数据 - List integrationTaskMonitoringEntities = integrationTaskMonitoringService.queryTaskMonitoringOne(jsonData); - if (integrationTaskMonitoringEntities.size() == 0 || null == integrationTaskMonitoringEntities) { - //触发时候，新增监控 - jsonData.put("plan_time",new Date()); - integrationTaskMonitoringService.saveIntegrationTaskMonitoring(jsonData); - } - //查询单个,得到上次修改时间，当前时间减去修改时间就是上次耗时时间 - int diff_timeMon = 0; - if (integrationTaskMonitoringEntities.size() == 0) { - diff_timeMon = 0; - } else { - IntegrationTaskMonitoringEntity integrationTaskMonitoringEntity = integrationTaskMonitoringEntities.get(0); - diff_timeMon = Integer.valueOf((int) (new Date().getTime() - integrationTaskMonitoringEntity.getModify_time().getTime())); - } - jsonData.put("diff_time", diff_timeMon); - //触发时候，修改任务监控执行次数 - integrationTaskMonitoringService.updateIntegrationTaskMonitoring(jsonData); - String plug = apiReflectionEntity.getPlug(); - String plug_id = apiReflectionEntity.getPlug_id(); - //是插件 - String isPlug = "1"; - try { - // 如果是插件，调用插件方法，否则调用二林哥方法 - if(isPlug.equalsIgnoreCase(plug)){ - try { - PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(plug_id); - if(null != pluginBaseEntity){ - String s = pluginBaseEntity.executeBusiness(jsonData); - if("执行成功".equals(s)){ - jsonData.put("result","执行成功"); - } - } - }catch (Exception e){ - jsonData.put("result","执行失败"); - jsonData.put("instructions",e.getMessage()); - } - }else{ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("ref_id",sceneId); - jsonObject.put("left_interface_parameters",parameters.toJSONString()); - JSONObject req = new JSONObject(); - req.put("jsonStr",jsonObject.toJSONString()); - JsonResultEntity jsonResultEntity = apiHandleService.executeApi(req); - if ("执行成功".equals(jsonResultEntity.getMsg())) { - jsonData.put("result", jsonResultEntity.getMsg()); - jsonData.put("info", jsonResultEntity.getAttribute()); - }else{ - jsonData.put("result", "执行失败"); - jsonData.put("instructions",jsonResultEntity.getMsg()); - } - } - return BaseResult.getSuccessMessageEntity("推送成功！"); - }catch (Exception e){ - jsonData.put("result","执行失败"); - //保存错误说明 - jsonData.put("instructions",e.getMessage()); - return BaseResult.getFailureMessageEntity("任务保存失败:"+e.getMessage()); - }finally { - //保存日志和实例 - integrationTaskService.saveLogAndLiving(jsonData,new Date()); - } - } -} diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 9728afdf..08ec7a99 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.github.pagehelper.PageHelper; @@ -36,6 +37,7 @@ import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto; import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.sysnew.application.service.ISysApplicationService; +import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService; import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao; import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; @@ -118,6 +120,8 @@ public class SysApplicationServiceImpl extends BaseService oldheaderMap = ServletUtil.getHeaderMap(request); @@ -1747,6 +1748,15 @@ public class SysApplicationServiceImpl extends BaseService a = Arrays.asList(new String[]{"apicode", "appid", "secretkey", "publickey", "x-forwarded-for", "cookie", "x-forwarded-proto", "x-real-ip", "content-length", "accept-language", "host", "content-type", "connection", "cache-control", "accept-encoding", "pragma", "accept", "user-agent"}); Map headers = new HashMap<>(); + if(receiveApi.getHeaderIn() != null && !"".equals(receiveApi.getHeaderIn())){ + JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn()); + if(jsonArray != null && jsonArray.size() > 0){ + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject object = jsonArray.getJSONObject(i); + headers.put(object.getString("parameterName"), object.getString("example")); + } + } + } if (headerMap != null && headerMap.size() > 0) { for (Map.Entry entry : headerMap.entrySet()) { if (!a.contains(entry.getKey())) { @@ -1754,6 +1764,8 @@ public class SysApplicationServiceImpl extends BaseService { + List IntegrationTaskEntity_maxCode(IntegrationTaskEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java index 1dc7c58c..6a31997d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java @@ -2,8 +2,12 @@ package com.hzya.frame.sysnew.integtationTask.dao.impl; import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; import com.hzya.frame.sysnew.integtationTask.dao.IIntegrationTaskDao; +import com.hzya.frame.sysnew.user.entity.SysUserEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + /** * 集成任务(IntegrationTask)表数据库访问层 * @@ -12,6 +16,11 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; */ @Repository(value = "IntegrationTaskDaoImpl") public class IntegrationTaskDaoImpl extends MybatisGenericDao implements IIntegrationTaskDao{ - + + @Override + public List IntegrationTaskEntity_maxCode(IntegrationTaskEntity entity) { + List o = super.query(getSqlIdPrifx() + "IntegrationTaskEntity_maxCode", entity); + return o; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java index 4db1f763..fa810389 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java @@ -26,8 +26,6 @@ public class IntegrationTaskEntity extends BaseEntity { private String funInfo; /** 备注 */ private String remark; - /** 执行策略1、立即执行2、定时 */ - private String taskRun; /** 公司id */ private String companyId; @@ -96,14 +94,6 @@ public class IntegrationTaskEntity extends BaseEntity { this.remark = remark; } - public String getTaskRun() { - return taskRun; - } - - public void setTaskRun(String taskRun) { - this.taskRun = taskRun; - } - public String getCompanyId() { return companyId; } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml index c70d8c41..359c64f0 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml @@ -2,28 +2,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + id ,task_code ,task_name @@ -33,8 +33,7 @@ ,task_plugin ,fun_info ,remark - ,task_run - ,sorts + ,sorts ,create_user_id ,create_time ,modify_user_id @@ -43,258 +42,281 @@ ,org_id ,company_id - - + select + + from integration_task + + and id = #{id} + and task_code = #{taskCode} + and task_name = #{taskName} + and task_cron = #{taskCron} + and task_status = #{taskStatus} + and task_app = #{taskApp} + and task_plugin = #{taskPlugin} + and fun_info = #{funInfo} + and remark = #{remark} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - - - - + + + + - + select + + from integration_task + + and id like concat('%',#{id},'%') + and task_code like concat('%',#{taskCode},'%') + and task_name like concat('%',#{taskName},'%') + and task_cron like concat('%',#{taskCron},'%') + and task_status like concat('%',#{taskStatus},'%') + and task_app like concat('%',#{taskApp},'%') + and task_plugin like concat('%',#{taskPlugin},'%') + and fun_info like concat('%',#{funInfo},'%') + and remark like concat('%',#{remark},'%') + 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 modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from integration_task + + or id = #{id} + or task_code = #{taskCode} + or task_name = #{taskName} + or task_cron = #{taskCron} + or task_status = #{taskStatus} + or task_app = #{taskApp} + or task_plugin = #{taskPlugin} + or fun_info = #{funInfo} + or remark = #{remark} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into integration_task( - - id , - task_code , - task_name , - task_cron , - task_status , - task_app , - task_plugin , - fun_info , - remark , - task_run , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{taskCode} , - #{taskName} , - #{taskCron} , - #{taskStatus} , - #{taskApp} , - #{taskPlugin} , - #{funInfo} , - #{remark} , - #{taskRun} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task a WHERE a.sts = 'Y' ), - 'Y', - - ) - - - - insert into integration_task(task_code, task_name, task_cron, task_status, task_app, task_plugin, fun_info, remark, task_run, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.taskCode},#{entity.taskName},#{entity.taskCron},#{entity.taskStatus},#{entity.taskApp},#{entity.taskPlugin},#{entity.funInfo},#{entity.remark},#{entity.taskRun},#{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(task_code, task_name, task_cron, task_status, task_app, task_plugin, fun_info, remark, task_run, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.taskCode},#{entity.taskName},#{entity.taskCron},#{entity.taskStatus},#{entity.taskApp},#{entity.taskPlugin},#{entity.funInfo},#{entity.remark},#{entity.taskRun},#{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_code = values(task_code), - task_name = values(task_name), - task_cron = values(task_cron), - task_status = values(task_status), - task_app = values(task_app), - task_plugin = values(task_plugin), - fun_info = values(fun_info), - remark = values(remark), - task_run = values(task_run), - 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 set - - task_code = #{taskCode}, - task_name = #{taskName}, - task_cron = #{taskCron}, - task_status = #{taskStatus}, - task_app = #{taskApp}, - task_plugin = #{taskPlugin}, - fun_info = #{funInfo}, - remark = #{remark}, - task_run = #{taskRun}, - 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} - - - + + + insert into integration_task( + + id , + task_code , + task_name , + task_cron , + task_status , + task_app , + task_plugin , + fun_info , + remark , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{taskCode} , + #{taskName} , + #{taskCron} , + #{taskStatus} , + #{taskApp} , + #{taskPlugin} , + #{funInfo} , + #{remark} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + + 'Y', + + ) + + + + insert into integration_task(task_code, task_name, task_cron, task_status, task_app, task_plugin, fun_info, + remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.taskCode},#{entity.taskName},#{entity.taskCron},#{entity.taskStatus},#{entity.taskApp},#{entity.taskPlugin},#{entity.funInfo},#{entity.remark},#{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(task_code, task_name, task_cron, task_status, task_app, task_plugin, fun_info, + remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.taskCode},#{entity.taskName},#{entity.taskCron},#{entity.taskStatus},#{entity.taskApp},#{entity.taskPlugin},#{entity.funInfo},#{entity.remark},#{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_code = values(task_code), + task_name = values(task_name), + task_cron = values(task_cron), + task_status = values(task_status), + task_app = values(task_app), + task_plugin = values(task_plugin), + fun_info = values(fun_info), + remark = values(remark), + 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 set + + task_code = #{taskCode}, + task_name = #{taskName}, + task_cron = #{taskCron}, + task_status = #{taskStatus}, + task_app = #{taskApp}, + task_plugin = #{taskPlugin}, + fun_info = #{funInfo}, + remark = #{remark}, + 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 set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - -update integration_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and task_code = #{taskCode} - and task_name = #{taskName} - and task_cron = #{taskCron} - and task_status = #{taskStatus} - and task_app = #{taskApp} - and task_plugin = #{taskPlugin} - and fun_info = #{funInfo} - and remark = #{remark} - and task_run = #{taskRun} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + + update integration_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and task_code = #{taskCode} + and task_name = #{taskName} + and task_cron = #{taskCron} + and task_status = #{taskStatus} + and task_app = #{taskApp} + and task_plugin = #{taskPlugin} + and fun_info = #{funInfo} + and remark = #{remark} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from integration_task where id = #{id} - + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskCacheableServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskCacheableServiceImpl.java new file mode 100644 index 00000000..da3c2496 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskCacheableServiceImpl.java @@ -0,0 +1,105 @@ +package com.hzya.frame.sysnew.integtationTask.service.impl; + +import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService; +import com.hzya.frame.sysnew.integtationTask.dao.IIntegrationTaskDao; +import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; +import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao; +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 集成任务缓存服务实现类 + * + * @author makejava + * @since 2024-05-06 15:36:12 + */ +@Service(value = "integrationTaskCacheableService") +public class IntegrationTaskCacheableServiceImpl implements IIntegrationTaskCacheableService { + @Resource + private IIntegrationTaskDao integrationTaskDao; + @Resource + private IIntegrationTaskLivingDao iIntegrationTaskLivingDao; + @Resource + private ISysApplicationPluginDao iSysApplicationPluginDao; + @Override + @Cacheable(cacheNames="IntegrationTask",key = "#id") + public IntegrationTaskEntity getIntegrationTaskEntity(String id) { + IntegrationTaskEntity entity = null; + if(id != null && !"".equals(id)){ + entity = integrationTaskDao.get(id); + } + return entity; + } + + @Override + @CachePut(cacheNames="IntegrationTask",key = "#entity.id",unless = "#result == null") + public IntegrationTaskEntity updateIntegrationTaskEntity(IntegrationTaskEntity entity) { + if(entity.getId() != null && !"".equals(entity.getId())){ + integrationTaskDao.update(entity); + } + return entity; + } + @Override + @CacheEvict(cacheNames="IntegrationTask",key = "#entity.id") + public void deleteIntegrationTaskEntity(IntegrationTaskEntity entity) { + integrationTaskDao.logicRemove(entity); + } + + + @Override + @Cacheable(cacheNames="IntegrationTaskLiving",key = "#id") + public IntegrationTaskLivingEntity getIntegrationTaskLivingEntity(String id) { + IntegrationTaskLivingEntity entity = null; + if(id != null && !"".equals(id)){ + entity = iIntegrationTaskLivingDao.get(id); + } + return entity; + } + + @Override + @CachePut(cacheNames="IntegrationTaskLiving",key = "#entity.id",unless = "#result == null") + public IntegrationTaskLivingEntity updateIntegrationTaskLivingEntity(IntegrationTaskLivingEntity entity) { + if(entity.getId() != null && !"".equals(entity.getId())){ + iIntegrationTaskLivingDao.update(entity); + } + return entity; + } + @Override + @CacheEvict(cacheNames="IntegrationTaskLiving",key = "#entity.id") + public void deleteIntegrationTaskLivingEntity(IntegrationTaskLivingEntity entity) { + iIntegrationTaskLivingDao.logicRemove(entity); + } + + + @Override + @Cacheable(cacheNames="sysApplicationPlugin",key = "#id") + public SysApplicationPluginEntity getSysApplicationPluginEntity(String id) { + SysApplicationPluginEntity entity = null; + if(id != null && !"".equals(id)){ + entity = iSysApplicationPluginDao.get(id); + } + return entity; + } + + @Override + @CachePut(cacheNames="sysApplicationPlugin",key = "#entity.id",unless = "#result == null") + public SysApplicationPluginEntity updateSysApplicationPluginEntity(SysApplicationPluginEntity entity) { + if(entity.getId() != null && !"".equals(entity.getId())){ + iSysApplicationPluginDao.update(entity); + } + return entity; + } + @Override + @CacheEvict(cacheNames="sysApplicationPlugin",key = "#entity.id") + public void deleteSysApplicationPluginEntity(SysApplicationPluginEntity entity) { + iSysApplicationPluginDao.logicRemove(entity); + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java index 12a894b0..829d659b 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java @@ -3,20 +3,27 @@ package com.hzya.frame.sysnew.integtationTask.service.impl; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.hzya.frame.dateutil.DateUtil; +import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService; import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; import com.hzya.frame.sysnew.integtationTask.dao.IIntegrationTaskDao; import com.hzya.frame.sysnew.integtationTask.service.IIntegrationTaskService; -import com.hzya.frame.sysnew.user.entity.SysUserEntity; -import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity; -import com.hzya.frame.sysnew.userRoles.entity.SysUserRolesEntity; -import com.hzya.frame.util.AESUtil; +import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao; +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.web.exception.BaseSystemException; +import com.hzya.frame.web.quartz.QuartzJobFactoryUtils; +import org.quartz.SchedulerException; 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.text.ParseException; +import java.util.Date; import java.util.List; /** @@ -27,207 +34,285 @@ import java.util.List; */ @Service(value = "integrationTaskService") public class IntegrationTaskServiceImpl extends BaseService implements IIntegrationTaskService { - + private IIntegrationTaskDao integrationTaskDao; - + @Resource + private IIntegrationTaskLivingDao iIntegrationTaskLivingDao; + @Resource + private IIntegrationTaskCacheableService iIntegrationTaskCacheableService; + @Autowired - public void setIntegrationTaskDao(IIntegrationTaskDao dao) { - this.integrationTaskDao = dao; - this.dao = dao; - } + public void setIntegrationTaskDao(IIntegrationTaskDao dao) { + this.integrationTaskDao = 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) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - //判断分页 - if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - List list = integrationTaskDao.queryByLike(entity); - PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = integrationTaskDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询任务列表 - * @Date 11:52 上午 2024/3/27 - **/ - @Override - public JsonResultEntity queryEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - entity = new IntegrationTaskEntity(); - } - List list = integrationTaskDao.queryByLike(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", list); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务列表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + entity = new IntegrationTaskEntity(); + } + List list = integrationTaskDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 保存任务 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity saveEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getTaskCode() == null || "".equals(entity.getTaskCode())) { - return BaseResult.getFailureMessageEntity("请先输入任务编码"); - } - if (entity.getTaskName() == null || "".equals(entity.getTaskName())) { - return BaseResult.getFailureMessageEntity("请先输入任务名称"); - } - if (entity.getTaskApp() == null || "".equals(entity.getTaskApp())) { - return BaseResult.getFailureMessageEntity("请先选择应用"); - } - if (entity.getTaskPlugin() == null || "".equals(entity.getTaskPlugin())) { - return BaseResult.getFailureMessageEntity("请先选择应用插件"); - } - if (!checkIsUse(entity)) { - return BaseResult.getFailureMessageEntity("当前任务编码已存在，请修改"); - } - //保存 - integrationTaskDao.save(entity); - return BaseResult.getSuccessMessageEntity("保存任务成功", entity); - } - - /** - * @param entity - * @return boolean - * @Author lvleigang - * @Description 校验人员是否已经有配置 - * @Date 10:00 上午 2024/4/1 - **/ - private boolean checkIsUse(IntegrationTaskEntity entity) { - IntegrationTaskEntity checkEntity = new IntegrationTaskEntity(); - checkEntity.setTaskCode(entity.getTaskCode()); - checkEntity.setSts("Y");//启用 - if (integrationTaskDao.getCount(checkEntity) > 0) { - return false; - } - return true; - } - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取任务 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity getEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity = integrationTaskDao.get(entity.getId()); - if (entity == null) { - return BaseResult.getFailureMessageEntity("获取任务失败"); - } - return BaseResult.getSuccessMessageEntity("获取任务成功", entity); - } - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 修改任务 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity updateEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - if (entity.getTaskCode() == null || "".equals(entity.getTaskCode())) { - return BaseResult.getFailureMessageEntity("请先输入任务编码"); - } - if (entity.getTaskName() == null || "".equals(entity.getTaskName())) { - return BaseResult.getFailureMessageEntity("请先输入任务名称"); - } - if (entity.getTaskApp() == null || "".equals(entity.getTaskApp())) { - return BaseResult.getFailureMessageEntity("请先选择应用"); - } - if (entity.getTaskPlugin() == null || "".equals(entity.getTaskPlugin())) { - return BaseResult.getFailureMessageEntity("请先选择应用插件"); - } - entity.setUpdate(); - //保存 - integrationTaskDao.update(entity); - return BaseResult.getSuccessMessageEntity("修改任务成功"); - } - - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 删除任务 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity deleteEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setUpdate(); - integrationTaskDao.logicRemove(entity); - return BaseResult.getSuccessMessageEntity("删除任务成功"); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存任务 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getTaskName() == null || "".equals(entity.getTaskName())) { + return BaseResult.getFailureMessageEntity("请先输入任务名称"); + } + if (entity.getTaskApp() == null || "".equals(entity.getTaskApp())) { + return BaseResult.getFailureMessageEntity("请先选择应用"); + } + if (entity.getTaskPlugin() == null || "".equals(entity.getTaskPlugin())) { + return BaseResult.getFailureMessageEntity("请先选择应用插件"); + } + entity.setCreate(); + List integrationTaskEntityMaxCode = integrationTaskDao.IntegrationTaskEntity_maxCode(entity); + if (integrationTaskEntityMaxCode != null && integrationTaskEntityMaxCode.size() > 0) { + String taskCode = "Task-" + integrationTaskEntityMaxCode.get(0).getTaskCode(); + entity.setTaskCode(taskCode); + } else { + String nowDateString = DateUtil.dateToString(new Date(), "yyyy-MM-dd"); + String taskCode = "Task-" + nowDateString + "-0000"; + entity.setTaskCode(taskCode); + } + //保存 + integrationTaskDao.save(entity); + //保存实例表 + IntegrationTaskLivingEntity integrationTaskLivingEntity = new IntegrationTaskLivingEntity(); + integrationTaskLivingEntity.setTaskId(entity.getId()); + integrationTaskLivingEntity.setTaskCode(entity.getTaskCode()); + integrationTaskLivingEntity.setTaskName(entity.getTaskName()); + integrationTaskLivingEntity.setTaskStatus("2"); + integrationTaskLivingEntity.setRunNum(0); + integrationTaskLivingEntity.setCreate(); + iIntegrationTaskLivingDao.save(integrationTaskLivingEntity); + //任务状态1、启用2、停用 + if (entity.getTaskStatus() != null && "1".equals(entity.getTaskStatus())) { + JSONObject jsonObjectMap = new JSONObject(); + jsonObjectMap.put("integrationTaskId", entity.getId());//任务id + jsonObjectMap.put("integrationTaskLivingId", integrationTaskLivingEntity.getId());//实例id + //根据cron，定时执行任务 + try { + QuartzJobFactoryUtils.createJob(jsonObjectMap); + } catch (Exception e) { + logger.error("新增任务成功，创建任务失败"); + return BaseResult.getSuccessMessageEntity("新增任务成功，创建定时任务失败，请联系管理员", entity); + } + } + return BaseResult.getSuccessMessageEntity("新增任务成功", entity); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 启用停用任务 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { - IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - if (entity.getTaskStatus() == null || "".equals(entity.getTaskStatus())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setUpdate(); - integrationTaskDao.update(entity);//1、启用2、停用 - if ("1".equals(entity.getTaskStatus())) { - return BaseResult.getSuccessMessageEntity("启用任务成功"); - } else { - return BaseResult.getSuccessMessageEntity("停用任务成功"); - } - } + /** + * @param entity + * @return boolean + * @Author lvleigang + * @Description 校验人员是否已经有配置 + * @Date 10:00 上午 2024/4/1 + **/ + private boolean checkIsUse(IntegrationTaskEntity entity) { + IntegrationTaskEntity checkEntity = new IntegrationTaskEntity(); + checkEntity.setTaskCode(entity.getTaskCode()); + checkEntity.setSts("Y");//启用 + if (integrationTaskDao.getCount(checkEntity) > 0) { + return false; + } + return true; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取任务 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = iIntegrationTaskCacheableService.getIntegrationTaskEntity(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取任务失败"); + } + return BaseResult.getSuccessMessageEntity("获取任务成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改任务 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getTaskCode() == null || "".equals(entity.getTaskCode())) { + return BaseResult.getFailureMessageEntity("请先输入任务编码"); + } + if (entity.getTaskName() == null || "".equals(entity.getTaskName())) { + return BaseResult.getFailureMessageEntity("请先输入任务名称"); + } + if (entity.getTaskApp() == null || "".equals(entity.getTaskApp())) { + return BaseResult.getFailureMessageEntity("请先选择应用"); + } + if (entity.getTaskPlugin() == null || "".equals(entity.getTaskPlugin())) { + return BaseResult.getFailureMessageEntity("请先选择应用插件"); + } + entity.setUpdate(); + //保存 + entity = iIntegrationTaskCacheableService.updateIntegrationTaskEntity(entity); + //实例表 + IntegrationTaskLivingEntity integrationTaskLivingEntity = new IntegrationTaskLivingEntity(); + integrationTaskLivingEntity.setTaskId(entity.getId()); + integrationTaskLivingEntity.setSts("Y"); + List integrationTaskLivingEntities = iIntegrationTaskLivingDao.queryBase(integrationTaskLivingEntity); + if (integrationTaskLivingEntities != null && integrationTaskLivingEntities.size() == 1) { + integrationTaskLivingEntity = integrationTaskLivingEntities.get(0); + } else { + throw new BaseSystemException("系统错误，请联系管理员"); + } + //任务状态1、启用2、停用 + if (entity.getTaskStatus() != null && "1".equals(entity.getTaskStatus())) { + JSONObject jsonObjectMap = new JSONObject(); + jsonObjectMap.put("integrationTaskId", entity.getId());//任务id + jsonObjectMap.put("integrationTaskLivingId", integrationTaskLivingEntity.getId());//实例id + //根据cron，定时执行任务 + try { + QuartzJobFactoryUtils.createJob(jsonObjectMap); + } catch (Exception e) { + logger.error("修改任务成功，创建任务失败"); + return BaseResult.getSuccessMessageEntity("修改任务成功，修改定时任务失败，请联系管理员", entity); + } + } else if (entity.getTaskStatus() != null && "2".equals(entity.getTaskStatus())) { + //停用的时候，由定时任务里面触发不自动停止任务 + } + return BaseResult.getSuccessMessageEntity("修改任务成功,修改定时任务成功"); + } + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除任务 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + iIntegrationTaskCacheableService.deleteIntegrationTaskEntity(entity); + return BaseResult.getSuccessMessageEntity("删除任务成功"); + } + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用任务 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + IntegrationTaskEntity entity = getData("jsonStr", jsonObject, IntegrationTaskEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getTaskStatus() == null || "".equals(entity.getTaskStatus())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + entity = iIntegrationTaskCacheableService.updateIntegrationTaskEntity(entity); + if ("1".equals(entity.getTaskStatus())) { + //实例表 + IntegrationTaskLivingEntity integrationTaskLivingEntity = new IntegrationTaskLivingEntity(); + integrationTaskLivingEntity.setTaskId(entity.getId()); + integrationTaskLivingEntity.setSts("Y"); + List integrationTaskLivingEntities = iIntegrationTaskLivingDao.queryBase(integrationTaskLivingEntity); + if (integrationTaskLivingEntities != null && integrationTaskLivingEntities.size() == 1) { + integrationTaskLivingEntity = integrationTaskLivingEntities.get(0); + } else { + throw new BaseSystemException("系统错误，请联系管理员"); + } + JSONObject jsonObjectMap = new JSONObject(); + jsonObjectMap.put("integrationTaskId", entity.getId());//任务id + jsonObjectMap.put("integrationTaskLivingId", integrationTaskLivingEntity.getId());//实例id + //根据cron，定时执行任务 + try { + QuartzJobFactoryUtils.createJob(jsonObjectMap); + } catch (Exception e) { + logger.error("修改任务成功，创建任务失败"); + return BaseResult.getSuccessMessageEntity("修改任务成功，修改定时任务失败，请联系管理员", entity); + } + return BaseResult.getSuccessMessageEntity("启用任务成功"); + } else { + //停用的时候，由定时任务里面触发不自动停止任务 + return BaseResult.getSuccessMessageEntity("停用任务成功"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java index 99fef22b..71a2b1e9 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java @@ -16,7 +16,7 @@ public class IntegrationTaskLivingEntity extends BaseEntity { private String taskCode; /** 任务名称 */ private String taskName; - /** 任务状态1、执行中2、待执行3、错误 */ + /** 任务状态1、执行中2、待执行3、错误 4、当前任务已停止*/ private String taskStatus; /** 上次开始时间 */ private Date oldStartTime; diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml index 26bbe617..4c523632 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml @@ -43,7 +43,15 @@ ,org_id ,company_id + + + + - + insert into integration_task_living( id , @@ -183,7 +191,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -206,13 +213,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living a WHERE a.sts = 'Y' ), 'Y', ) - + insert into integration_task_living(task_id, task_code, task_name, task_status, old_start_time, start_time, end_time, diff_time, run_num, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values @@ -220,7 +226,7 @@ - + insert into integration_task_living(task_id, task_code, task_name, task_status, old_start_time, start_time, end_time, diff_time, run_num, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java index 102373c9..5b90c88e 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java @@ -18,7 +18,7 @@ public class IntegrationTaskLivingDetailsEntity extends BaseEntity { private String taskCode; /** 任务名称 */ private String taskName; - /** 任务状态1、执行中2、执行成功 3、执行失败 */ + /** 任务状态1、执行中2、执行成功 3、执行失败 4\当前任务已停止*/ private String taskStatus; /** 当前任务开始时间 */ private Date startTime; @@ -28,6 +28,8 @@ public class IntegrationTaskLivingDetailsEntity extends BaseEntity { private String diffTime; /** 公司id */ private String companyId; + /** 备注 */ + private String remark; public String getTaskLinvingId() { @@ -102,5 +104,12 @@ public class IntegrationTaskLivingDetailsEntity extends BaseEntity { this.companyId = companyId; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml index 89c6875e..661668c2 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml @@ -9,6 +9,7 @@ + @@ -29,7 +30,8 @@ ,task_id ,task_code ,task_name - ,task_status + ,remark + ,task_status ,start_time ,end_time ,diff_time @@ -42,6 +44,12 @@ ,org_id ,company_id + +