diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java index de5041b..69f8136 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java @@ -1,6 +1,7 @@ package com.lyms.base.common.dao.user; import java.io.Serializable; +import java.util.List; import org.springframework.stereotype.Repository; @@ -19,5 +20,7 @@ import com.lyms.base.common.entity.user.Users; public interface UsersMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + public List getUsersByOrgId(Serializable orgid); } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml index 3fd72fa..7f8470d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml @@ -34,4 +34,12 @@ ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, IFDEL AS ifdel, ENABLE AS enable, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt,CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime + + + + diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java index 02d6c02..4a38b01 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java @@ -94,5 +94,16 @@ public interface UsersService extends BaseService { *
  • 修改时间： */ public List getRoleIdListByUserid(String uid); + + /** + *
  • @Description:根据OrgId获取用户 + *
  • @param orgid + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getUsersByOrgId(Serializable orgid); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java index 590b6a7..4f702b6 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -192,4 +192,9 @@ public class UsersServiceImpl extends ServiceImpl implements return roleIdList; } + @Override + public List getUsersByOrgId(Serializable orgid) { + return baseMapper.getUsersByOrgId(orgid); + } + } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java index 7407fb0..f27c50e 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java @@ -25,6 +25,7 @@ import com.lyms.base.common.service.role.PermissionsService; import com.lyms.base.common.service.role.RolesService; import com.lyms.base.common.service.user.UsersService; import com.lyms.hospital.service.token.TokenService; +import com.lyms.util.DateTimeUtils; import com.lyms.util.InstanceUtils; import com.lyms.util.MD5Utils; import com.lyms.web.bean.AjaxResult; @@ -129,10 +130,13 @@ public class LoginController extends BaseController { List permissions = permissionsService.getUserPermission(users.getId()); Organizations org = organizationsService.selectById(users.getOrgId()); result.put("token", token); + users.setLastLoginTime(DateTimeUtils.getNow()); result.put("user",users); result.put("roles",roles); result.put("organization",org); - result.put("organizations",org); + List orgs = InstanceUtils.newArrayList(); + orgs.add(org); + result.put("organizations",orgs); result.put("permissions", permissions); result.put("watermark", "water"); ajaxResult.setData(result); diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/SysConfController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/SysConfController.java new file mode 100644 index 0000000..9bc5b2a --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/SysConfController.java @@ -0,0 +1,24 @@ +package com.lyms.hospital.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.lyms.util.DateTimeUtils; +import com.lyms.web.controller.BaseController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@RestController +@Api(value = "/api", description = "登录的相关操作") +public class SysConfController extends BaseController { + + @ApiOperation(value = "系统时间", notes = "系统时间") + @RequestMapping(value = "/cTime") + @ResponseBody + public String testLogin() { + return String.valueOf(DateTimeUtils.getNow().getTime()); + } + +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/user/UserController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/user/UserController.java new file mode 100644 index 0000000..27b15da --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/user/UserController.java @@ -0,0 +1,34 @@ +package com.lyms.hospital.controller.user; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.lyms.base.common.service.user.UsersService; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping(value = "/user") +@Api(value = "/api", description = "用户相关操作") +public class UserController extends BaseController { + + @Autowired + private UsersService usersService; + + @ApiOperation(value = "测试登录", notes = "测试登录说明") + @ApiImplicitParams(@ApiImplicitParam(name = "hospitalId", value = "机构ID", required = true, dataType = "String")) + @RequestMapping(value = "/getUsersByOrgId") + @ResponseBody + public AjaxResult testLogin(@RequestParam(value = "hospitalId") String hospitalId,AjaxResult ajaxResult) { + ajaxResult.setSuccess(true).setStatus("200").setData(usersService.getUsersByOrgId(hospitalId)); + return ajaxResult; + } +} diff --git a/parent/hospital.web/src/main/resources/logback.xml b/parent/hospital.web/src/main/resources/logback.xml index ccb392c..b633451 100644 --- a/parent/hospital.web/src/main/resources/logback.xml +++ b/parent/hospital.web/src/main/resources/logback.xml @@ -19,7 +19,7 @@ - +