From 52bc8c26ae4415c3d4f395056d92ca308be756c5 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 7 May 2024 09:26:06 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/pom.xml | 8 +- .../src/main/resources/application-llg.yml | 23 ++ ...egrationTaskClassificationServiceImpl.java | 4 +- ...tegrationTaskLivingDetailsServiceImpl.java | 2 +- .../IntegrationTaskLivingServiceImpl.java | 6 +- .../IntegrationTaskLogDetailServiceImpl.java | 4 +- .../impl/IntegrationTaskLogServiceImpl.java | 6 +- .../IntegrationTaskMonitoringServiceImpl.java | 8 +- .../IntegrationTaskDetailsServiceImpl.java | 4 +- .../impl/IntegrationTaskServiceImpl.java | 14 +- ...grationTaskWorkshopDetailsServiceImpl.java | 4 +- .../IntegrationTaskWorkshopServiceImpl.java | 12 +- .../service/ISysApplicationPluginService.java | 12 + .../impl/SysApplicationPluginServiceImpl.java | 27 +- .../service/ISysApplicationService.java | 9 +- .../impl/SysApplicationServiceImpl.java | 18 +- .../dao/IIntegrationTaskDao.java | 15 + .../dao/impl/IntegrationTaskDaoImpl.java | 17 + .../entity/IntegrationTaskEntity.java | 116 +++++++ .../entity/IntegrationTaskEntity.xml | 300 +++++++++++++++++ .../service/IIntegrationTaskService.java | 77 +++++ .../impl/IntegrationTaskServiceImpl.java | 233 +++++++++++++ .../dao/IIntegrationTaskLivingDao.java | 15 + .../impl/IntegrationTaskLivingDaoImpl.java | 17 + .../entity/IntegrationTaskLivingEntity.java | 116 +++++++ .../entity/IntegrationTaskLivingEntity.xml | 302 +++++++++++++++++ .../IIntegrationTaskLivingService.java | 26 ++ .../IntegrationTaskLivingServiceImpl.java | 55 +++ .../dao/IIntegrationTaskLivingDetailsDao.java | 15 + .../IntegrationTaskLivingDetailsDaoImpl.java | 17 + .../IntegrationTaskLivingDetailsEntity.java | 106 ++++++ .../IntegrationTaskLivingDetailsEntity.xml | 316 ++++++++++++++++++ .../IIntegrationTaskLivingDetailsService.java | 25 ++ ...tegrationTaskLivingDetailsServiceImpl.java | 55 +++ .../service/impl/EntranceServiceImpl.java | 46 --- 35 files changed, 1948 insertions(+), 82 deletions(-) create mode 100644 buildpackage/src/main/resources/application-llg.yml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/IIntegrationTaskDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/IIntegrationTaskService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/IIntegrationTaskLivingDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/impl/IntegrationTaskLivingDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml index bc03d6a2..666c0306 100644 --- a/buildpackage/pom.xml +++ b/buildpackage/pom.xml @@ -58,11 +58,17 @@ - hclocal + hclocal hclocal + + llg + + llg + + kangarooDataCenterV3 diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml new file mode 100644 index 00000000..5d960999 --- /dev/null +++ b/buildpackage/src/main/resources/application-llg.yml @@ -0,0 +1,23 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: /Users/apple/Desktop/log/local +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: bd993088e8a7c3dc5f44441617f9b4bf + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/apple/Desktop/log/local +ax: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/classification/service/impl/IntegrationTaskClassificationServiceImpl.java index 24ccf827..693bef86 100644 --- 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 @@ -20,12 +20,12 @@ import java.util.List; * @author: gjh * @history: 1.0 */ -@Service(value = "integrationTaskClassificationService") +//@Service(value = "integrationTaskClassificationService") public class IntegrationTaskClassificationServiceImpl extends BaseService implements IIntegrationTaskClassificationService { protected IIntegrationTaskClassificationDao integrationtaskclassificationDao; - @Autowired + //@Autowired public void setIntegrationTaskClassificationDao(IIntegrationTaskClassificationDao dao) { this.integrationtaskclassificationDao = dao; this.dao = dao; 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 index f9a6326f..ebafed1c 100644 --- 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 @@ -37,7 +37,7 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingService { protected IIntegrationTaskLivingDao integrationtasklivingDao; - @Autowired + //@Autowired private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; - @Autowired + //@Autowired public void setIntegrationTaskLivingDao(IIntegrationTaskLivingDao dao) { this.integrationtasklivingDao = dao; this.dao = dao; 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 index a8fe4164..940c2b7c 100644 --- 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 @@ -14,12 +14,12 @@ import com.hzya.frame.basedao.service.impl.BaseService; * @author: gjh * @history: 1.0 */ -@Service(value = "integration_task_log_detailsService") +//@Service(value = "integration_task_log_detailsService") public class IntegrationTaskLogDetailServiceImpl extends BaseService implements IIntegrationTaskLogDetailService { protected IIntegrationTaskLogDetailDao integrationtasklogdetailDao; - @Autowired + //@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 index ca41d829..4dda3b64 100644 --- 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 @@ -35,13 +35,13 @@ import java.util.List; * @author: gjh * @history: 1.0 */ -@Service(value = "integrationTaskLogService") +//@Service(value = "integrationTaskLogService") public class IntegrationTaskLogServiceImpl extends BaseService implements IIntegrationTaskLogService { protected IIntegrationTaskLogDao integrationtasklogDao; - @Autowired + //@Autowired private IIntegrationTaskLogDetailDao integrationTaskLogDetailDao; - @Resource + //@Resource private HttpServletResponse httpServletResponse; @Autowired 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 index 8710ae30..335cb173 100644 --- 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 @@ -30,17 +30,17 @@ import java.util.List; * @author: gjh * @history: 1.0 */ -@Service(value = "integrationTaskMonitoringService") +//@Service(value = "integrationTaskMonitoringService") public class IntegrationTaskMonitoringServiceImpl extends BaseService implements IIntegrationTaskMonitoringService { protected IIntegrationTaskMonitoringDao integrationtaskmonitoringDao; - @Autowired + //@Autowired private IIntegrationTaskDao integrationTaskDao; - @Autowired + //@Autowired private HttpServletResponse httpServletResponse; - @Autowired + //@Autowired public void setIntegrationTaskMonitoringDao(IIntegrationTaskMonitoringDao dao) { this.integrationtaskmonitoringDao = dao; this.dao = dao; 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 index 23195040..50b78a0f 100644 --- 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 @@ -14,12 +14,12 @@ import com.hzya.frame.basedao.service.impl.BaseService; * @author: gjh * @history: 1.0 */ -@Service(value = "integration_task_detailsService") +//@Service(value = "integration_task_detailsService") public class IntegrationTaskDetailsServiceImpl extends BaseService implements IIntegrationTaskDetailsService { protected IIntegrationTaskDetailsDao integrationtaskdetailsDao; - @Autowired + //@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 index 0112f99d..bd6f06f1 100644 --- 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 @@ -41,7 +41,7 @@ import java.util.List; * @author: gjh * @history: 1.0 */ -@Service(value = "integrationTaskService") +//@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：定时 @@ -49,18 +49,18 @@ public class IntegrationTaskServiceImpl extends BaseService implements IIntegrationTaskWorkshopDetailsService { private IIntegrationTaskWorkshopDetailsDao integrationTaskWorkshopDetailsDao; - @Autowired + //@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 index e6bc878f..fb3dd946 100644 --- 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 @@ -40,21 +40,21 @@ import java.util.List; */ @Service("integrationTaskWorkshopService") public class IntegrationTaskWorkshopServiceImpl extends BaseService implements IIntegrationTaskWorkshopService { - @Resource + //@Resource private ApiHandleServiceImpl apiHandleService; - @Resource + //@Resource private IApiReflectionDao apiReflectionDao; - @Resource + //@Resource private IntegrationTaskMonitoringServiceImpl integrationTaskMonitoringService; - @Resource + //@Resource private IIntegrationTaskService integrationTaskService; private IIntegrationTaskWorkshopDao integrationTaskWorkshopDao; - @Resource + //@Resource private IIntegrationTaskWorkshopDetailsDao detailsDao; - @Autowired + //@Autowired public void setIntegrationTaskWorkshopDao(IIntegrationTaskWorkshopDao dao) { this.integrationTaskWorkshopDao = dao; this.dao = dao; diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java index 65b438cb..c431d7ca 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java @@ -1,7 +1,10 @@ package com.hzya.frame.sysnew.application.plugin.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + /** * 插件表(SysApplicationPlugin)表服务接口 * @@ -9,4 +12,13 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2023-09-22 16:30:03 */ public interface ISysApplicationPluginService extends IBaseService{ + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询应用插件列表 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntity(JSONObject jsonObject); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java index 2ed5ac0b..04998b80 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java @@ -1,12 +1,19 @@ package com.hzya.frame.sysnew.application.plugin.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; import com.hzya.frame.sysnew.application.plugin.service.ISysApplicationPluginService; -import org.springframework.stereotype.Service; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + /** * 插件表(SysApplicationPlugin)表服务实现类 * @@ -23,4 +30,22 @@ public class SysApplicationPluginServiceImpl extends BaseService list = sysApplicationPluginDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java index 707622b3..88c81fc1 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java @@ -339,5 +339,12 @@ public interface ISysApplicationService extends IBaseService ids = sysApplicationApiDao.queryBaseName(entity); return BaseResult.getSuccessMessageEntity("查询数据成功", ids); } - + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询应用列表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + SysApplicationEntity entity = getData("jsonStr", jsonObject, SysApplicationEntity.class); + if (entity == null) { + entity = new SysApplicationEntity(); + } + List list = sysApplicationDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/IIntegrationTaskDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/IIntegrationTaskDao.java new file mode 100644 index 00000000..978f0a78 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/IIntegrationTaskDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.sysnew.integtationTask.dao; + +import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 集成任务(integration_task: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:36:03 + */ +public interface IIntegrationTaskDao extends IBaseDao { + +} + 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 new file mode 100644 index 00000000..1dc7c58c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/dao/impl/IntegrationTaskDaoImpl.java @@ -0,0 +1,17 @@ +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 org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 集成任务(IntegrationTask)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:36:06 + */ +@Repository(value = "IntegrationTaskDaoImpl") +public class IntegrationTaskDaoImpl extends MybatisGenericDao implements IIntegrationTaskDao{ + +} + 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 new file mode 100644 index 00000000..4db1f763 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.java @@ -0,0 +1,116 @@ +package com.hzya.frame.sysnew.integtationTask.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 集成任务(IntegrationTask)实体类 + * + * @author makejava + * @since 2024-05-06 15:36:08 + */ +public class IntegrationTaskEntity extends BaseEntity { + + /** 任务编码 */ + private String taskCode; + /** 任务名称 */ + private String taskName; + /** 任务策略 */ + private String taskCron; + /** 任务状态1、启用2、停用 */ + private String taskStatus; + /** 应用 */ + private String taskApp; + /** 插件 */ + private String taskPlugin; + /** 功能介绍/任务描述 */ + private String funInfo; + /** 备注 */ + private String remark; + /** 执行策略1、立即执行2、定时 */ + private String taskRun; + /** 公司id */ + private String companyId; + + + public String getTaskCode() { + return taskCode; + } + + public void setTaskCode(String taskCode) { + this.taskCode = taskCode; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskCron() { + return taskCron; + } + + public void setTaskCron(String taskCron) { + this.taskCron = taskCron; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + + public String getTaskApp() { + return taskApp; + } + + public void setTaskApp(String taskApp) { + this.taskApp = taskApp; + } + + public String getTaskPlugin() { + return taskPlugin; + } + + public void setTaskPlugin(String taskPlugin) { + this.taskPlugin = taskPlugin; + } + + public String getFunInfo() { + return funInfo; + } + + public void setFunInfo(String funInfo) { + this.funInfo = funInfo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaskRun() { + return taskRun; + } + + public void setTaskRun(String taskRun) { + this.taskRun = taskRun; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = 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 new file mode 100644 index 00000000..c70d8c41 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/entity/IntegrationTaskEntity.xml @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + 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} + + + +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} + and sts='Y' + + + + + delete from integration_task where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/IIntegrationTaskService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/IIntegrationTaskService.java new file mode 100644 index 00000000..39d76c37 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/IIntegrationTaskService.java @@ -0,0 +1,77 @@ +package com.hzya.frame.sysnew.integtationTask.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + +/** + * 集成任务(IntegrationTask)表服务接口 + * + * @author makejava + * @since 2024-05-06 15:36:10 + */ +public interface IIntegrationTaskService extends IBaseService { + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务列表 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存任务 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取任务 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改任务 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除任务 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用任务 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity enableDisableEntity(JSONObject jsonObject); +} 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 new file mode 100644 index 00000000..12a894b0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskServiceImpl.java @@ -0,0 +1,233 @@ +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.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.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + +/** + * 集成任务(IntegrationTask)表服务实现类 + * + * @author makejava + * @since 2024-05-06 15:36:12 + */ +@Service(value = "integrationTaskService") +public class IntegrationTaskServiceImpl extends BaseService implements IIntegrationTaskService { + + private IIntegrationTaskDao integrationTaskDao; + + @Autowired + 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 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: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("停用任务成功"); + } + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/IIntegrationTaskLivingDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/IIntegrationTaskLivingDao.java new file mode 100644 index 00000000..db6dff21 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/IIntegrationTaskLivingDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.sysnew.integtationTaskLiving.dao; + +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 集成任务-实例(integration_task_living: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:09 + */ +public interface IIntegrationTaskLivingDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/impl/IntegrationTaskLivingDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/impl/IntegrationTaskLivingDaoImpl.java new file mode 100644 index 00000000..60621893 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/dao/impl/IntegrationTaskLivingDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.sysnew.integtationTaskLiving.dao.impl; + +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 集成任务-实例(IntegrationTaskLiving)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:09 + */ +@Repository(value = "IntegrationTaskLivingDaoImpl") +public class IntegrationTaskLivingDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDao{ + +} + 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 new file mode 100644 index 00000000..99fef22b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.java @@ -0,0 +1,116 @@ +package com.hzya.frame.sysnew.integtationTaskLiving.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 集成任务-实例(IntegrationTaskLiving)实体类 + * + * @author makejava + * @since 2024-05-06 15:37:09 + */ +public class IntegrationTaskLivingEntity extends BaseEntity { + + /** integration_task_id */ + private String taskId; + /** 任务编码 */ + private String taskCode; + /** 任务名称 */ + private String taskName; + /** 任务状态1、执行中2、待执行3、错误 */ + private String taskStatus; + /** 上次开始时间 */ + private Date oldStartTime; + /** 当前任务开始时间 */ + private Date startTime; + /** 结束时间 */ + private Date endTime; + /** 耗时 */ + private String diffTime; + /** 运行次数 */ + private Integer runNum; + /** 公司id */ + private String companyId; + + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskCode() { + return taskCode; + } + + public void setTaskCode(String taskCode) { + this.taskCode = taskCode; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + + public Date getOldStartTime() { + return oldStartTime; + } + + public void setOldStartTime(Date oldStartTime) { + this.oldStartTime = oldStartTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getDiffTime() { + return diffTime; + } + + public void setDiffTime(String diffTime) { + this.diffTime = diffTime; + } + + public Integer getRunNum() { + return runNum; + } + + public void setRunNum(Integer runNum) { + this.runNum = runNum; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + 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 new file mode 100644 index 00000000..26bbe617 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/entity/IntegrationTaskLivingEntity.xml @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,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 + + + + + + + + + + + + + + + + insert into integration_task_living( + + id , + 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 , + sorts, + sts, + + )values( + + #{id} , + #{taskId} , + #{taskCode} , + #{taskName} , + #{taskStatus} , + #{oldStartTime} , + #{startTime} , + #{endTime} , + #{diffTime} , + #{runNum} , + #{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_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 + + (#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.taskStatus},#{entity.oldStartTime},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.runNum},#{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_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 + + (#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.taskStatus},#{entity.oldStartTime},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.runNum},#{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_id = values(task_id), + task_code = values(task_code), + task_name = values(task_name), + task_status = values(task_status), + old_start_time = values(old_start_time), + start_time = values(start_time), + end_time = values(end_time), + diff_time = values(diff_time), + run_num = values(run_num), + 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_living set + + task_id = #{taskId}, + task_code = #{taskCode}, + task_name = #{taskName}, + task_status = #{taskStatus}, + old_start_time = #{oldStartTime}, + start_time = #{startTime}, + end_time = #{endTime}, + diff_time = #{diffTime}, + run_num = #{runNum}, + 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_living set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update integration_task_living set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and task_id = #{taskId} + and task_code = #{taskCode} + and task_name = #{taskName} + and task_status = #{taskStatus} + and old_start_time = #{oldStartTime} + and start_time = #{startTime} + and end_time = #{endTime} + and diff_time = #{diffTime} + and run_num = #{runNum} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from integration_task_living where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java new file mode 100644 index 00000000..fbb19bf5 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java @@ -0,0 +1,26 @@ +package com.hzya.frame.sysnew.integtationTaskLiving.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + +/** + * 集成任务-实例(IntegrationTaskLiving)表服务接口 + * + * @author makejava + * @since 2024-05-06 15:37:09 + */ +public interface IIntegrationTaskLivingService extends IBaseService{ + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务实例列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java new file mode 100644 index 00000000..e1f21736 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java @@ -0,0 +1,55 @@ +package com.hzya.frame.sysnew.integtationTaskLiving.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao; +import com.hzya.frame.sysnew.integtationTaskLiving.service.IIntegrationTaskLivingService; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + +/** + * 集成任务-实例(IntegrationTaskLiving)表服务实现类 + * + * @author makejava + * @since 2024-05-06 15:37:09 + */ +@Service(value = "integrationTaskLivingService") +public class IntegrationTaskLivingServiceImpl extends BaseService implements IIntegrationTaskLivingService { + + private IIntegrationTaskLivingDao integrationTaskLivingDao; + + @Autowired + public void setIntegrationTaskLivingDao(IIntegrationTaskLivingDao dao) { + this.integrationTaskLivingDao = 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) { + IntegrationTaskLivingEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = integrationTaskLivingDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java new file mode 100644 index 00000000..c6c91d37 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao; + +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 集成任务-实例详情(integration_task_living_details: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +public interface IIntegrationTaskLivingDetailsDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java new file mode 100644 index 00000000..44e93fb8 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.impl; + +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)表数据库访问层 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +@Repository(value = "IntegrationTaskLivingDetailsDaoImpl") +public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao implements IIntegrationTaskLivingDetailsDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java new file mode 100644 index 00000000..102373c9 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java @@ -0,0 +1,106 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)实体类 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +public class IntegrationTaskLivingDetailsEntity extends BaseEntity { + + /** 集成任务-实例_id */ + private String taskLinvingId; + /** integration_task_id */ + private String taskId; + /** 任务编码 */ + private String taskCode; + /** 任务名称 */ + private String taskName; + /** 任务状态1、执行中2、执行成功 3、执行失败 */ + private String taskStatus; + /** 当前任务开始时间 */ + private Date startTime; + /** 结束时间 */ + private Date endTime; + /** 耗时 */ + private String diffTime; + /** 公司id */ + private String companyId; + + + public String getTaskLinvingId() { + return taskLinvingId; + } + + public void setTaskLinvingId(String taskLinvingId) { + this.taskLinvingId = taskLinvingId; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskCode() { + return taskCode; + } + + public void setTaskCode(String taskCode) { + this.taskCode = taskCode; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getDiffTime() { + return diffTime; + } + + public void setDiffTime(String diffTime) { + this.diffTime = diffTime; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + 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 new file mode 100644 index 00000000..89c6875e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,task_linving_id + ,task_id + ,task_code + ,task_name + ,task_status + ,start_time + ,end_time + ,diff_time + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + insert into integration_task_living_details( + + id , + task_linving_id , + task_id , + task_code , + task_name , + task_status , + start_time , + end_time , + diff_time , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{taskLinvingId} , + #{taskId} , + #{taskCode} , + #{taskName} , + #{taskStatus} , + #{startTime} , + #{endTime} , + #{diffTime} , + #{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_living_details a WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into integration_task_living_details(task_linving_id, task_id, task_code, task_name, task_status, + start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, + company_id, sts) + values + + (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, + 'Y') + + + + + insert into integration_task_living_details(task_linving_id, task_id, task_code, task_name, task_status, + start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, + company_id) + values + + (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + task_linving_id = values(task_linving_id), + task_id = values(task_id), + task_code = values(task_code), + task_name = values(task_name), + task_status = values(task_status), + start_time = values(start_time), + end_time = values(end_time), + diff_time = values(diff_time), + sorts = values(sorts), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + + + update integration_task_living_details set + + task_linving_id = #{taskLinvingId}, + task_id = #{taskId}, + task_code = #{taskCode}, + task_name = #{taskName}, + task_status = #{taskStatus}, + start_time = #{startTime}, + end_time = #{endTime}, + diff_time = #{diffTime}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + + where id = #{id} + + + +update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + + update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = + #{modify_user_id} + + and id = #{id} + and task_linving_id = #{taskLinvingId} + and task_id = #{taskId} + and task_code = #{taskCode} + and task_name = #{taskName} + and task_status = #{taskStatus} + and start_time = #{startTime} + and end_time = #{endTime} + and diff_time = #{diffTime} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from integration_task_living_details where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java new file mode 100644 index 00000000..aa350811 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java @@ -0,0 +1,25 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +public interface IIntegrationTaskLivingDetailsService extends IBaseService{ + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java new file mode 100644 index 00000000..70c0d746 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java @@ -0,0 +1,55 @@ +package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + +/** + * 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类 + * + * @author makejava + * @since 2024-05-06 15:37:55 + */ +@Service(value = "integrationTaskLivingDetailsService") +public class IntegrationTaskLivingDetailsServiceImpl extends BaseService implements IIntegrationTaskLivingDetailsService { + + private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; + + @Autowired + public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { + this.integrationTaskLivingDetailsDao = dao; + this.dao = dao; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询任务日志列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + IntegrationTaskLivingDetailsEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingDetailsEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = integrationTaskLivingDetailsDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } +} diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java index 1b56f2fc..15dbc1a5 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java @@ -268,57 +268,11 @@ public class EntranceServiceImpl implements IEntranceService { logger.info("当前mnAME:" + m.getName() + " :serviceMethod = " + serviceMethod.trim()); if (null != m) { if (m.getName().equals(serviceMethod.trim())) { - if (m.getName().startsWith("thirdInterface")) {//TODO 后续可能要加强校验规则 - logger.info("第三方接口，不校验是否登陆"); - }else if (!"doLogin".equals(m.getName())) { - try { - StpUtil.checkLogin(); - //校验当前登陆人是否有权限 - boolean flag = false; - String userId = StpUtil.getLoginIdAsString(); - //获取接口 - SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanName"+service+"interfacName"+serviceMethod); - if(sysInterfaceEntity == null || sysInterfaceEntity.getId() == null){ - //todo 接口权限验证 - return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); - } - //查询用户权限 - if(!flag){ - SysPopedomInterfaceEntity userPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("4","userId"+userId+"interfaceId"+sysInterfaceEntity.getId()); - if(userPopedomInterfaceEntity != null && userPopedomInterfaceEntity.getId() != null ){ - flag = true; - } - } - //查询用户角色的权限 - if(!flag){ - List userRoleMap = (List) interfaceCache.get("3",null); - if(userRoleMap != null && userRoleMap.size() > 0){ - for (SysUserRolesEntity sysUserRolesEntity : userRoleMap) { - if(sysUserRolesEntity.getUserId().equals(userId)){ - SysPopedomInterfaceEntity sysPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("5","roleId"+sysUserRolesEntity.getRoleId()+"interfaceId"+sysInterfaceEntity.getId()); - if(sysPopedomInterfaceEntity != null && sysPopedomInterfaceEntity.getId() != null ){ - flag = true; - break; - } - } - } - } - } - if(!flag){ - //todo 接口权限验证 - return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); - } - } catch (NotLoginException e) { - logger.error("token无效"); - return BaseResult.getFailureMessageEntity("token无效"); - } - } logger.info("m.getNameEquals成功"); JSONObject jsonObject = new JSONObject(); if (!ObjectUtils.isEmpty(body)) { jsonObject.put("jsonStr", body); } - JsonResultEntity jsonResultEntity; try { logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); logger.info("请求的参数：jsonObject：" + jsonObject.toJSONString());