Add intent base operation process code .

Issue-ID: USECASEUI-696
Change-Id: I5fd136d1dfe100888ca5fa6f9f955106dfa3eaa8
Signed-off-by: hekeguang <hekeguang@chinamobile.com>

5 files changed, 29 insertions, 17 deletions

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java
index e9ee3f7..6c7b4f7 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java
@@ -17,27 +17,38 @@ package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule;
 
 import org.apache.commons.lang.StringUtils;
 import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
+import org.onap.usecaseui.intentanalysis.bean.models.Intent;
 import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
 import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
+import org.onap.usecaseui.intentanalysis.service.IntentService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public abstract class ActuationModule {
     @Autowired
     IntentInterfaceService intentInterfaceService;
+    @Autowired
+    IntentService intentService;
 
     //actuationModel & knownledgeModel interact
-    public abstract void sendToIntentHandler(IntentManagementFunction IntentHandler);
+    public abstract void sendToIntentHandler(Intent intent, IntentManagementFunction IntentHandler);
 
     public abstract void sendToNonIntentHandler();//直接操作
 
     public abstract void interactWithIntentHandle();
 
     //Save intent information to the intent instance database
-    public abstract void saveIntentToDb(List<Map<IntentGoalBean, IntentManagementFunction>> intentMapList);
+    public void saveIntentToDb(Map<IntentGoalBean, IntentManagementFunction> intentMap) {
+        List<Intent> subIntentList = intentMap.keySet().stream().map(IntentGoalBean::getIntent)
+                .collect(Collectors.toList());
+        for (Intent subIntent : subIntentList) {
+            intentService.createIntent(subIntent);
+        }
+    }
 
     public boolean distrubuteIntentToHandler(Map<IntentGoalBean, IntentManagementFunction> intentMap) {
         for (Map.Entry<IntentGoalBean, IntentManagementFunction> entry : intentMap.entrySet()) {
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java
index a75701d..01581c4 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java
@@ -41,10 +41,10 @@ public class IntentDefinitionService {
         }
     }
 
-    public void definitionPorcess(List<Map<IntentGoalBean,IntentManagementFunction>> intentMapList) {
+    public void definitionPorcess(Map<IntentGoalBean,IntentManagementFunction> intentMap) {
         DecisionModule intentDecisionModule = intentOwner.getDecisionModule();
         ActuationModule intentActuationModule = intentOwner.getActuationModule();
         intentDecisionModule.intentDefinition();
-        intentActuationModule.saveIntentToDb(intentMapList);//id  type
+        intentActuationModule.saveIntentToDb(intentMap);//id  type
     }
 }
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java
index 9e6c921..3a4e48e 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java
@@ -16,16 +16,12 @@
 package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
 
-import org.apache.commons.lang.StringUtils;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
 import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
 import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
 import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 
 @Service
@@ -47,8 +43,8 @@ public class IntentDistributionService {
 
     public boolean distributionProcess(Map<IntentGoalBean, IntentManagementFunction> intentMap) {
 
-        intentOwner.getActuationModule().distrubuteIntentToHandler(intentMap);
-        return false;
+        return intentOwner.getActuationModule().distrubuteIntentToHandler(intentMap);
+
     }
 
 }
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java
index 47fe679..f26be6c 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java
@@ -16,6 +16,7 @@
 package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
 
+import org.onap.usecaseui.intentanalysis.bean.models.Intent;
 import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
 import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
@@ -36,13 +37,14 @@ public class IntentOperationService {
         }
     }
 
-    public void operationProcess() {
+    public void operationProcess(Intent intent) {
         DecisionModule intentDecisionModule = intentOwner.getDecisionModule();
-        ActuationModule intentActuationModule = intentHandler.getActuationModule();
+        ActuationModule intentActuationModule = intentOwner.getActuationModule();
 
         //intentDecisionModule.interactWithTemplateDb();
         intentActuationModule.interactWithIntentHandle();
-        intentActuationModule.sendToIntentHandler(intentHandler);
+
+        intentActuationModule.sendToIntentHandler(intent,intentHandler);
 
         intentActuationModule.sendToNonIntentHandler();
     }
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java
index 537f582..df1c437 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java
@@ -64,15 +64,18 @@ public class IntentProcessService {
         for (Map<IntentGoalBean,IntentManagementFunction> map : intentListMap) {
             //definition process  save subintent
             intentDefinitionService.setIntentRole(intentOwner,intentHandler);
-            intentDefinitionService.definitionPorcess(intentListMap);
+            intentDefinitionService.definitionPorcess(map);
 
             //distribution process
             intentDistributionService.setIntentRole(intentOwner,intentHandler);
             intentDistributionService.distributionProcess(map);
 
-            //operation process
-            intentOperationService.setIntentRole(intentOwner,intentHandler);
-            intentOperationService.operationProcess();
+            //operation process     enery entry only have one key-value
+            for (Map.Entry<IntentGoalBean, IntentManagementFunction> entry : map.entrySet()) {
+                intentOperationService.setIntentRole(intentOwner,entry.getValue());
+                intentOperationService.operationProcess(entry.getKey().getIntent());
+            }
+
         }
     }