diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java index a4d09cb..a2c89bd 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRemoteController.java @@ -21,6 +21,10 @@ public class SysRemoteController extends BaseController { public String push(HttpServletRequest request) throws ClassNotFoundException, IOException { SyncnModel model = conver(request); SysUsers user = (SysUsers) model.getData(); + System.out.println(user.getRoles().getName()); + // model + // service + System.out.println(user.getName() + " " + model.getMethod()); return "OK"; } diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java index f5f7967..392c43e 100644 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java @@ -1,11 +1,12 @@ package com.lyms.cm.entity.sys; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; + /** *

* 用户表 @@ -17,129 +18,133 @@ import java.util.Date; @TableName("SYS_USERS") public class SysUsers implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * */ - @TableId(value="ID") + @TableId(value = "ID") private String id; /** * 0:管理员,1:用户 */ - @TableField(value="TYPE") + @TableField(value = "TYPE") private Integer type; /** * 名称 */ - @TableField(value="NAME") + @TableField(value = "NAME") private String name; /** * 帐号 */ - @TableField(value="ACCOUNT") + @TableField(value = "ACCOUNT") private String account; /** * 机构id */ - @TableField(value="ORG_ID") + @TableField(value = "ORG_ID") private String orgId; /** * 部门id */ - @TableField(value="DEPT_ID") + @TableField(value = "DEPT_ID") private String deptId; /** * 名字 */ - @TableField(value="PWD") + @TableField(value = "PWD") private String pwd; /** * 手机号 */ - @TableField(value="PHONE") + @TableField(value = "PHONE") private String phone; /** * 备注 */ - @TableField(value="REMARKS") + @TableField(value = "REMARKS") private String remarks; /** * 最后登录时间 */ - @TableField(value="LAST_LOGIN_TIME") + @TableField(value = "LAST_LOGIN_TIME") private Date lastLoginTime; /** * 导入数据的源id */ - @TableField(value="FOREIGN_ID") + @TableField(value = "FOREIGN_ID") private String foreignId; /** * 医院的帐号 */ - @TableField(value="OTHER_ACCOUNT") + @TableField(value = "OTHER_ACCOUNT") private String otherAccount; /** * */ - @TableField(value="EMPLOYEE_ID") + @TableField(value = "EMPLOYEE_ID") private String employeeId; /** * */ - @TableField(value="EXPIR_TIME") + @TableField(value = "EXPIR_TIME") private Date expirTime; /** * */ - @TableField(value="LEVEL") + @TableField(value = "LEVEL") private Integer level; /** * */ - @TableField(value="AVATAR") + @TableField(value = "AVATAR") private String avatar; /** * */ - @TableField(value="WORK_TIME") + @TableField(value = "WORK_TIME") private String workTime; /** * */ - @TableField(value="GOOD_AT") + @TableField(value = "GOOD_AT") private String goodAt; /** * */ - @TableField(value="CREATE_ID") + @TableField(value = "CREATE_ID") private String createId; /** * */ - @TableField(value="CREATE_TIME") + @TableField(value = "CREATE_TIME") private Date createTime; /** * */ - @TableField(value="MODIFY_ID") + @TableField(value = "MODIFY_ID") private String modifyId; /** * */ - @TableField(value="MODIFY_TIME") + @TableField(value = "MODIFY_TIME") private Date modifyTime; /** * */ - @TableField(value="IFDEL") + @TableField(value = "IFDEL") private Integer ifdel; /** * */ - @TableField(value="ENABLE") + @TableField(value = "ENABLE") private Integer enable; + /** + * 测试 + */ + private SysRoles roles; public String getId() { return id; @@ -333,4 +338,12 @@ public class SysUsers implements Serializable { this.enable = enable; } + public SysRoles getRoles() { + return roles; + } + + public void setRoles(SysRoles roles) { + this.roles = roles; + } + } diff --git a/center.manager/src/test/java/center/manager/test/user/WorkTest.java b/center.manager/src/test/java/center/manager/test/user/WorkTest.java index 7e962ff..461fe1e 100644 --- a/center.manager/src/test/java/center/manager/test/user/WorkTest.java +++ b/center.manager/src/test/java/center/manager/test/user/WorkTest.java @@ -3,6 +3,7 @@ package center.manager.test.user; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import com.lyms.cm.entity.sys.SysRoles; import com.lyms.cm.entity.sys.SysUsers; import com.lyms.synch.CenterCallback; import com.lyms.synch.SyncnCenter; @@ -41,11 +42,16 @@ public class WorkTest extends BaseTest { user.setName("乱码测试"); model.setData(user); + SysRoles roles = new SysRoles(); + roles.setName("roles"); + user.setRoles(roles); + center.buildWork().push(model, new CenterCallback() { @Override public void callBack(Object object) { System.out.println("push callBack : " + object); + tmp(); } }); @@ -59,6 +65,8 @@ public class WorkTest extends BaseTest { @Override public void callBack(Object object) { System.out.println("pull callBack : " + object); + SyncnModel model = (SyncnModel) object; + HttpUtils.REMOTE.post(model); } }); } catch (Exception e) {