From cf2a90bb7f648a7044c56c6772c09ee77d469ca7 Mon Sep 17 00:00:00 2001 From: xm Date: Fri, 19 Nov 2021 10:22:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AF=A5=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E5=86=B2?= =?UTF-8?q?=E7=AA=81=EF=BC=8C=E8=AF=A5=E7=89=88=E6=9C=AC=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=BD=B1=E5=93=8D=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?bug=EF=BC=8C=E8=AF=B7=E5=8B=BF=E7=9B=B4=E6=8E=A5=E6=89=93?= =?UTF-8?q?=E5=8C=85=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 25 ++- .../manage/controller/LoginController.java | 10 +- .../com/manage/controller/PageController.java | 2 +- .../webservice/impl/PowerWebServiceImpl.java | 13 +- .../java/com/manage/dao/Power_UserMapper.java | 7 +- .../com/manage/vo/Power_UserWebServiceVo.java | 3 - .../resources/mapper/Power_DeptMapper.xml | 181 +++++++++--------- 7 files changed, 120 insertions(+), 121 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 c21b386..64d4161 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -63,7 +63,6 @@ public class FontController { private Power_DeptService power_deptService; @Autowired private Power_UserMapper power_userMapper; - /** * 2.1 * @ProjectName: getUserPowerTreeBySysFlag @@ -562,9 +561,8 @@ public class FontController { return result; } - /** - * 通过申请医生id，获取医生名字 + * 通过申请医生id，获取医生名字, * 通过病案deptcode，获取医生对应的科室 */ @RequestMapping("/getDoctorNameAndDoctorRoom") @@ -575,4 +573,25 @@ public class FontController { String result = room+","+name; return result; } + + /** + * 通过userName获取deptcode + */ + @RequestMapping("/getDoctorDeptcode") + @ResponseBody + public String getDoctorDeptcode(Integer userId) throws Exception{ + //获取deptId + String deptId = power_userMapper.selectForDeptId(userId); + //获取deptcode + String result = null; + String [] deptIdSingle = deptId.split(","); + if (deptIdSingle!=null&&deptIdSingle.length>0){ + for (int i = 0; i < deptIdSingle.length; i++) { + String deptCode = power_userMapper.selectForDeptCode(deptIdSingle[i]); + result = deptCode+","; + } + } + 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 5ad516a..d111991 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -1,8 +1,6 @@ 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; @@ -13,7 +11,6 @@ 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; @@ -48,7 +45,6 @@ public class LoginController { @Autowired private Power_UserMapper power_userMapper; - @RequestMapping(value = "login",method = RequestMethod.GET) public String toLogin(Model model ,HttpServletRequest request){ CacheManager.addExcCount("noExc"); @@ -58,13 +54,10 @@ public class LoginController { return "loginDir/login"; } - - @RequestMapping(value = "login",method = RequestMethod.POST) - public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ + public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model) throws Exception { //同一浏览器打开login，直接触发注销登录session loginService.removeOldUserOnLogin(request); - try { Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser); //添加进操作日志 @@ -85,6 +78,7 @@ public class LoginController { String token = UUID.randomUUID().toString(); + //查询归属医院 /* long start5 = System.currentTimeMillis(); Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId()); diff --git a/power-admin/src/main/java/com/manage/controller/PageController.java b/power-admin/src/main/java/com/manage/controller/PageController.java index b92568f..6004c06 100644 --- a/power-admin/src/main/java/com/manage/controller/PageController.java +++ b/power-admin/src/main/java/com/manage/controller/PageController.java @@ -133,7 +133,7 @@ public class PageController { CacheManager.addExcCount("exc"); } } - //查询当前用户 + //查询当前用户 Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); //查询系统权限 List sysList = new ArrayList<>(); 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 785bf20..6ea05b1 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 @@ -5,14 +5,13 @@ 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; @@ -23,10 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.jws.WebService; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; @Component @WebService(serviceName = "PowerWebService", @@ -48,9 +44,8 @@ public class PowerWebServiceImpl implements PowerWebService { @Override public String getInfosByUserId(String token,String sysFlag) { - Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo(); + Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo(); if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ){ - token = MD5.JM(Base64.decode(token)); Cache cache = CacheManager.getCacheInfo(token); if(cache != null){ Power_UserVo user = (Power_UserVo) cache.getValue(); 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 6464f43..cde6da1 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,16 +67,17 @@ public interface Power_UserMapper { * */ List selectUserIdsWithApprove(@Param("menuUrl")String menuUrl); + //更新部分 //根据deptcode科室id查询符合的科主任信息 List selectAllForChief (String deptCode); List selectAllForRecordRoom (String deptCode); - Power_User selectDoctorNameAndDoctorRoom(String userId); - - Power_User selectForDoctorName (String userId); Power_User selectForDoctorRoom (String deptCode); + String selectForDeptId(Integer userId); + + String selectForDeptCode(String deptId); } \ 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 8142d40..950427d 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,6 +1,5 @@ package com.manage.vo; -import java.util.List; import java.util.Set; public class Power_UserWebServiceVo { @@ -19,8 +18,6 @@ public class Power_UserWebServiceVo { private String updater; private String remark; private Set menus; - - public Integer getUserId() { return userId; } diff --git a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml index 61028d7..f9a4ce2 100644 --- a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml @@ -18,20 +18,20 @@ remark,dept_code @@ -39,14 +39,14 @@ where dept_id = #{deptId,jdbcType=INTEGER} - insert into power_dept (dept_id, dept_name, dict_id, - effective, create_date, creater, - update_date, updater, remark,dept_code - ) + insert into power_dept (dept_id, dept_name, dict_id, + effective, create_date, creater, + update_date, updater, remark,dept_code + ) values (#{deptId,jdbcType=INTEGER}, #{deptName,jdbcType=VARCHAR}, #{dictId,jdbcType=INTEGER}, - #{effective,jdbcType=INTEGER}, #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR}, - #{updateDate,jdbcType=CHAR}, #{updater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},#{deptCode,jdbcType=VARCHAR} - ) + #{effective,jdbcType=INTEGER}, #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR}, + #{updateDate,jdbcType=CHAR}, #{updater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},#{deptCode,jdbcType=VARCHAR} + ) insert into power_dept @@ -151,31 +151,29 @@ update power_dept set dept_name = #{deptName,jdbcType=VARCHAR}, - dict_id = #{dictId,jdbcType=INTEGER}, - effective = #{effective,jdbcType=INTEGER}, - create_date = #{createDate,jdbcType=CHAR}, - creater = #{creater,jdbcType=VARCHAR}, - update_date = #{updateDate,jdbcType=CHAR}, - updater = #{updater,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - dept_code = #{deptCode,jdbcType=VARCHAR} + dict_id = #{dictId,jdbcType=INTEGER}, + effective = #{effective,jdbcType=INTEGER}, + create_date = #{createDate,jdbcType=CHAR}, + creater = #{creater,jdbcType=VARCHAR}, + update_date = #{updateDate,jdbcType=CHAR}, + updater = #{updater,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + dept_code = #{deptCode,jdbcType=VARCHAR} where dept_id = #{deptId,jdbcType=INTEGER} - - SELECT - power_sys_dict.dict_id, - power_sys_dict.hospital_name, - power_dept.dept_id, - power_dept.dept_name + power_sys_dict.dict_id, + power_sys_dict.hospital_name, + power_dept.dept_id, + power_dept.dept_name FROM - power_dept + power_dept INNER JOIN power_sys_dict ON power_sys_dict.dict_id = power_dept.dict_id WHERE - power_sys_dict.dict_status = 1 + power_sys_dict.dict_status = 1 AND power_dept.effective = 1 - - and power_sys_dict.dict_id = (select power_user_dict.dict_id from power_user_dict WHERE power_user_dict.user_id = ${userId}) - + + and power_sys_dict.dict_id = (select power_user_dict.dict_id from power_user_dict WHERE power_user_dict.user_id = ${userId}) + INSERT INTO power_dept( - dept_id, - dept_name, - dict_id, - effective, - create_date, - creater, - update_date, - updater, - remark, - dept_code - ) + dept_id, + dept_name, + dict_id, + effective, + create_date, + creater, + update_date, + updater, + remark, + dept_code + ) VALUES ( @@ -324,9 +322,4 @@ ) - \ No newline at end of file