diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 1e11207..60835b9 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -68,6 +68,10 @@ i3plus-ext-qms-icloud + + i3plus.eam + i3plus-eam-icloud + i3plus.pojo diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java index 40f7947..40251cb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java @@ -1,35 +1,36 @@ -//package cn.estsh.i3plus.core.apiservice.configuration; -// -//import cn.estsh.i3plus.platform.common.util.CommonConstWords; -//import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.boot.autoconfigure.domain.EntityScan; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -// -///** -// * @Description : 需要扫描其他包的配置文件 -// * 此类专门添加需要单独加载的其他模块的包 -// * @Reference : -// * @Author : alwaysfrin -// * @CreateDate : 2018-12-12 20:49 -// * @Modify: -// **/ -//@Configuration -////扫描需要单独处理的包 -//@EntityScan(basePackages = { -// "cn.estsh.i3plus.**.platbean" -//}) -// -////需要单独处理的其他模块包 -//@EnableJpaRepositories(basePackages = { -// "cn.estsh.i3plus.**.platrepository" -//}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class) -//public class ScanPackageConfiguration { -// public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); -// -// public ScanPackageConfiguration(){ -// LOGGER.info("【扫描关联包...】"); -// } -//} +package cn.estsh.i3plus.core.apiservice.configuration; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +/** + * @Description : 需要扫描其他包的配置文件 + * 此类专门添加需要单独加载的其他模块的包 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-12-12 20:49 + * @Modify: + **/ +@Configuration +//扫描需要单独处理的包 +@EnableFeignClients(basePackages = {//微服方法路径(需要在组件扫面中添加熔断类路径) + "${impp.icloud.ext-packages:}.**" +}) +@ComponentScan(basePackages = { + //微服熔断路径 扫描qms iCloud熔断路径 + "${impp.icloud.ext.fallback-packages:}.**" +}) +public class ScanPackageConfiguration { + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + public ScanPackageConfiguration(){ + LOGGER.info("【扫描关联包...】"); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 57ce842..d6cbd3c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsCommonCloud; import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; +import cn.estsh.i3plus.icloud.eam.sdk.IEamCommonCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud; import cn.estsh.i3plus.icloud.ptl.sdk.IPtlCommonCloud; @@ -104,6 +105,9 @@ public class SysTaskController extends CoreBaseController { private IQmsCommonCloud iQmsCommonCloud; @Autowired + private IEamCommonCloud iEamCommonCloud; + + @Autowired private EntityManager entityManager; @Autowired @@ -148,7 +152,11 @@ public class SysTaskController extends CoreBaseController { } else if (softType == CommonEnumUtil.SOFT_TYPE.SCREEN.getValue()) { commonService = screenCommonCloud; } else if (softType == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) { + //qms commonService = iQmsCommonCloud; + }else if (softType == CommonEnumUtil.SOFT_TYPE.EAM.getValue()) { + //eam + commonService = iEamCommonCloud; } return commonService; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index ebfa61e..c31da29 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsScheduleJobCloud; import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud; +import cn.estsh.i3plus.icloud.eam.sdk.IEamCommonCloud; +import cn.estsh.i3plus.icloud.eam.sdk.IEamScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; @@ -103,6 +105,10 @@ public class SysTaskCycleController extends CoreBaseController { @Autowired private IQmsScheduleJobCloud qmsScheduleJobCloud; + + @Autowired + private IEamScheduleJobCloud eamScheduleJobCloud; + /** * 根据来源切换定时任务服务 * @@ -129,6 +135,8 @@ public class SysTaskCycleController extends CoreBaseController { quartzJobService = andonScheduleJobCloud; }else if (source == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) { quartzJobService = qmsScheduleJobCloud; + }else if (source == CommonEnumUtil.SOFT_TYPE.EAM.getValue()) { + quartzJobService = eamScheduleJobCloud; } return quartzJobService; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index 8fc4bee..c1be42a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsCommonCloud; import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsScheduleJobCloud; import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud; +import cn.estsh.i3plus.icloud.eam.sdk.IEamScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud; import cn.estsh.i3plus.icloud.ptl.sdk.IPtlScheduleJobCloud; @@ -128,6 +129,9 @@ public class SysTaskPlanController extends CoreBaseController { @Autowired private IQmsScheduleJobCloud qmsScheduleJobCloud; + @Autowired + private IEamScheduleJobCloud eamScheduleJobCloud; + /** @@ -164,6 +168,8 @@ public class SysTaskPlanController extends CoreBaseController { quartzJobService = screenScheduleJobCloud; }else if (source == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) { quartzJobService = qmsScheduleJobCloud; + }else if (source == CommonEnumUtil.SOFT_TYPE.EAM.getValue()) { + quartzJobService = eamScheduleJobCloud; } return quartzJobService; } diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 5bb95b9..0828a0c 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -44,7 +44,7 @@ impp.app.pojo-mongo-dao=${impp.app.base-packages}.**.apiservice.daomongo #\u5BF9\u8C61\u6301\u4E45\u5316\u5305\u8DEF\u5F84\uFF0C\u53EF\u4EE5\u591A\u4E2A\u5305\uFF0C\u9017\u53F7\u5206\u9694 impp.app.pojo-repository=${impp.app.pojo-packages}.**.repository #mongodb\u8D44\u6E90\u4ED3go -impp.app.pojo-mongo-repository=${impp.app.pojo-packages}.**.repositorymon +#impp.app.pojo-mongo-repository=${impp.app.pojo-packages}.**.repositorymon ###\u4E8C\u5F00\u9879\u76EE\u7684iCloud impp.icloud.ext-packages=cn.estsh.i3plus.ext.**.icloud.** diff --git a/pom.xml b/pom.xml index 2f5c88e..1398111 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 1.8 1.0-TEST-SNAPSHOT 1.0.0.1 + 1.0.0.1 2.17.0 @@ -127,6 +128,12 @@ ${qms.icloud.version} + + i3plus.eam + i3plus-eam-icloud + ${eam.icloud.version} + + i3plus.pojo