jiangjiazhi / center

Download as
Browse Code »

Commit 60ce68f45a10d1edea14b4db00e5b6fd3ace2c85

Authored by maliang
1 parent 44918fa247
Exists in master

修改信息

Showing 3 changed files with 53 additions and 28 deletions

center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java View file @ 60ce68f
... ... @@ -21,6 +21,10 @@
21 21 public String push(HttpServletRequest request) throws ClassNotFoundException, IOException {
22 22 SyncnModel model = conver(request);
23 23 SysUsers user = (SysUsers) model.getData();
  24 + System.out.println(user.getRoles().getName());
  25 + // model
  26 + // service
  27 +
24 28 System.out.println(user.getName() + " " + model.getMethod());
25 29 return "OK";
26 30 }
center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java View file @ 60ce68f
1 1 package com.lyms.cm.entity.sys;
2 2  
3   -import com.baomidou.mybatisplus.annotations.TableId;
4   -import com.baomidou.mybatisplus.annotations.TableField;
5   -import com.baomidou.mybatisplus.annotations.TableName;
6 3 import java.io.Serializable;
7 4 import java.util.Date;
8 5  
  6 +import com.baomidou.mybatisplus.annotations.TableField;
  7 +import com.baomidou.mybatisplus.annotations.TableId;
  8 +import com.baomidou.mybatisplus.annotations.TableName;
  9 +
9 10 /**
10 11 * <p>
11 12 * 用户表
12 13  
13 14  
14 15  
15 16  
16 17  
17 18  
18 19  
19 20  
20 21  
21 22  
22 23  
23 24  
24 25  
25 26  
26 27  
27 28  
28 29  
29 30  
30 31  
31 32  
32 33  
33 34  
34 35  
35 36  
36 37  
... ... @@ -17,129 +18,133 @@
17 18 @TableName("SYS_USERS")
18 19 public class SysUsers implements Serializable {
19 20  
20   - private static final long serialVersionUID = 1L;
  21 + private static final long serialVersionUID = 1L;
21 22  
22 23 /**
23 24 *
24 25 */
25   - @TableId(value="ID")
  26 + @TableId(value = "ID")
26 27 private String id;
27 28 /**
28 29 * 0:管理员,1:用户
29 30 */
30   - @TableField(value="TYPE")
  31 + @TableField(value = "TYPE")
31 32 private Integer type;
32 33 /**
33 34 * 名称
34 35 */
35   - @TableField(value="NAME")
  36 + @TableField(value = "NAME")
36 37 private String name;
37 38 /**
38 39 * 帐号
39 40 */
40   - @TableField(value="ACCOUNT")
  41 + @TableField(value = "ACCOUNT")
41 42 private String account;
42 43 /**
43 44 * 机构id
44 45 */
45   - @TableField(value="ORG_ID")
  46 + @TableField(value = "ORG_ID")
46 47 private String orgId;
47 48 /**
48 49 * 部门id
49 50 */
50   - @TableField(value="DEPT_ID")
  51 + @TableField(value = "DEPT_ID")
51 52 private String deptId;
52 53 /**
53 54 * 名字
54 55 */
55   - @TableField(value="PWD")
  56 + @TableField(value = "PWD")
56 57 private String pwd;
57 58 /**
58 59 * 手机号
59 60 */
60   - @TableField(value="PHONE")
  61 + @TableField(value = "PHONE")
61 62 private String phone;
62 63 /**
63 64 * 备注
64 65 */
65   - @TableField(value="REMARKS")
  66 + @TableField(value = "REMARKS")
66 67 private String remarks;
67 68 /**
68 69 * 最后登录时间
69 70 */
70   - @TableField(value="LAST_LOGIN_TIME")
  71 + @TableField(value = "LAST_LOGIN_TIME")
71 72 private Date lastLoginTime;
72 73 /**
73 74 * 导入数据的源id
74 75 */
75   - @TableField(value="FOREIGN_ID")
  76 + @TableField(value = "FOREIGN_ID")
76 77 private String foreignId;
77 78 /**
78 79 * 医院的帐号
79 80 */
80   - @TableField(value="OTHER_ACCOUNT")
  81 + @TableField(value = "OTHER_ACCOUNT")
