Merge pull request #369 from pahnjy/develop

ServiceModel create API 수정 #367
iotoasis · Feb 7, 2017 · 49bf227 · 49bf227
2 parents a4db12a + 0cea71a
commit 49bf227
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/so-profile/src/main/java/com/pineone/icbms/so/profile/logic/ProfileLogicImpl.java b/so-profile/src/main/java/com/pineone/icbms/so/profile/logic/ProfileLogicImpl.java
@@ -108,7 +108,7 @@ public String registerProfile(Profile profile) {
         logger.debug("Profile = " + profile.toString());
         ResponseMessage responseMessage = ResponseMessage.newResponseMessage();
         if(profile.getId() == null){
-            profile.setId("pr-make-"+ UUIDConverter.shortUUID(UUID.randomUUID().toString().toCharArray()));
+            profile.setId("!!pr-make-"+ UUIDConverter.shortUUID(UUID.randomUUID().toString().toCharArray()));
         }
 //        ProfileStore profileStore = ProfileMapStore.getInstance();
 

diff --git a/so-servicemodel/src/main/java/com/pineone/icbms/so/servicemodel/entity/ServiceModel.java b/so-servicemodel/src/main/java/com/pineone/icbms/so/servicemodel/entity/ServiceModel.java
@@ -31,14 +31,14 @@ public class ServiceModel {
      * format : yyyymmddhhmm
      * ex : '201608250930'
      */
-    private String createTime;
+    private long createTime;
 
     /**
      * ServiceModel 변경 시간
      * format : yyyymmddhhmm
      * ex : '201608250930'
      */
-    private String modifiedTime;
+    private long modifiedTime;
 
     /**
      * ServiceModel 실행 위치
@@ -57,7 +57,7 @@ public class ServiceModel {
     public ServiceModel() {
     }
 
-    public ServiceModel(String id, String name, List<String> serviceIdList, String createTime, String modifiedTime, String location, String description) {
+    public ServiceModel(String id, String name, List<String> serviceIdList, long createTime, long modifiedTime, String location, String description) {
         this.id = id;
         this.name = name;
         this.serviceIdList = serviceIdList;
@@ -91,19 +91,19 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public String getCreateTime() {
+    public long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
+    public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
 
-    public String getModifiedTime() {
+    public long getModifiedTime() {
         return modifiedTime;
     }
 
-    public void setModifiedTime(String modifiedTime) {
+    public void setModifiedTime(long modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
 

diff --git a/...icemodel/src/main/java/com/pineone/icbms/so/servicemodel/logic/ServiceModelLogicImpl.java b/...icemodel/src/main/java/com/pineone/icbms/so/servicemodel/logic/ServiceModelLogicImpl.java
@@ -54,11 +54,14 @@ public String registerServiceModel(ServiceModel serviceModel) {
             return null;
         }
         if(serviceModel.getId() == null){
-            serviceModel.setId("sm-make-"+ UUIDConverter.shortUUID(UUID.randomUUID().toString().toCharArray()));
+            serviceModel.setId("!!sm-make-"+ UUIDConverter.shortUUID(UUID.randomUUID().toString().toCharArray()));
         }
         if(serviceModel.getDescription() == null){
             serviceModel.setDescription(serviceModel.getName() + "CVO");
         }
+        long time = System.currentTimeMillis();
+        serviceModel.setCreateTime(time);
+        serviceModel.setModifiedTime(time);
         logger.debug("ServiceModel = " + serviceModel);
         ResponseMessage responseMessage = ResponseMessage.newResponseMessage();
 //        ServiceModelStore serviceModelStore = ServiceModelMapStore.getInstance();

diff --git a/...model/src/main/java/com/pineone/icbms/so/servicemodel/pr/ServiceModelTransFormObject.java b/...model/src/main/java/com/pineone/icbms/so/servicemodel/pr/ServiceModelTransFormObject.java
@@ -10,8 +10,8 @@ public class ServiceModelTransFormObject {
     private String id;
     private String name;
     private List<String> serviceIdList;
-    private String createTime;
-    private String modifiedTime;
+    private long createTime;
+    private long modifiedTime;
     private String location;
     private String sessionId;
     private String description;
@@ -41,19 +41,19 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public String getCreateTime() {
+    public long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
+    public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
 
-    public String getModifiedTime() {
+    public long getModifiedTime() {
         return modifiedTime;
     }
 
-    public void setModifiedTime(String modifiedTime) {
+    public void setModifiedTime(long modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
 
@@ -96,7 +96,7 @@ public ServiceModelTransFormObject(String name, List<String> serviceIdList , Str
         this.location = location;
     }
 
-    public ServiceModelTransFormObject(String id, String name, List<String> serviceIdList, String createTime, String modifiedTime, String location, String sessionId, String description) {
+    public ServiceModelTransFormObject(String id, String name, List<String> serviceIdList, long createTime, long modifiedTime, String location, String sessionId, String description) {
         this.id = id;
         this.name = name;
         this.serviceIdList = serviceIdList;

diff --git a/...l/src/main/java/com/pineone/icbms/so/servicemodel/store/mongo/ServiceModelDataObject.java b/...l/src/main/java/com/pineone/icbms/so/servicemodel/store/mongo/ServiceModelDataObject.java
@@ -14,8 +14,8 @@ public class ServiceModelDataObject {
     private String id;
     private String name;
     private List<String> serviceIdList;
-    private String createTime;
-    private String modifiedTime;
+    private long createTime;
+    private long modifiedTime;
     private String location;
     private String description;
 
@@ -43,19 +43,19 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public String getCreateTime() {
+    public long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
+    public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
 
-    public String getModifiedTime() {
+    public long getModifiedTime() {
         return modifiedTime;
     }
 
-    public void setModifiedTime(String modifiedTime) {
+    public void setModifiedTime(long modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
 
@@ -84,7 +84,7 @@ public ServiceModelDataObject(String id, String name, List<String> serviceIdList
         this.serviceIdList = serviceIdList;
     }
 
-    public ServiceModelDataObject(String id, String name, List<String> serviceIdList, String createTime, String modifiedTime, String location, String description) {
+    public ServiceModelDataObject(String id, String name, List<String> serviceIdList, long createTime, long modifiedTime, String location, String description) {
         this.id = id;
         this.name = name;
         this.serviceIdList = serviceIdList;