diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java new file mode 100644 index 0000000..41eb466 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java @@ -0,0 +1,19 @@ +package com.lyms.cm.controller.sys; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import com.lyms.web.controller.BaseController; + +/** + *

+ * 角色表 前端控制器 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@Controller +@RequestMapping("/sysRoles") +public class SysRolesController extends BaseController { + +} diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java index 8d3deca..5feda8f 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java @@ -1,13 +1,13 @@ package com.lyms.cm.controller.sys; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; + import com.lyms.web.controller.BaseController; /** *

- * 用户表 前端控制器 + * 用户表 前端控制器 *

* * @author maliang @@ -16,5 +16,5 @@ import com.lyms.web.controller.BaseController; @Controller @RequestMapping("/sysUsers") public class SysUsersController extends BaseController { - + } diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java new file mode 100644 index 0000000..b11cf8c --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java @@ -0,0 +1,19 @@ +package com.lyms.cm.dao.sys; + + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.cm.entity.sys.SysRoles; + +import org.springframework.stereotype.Repository; +/** + *

+ * Mapper接口 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@Repository +public interface SysRolesMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml new file mode 100644 index 0000000..779cd69 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java index 15aff60..1cef2aa 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java @@ -1,10 +1,10 @@ package com.lyms.cm.dao.sys; +import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.lyms.cm.entity.sys.SysUsers; -import org.springframework.stereotype.Repository; /** *

* Mapper接口 diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml index 9c22253..91455c7 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java new file mode 100644 index 0000000..7a5f992 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java @@ -0,0 +1,167 @@ +package com.lyms.cm.entity.sys; + + +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotations.TableField; +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 角色表 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@TableName("SYS_ROLES") +public class SysRoles implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value="ID") + private String id; + /** + * 0:管理员角色,1:用户角色 + */ + @TableField(value="TYPE") + private Integer type; + /** + * 角色名称 + */ + @TableField(value="NAME") + private String name; + /** + * + */ + @TableField(value="PUBLISH_ID") + private String publishId; + /** + * 1：启用，2：停用 + */ + @TableField(value="ENABLE") + private Integer enable; + /** + * 1：有效，2：无效 + */ + @TableField(value="YN") + private Integer yn; + /** + * 备注 + */ + @TableField(value="REMARKS") + private String remarks; + /** + * 简码 + */ + @TableField(value="SHORT_CODE") + private String shortCode; + /** + * 机构id + */ + @TableField(value="ORG_ID") + private String orgId; + /** + * + */ + @TableField(value="CREATED") + private Date created; + /** + * + */ + @TableField(value="MODIFIED") + private Date modified; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + +} 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 new file mode 100644 index 0000000..3f29dc0 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java @@ -0,0 +1,342 @@ +package com.lyms.cm.entity.sys; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import com.lyms.cm.enums.UserStatusEnum; +import com.lyms.cm.enums.UserTypeEnum; +import com.lyms.cm.enums.UserValidityEnum; + +/** + *

+ * 用户表 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@TableName("SYS_USERS") +public class SysUsers implements Serializable { + + private static final long serialVersionUID = 1L; + + // 初始默认值 + public SysUsers() { + // this.setType(UserTypeEnum.USER.getType()); + // this.setEnable(UserStatusEnum.ENABLED.getStatus()); + // this.setCreated(new Date()); + } + + /** + * + */ + @TableField(value = "ID") + private String id; + /** + * 0:管理员,1:用户 + *

+ * {@link UserTypeEnum#MANAGER} OR {@link UserTypeEnum#USER} + */ + @TableField(value = "TYPE") + private Integer type = UserTypeEnum.USER.getType(); + /** + * 机构id + */ + @TableField(value = "ORG_ID") + private String orgId; + /** + * 部门id + */ + @TableField(value = "DEPT_ID") + private String deptId; + /** + * 名称 + */ + @TableField(value = "NAME") + private String name; + /** + * 帐号 + */ + @TableField(value = "ACCOUNT") + private String account; + /** + * 名字 + */ + @TableField(value = "PWD") + private String pwd; + /** + * 手机号 + */ + @TableField(value = "PHONE") + private String phone; + /** + * 发布者id + */ + @TableField(value = "PUBLISH_ID") + private Integer publishId; + /** + * 1：有效，2：无效 + *

+ * {@link UserValidityEnum#VALIDITY} OR {@link UserValidityEnum#UNVALIDITY} + */ + @TableField(value = "YN") + private Integer yn = UserValidityEnum.VALIDITY.getValidity(); + /** + * 1：启用，2：停用 + *

+ * {@link UserStatusEnum#ENABLED} OR {@link UserStatusEnum#DISENABLED} + */ + @TableField(value = "ENABLE") + private Integer enable = UserStatusEnum.ENABLED.getStatus(); + /** + * 最后修改时间 + */ + @TableField(value = "MODIFIED") + private Date modified; + /** + * 创建时间 + */ + @TableField(value = "CREATED") + private Date created; + /** + * 备注 + */ + @TableField(value = "REMARKS") + private String remarks; + /** + * 最后登录时间 + */ + @TableField(value = "LAST_LOGIN_TIME") + private Date lastLoginTime; + /** + * 导入数据的源id + */ + @TableField(value = "FOREIGN_ID") + private String foreignId; + /** + * 医院的帐号 + */ + @TableField(value = "OTHER_ACCOUNT") + private String otherAccount; + /** + * + */ + @TableField(value = "EMPLOYEE_ID") + private String employeeId; + /** + * + */ + @TableField(value = "EXPIR_TIME") + private Date expirTime; + /** + * + */ + @TableField(value = "LEVEL") + private Integer level; + /** + * + */ + @TableField(value = "AVATAR") + private String avatar; + /** + * + */ + @TableField(value = "WORK_TIME") + private String workTime; + /** + * + */ + @TableField(value = "GOOD_AT") + private String goodAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getPublishId() { + return publishId; + } + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public Date getLastLoginTime() { + return lastLoginTime; + } + + public void setLastLoginTime(Date lastLoginTime) { + this.lastLoginTime = lastLoginTime; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public String getOtherAccount() { + return otherAccount; + } + + public void setOtherAccount(String otherAccount) { + this.otherAccount = otherAccount; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public Date getExpirTime() { + return expirTime; + } + + public void setExpirTime(Date expirTime) { + this.expirTime = expirTime; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getWorkTime() { + return workTime; + } + + public void setWorkTime(String workTime) { + this.workTime = workTime; + } + + public String getGoodAt() { + return goodAt; + } + + public void setGoodAt(String goodAt) { + this.goodAt = goodAt; + } + + public boolean isEnabled() { + return UserStatusEnum.isEnabled(this.getEnable()); + } + +} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/UserStatusEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/UserStatusEnum.java new file mode 100644 index 0000000..298063a --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/enums/UserStatusEnum.java @@ -0,0 +1,34 @@ +package com.lyms.cm.enums; + +/** + * 用户状态标识 + * + * @author maliang + * + */ +public enum UserStatusEnum { + + // 启用 + ENABLED(1), + // 禁用 + DISENABLED(2); + + private int status; + + private UserStatusEnum(int status) { + this.status = status; + } + + public int getStatus() { + return this.status; + } + + public static boolean isEnabled(Integer status) { + return status != null && ENABLED.getStatus() == status; + } + + public static boolean isDisEnabled(Integer status) { + return status != null && DISENABLED.getStatus() == status; + } + +} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/UserTypeEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/UserTypeEnum.java new file mode 100644 index 0000000..10f3591 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/enums/UserTypeEnum.java @@ -0,0 +1,31 @@ +package com.lyms.cm.enums; + +/** + * 用户类型 + * + * @author maliang + * + */ +public enum UserTypeEnum { + + // 管理员 + MANAGER(0), + // 用户 + USER(1); + + private int type; + + private UserTypeEnum(int type) { + this.type = type; + } + + /** + * 获取类型 + * + * @return + */ + public int getType() { + return this.type; + } + +} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/UserValidityEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/UserValidityEnum.java new file mode 100644 index 0000000..f487669 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/enums/UserValidityEnum.java @@ -0,0 +1,26 @@ +package com.lyms.cm.enums; + +/** + * 用户是否有效 + * + * @author maliang + * + */ +public enum UserValidityEnum { + + // 有效 + VALIDITY(1), + // 无效 + UNVALIDITY(2); + + private int validity; + + private UserValidityEnum(int validity) { + this.validity = validity; + } + + public int getValidity() { + return this.validity; + } + +} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/package-info.java b/center.manager/src/main/java/com/lyms/cm/enums/package-info.java new file mode 100644 index 0000000..e7fea8e --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/enums/package-info.java @@ -0,0 +1,6 @@ +/** + * 标识信息 + * + * @author maliang + */ +package com.lyms.cm.enums; \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java new file mode 100644 index 0000000..0295a85 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java @@ -0,0 +1,16 @@ +package com.lyms.cm.service.sys; + +import com.lyms.cm.entity.sys.SysRoles; +import com.lyms.web.service.BaseService; + +/** + *

+ * 服务类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +public interface ISysRolesService extends BaseService { + +} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java new file mode 100644 index 0000000..c60ee76 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java @@ -0,0 +1,56 @@ +package com.lyms.cm.service.sys; + +import com.lyms.cm.entity.sys.SysUsers; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

+ * 用户服务类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +public interface ISysUsersService extends BaseService { + + /** + * 添加用户 + * + * @param user + * @return + * @author maliang + */ + public boolean addUser(SysUsers user) throws SystemException; + + /** + * 修改用户信息 + * + * @param user + * @return + * @author maliang + */ + public boolean updateUser(SysUsers user) throws SystemException; + + /** + * 根据ID获取用户信息 + * + * @param userId + * @return + * @author maliang + */ + public SysUsers getUserById(String userId) throws SystemException; + + /** + * 启用/停用 + *

+ * 根据用户ID操作 + *

+ * + * @param userId + * @return + * @author maliang + */ + public boolean enabled(String userId) throws SystemException; + +} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java new file mode 100644 index 0000000..3742c9e --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java @@ -0,0 +1,21 @@ +package com.lyms.cm.service.sys.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.cm.dao.sys.SysRolesMapper; +import com.lyms.cm.entity.sys.SysRoles; +import com.lyms.cm.service.sys.ISysRolesService; + +/** + *

+ * 角色表 服务实现类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@Service +public class SysRolesServiceImpl extends ServiceImpl implements ISysRolesService { + +} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java new file mode 100644 index 0000000..a6171f5 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java @@ -0,0 +1,76 @@ +package com.lyms.cm.service.sys.impl; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.cm.dao.sys.SysUsersMapper; +import com.lyms.cm.entity.sys.SysUsers; +import com.lyms.cm.enums.UserStatusEnum; +import com.lyms.cm.service.sys.ISysUsersService; + +/** + *

+ * 用户表 服务实现类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +@Service +public class SysUsersServiceImpl extends ServiceImpl implements ISysUsersService { + + @Autowired + private SysUsersMapper userMapper; + + // 模块基础操作信息 + private boolean empty(SysUsers user) { + return user == null; + } + + @Override + @Transactional + public boolean addUser(SysUsers user) { + if (empty(user)) + return false; + + Integer tag = userMapper.insert(user); + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean updateUser(SysUsers user) { + if (empty(user)) + return false; + Integer tag = userMapper.updateById(user); + return tag != null && tag >= 1; + } + + @Override + public SysUsers getUserById(String userId) { + if (StringUtils.isBlank(userId)) + return null; + return userMapper.selectById(userId); + } + + @Override + @Transactional + public boolean enabled(String userId) { + // TODO 编写SQL 修改 + SysUsers user = this.getUserById(userId); + if (empty(user)) + return false; + + // 判断当前用户的启用，禁用情况 + if (user.isEnabled()) { + user.setEnable(UserStatusEnum.DISENABLED.getStatus()); + } else { + user.setEnable(UserStatusEnum.ENABLED.getStatus()); + } + return this.updateUser(user); + } + +} diff --git a/center.manager/src/main/resources/app-context.xml b/center.manager/src/main/resources/app-context.xml index 24718b3..dcb0a90 100644 --- a/center.manager/src/main/resources/app-context.xml +++ b/center.manager/src/main/resources/app-context.xml @@ -13,99 +13,14 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - - - - classpath:jdbc.properties - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - application/json;charset=UTF-8 - - - - - - - - text/plain;charset=UTF-8 - text/html;charset=UTF-8 - application/json;charset=UTF-8 - - - - - + - - - - - - - - - - - - - - - - - + - + + \ No newline at end of file diff --git a/center.manager/src/main/resources/app-mvc.xml b/center.manager/src/main/resources/app-mvc.xml new file mode 100644 index 0000000..88e8df4 --- /dev/null +++ b/center.manager/src/main/resources/app-mvc.xml @@ -0,0 +1,112 @@ + + + + + + + + classpath:jdbc.properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + application/json;charset=UTF-8 + + + + + + + + text/plain;charset=UTF-8 + text/html;charset=UTF-8 + application/json;charset=UTF-8 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/center.manager/src/main/webapp/WEB-INF/web.xml b/center.manager/src/main/webapp/WEB-INF/web.xml index 5583835..31444c0 100644 --- a/center.manager/src/main/webapp/WEB-INF/web.xml +++ b/center.manager/src/main/webapp/WEB-INF/web.xml @@ -4,6 +4,19 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" metadata-complete="true" version="3.0"> + + + contextConfigLocation + + classpath:app-context.xml + + + + + + org.springframework.web.context.ContextLoaderListener + + org.springframework.web.context.request.RequestContextListener @@ -43,7 +56,7 @@ org.springframework.web.servlet.DispatcherServlet contextConfigLocation - classpath:app-context.xml + classpath:app-mvc.xml 1 diff --git a/center.manager/src/test/java/center/manager/test/user/UserTest.java b/center.manager/src/test/java/center/manager/test/user/UserTest.java new file mode 100644 index 0000000..51479b0 --- /dev/null +++ b/center.manager/src/test/java/center/manager/test/user/UserTest.java @@ -0,0 +1,41 @@ +package center.manager.test.user; + +import java.util.UUID; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; + +import com.lyms.cm.entity.sys.SysUsers; +import com.lyms.cm.service.sys.ISysUsersService; + +@Transactional +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "classpath:app-context.xml" }) +public class UserTest { + + @Autowired + private ISysUsersService userService; + + SysUsers user = null; + + @Before + public void init() { + user = new SysUsers(); + user.setId(UUID.randomUUID().toString().replaceAll("-", "")); + user.setName("欧阳拉闸"); + user.setPhone("18682531229"); + } + + @Test + public void addUserTest() { + boolean tag = userService.addUser(user); + Assert.assertTrue("添加成功", tag); + } + +} diff --git a/center.manager/src/test/java/center/manager/test/user/package-info.java b/center.manager/src/test/java/center/manager/test/user/package-info.java new file mode 100644 index 0000000..9d5b151 --- /dev/null +++ b/center.manager/src/test/java/center/manager/test/user/package-info.java @@ -0,0 +1,7 @@ +/** + * 用户测试包 + * + * @author maliang + * + */ +package center.manager.test.user; \ No newline at end of file diff --git a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java index eb92330..a8cbba6 100644 --- a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java +++ b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.util.StringUtils; import org.springframework.web.bind.ServletRequestDataBinder; @@ -30,29 +29,29 @@ import com.lyms.web.bean.AjaxResult; import com.lyms.web.entity.MobileInfo; public class BaseController { - - protected Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired + protected Logger logger = LoggerFactory.getLogger(this.getClass()); + + // @Autowired protected HttpServletRequest request; - @Autowired + // @Autowired protected HttpServletResponse response; - + @InitBinder public void initBinder(ServletRequestDataBinder binder) { - /** - * 自动转换日期类型的字段格式 - */ - binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"), true)); + /** + * 自动转换日期类型的字段格式 + */ + binder.registerCustomEditor(Date.class, + new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"), true)); + + /** + * 防止XSS攻击 + */ + binder.registerCustomEditor(String.class, new StringEscapeEditor(true, false)); + } - /** - * 防止XSS攻击 - */ - binder.registerCustomEditor(String.class, new StringEscapeEditor(true, false)); - } - - /** * 是否为 post 请求 */ @@ -66,16 +65,16 @@ public class BaseController { protected boolean isGet() { return HttpUtils.isGet(request); } - /** - * @param name 获取parameter + * @param name + * 获取parameter * @return */ protected String getParameter(String name) { return request.getParameter(name); } - + /** * 重定向至地址 url * @@ -88,7 +87,7 @@ public class BaseController { rto.append(url); return rto.toString(); } - + /** *

* 获取分页对象 @@ -119,7 +118,6 @@ public class BaseController { } return new Page(_index, _size); } - /** * @@ -130,11 +128,11 @@ public class BaseController { * @return */ protected String toJson(Object object) { - //return JSON.toJSONString(object, SerializerFeature.BrowserCompatible); + // return JSON.toJSONString(object, + // SerializerFeature.BrowserCompatible); return JSON.toJSONString(object, SerializerFeature.WriteMapNullValue); } - - + /** * * 返回 JSON 格式对象 @@ -151,7 +149,7 @@ public class BaseController { } return JSON.toJSONStringWithDateFormat(object, format, SerializerFeature.WriteDateUseDateFormat); } - + /** *

* 转换为 bootstrap-table 需要的分页格式 JSON @@ -167,8 +165,6 @@ public class BaseController { gridData.put("rows", page.getRecords()); return gridData; } - - /** *

  • @Description:构建分页参数 @@ -203,7 +199,7 @@ public class BaseController { ajaxResult.setMessage(operationName + (result > 0 ? "成功" : "失败")); return ajaxResult; } - + /** *
  • @Description:处理json数据(方法描述) *
  • @param ajaxResult ajaxResult对象 @@ -219,9 +215,8 @@ public class BaseController { ajaxResult.setMessage(operationName + (result ? "成功" : "失败")); return ajaxResult; } - - - /** + + /** *
  • @Description:将JSON.toJSONString(data)输出 *
  • @param data *
  • @param response @@ -229,38 +224,39 @@ public class BaseController { *
  • 创建时间：2016年9月20日 *
  • 修改人： *
  • 修改时间： - */ - protected void writeJson(Object data,HttpServletResponse response){ - writeJsonText(JSON.toJSONString(data),response); + */ + protected void writeJson(Object data, HttpServletResponse response) { + writeJsonText(JSON.toJSONString(data), response); } - - /** + + /** *
  • @Description:原样输出text(ContentType="application/json; charset=utf-8") - *
  • @param text + *
  • @param text *
  • @param response *
  • 创建人：方承 *
  • 创建时间：2016年9月20日 *
  • 修改人： *
  • 修改时间： - */ - protected void writeJsonText(String text,HttpServletResponse response){ - PrintWriter pw = null; + */ + protected void writeJsonText(String text, HttpServletResponse response) { + PrintWriter pw = null; try { - response.setCharacterEncoding("UTF-8"); - response.setContentType("application/json; charset=utf-8"); + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/json; charset=utf-8"); pw = response.getWriter(); pw.write(text); pw.flush(); } catch (IOException e) { e.printStackTrace(); - }finally { - if(pw != null){ + } finally { + if (pw != null) { pw.flush(); pw.close(); } } } - /** + + /** *
  • @Description:输出类型：text/html *
  • @param text *
  • @param response @@ -268,55 +264,55 @@ public class BaseController { *
  • 创建时间：2016年9月20日 *
  • 修改人： *
  • 修改时间： - */ - protected void writeText(String text,HttpServletResponse response){ - PrintWriter pw = null; + */ + protected void writeText(String text, HttpServletResponse response) { + PrintWriter pw = null; try { - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html; charset=utf-8"); + response.setCharacterEncoding("UTF-8"); + response.setContentType("text/html; charset=utf-8"); pw = response.getWriter(); pw.write(text); pw.flush(); } catch (IOException e) { e.printStackTrace(); - }finally { - if(pw != null){ + } finally { + if (pw != null) { pw.flush(); pw.close(); } } } - - /** - *
  • @Description:获取移动端请求头信息 - *
  • @param request - *
  • @return - *
  • @throws BusinessException - *
  • 创建人：方承 - *
  • 创建时间：2016年10月28日 - *
  • 修改人： - *
  • 修改时间： - */ - protected MobileInfo getMobileInfo(HttpServletRequest request) throws BusinessException { - String appVersion = request.getHeader("appVersion"); - String systemVersion = request.getHeader("appSystemVersion"); - String deviceId = request.getHeader("appDeviceId"); - Integer width = null; - Integer height = null; - int night = 0; - try { - width = Integer.parseInt(request.getHeader("appDeviceWidth")); - height = Integer.parseInt(request.getHeader("appDeviceHeight")); - if (request.getHeader("nightMode") != null) { - night = Integer.parseInt(request.getHeader("nightMode")); - } - } catch (NumberFormatException e) { - throw new BusinessException("移动端请求头不符合约定"); - } - if (StrUtils.isEmpty(appVersion) || width == null || height == null) { - throw new BusinessException("移动端请求头不符合约定"); - } - return new MobileInfo(appVersion, systemVersion, deviceId, width, height, night != 0); - } + + /** + *
  • @Description:获取移动端请求头信息 + *
  • @param request + *
  • @return + *
  • @throws BusinessException + *
  • 创建人：方承 + *
  • 创建时间：2016年10月28日 + *
  • 修改人： + *
  • 修改时间： + */ + protected MobileInfo getMobileInfo(HttpServletRequest request) throws BusinessException { + String appVersion = request.getHeader("appVersion"); + String systemVersion = request.getHeader("appSystemVersion"); + String deviceId = request.getHeader("appDeviceId"); + Integer width = null; + Integer height = null; + int night = 0; + try { + width = Integer.parseInt(request.getHeader("appDeviceWidth")); + height = Integer.parseInt(request.getHeader("appDeviceHeight")); + if (request.getHeader("nightMode") != null) { + night = Integer.parseInt(request.getHeader("nightMode")); + } + } catch (NumberFormatException e) { + throw new BusinessException("移动端请求头不符合约定"); + } + if (StrUtils.isEmpty(appVersion) || width == null || height == null) { + throw new BusinessException("移动端请求头不符合约定"); + } + return new MobileInfo(appVersion, systemVersion, deviceId, width, height, night != 0); + } }