From 84f6554f31362c2a27f27d793af681083c73118c Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 17 May 2016 10:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yimiao/main/data/util/ArticleContext.java      |  6 ++---
 .../com/lymsh/yimiao/main/data/util/LoginUtil.java | 27 ++++++++++++++++++++++
 .../yimiao/web/controller/v1/KidsController.java   |  5 ++++
 .../yimiao/web/controller/v1/UserController.java   |  1 +
 webApi/src/main/webapp/WEB-INF/html/article.vm     | 11 +++++----
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/ArticleContext.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/ArticleContext.java
index 1037754..ba2bcd8 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/ArticleContext.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/ArticleContext.java
@@ -12,14 +12,14 @@ public class ArticleContext {
     private String content;
 
     public String getIntroduction() {
-        return Introduction;
+        return introduction;
     }
 
     public void setIntroduction(String introduction) {
-        Introduction = introduction;
+        this.introduction = introduction;
     }
 
-    private String Introduction;
+    private String introduction;
     private ImageContext image;
 
     public String getErrorcode() {
diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
index 0ae57d6..619bb78 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
@@ -102,6 +102,33 @@ public class LoginUtil {
         return false;
     }
 
+    public static boolean sendCode(String phone, String typeId, String token) {
+        HttpClient client = new HttpClient();
+        GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/authCode.action");
+        NameValuePair[] data = {
+                new NameValuePair("phone", phone),
+                new NameValuePair("typeId", typeId),
+        };
+        get.setQueryString(data);
+        get.setRequestHeader("Authorization", token);
+        try {
+            client.executeMethod(get);
+            int statusCode = get.getStatusCode();
+            System.out.println("statusCode:" + statusCode);
+            String result = new String(get.getResponseBodyAsString());
+            System.out.println("result:" + result);
+            get.releaseConnection();
+            if (result != null && result.indexOf("成功") > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+
     public static LoginContext checkLoginState(String token) {
         LoginContext loginState = new LoginContext();
         HttpClient client = new HttpClient();
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
index 6f4901f..66cec8d 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
@@ -291,6 +291,7 @@ public class KidsController extends BaseController {
             map.put("lastInculateTime",DateUtil.getSecond(DateUtil.parseYMDHMS(recordsList.get(0).getInoculateTime())));
         }else {
             map.put("lastInculateTime","");
+//            map.put("lastInculateTime",null);
         }
 
         //取出建档最早的那个
@@ -325,6 +326,7 @@ public class KidsController extends BaseController {
                 map.put("organizationId", order.getIoOrganizationId());
                 MedOrganization medOrganization = medOrganizationService.getMedOrganization(order.getIoOrganizationId());
                 map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName());
+//                map.put("organizationName", medOrganization == null ? null : medOrganization.getoName());
 
                 for (MedInoculateOrder data : inoculateorderList){
                     Map<String, Object> orderMap = new HashMap<>();
@@ -335,6 +337,7 @@ public class KidsController extends BaseController {
                     //下次接种疫苗名称
                     MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(data.getIoVaccineId());
                     orderMap.put("vaccineName", medVaccineName == null ? "" : medVaccineName.getVnName());
+//                    orderMap.put("vaccineName", medVaccineName == null ? null : medVaccineName.getVnName());
                     //剂次
                     if (medVaccineName != null) {
                         //总针数
@@ -366,7 +369,9 @@ public class KidsController extends BaseController {
                 orderMap.put("vaccineId", null);
                 orderMap.put("vaccineName", null);
                 orderMap.put("sum","");
+//                orderMap.put("sum",null);
                 orderMap.put("jiCi","");
+//                orderMap.put("jiCi",null);
                 list.add(orderMap);
                 map.put("inoculate",list);
             }
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
index f9c688e..c05c819 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
@@ -62,6 +62,7 @@ public class UserController extends BaseController {
     public void sendVercode(HttpServletResponse response,@RequestParam("phone") String phone) {
 
         Boolean result = LoginUtil.sendVerCode(phone, typeId, token);
+//        Boolean result = LoginUtil.sendCode(phone, typeId, token);
         if (result){
             ResultUtils.buildSuccessResultAndWrite(response);
         }else {
diff --git a/webApi/src/main/webapp/WEB-INF/html/article.vm b/webApi/src/main/webapp/WEB-INF/html/article.vm
index 0485c77..c3e676c 100644
--- a/webApi/src/main/webapp/WEB-INF/html/article.vm
+++ b/webApi/src/main/webapp/WEB-INF/html/article.vm
@@ -43,11 +43,12 @@
 <div class="container">
 
     <h1>$!articleContext.title</h1>
-    <p>
-        <img src=$!articleContext.image.real width="299" height="200" border="0" hspace="0" vspace="0" title="" style="width: 299px; height: 200px;"/>
-    </p>
-    <p>$!articleContext.Introduction</p>
-    <p>&nbsp;</p><p><br/></p>
+        $!articleContext.content
+##    <p>
+##        <img src=$!articleContext.image.real width="299" height="200" border="0" hspace="0" vspace="0" title="" style="width: 299px; height: 200px;"/>
+##    </p>
+##    <p>$!articleContext.Introduction</p>
+##    <p>&nbsp;</p><p><br/></p>
 </div>
 
 </body>
-- 
1.8.3.1