From a6b6bcc99513ce09bce8ae27927dd8457f09c8af Mon Sep 17 00:00:00 2001 From: xm Date: Wed, 17 Nov 2021 08:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9C=89webservice?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E4=BC=A0=E9=80=92=E5=8F=82?= =?UTF-8?q?=E6=95=B0deptcode=E7=94=A8=E4=BA=8E=E5=AD=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=A7=91=E5=AE=A4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E4=BA=8E=E6=9F=A5=E8=AF=A2=E5=AD=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=97=85=E6=A1=88=E4=BF=A1=E6=81=AF=EF=BC=88=E8=AF=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B0=9A=E6=9C=AA=E8=B0=83=E9=80=9A=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=81=9A=E4=BA=86=E4=BB=A3=E7=A0=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/LoginController.java | 41 +++++++++++++++++++ .../webservice/PowerWebService.java | 3 +- .../webservice/impl/PowerWebServiceImpl.java | 30 ++++++++++++-- .../java/com/manage/dao/Power_DeptMapper.java | 3 ++ .../java/com/manage/dao/Power_UserMapper.java | 8 ++++ .../java/com/manage/entity/Power_User.java | 33 +++++++++++++++ .../main/java/com/manage/vo/Power_UserVo.java | 1 + .../com/manage/vo/Power_UserWebServiceVo.java | 19 +++++++++ .../java/com/manage/vo/User_Dept_Menu.java | 1 + .../resources/mapper/Power_DeptMapper.xml | 5 +++ .../resources/mapper/Power_UserMapper.xml | 16 ++++++++ .../com/manage/service/Power_UserService.java | 2 + .../service/ipml/Power_UserServiceImpl.java | 6 +++ 13 files changed, 164 insertions(+), 4 deletions(-) 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 23ea903..ed382b9 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -1,6 +1,9 @@ package com.manage.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.manage.dao.Power_UserMapper; import com.manage.encrypt.Base64; import com.manage.encrypt.MD5; import com.manage.entity.*; @@ -10,6 +13,7 @@ import com.manage.service.cache.CacheManager; import com.manage.util.*; import com.manage.vo.*; import org.apache.commons.lang3.StringUtils; +import org.apache.cxf.endpoint.Client; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -28,6 +32,8 @@ import java.util.*; public class LoginController { @Value("${TOKEN_EXPIRE_TIME}") private long TOKEN_EXPIRE_TIME; + @Value("${EMRRECORD_URLHEAD}") + private String EMRRECOD_URLHEAD; @Autowired private Power_UserService powerUserService; @Autowired @@ -39,6 +45,10 @@ public class LoginController { @Autowired LoginService loginService; + @Autowired + private Power_UserMapper power_userMapper; + + @RequestMapping(value = "login",method = RequestMethod.GET) public String toLogin(Model model ,HttpServletRequest request){ CacheManager.addExcCount("noExc"); @@ -48,6 +58,37 @@ 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) public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ //同一浏览器打开login，直接触发注销登录session diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java b/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java index c2de6fa..61b416a 100644 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java +++ b/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java @@ -9,8 +9,9 @@ import javax.jws.WebService; public interface PowerWebService { @WebMethod() - String getInfosByUserId(@WebParam(name = "token") String token,String sysId); + String getInfosByUserId(@WebParam(name = "token") String token, String sysId); @WebMethod String tempTest(); + } 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 e3add17..cfe7cb9 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 @@ -1,16 +1,18 @@ package com.manage.interfaces.webservice.impl; import com.alibaba.fastjson.JSON; +import com.manage.dao.Power_DeptMapper; import com.manage.dao.Power_MenuMapper; import com.manage.encrypt.Base64; import com.manage.encrypt.MD5; +import com.manage.entity.Power_Dept; import com.manage.entity.Power_Menu; import com.manage.entity.Power_User; +import com.manage.interfaces.webservice.PowerWebService; import com.manage.service.Power_UserService; +import com.manage.service.User_Dept_MenuService; import com.manage.service.cache.Cache; import com.manage.service.cache.CacheManager; -import com.manage.interfaces.webservice.PowerWebService; -import com.manage.service.User_Dept_MenuService; import com.manage.util.Constant; import com.manage.vo.Power_UserVo; import com.manage.vo.Power_UserWebServiceVo; @@ -21,7 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.jws.WebService; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; @Component @WebService(serviceName = "PowerWebService", @@ -37,6 +42,10 @@ public class PowerWebServiceImpl implements PowerWebService { @Autowired Power_UserService powerUserService; + @Autowired + Power_DeptMapper power_deptMapper; + + @Override public String getInfosByUserId(String token,String sysFlag) { @@ -46,8 +55,22 @@ public class PowerWebServiceImpl implements PowerWebService { Cache cache = CacheManager.getCacheInfo(token); if(cache != null){ Power_UserVo user = (Power_UserVo) cache.getValue(); + //获取用户id、查询出deptid，分割后作为结果查询deptcode + String [] temp; + String delimeter = ","; + Power_User power_user = powerUserService.selectByUserNameByTrue(user.getUserName()); + List userDeptCodeList = new ArrayList(); + temp = power_user.getDeptId().split(delimeter); + for (int i = 0; i menuList = user.getMenuList(); Set menus = new TreeSet(); try { @@ -60,6 +83,7 @@ public class PowerWebServiceImpl implements PowerWebService { e.printStackTrace(); } BeanUtils.copyProperties(user,userWebServiceVo); + userWebServiceVo.setDeptCode(userDeptCodeList); userWebServiceVo.setMenus(menus); } } 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 eeb4e83..578b31d 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 @@ -38,4 +38,7 @@ public interface Power_DeptMapper { List selectDeptByDictId(@Param("dictId") Integer dictId,@Param("sysFlag")String sysFlag); int SimpleInsert(List list); + + Power_Dept selectByPrimaryKeyDeptId(Integer deptId); + } \ No newline at end of file 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 f15948d..8caacbd 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 @@ -66,4 +66,12 @@ public interface Power_UserMapper { * 查询有审批权限的用户id * */ List selectUserIdsWithApprove(@Param("menuUrl")String menuUrl); + + //修改为正确入参类型 + Power_User selectByUserNameByTrue(String userName); + + + //根据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 834cc7c..d6a3821 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 @@ -1,6 +1,7 @@ package com.manage.entity; +import java.util.List; public class Power_User{ private Integer userId; @@ -37,6 +38,38 @@ public class Power_User{ private String remark; + //使用deptId， + private List powerDept; + + public List getPowerDept() { + return powerDept; + } + + public void setPowerDept(List powerDept) { + this.powerDept = powerDept; + } + + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + + private String realName; + + private String DeptCode; + + public String getDeptCode() { + return DeptCode; + } + + public void setDeptCode(String deptCode) { + DeptCode = deptCode; + } + + public Integer getUserId() { return userId; } diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java index 8a73667..b54c6fe 100644 --- a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java +++ b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java @@ -213,4 +213,5 @@ public class Power_UserVo extends Power_User { public void setMenuList(List menuList) { this.menuList = menuList; } + } \ No newline at end of file diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java b/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java index d6065c0..fef4a9c 100644 --- a/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java +++ b/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java @@ -1,5 +1,6 @@ package com.manage.vo; +import java.util.List; import java.util.Set; public class Power_UserWebServiceVo { @@ -18,6 +19,24 @@ public class Power_UserWebServiceVo { private String updater; private String remark; private Set menus; + private String deptId; + private List DeptCode; + + public List getDeptCode() { + return DeptCode; + } + + public void setDeptCode(List deptCode) { + DeptCode = deptCode; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } public Integer getUserId() { return userId; diff --git a/power-dao/src/main/java/com/manage/vo/User_Dept_Menu.java b/power-dao/src/main/java/com/manage/vo/User_Dept_Menu.java index b401fb5..8dcdaca 100644 --- a/power-dao/src/main/java/com/manage/vo/User_Dept_Menu.java +++ b/power-dao/src/main/java/com/manage/vo/User_Dept_Menu.java @@ -49,6 +49,7 @@ public class User_Dept_Menu { private Integer methodSort; + public String getDeptCode() { return deptCode; } diff --git a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml index 9bf5dd1..61028d7 100644 --- a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml @@ -324,4 +324,9 @@ ) + \ 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 0537e21..8349a29 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -698,4 +698,20 @@ role_id = 0 OR role_id = - 100 + + + \ 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 78dd503..84f826c 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 @@ -93,4 +93,6 @@ public interface Power_UserService { * @Description 根据用户名和备注获取用户信息 * */ 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 9618e15..c57e0c5 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,4 +270,10 @@ 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; + } + }