diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index fb62e96..77af224 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -23,16 +23,18 @@ i3plus.icloud i3plus-icloud-wms - i3plus.icloud i3plus-icloud-mes - i3plus.icloud i3plus-icloud-mes-pcn + + i3plus.icloud + i3plus-icloud-andon + 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 348a2b5..b3d00c5 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud; @@ -58,6 +59,9 @@ public class SysTaskController extends CoreBaseController { @Autowired private IMesPcnCommonCloud mesPcnCommonCloud; + @Autowired + private IAndonCommonCloud andonCommonCloud; + /** * 获取对应软件模块的通用服务 * @param softType 软件模块 @@ -78,6 +82,9 @@ public class SysTaskController extends CoreBaseController { // MES_PCN } else if(softType == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()){ commonService = mesPcnCommonCloud; + // ANDON + } else if (softType == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()) { + commonService = andonCommonCloud; } return commonService; } 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 195ee7c..2de0ddd 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 @@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; +import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud; 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; @@ -24,6 +26,7 @@ import cn.estsh.impp.framework.boot.quartz.IQuartzJobService; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import com.netflix.discovery.converters.Auto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -69,6 +72,9 @@ public class SysTaskPlanController extends CoreBaseController { @Autowired private IMesPcnScheduleJobCloud mesPcnScheduleJobCloud; + @Autowired + private IAndonScheduleJobCloud andonScheduleJobCloud; + /** * 根据来源切换定时任务服务 * @@ -90,6 +96,9 @@ public class SysTaskPlanController extends CoreBaseController { // MES_PCN } else if (source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()) { quartzJobService = mesPcnScheduleJobCloud; + // ANDON + } else if(source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()){ + quartzJobService = andonScheduleJobCloud; } return quartzJobService; } @@ -103,7 +112,7 @@ public class SysTaskPlanController extends CoreBaseController { */ @PostMapping(value = "/insert") @ApiOperation(value = "新增任务计划", notes = "任务计划") - public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) { + public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) { try { // 数据校验 ValidatorBean.beginValid(sysTaskPlan) @@ -156,7 +165,7 @@ public class SysTaskPlanController extends CoreBaseController { sysTaskPlan = sysTaskPlanService.insertSysTaskPlan(sysTaskPlan); // 立即执行 - if (isExecute != null && isExecute) { + if (isExecute != null && isExecute == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if (!baseResultBean.isSuccess()) { @@ -184,7 +193,7 @@ public class SysTaskPlanController extends CoreBaseController { */ @PutMapping(value = "/update") @ApiOperation(value = "修改任务计划", notes = "任务计划") - public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) { + public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) { try { ResultBean resultBean = ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -236,7 +245,7 @@ public class SysTaskPlanController extends CoreBaseController { } // 是否立即执行 - if (isExecute != null && isExecute) { + if (isExecute != null && isExecute == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if (!baseResultBean.isSuccess()) { diff --git a/pom.xml b/pom.xml index 3d8fe33..636c3f8 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,12 @@ ${project.version} + + i3plus.icloud + i3plus-icloud-andon + ${project.version} + + i3plus.pojo