From cd3c822986e8c32b4d872faf22d795e70e2bc685 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 19 Apr 2017 09:21:52 +0800
Subject: [PATCH] =?UTF-8?q?his=20lis=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/MasterLisMapper.java     |  2 +-
 .../permission/service/impl/LisServiceImpl.java    | 43 ++++++++++++++--------
 .../main/resources/mainOrm/master/MasterLis.xml    | 21 +++++------
 .../operate/web/service/SyncDataTaskService.java   |  2 +-
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
index 7244984..e31550d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
@@ -10,7 +10,7 @@ public interface MasterLisMapper {
 
     void saveLisData(LisReportModel model);
 
-    void saveLisItemsData(List<LisReportItemModel> items);
+    void saveLisItemsData(List<LisReportItemModel> list);
 
     void deleteLisData(LisReportModel model);
 
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
index 73eb3a2..48a9bd1 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
@@ -25,27 +25,40 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService
     @Override
     public BaseResponse saveLisData(String lisData) {
 
-        List<LisReportModel> lisList =JsonUtil.jkstr2List(lisData, new TypeReference<List<LisReportModel>>() {});
-        System.out.println(lisList);
+        try {
+            final List<LisReportModel> lisList =JsonUtil.jkstr2List(lisData, new TypeReference<List<LisReportModel>>() {});
+            System.out.println("saveLis data size = "+ lisList.size());
 
-        if (CollectionUtils.isNotEmpty(lisList))
-        {
-            for(LisReportModel model : lisList)
+            if (CollectionUtils.isNotEmpty(lisList))
             {
-                List<LisReportModel> dbLis = masterLisMapper.queryLisDataByModel(model);
-                if (CollectionUtils.isEmpty(dbLis))
-                {
-                    masterLisMapper.saveLisData(model);
-                    List<LisReportItemModel> items = model.getItems();
-                    if (CollectionUtils.isNotEmpty(items))
-                    {
-                        masterLisMapper.saveLisItemsData(items);
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        for(LisReportModel model : lisList)
+                        {
+                            List<LisReportModel> dbLis = masterLisMapper.queryLisDataByModel(model);
+                            if (CollectionUtils.isEmpty(dbLis))
+                            {
+                                masterLisMapper.saveLisData(model);
+                                List<LisReportItemModel> items = model.getItems();
+                                if (CollectionUtils.isNotEmpty(items))
+                                {
+                                    masterLisMapper.saveLisItemsData(items);
+                                }
+                            }
+
+                        }
                     }
-                }
+                },"saveLisDataThread").start();
 
             }
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
         }
-        return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+         catch (Exception e)
+        {
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
+        }
+
     }
 
     @Override
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index ee37903..3030358 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -61,17 +61,16 @@
         values
         <foreach collection="list" item="item" index="index" separator="," >
             (
-            #{item.rId},
-            #{item.code},
-            #{item.name},
-            #{item.result},
-            #{item.resultFlag},
-            #{item.ref},
-            #{item.resultType},
-            #{item.unit},
-            #{item.modifyDate},
-            #{item.printOrder},
-            #{item.hospitalId}
+            #{item.lisId,jdbcType=VARCHAR},
+            #{item.code,jdbcType=VARCHAR},
+            #{item.name,jdbcType=VARCHAR},
+            #{item.result,jdbcType=VARCHAR},
+            #{item.resultFlag,jdbcType=VARCHAR},
+            #{item.ref,jdbcType=VARCHAR},
+            #{item.resultType,jdbcType=VARCHAR},
+            #{item.unit,jdbcType=VARCHAR},
+            #{item.printOrder,jdbcType=VARCHAR},
+            #{item.hospitalId,jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
index 11ccf98..f5a463c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
@@ -256,7 +256,7 @@ public class SyncDataTaskService {
             public void run() {
                 dzfySyncDataSSL();
             }
-        },"qhdfy-thread").start();
+        },"dzfy-thread").start();
 
     }
 
-- 
1.8.3.1