From 80fa87b16e72566e87bb2f7ed082e03a1de67520 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Wed, 12 Apr 2017 16:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/common/dao/organ/OrganGroupMapper.xml     |  5 ++--
 .../lyms/base/common/entity/organ/OrganGroup.java  | 33 ++++++++++++++++------
 .../main/java/com/lyms/cm/util/SyncComponent.java  |  8 +++---
 .../webapp/WEB-INF/views/depart/depart_edit.html   |  2 +-
 .../webapp/WEB-INF/views/group/group_edit.html     | 10 +++++--
 .../webapp/WEB-INF/views/group/group_list.html     |  7 +++--
 .../java/center/manager/test/user/SyncTest.java    |  2 +-
 7 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml
index a3115cc..0c57c42 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml
@@ -8,12 +8,13 @@
 		<result column="NAME" property="name" />
 		<result column="TYPE" property="type" />
 		<result column="ORGNUMBER" property="orgnumber" />
-		<result column="CLIENTADDRESS" property="clientaddress" />
+		<result column="PUSHADDRESS" property="pushaddress" />
+		<result column="PULLADDRESS" property="pulladdress" />
 		<result column="IFDEl" property="ifdel" />
 	</resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, CLIENTADDRESS AS clientaddress ,IFDEL AS ifdel
+        ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, PUSHADDRESS AS pushaddress ,PULLADDRESS AS pulladdress ,IFDEL AS ifdel
     </sql>
 </mapper>
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java
index 37989a2..96a0f50 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java
@@ -42,8 +42,14 @@ public class OrganGroup implements Serializable {
 	/**
 	 * 数据推送地址
 	 */
-	@TableField(value = "CLIENTADDRESS")
-	private String clientaddress;
+	@TableField(value = "PUSHADDRESS")
+	private String pushaddress;
+	
+	/**
+     * 数据拉取地址
+     */
+    @TableField(value = "PULLADDRESS")
+    private String pulladdress;
 	
 	@TableField(exist=false)
 	private String orgIds;
@@ -86,15 +92,24 @@ public class OrganGroup implements Serializable {
 		this.orgnumber = orgnumber;
 	}
 
-	public String getClientaddress() {
-		return clientaddress;
-	}
 
-	public void setClientaddress(String clientaddress) {
-		this.clientaddress = clientaddress;
-	}
+	public String getPushaddress() {
+        return pushaddress;
+    }
+
+    public void setPushaddress(String pushaddress) {
+        this.pushaddress = pushaddress;
+    }
+
+    public String getPulladdress() {
+        return pulladdress;
+    }
+
+    public void setPulladdress(String pulladdress) {
+        this.pulladdress = pulladdress;
+    }
 
-	public Integer getIfdel() {
+    public Integer getIfdel() {
 		return ifdel;
 	}
 
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/util/SyncComponent.java b/parent/center.manager/src/main/java/com/lyms/cm/util/SyncComponent.java
index c1d6005..57ecde4 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/util/SyncComponent.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/util/SyncComponent.java
@@ -29,8 +29,8 @@ public class SyncComponent {
         List<OrganGroup> list = organGroupService.selectList(new EntityWrapper<OrganGroup>().where("ifDel=0"));
         if (CollectionUtils.isNotEmpty(list)) {
             for (OrganGroup group : list) {
-                if (StrUtils.isNotEmpty(group.getClientaddress())) {
-                    ipList.add(group.getClientaddress());
+                if (StrUtils.isNotEmpty(group.getPushaddress())) {
+                    ipList.add(group.getPushaddress());
                 }
             }
         }
@@ -38,7 +38,7 @@ public class SyncComponent {
     }
 
     /** 
-     * <li>@Description:添加一个同步操作
+     * <li>@Description:添加一个推送同步操作
      * <li>@param syncParamConf
      * <li>@param data data和对应方法参数个数和类型一致
      * <li>@return
@@ -47,7 +47,7 @@ public class SyncComponent {
      * <li>修改人：
      * <li>修改时间：
      */  
-    public boolean addSyncOperation(SyncParamConf syncParamConf, Object... data) {
+    public boolean addPushSyncOperation(SyncParamConf syncParamConf, Object... data) {
         List<String> ipList = getAllGroupIpList();
         ParamsAdpter adpter = null;
         if (data != null && data.length > 0) {
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
index 583e073..3ddfb1b 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
@@ -25,7 +25,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">上级科室id:</label>
                 <div class="col-sm-8">
-                	<input type="text" placeholder="上级科室id" value="$!depart.parentId" aria-required="true" required="true" class="form-control" minlength="2" name="parentId" id="parentId">
+                	<input type="text" placeholder="上级科室id" value="$!depart.parentId" class="form-control"  name="parentId" id="parentId">
                 	<!-- 
                      <select class="form-control" name="parentId" id="parent">
                      	<option value="0">--选择--</option>
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
index 3d9e996..45b0e8b 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html
@@ -23,9 +23,15 @@
 	            </div>
 	            
 	            <div class="form-group">
-	                <label class="col-sm-3 control-label">连接地址:</label>
+	                <label class="col-sm-3 control-label">推送地址:</label>
 	                <div class="col-sm-8">
-	                    <input type="text" value="$!group.clientaddress" placeholder="连接地址" aria-required="true" required="true" minlength="3"  name="clientaddress" class="form-control" id="shortCode">
+	                    <input type="text" value="$!group.pushaddress" placeholder="连接地址" aria-required="true" required="true" minlength="3"  name="pushaddress" class="form-control">
+	                </div>
+	            </div>
+	            <div class="form-group">
+	                <label class="col-sm-3 control-label">拉取地址:</label>
+	                <div class="col-sm-8">
+	                    <input type="text" value="$!group.pulladdress" placeholder="连接地址" aria-required="true" required="true" minlength="3"  name="pulladdress" class="form-control">
 	                </div>
 	            </div>
                 <div class="form-group">
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
index 865e73a..0bb8dab 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html
@@ -78,8 +78,11 @@ var default_dataColumns = [{
 					    field: 'orgnumber',
 					    title: '医院数'
 					},{
-					    field: 'clientaddress',
-					    title: '连接地址'
+					    field: 'pushaddress',
+					    title: '推送地址'
+					},{
+					    field: 'pulladdress',
+					    title: '拉取地址'
 					}];
 </script>
 #end
diff --git a/parent/center.manager/src/test/java/center/manager/test/user/SyncTest.java b/parent/center.manager/src/test/java/center/manager/test/user/SyncTest.java
index 0bf0e0d..707e7fb 100644
--- a/parent/center.manager/src/test/java/center/manager/test/user/SyncTest.java
+++ b/parent/center.manager/src/test/java/center/manager/test/user/SyncTest.java
@@ -19,7 +19,7 @@ public class SyncTest extends BaseTest {
         entity.setId(name);
         entity.setAccount(name);
         entity.setName(name);
-        syncComponent.addSyncOperation(SyncParamConf.USER_INSERT, entity,null);
+        syncComponent.addPushSyncOperation(SyncParamConf.USER_INSERT, entity,null);
     }
 
 }
-- 
1.8.3.1