From 6ced8be8a74c8b06bebd00f7509792a03ea13e87 Mon Sep 17 00:00:00 2001
From: "zhang.xw" <zhang.xw@sand.com.cn>
Date: Mon, 15 Aug 2022 14:27:22 +0800
Subject: [PATCH] cdm

---
 modules/i3plus-core-apiservice/pom.xml             |  6 +++++-
 .../controller/busi/SysTaskController.java         | 22 +++++++++-------------
 .../controller/busi/SysTaskPlanController.java     |  6 ++++++
 pom.xml                                            |  6 +++++-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 60835b9..ee717bf 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -240,7 +240,11 @@
             <artifactId>elasticsearch</artifactId>
             <version>7.5.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>i3plus.ext.cdm</groupId>
+            <artifactId>i3plus-ext-cdm-icloud</artifactId>
+            <version>1.0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
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 d6cbd3c..cc85e8d 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
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.ext.cdm.icloud.sdk.ICdmCommonCloud;
 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;
@@ -39,23 +40,12 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.persistence.EntityManager;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
@@ -108,6 +98,9 @@ public class SysTaskController extends CoreBaseController {
     private IEamCommonCloud iEamCommonCloud;
 
     @Autowired
+    private ICdmCommonCloud iCdmCommonCloud;
+
+    @Autowired
     private EntityManager entityManager;
 
     @Autowired
@@ -157,6 +150,9 @@ public class SysTaskController extends CoreBaseController {
         }else if (softType == CommonEnumUtil.SOFT_TYPE.EAM.getValue()) {
             //eam
             commonService = iEamCommonCloud;
+        } else if (softType == CommonEnumUtil.SOFT_TYPE.CDM.getValue()) {
+            //cdm
+            commonService = iCdmCommonCloud;
         }
         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 c1be42a..274040f 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
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 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.ext.cdm.icloud.sdk.ICdmScheduleJobCloud;
 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;
@@ -132,6 +133,8 @@ public class SysTaskPlanController extends CoreBaseController {
     @Autowired
     private IEamScheduleJobCloud eamScheduleJobCloud;
 
+    @Autowired
+    private ICdmScheduleJobCloud iCdmScheduleJobCloud;
 
 
     /**
@@ -170,7 +173,10 @@ public class SysTaskPlanController extends CoreBaseController {
             quartzJobService = qmsScheduleJobCloud;
         }else if (source == CommonEnumUtil.SOFT_TYPE.EAM.getValue()) {
             quartzJobService = eamScheduleJobCloud;
+        } else if (source == CommonEnumUtil.SOFT_TYPE.CDM.getValue()) {
+            quartzJobService = iCdmScheduleJobCloud;
         }
+
         return quartzJobService;
     }
 
diff --git a/pom.xml b/pom.xml
index 2a780f9..03147a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,11 @@
                 <artifactId>i3plus-core-icloud</artifactId>
                 <version>${project.dependency.version}</version>
             </dependency>
-
+           <!-- <dependency>
+                <groupId>i3plus.ext.cdm</groupId>
+                <artifactId>i3plus-ext-cdm-icloud</artifactId>
+                <version>1.0.0.1</version>
+            </dependency>-->
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-wms</artifactId>