Merge branch 'master' of gitlab.ioubuy.cn:xunjia/dmhub-plugin

# Conflicts:
#	src/main/java/com/jz/sms/chuanlan/SendService.java
#	src/main/java/com/jz/sms/chuanlan/service/impl/SendServiceImpl.java

src/main/java/com/jz/sms/api/BizController.java

 package com.jz.sms.api;
 
+import com.jz.sms.chuanlan.SendService;
+import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
+import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -7,6 +11,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("test")
 public class BizController {
 
+    @Autowired
+    private SendService service;
+
     @RequestMapping("index")
     public String index() {
 
@@ -20,9 +27,9 @@ public class BizController {
      * @return
      */
     @RequestMapping("/sms/template")
-    public String template() {
-
-        return "success";
+    public XfaceDmHubTemplateResponseDTO template(XfaceDmHubTemplateRequestDTO requestDTO) {
+        XfaceDmHubTemplateResponseDTO responseDTO = service.send(requestDTO);
+        return responseDTO;
     }
 
 

src/main/java/com/jz/sms/chuanlan/SendService.java

+package com.jz.sms.chuanlan;
+
+import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
+import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
+
+public interface SendService {
+
+
+    XfaceDmHubTemplateResponseDTO send(XfaceDmHubTemplateRequestDTO requestDTO);
+}

src/main/java/com/jz/sms/chuanlan/service/impl/SendServiceImpl.java

 package com.jz.sms.chuanlan.service.impl;
 
 
+<<<<<<< HEAD:src/main/java/com/jz/sms/chuanlan/service/impl/SendServiceImpl.java
 import com.jz.sms.chuanlan.service.SendService;
+=======
+import com.jz.sms.chuanlan.SendService;
+import com.jz.sms.dto.XfaceClTemplateRequestDTO;
+import com.jz.sms.dto.XfaceClTemplateResponseDTO;
+import com.jz.sms.dto.XfaceDmHubTemplateRequestDTO;
+import com.jz.sms.dto.XfaceDmHubTemplateResponseDTO;
+>>>>>>> 528ba3c0e06018ca5719f9e1b7b1f6a61a423153:src/main/java/com/jz/sms/chuanlan/impl/SendServiceImpl.java
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -11,13 +19,19 @@ public class SendServiceImpl implements SendService {
 
 
     @Override
-    public Map<String, Object> send(Map<String, Object> params) {
-
-
-
-
-
-
-        return null;
+    public XfaceDmHubTemplateResponseDTO send(XfaceDmHubTemplateRequestDTO requestDTO) {
+        /**
+         * 调用创蓝的业务逻辑.....
+         * requestDTO.getXXX....
+         */
+        XfaceClTemplateRequestDTO clRequestDto = new XfaceClTemplateRequestDTO();
+        XfaceClTemplateResponseDTO clResponseDTO = new XfaceClTemplateResponseDTO();
+
+        /**
+         * 调用结果包装到DM Hub Response中
+         */
+        XfaceDmHubTemplateResponseDTO responseDTO = new XfaceDmHubTemplateResponseDTO();
+
+        return responseDTO;
     }
 }

src/main/java/com/jz/sms/dto/XfaceClTemplateRequestDTO.java

+package com.jz.sms.dto;
+
+public class XfaceClTemplateRequestDTO {
+}

src/main/java/com/jz/sms/dto/XfaceClTemplateResponseDTO.java

+package com.jz.sms.dto;
+
+public class XfaceClTemplateResponseDTO {
+}

src/main/java/com/jz/sms/dto/XfaceDmHubTemplateRequestDTO.java

+package com.jz.sms.dto;
+
+public class XfaceDmHubTemplateRequestDTO {
+}

src/main/java/com/jz/sms/dto/XfaceDmHubTemplateResponseDTO.java

+package com.jz.sms.dto;
+
+public class XfaceDmHubTemplateResponseDTO {
+}