81 82 private String otherAccount;
82 83 /**
83 84 *
84 85 */
85   - @TableField(value="EMPLOYEE_ID")
  86 + @TableField(value = "EMPLOYEE_ID")
86 87 private String employeeId;
87 88 /**
88 89 *
89 90 */
90   - @TableField(value="EXPIR_TIME")
  91 + @TableField(value = "EXPIR_TIME")
91 92 private Date expirTime;
92 93 /**
93 94 *
94 95 */
95   - @TableField(value="LEVEL")
  96 + @TableField(value = "LEVEL")
96 97 private Integer level;
97 98 /**
98 99 *
99 100 */
100   - @TableField(value="AVATAR")
  101 + @TableField(value = "AVATAR")
101 102 private String avatar;
102 103 /**
103 104 *
104 105 */
105   - @TableField(value="WORK_TIME")
  106 + @TableField(value = "WORK_TIME")
106 107 private String workTime;
107 108 /**
108 109 *
109 110 */
110   - @TableField(value="GOOD_AT")
  111 + @TableField(value = "GOOD_AT")
111 112 private String goodAt;
112 113 /**
113 114 *
114 115 */
115   - @TableField(value="CREATE_ID")
  116 + @TableField(value = "CREATE_ID")
116 117 private String createId;
117 118 /**
118 119 *
119 120 */
120   - @TableField(value="CREATE_TIME")
  121 + @TableField(value = "CREATE_TIME")
121 122 private Date createTime;
122 123 /**
123 124 *
124 125 */
125   - @TableField(value="MODIFY_ID")
  126 + @TableField(value = "MODIFY_ID")
126 127 private String modifyId;
127 128 /**
128 129 *
129 130 */
130   - @TableField(value="MODIFY_TIME")
  131 + @TableField(value = "MODIFY_TIME")
131 132 private Date modifyTime;
132 133 /**
133 134 *
134 135 */
135   - @TableField(value="IFDEL")
  136 + @TableField(value = "IFDEL")
136 137 private Integer ifdel;
137 138 /**
138 139 *
139 140 */
140   - @TableField(value="ENABLE")
  141 + @TableField(value = "ENABLE")
141 142 private Integer enable;
142 143  
  144 + /**
  145 + * 测试
  146 + */
  147 + private SysRoles roles;
143 148  
144 149 public String getId() {
145 150 return id;
... ... @@ -331,6 +336,14 @@
331 336  
332 337 public void setEnable(Integer enable) {
333 338 this.enable = enable;
  339 + }
  340 +
  341 + public SysRoles getRoles() {
  342 + return roles;
  343 + }
  344 +
  345 + public void setRoles(SysRoles roles) {
  346 + this.roles = roles;
334 347 }
335 348  
336 349 }
center.manager/src/test/java/center/manager/test/user/WorkTest.java View file @ 60ce68f
... ... @@ -3,6 +3,7 @@
3 3 import org.junit.Test;
4 4 import org.springframework.beans.factory.annotation.Autowired;
5 5  
  6 +import com.lyms.cm.entity.sys.SysRoles;
6 7 import com.lyms.cm.entity.sys.SysUsers;
7 8 import com.lyms.synch.CenterCallback;
8 9 import com.lyms.synch.SyncnCenter;
9 10  
... ... @@ -41,11 +42,16 @@
41 42 user.setName("乱码测试");
42 43 model.setData(user);
43 44  
  45 + SysRoles roles = new SysRoles();
  46 + roles.setName("roles");
  47 + user.setRoles(roles);
  48 +
44 49 center.buildWork().push(model, new CenterCallback() {
45 50  
46 51 @Override
47 52 public void callBack(Object object) {
48 53 System.out.println("push callBack : " + object);
  54 + tmp();
49 55 }
50 56 });
51 57  
... ... @@ -59,6 +65,8 @@
59 65 @Override
60 66 public void callBack(Object object) {
61 67 System.out.println("pull callBack : " + object);
  68 + SyncnModel model = (SyncnModel) object;
  69 + HttpUtils.REMOTE.post(model);
62 70 }
63 71 });
64 72 } catch (Exception e) {