diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index d231ed2..6c79b0a 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -1,6 +1,5 @@ package com.manage.controller; -import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import com.manage.dao.Power_DeptMapper; import com.manage.dao.Power_NoticeMapper; @@ -542,7 +541,7 @@ public class FontController { * @CreateDate: 2021-08-30 * @UpdateUser: wzq */ - @RequestMapping("/getDeptCodeByUserName") + @RequestMapping(value = "/getDeptCodeByUserName", produces = "text/plain;charset=UTF-8") @ResponseBody public String getDeptCodeByDeptId(Integer deptId) throws Exception { Power_Dept power_dept = power_deptService.selectByPrimaryKey(deptId); @@ -579,64 +578,6 @@ public class FontController { return result; } - /** - * 根据病案deptcode，查询出所有符合的每个用户，数据：用户id，用户名字，roleId - */ - @RequestMapping(value = "/getUserInfoByDeptCodeForMedicalRecordCollection", produces = "text/plain;charset=UTF-8") - @ResponseBody - public String getUserInfoByDeptCodeForMedicalRecordCollection(String deptCode) { -// 通过deptCode获取userId数组 - List power_users = power_userMapper.selectAllUserInfo(); - StringBuilder userALLInfo = new StringBuilder(); - for (Power_User powerUser : power_users) { - String deptId = powerUser.getDeptId(); - String[] userDeptId = deptId.split(","); - Integer roleId = powerUser.getRoleId(); - for (int i = 0; i < userDeptId.length; i++) { -// 查询到deptId对应的deptCode - List powerDepts = powerDeptMapper.selectDeptCode(userDeptId[i]); - for (Power_Dept powerDept : powerDepts) { - if (deptCode.equals(powerDept.getDeptCode())) { - String oneDeptCodeResult = powerUser.getUserId() + "," + powerUser.getName() + ";"; - if (roleId == 24 || roleId == 26 || roleId == 23 || roleId == 29) { - userALLInfo.append(oneDeptCodeResult); - } - } - } - } - } - return userALLInfo.toString(); - } - - /** - * 根据病案deptcode，查询出所有符合的每个用户，数据：用户id，用户名字，roleId - */ - @RequestMapping(value = "/getUserInfoByDeptCodeForAcquisitionCompleted", produces = "text/plain;charset=UTF-8") - @ResponseBody - public String getUserInfoByDeptCodeForAcquisitionCompleted(String deptCode) { -// 通过deptCode获取userId数组 - List power_users = power_userMapper.selectAllUserInfo(); - StringBuilder userALLInfo = new StringBuilder(); - for (Power_User powerUser : power_users) { - String deptId = powerUser.getDeptId(); - String[] userDeptId = deptId.split(","); - Integer roleId = powerUser.getRoleId(); - for (int i = 0; i < userDeptId.length; i++) { -// 查询到deptId对应的deptCode - List powerDepts = powerDeptMapper.selectDeptCode(userDeptId[i]); - for (Power_Dept powerDept : powerDepts) { - if (deptCode.equals(powerDept.getDeptCode())) { - String oneDeptCodeResult = powerUser.getUserId() + "," + powerUser.getName() + ";"; - if (roleId == 24 || roleId == 26 || roleId == 23 || roleId == 29) { - userALLInfo.append(oneDeptCodeResult); - } - } - } - } - } - return userALLInfo.toString(); - } - /** * 通过申请医生id，获取医生名字 @@ -670,7 +611,7 @@ public class FontController { /** * 通过userName获取deptcode */ - @RequestMapping("/getDoctorDeptcode") + @RequestMapping(value = "/getDoctorDeptcode", produces = "text/plain;charset=UTF-8") @ResponseBody public String getDoctorDeptcode(Integer userId) { //获取deptId @@ -690,7 +631,7 @@ public class FontController { /** * 通过userName获取realName */ - @RequestMapping("/getRealName") + @RequestMapping(value = "/getRealName", produces = "text/plain;charset=UTF-8") @ResponseBody public String getRealName(String userName) { //获取realName @@ -701,7 +642,7 @@ public class FontController { /** * 通过deptcode获取科室中文名称 */ - @RequestMapping("/getDeptCodeByChinese") + @RequestMapping(value = "/getDeptCodeByChinese", produces = "text/plain;charset=UTF-8") @ResponseBody public String getDeptCodeByChinese(String deptCode) { //获取realName @@ -709,34 +650,6 @@ public class FontController { return chineseName; } - /** - * 获取所有用户的id、名字、deptcode、中文科室名字 - */ - @RequestMapping("/getAllUserInfo") - @ResponseBody - public String getAllUserInfo() { - List power_users = power_userMapper.selectAllUserInfo(); - String deptCode = ""; - String deptName = ""; - for (int i = 0; i < power_users.size(); i++) { - String deptId = power_users.get(i).getDeptId(); - String[] deptIdOne = deptId.split(","); - for (int j = 0; j < deptIdOne.length; j++) { - List deptCodeAndDeptCodeChinese = powerDeptMapper.getDeptCodeAndDeptCodeChinese(deptIdOne[j]); - for (int k = 0; k < deptCodeAndDeptCodeChinese.size(); k++) { - String deptCodeOne = deptCodeAndDeptCodeChinese.get(k).getDeptCode(); - deptCode += deptCodeOne + ","; - String deptNameOne = deptCodeAndDeptCodeChinese.get(k).getDeptName(); - deptName += deptNameOne + ","; - } - } - power_users.get(i).setDeptCode(deptCode); - power_users.get(i).setDeptId(deptName); - } - String json = JSON.toJSONString(power_users); - return json; - } - /** * 从高明更新至湛江，2021/11/20 @@ -768,7 +681,7 @@ public class FontController { * 科主任需要判定是否和病案的科室相符， * 病案室直接发送未审核数量 */ - @RequestMapping("sendMessageWithNew") + @RequestMapping(value = "sendMessageWithNew") @ResponseBody public Msg sendMessageWithNew(Message message) throws Exception { if (null == message.getUserId()) { @@ -795,7 +708,7 @@ public class FontController { * 科主任需要判定是否和病案的科室相符， * 病案室直接发送未审核数量 */ - @RequestMapping("sendMessageWithNewWithOutSysFlag") + @RequestMapping(value = "sendMessageWithNewWithOutSysFlag") @ResponseBody public Msg sendMessageWithNewWithOutSysFlag(Message message) throws Exception { if (null == message.getUserId()) { @@ -811,4 +724,35 @@ public class FontController { return Msg.success(); } + + /** + * 获取该deptCode对应的所有用户信息包括：userId,userName,userRoleId + */ + @RequestMapping(value = "/getAllUserInfoByDeptCode", produces = "text/plain;charset=UTF-8") + @ResponseBody + public String getAllUserInfoByDeptCode(String deptCode) { +// deptCode获取userId,userName,userRoleId + List power_users = power_userMapper.selectDeptIdByDeptCode(deptCode); + String result = ""; + for (Power_User power_user : power_users) { + result += power_user.getUserId() + "," + power_user.getName() + "," + power_user.getRoleId() + ";"; + } + return result; + } + + /** + * 获取roleId=22所有用户信息包括：userId,userName + */ + @RequestMapping(value = "/getAllUserForRoom", produces = "text/plain;charset=UTF-8") + @ResponseBody + public String getAllUserForRoom() { +// 获取roleId=22的userId,userName + List power_users = power_userMapper.selectAllRoomUser(); + String result = ""; + for (Power_User power_user : power_users) { + result += power_user.getUserId() + "," + power_user.getName() + ";"; + } + return result; + } + } diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java index 8c0094c..7270ee9 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java @@ -86,4 +86,14 @@ public interface Power_UserMapper { String selectForRealName(String userName); List selectAllUserInfo(); + + /** + * deptCode获取userId,userName,userRoleId + * + * @param deptCode + * @return + */ + List selectDeptIdByDeptCode(String deptCode); + + List selectAllRoomUser(); } \ No newline at end of file diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 8aab122..2919dec 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -758,14 +758,21 @@ select * from power_user - + SELECT user_id, + power_user.name, + power_user.role_id + from power_user + where dept_id like + concat('%', (SELECT power_dept.dept_id from power_dept WHERE dept_code = #{deptCode} '%') + and effective = 1 + +