From 657996664ba7248e205a1683cec918b1b55f8306 Mon Sep 17 00:00:00 2001 From: xm Date: Wed, 17 Nov 2021 16:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E8=87=B3=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E5=80=9F=E9=98=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 30 +++++++++++++++++++ .../manage/controller/LoginController.java | 29 ------------------ .../webservice/impl/PowerWebServiceImpl.java | 2 +- .../java/com/manage/dao/Power_DeptMapper.java | 1 + .../java/com/manage/dao/Power_UserMapper.java | 7 ++--- .../java/com/manage/entity/Power_User.java | 1 - .../resources/mapper/Power_UserMapper.xml | 21 ++++++++----- .../com/manage/service/Power_UserService.java | 1 - .../service/ipml/Power_UserServiceImpl.java | 6 ---- 9 files changed, 49 insertions(+), 49 deletions(-) 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 25dede0..2dc6f01 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -61,6 +61,8 @@ public class FontController { private Power_MenuService powerMenuService; @Autowired private Power_DeptService power_deptService; + @Autowired + private Power_UserMapper power_userMapper; /** * 2.1 @@ -533,4 +535,32 @@ public class FontController { Power_Dept power_dept = power_deptService.selectByPrimaryKey(deptId); return power_dept.getDeptCode(); } + /** + * 根据病案deptcode，查询出所有符合的科主任，需要用户id，用户名称，科室名称 + */ + @RequestMapping("/getUserInfoByDeptCodeForChief") + @ResponseBody + public String getUserInfoByDeptCodeForChief(String DeptCode) throws Exception{ + List power_users = power_userMapper.selectAllForChief(DeptCode); + String result = null; + for (int i = 0; i < power_users.size(); i++) { + Power_User power_user = power_users.get(i); + result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; + } + return result; + } + /** + * 根据病案deptcode，查询出所有符合的病案室用户，需要用户id，用户名称，科室名称 + */ + @RequestMapping("/getUserInfoByDeptCodeForRecordRoom") + @ResponseBody + public String getUserInfoByDeptCodeForRecordRoom(String DeptCode) throws Exception{ + List power_users = power_userMapper.selectAllForRecordRoom(DeptCode); + String result = null; + for (int i = 0; i < power_users.size(); i++) { + Power_User power_user = power_users.get(i); + result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; + } + return result; + } } diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index ed382b9..a160c21 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -58,35 +58,6 @@ public class LoginController { return "loginDir/login"; } - public List getAllRecordUserId() throws Exception { - //创建连接工厂 - JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance(); - //创建客户端 - Client client = dcf.createClient(EMRRECOD_URLHEAD + "/WebService/EMRRecordWebService?wsdl"); - //动态调用getInfosByUserId方法 - Object[] objects = client.invoke("getAllRecordUserId"); - client.destroy(); - ObjectMapper mapper = new ObjectMapper(); - //返回用户对象数组 - List emrApplyApprovelist = new ArrayList(JSONArray.parseArray(objects[0].toString(), EmrApplyApprove.class)); - List allRecordUserId = this.getAllRecordUserId(); - List power_users = new ArrayList<>(); - String s =null; - for (int i = 0; i < allRecordUserId.size(); i++) { - //传回的deptcode - String deptCode = allRecordUserId.get(i).getDeptCode(); - //通过deptcode查询科室表，连接查询user表，user表筛选出rold id25，effective = 1 - power_users = power_userMapper.selectAllChief(deptCode); - for (int j = 0; j < power_users.size(); j++) { - Power_User power_user = power_users.get(j); - //科室主任名字，用来作为展示 - String name = power_user.getName(); - //科室主任userName，用来作为识别发送消息 - String userName = power_user.getUserName(); - } - } - return emrApplyApprovelist; - } @RequestMapping(value = "login",method = RequestMethod.POST) diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java index cfe7cb9..00c5284 100644 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java +++ b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java @@ -46,7 +46,6 @@ public class PowerWebServiceImpl implements PowerWebService { Power_DeptMapper power_deptMapper; - @Override public String getInfosByUserId(String token,String sysFlag) { Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo(); @@ -68,6 +67,7 @@ public class PowerWebServiceImpl implements PowerWebService { userDeptCodeList.add(power_dept.getDeptCode()); } } + //设置名字 user.setUserPosition(user.getName()); diff --git a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java index 578b31d..0bee964 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java @@ -37,6 +37,7 @@ public interface Power_DeptMapper { List selectDeptByDictId(@Param("dictId") Integer dictId,@Param("sysFlag")String sysFlag); + int SimpleInsert(List list); Power_Dept selectByPrimaryKeyDeptId(Integer deptId); 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 8caacbd..21d4d32 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 @@ -67,11 +67,10 @@ public interface Power_UserMapper { * */ List selectUserIdsWithApprove(@Param("menuUrl")String menuUrl); - //修改为正确入参类型 - Power_User selectByUserNameByTrue(String userName); + //根据deptcode科室id查询符合的科主任信息 + List selectAllForChief (String deptCode); + List selectAllForRecordRoom (String deptCode); - //根据deptcode科室id查询符合的科主任信息 - List selectAllChief (String deptCode); } \ No newline at end of file diff --git a/power-dao/src/main/java/com/manage/entity/Power_User.java b/power-dao/src/main/java/com/manage/entity/Power_User.java index d6a3821..e3970e3 100644 --- a/power-dao/src/main/java/com/manage/entity/Power_User.java +++ b/power-dao/src/main/java/com/manage/entity/Power_User.java @@ -37,7 +37,6 @@ public class Power_User{ private String updater; private String remark; - //使用deptId， private List powerDept; diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 8349a29..35966a5 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -698,20 +698,27 @@ role_id = 0 OR role_id = - 100 - + SELECT user_id, + user_name, + power_user.name from power_user - where user_name = #{userName} + where dept_id like concat( '%',(select dept_id + from power_dept + where dept_code = #{deptCode},'%') + and effective = 1 + and role_id in (25) - + SELECT user_id, + user_name, + power_user.name from power_user where dept_id like concat( '%',(select dept_id from power_dept where dept_code = #{deptCode},'%') and effective = 1 - and role_id = 25 + and role_id in (20,22) \ No newline at end of file diff --git a/power-service/src/main/java/com/manage/service/Power_UserService.java b/power-service/src/main/java/com/manage/service/Power_UserService.java index 84f826c..c955c99 100644 --- a/power-service/src/main/java/com/manage/service/Power_UserService.java +++ b/power-service/src/main/java/com/manage/service/Power_UserService.java @@ -94,5 +94,4 @@ public interface Power_UserService { * */ public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser); - Power_User selectByUserNameByTrue(String userName); } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java index c57e0c5..9618e15 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java @@ -270,10 +270,4 @@ public class Power_UserServiceImpl implements Power_UserService { return powerUserMapper.findPowerUserByUserNameAndRemark(powerUser); } - @Override - public Power_User selectByUserNameByTrue(String userName) { - Power_User power_user = powerUserMapper.selectByUserNameByTrue(userName); - return power_user; - } - }