jiangjiazhi / center

Authored by fangcheng about 8 years ago

Exists in master

Showing 7 changed files with 46 additions and 21 deletions

...	...	@@ -8,13 +8,14 @@
8	8	<result column="NAME" property="name" />
9	9	<result column="TYPE" property="type" />
10	10	<result column="ORGNUMBER" property="orgnumber" />
11		- <result column="CLIENTADDRESS" property="clientaddress" />
	11	+ <result column="PUSHADDRESS" property="pushaddress" />
	12	+ <result column="PULLADDRESS" property="pulladdress" />
12	13	<result column="IFDEl" property="ifdel" />
13	14	</resultMap>
14	15
15	16	<!-- 通用查询结果列 -->
16	17	<sql id="Base_Column_List">
17		- ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, CLIENTADDRESS AS clientaddress ,IFDEL AS ifdel
	18	+ ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, PUSHADDRESS AS pushaddress ,PULLADDRESS AS pulladdress ,IFDEL AS ifdel
18	19	</sql>
19	20	</mapper>

...	...	@@ -42,9 +42,15 @@
42	42	/**
43	43	* 数据推送地址
44	44	*/
45		- @TableField(value = "CLIENTADDRESS")
46		- private String clientaddress;
	45	+ @TableField(value = "PUSHADDRESS")
	46	+ private String pushaddress;
47	47
	48	+ /**
	49	+ * 数据拉取地址
	50	+ */
	51	+ @TableField(value = "PULLADDRESS")
	52	+ private String pulladdress;
	53	+
48	54	@TableField(exist=false)
49	55	private String orgIds;
50	56
51	57
52	58
...	...	@@ -86,15 +92,24 @@
86	92	this.orgnumber = orgnumber;
87	93	}
88	94
89		- public String getClientaddress() {
90		- return clientaddress;
91		- }
92	95
93		- public void setClientaddress(String clientaddress) {
94		- this.clientaddress = clientaddress;
95		- }
	96	+ public String getPushaddress() {
	97	+ return pushaddress;
	98	+ }
96	99
97		- public Integer getIfdel() {
	100	+ public void setPushaddress(String pushaddress) {
	101	+ this.pushaddress = pushaddress;
	102	+ }
	103	+
	104	+ public String getPulladdress() {
	105	+ return pulladdress;
	106	+ }
	107	+
	108	+ public void setPulladdress(String pulladdress) {
	109	+ this.pulladdress = pulladdress;
	110	+ }
	111	+
	112	+ public Integer getIfdel() {
98	113	return ifdel;
99	114	}
100	115

...	...	@@ -29,8 +29,8 @@
29	29	List<OrganGroup> list = organGroupService.selectList(new EntityWrapper<OrganGroup>().where("ifDel=0"));
30	30	if (CollectionUtils.isNotEmpty(list)) {
31	31	for (OrganGroup group : list) {
32		- if (StrUtils.isNotEmpty(group.getClientaddress())) {
33		- ipList.add(group.getClientaddress());
	32	+ if (StrUtils.isNotEmpty(group.getPushaddress())) {
	33	+ ipList.add(group.getPushaddress());
34	34	}
35	35	}
36	36	}
...	...	@@ -38,7 +38,7 @@
38	38	}
39	39
40	40	/**
41		- * <li>@Description:添加一个同步操作
	41	+ * <li>@Description:添加一个推送同步操作
42	42	* <li>@param syncParamConf
43	43	* <li>@param data data和对应方法参数个数和类型一致
44	44	* <li>@return
...	...	@@ -47,7 +47,7 @@
47	47	* <li>修改人：
48	48	* <li>修改时间：
49	49	*/
50		- public boolean addSyncOperation(SyncParamConf syncParamConf, Object... data) {
	50	+ public boolean addPushSyncOperation(SyncParamConf syncParamConf, Object... data) {
51	51	List<String> ipList = getAllGroupIpList();
52	52	ParamsAdpter adpter = null;
53	53	if (data != null && data.length > 0) {

...	...	@@ -25,7 +25,7 @@
25	25	<div class="form-group">
26	26	<label class="col-sm-3 control-label">上级科室id:</label>
27	27	<div class="col-sm-8">
28		- <input type="text" placeholder="上级科室id" value="$!depart.parentId" aria-required="true" required="true" class="form-control" minlength="2" name="parentId" id="parentId">
	28	+ <input type="text" placeholder="上级科室id" value="$!depart.parentId" class="form-control" name="parentId" id="parentId">
29	29	<!--
30	30	<select class="form-control" name="parentId" id="parent">
31	31	<option value="0">--选择--</option>

...	...	@@ -23,9 +23,15 @@
23	23	</div>
24	24
25	25	<div class="form-group">
26		- <label class="col-sm-3 control-label">连接地址:</label>
	26	+ <label class="col-sm-3 control-label">推送地址:</label>
27	27	<div class="col-sm-8">
28		- <input type="text" value="$!group.clientaddress" placeholder="连接地址" aria-required="true" required="true" minlength="3" name="clientaddress" class="form-control" id="shortCode">
	28	+ <input type="text" value="$!group.pushaddress" placeholder="连接地址" aria-required="true" required="true" minlength="3" name="pushaddress" class="form-control">
	29	+ </div>
	30	+ </div>
	31	+ <div class="form-group">
	32	+ <label class="col-sm-3 control-label">拉取地址:</label>
	33	+ <div class="col-sm-8">
	34	+ <input type="text" value="$!group.pulladdress" placeholder="连接地址" aria-required="true" required="true" minlength="3" name="pulladdress" class="form-control">
29	35	</div>
30	36	</div>
31	37	<div class="form-group">

...	...	@@ -19,7 +19,7 @@
19	19	entity.setId(name);
20	20	entity.setAccount(name);
21	21	entity.setName(name);
22		- syncComponent.addSyncOperation(SyncParamConf.USER_INSERT, entity,null);
	22	+ syncComponent.addPushSyncOperation(SyncParamConf.USER_INSERT, entity,null);
23	23	}
24	24
25	25	}