power2.0
/
power_zz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加了若干查询方法，替换了了一个sigar源，独立了一个websocket方法用语发送信息

Browse Source
master
xm 4 years ago
parent 6b711a4985
commit 9cd8b94ba6
7 changed files with 391 additions and 217 deletions
Show Stats Download Patch File Download Diff File

147
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -1,6 +1,8 @@
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;
import com.manage.dao.Power_UserMapper;
import com.manage.entity.Power_Dept;
@ -64,8 +66,12 @@ public class FontController {
private Power_DeptService power_deptService;
@Autowired
private Power_UserMapper power_userMapper;
@Autowired
private Power_DeptMapper powerDeptMapper;
/**
* 2.1
*
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取菜单通过系统标识
* @Param 无
@ -109,6 +115,7 @@ public class FontController {
/**
* 2.2
*
* @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Description: 根据用户id或角色id和系统id或系统标识查询通知记录
* @Param 无
@ -130,6 +137,7 @@ public class FontController {
/**
* 2.4
*
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取系统用户树通过系统标识
* @Param 无
@ -166,6 +174,7 @@ public class FontController {
/**
* 2.5
*
* @ProjectName: getRolePowerTreeBySysFlag
* @Description: 获取系统角色树通过系统标识
* @Param 无
@ -201,6 +210,7 @@ public class FontController {
/**
* 2.6
*
* @ProjectName: getUserList
* @Description: 获取用户id和用户名
* @Param 无
@ -235,6 +245,7 @@ public class FontController {
/**
* 2.7
*
* @ProjectName: checkToken
* @Description: 验证token是否有效
* @Param 无
@ -262,6 +273,7 @@ public class FontController {
/**
* 2.8
*
* @ProjectName: getUserByToken
* @Description: 根据token获取用户
* @Param 无
@ -322,6 +334,7 @@ public class FontController {
/**
* 2.9
*
* @ProjectName: getMenuByToken
* @Description: 根据token获取菜单
* @Param 无
@ -360,6 +373,7 @@ public class FontController {
/**
* 2.10
*
* @ProjectName: getToken
* @Description: 获取token
* @Param 无
@ -434,6 +448,7 @@ public class FontController {
/**
* 2.11
*
* @MethodName getUnReadCount
* @Description: 根据用户获取未读通知数量
* @Param 无
@ -521,6 +536,7 @@ public class FontController {
/**
* 根据当前登录用户工号获取所在科室编号
*
* @return String
* @throws Exception
* @CreateDate: 2021-08-30
@ -532,6 +548,7 @@ public class FontController {
Power_Dept power_dept = power_deptService.selectByPrimaryKey(deptId);
return power_dept.getDeptCode();
}
/**
* 根据病案deptcode，查询出所有符合的科主任，数据：用户id，用户名称，科室名称
*/
@ -542,25 +559,85 @@ public class FontController {
String result = "";
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()+";";
result += power_user.getUserId() + "," + power_user.getUserName() + "," + power_user.getName() + ";";
}
return result;
}
/**
* 根据病案deptcode，查询出所有符合的病案室用户，需要用户id，用户名称，科室名称
*/
@RequestMapping(value = "/getUserInfoByDeptCodeForRecordRoom", produces = "text/plain;charset=UTF-8")
@ResponseBody
public String getUserInfoByDeptCodeForRecordRoom(String DeptCode){
List<Power_User> power_users = power_userMapper.selectAllForRecordRoom(DeptCode);
public String getUserInfoByDeptCodeForRecordRoom() {
List<Power_User> power_users = power_userMapper.selectAllForRecordRoom();
String result = "";
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()+";";
result += power_user.getUserId() + "," + power_user.getUserName() + "," + power_user.getName() + ";";
}
return result;
}
/**
* 根据病案deptcode，查询出所有符合的每个用户，数据：用户id，用户名字，roleId
*/
@RequestMapping(value = "/getUserInfoByDeptCodeForMedicalRecordCollection", produces = "text/plain;charset=UTF-8")
@ResponseBody
public String getUserInfoByDeptCodeForMedicalRecordCollection(String deptCode) {
// 通过deptCode获取userId数组
List<Power_User> 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<Power_Dept> 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_User> 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<Power_Dept> 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，获取医生名字,
* 通过病案deptcode，获取医生对应的科室
@ -605,6 +682,45 @@ public class FontController {
return realName;
}
/**
* 通过deptcode获取科室中文名称
*/
@RequestMapping("/getDeptCodeByChinese")
@ResponseBody
public String getDeptCodeByChinese(String deptCode) {
//获取realName
String chineseName = powerDeptMapper.getDeptCodeByChinese(deptCode);
return chineseName;
}
/**
* 获取所有用户的id、名字、deptcode、中文科室名字
*/
@RequestMapping("/getAllUserInfo")
@ResponseBody
public String getAllUserInfo() {
List<Power_User> 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<Power_Dept> 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
@ -628,6 +744,7 @@ public class FontController {
return Msg.success();
}
/**
* 从高明更新至湛江，2021/11/20
* 修改为向特定用户发送信息
@ -655,5 +772,27 @@ public class FontController {
return Msg.success();
}
/**
* 从高明更新至湛江，2021/11/29
* 修改为向特定用户发送信息,不使用sysflag
* 特定用户科主任，病案室
* 科主任需要判定是否和病案的科室相符，
* 病案室直接发送未审核数量
*/
@RequestMapping("sendMessageWithNewWithOutSysFlag")
@ResponseBody
public Msg sendMessageWithNewWithOutSysFlag(Message message) throws Exception {
if (null == message.getUserId()) {
return Msg.fail("消息用户id不能为空");
}
if (StringUtils.isBlank(message.getTitle())) {
return Msg.fail("消息标题不能为空");
}
if (StringUtils.isBlank(message.getContent())) {
return Msg.fail("消息内容不能为空");
}
WsPool.sendMessageToAll(message.getUserId().toString(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag());
return Msg.success();
}
}

5
power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf
Unescape Escape View File

@ -62,7 +62,7 @@
var msg = e.data.split(strSplit);
var a1 = msg[0];
if (a1 == "借阅通知") {
narn1('warn',msg[0],msg[1],msg[2]);
narnBorrow('warn', msg[0], msg[1], msg[2]);
} else {
narn('warn',msg[0],msg[1],msg[2]);
}
@ -90,7 +90,8 @@
}]
})
}
function narn1 (type,title,text,noticeId) {
function narnBorrow(type, title, text, noticeId) {
debugger
naranja()[type]({
title: title,

6
power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
Unescape Escape View File

@ -42,4 +42,10 @@ public interface Power_DeptMapper {
Power_Dept selectByPrimaryKeyDeptId(Integer deptId);
String getDeptCodeByChinese(String deptCode);
List<Power_Dept> getDeptCodeAndDeptCodeChinese(String s);
List<Power_Dept> selectDeptCode(String deptId);
}

3
power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
Unescape Escape View File

@ -71,7 +71,7 @@ public interface Power_UserMapper {
//根据deptcode科室id查询符合的科主任信息
List<Power_User> selectAllForChief (String deptCode);
List<Power_User> selectAllForRecordRoom (String deptCode);
List<Power_User> selectAllForRecordRoom();
String selectForDoctorName(String userId);
@ -85,4 +85,5 @@ public interface Power_UserMapper {
String selectForRealName(String userName);
List<Power_User> selectAllUserInfo();
}

15
power-dao/src/main/resources/mapper/Power_DeptMapper.xml
Unescape Escape View File

@ -291,6 +291,21 @@
power_dept.dict_id = #{dictId}
</if>
</select>
<select id="getDeptCodeByChinese" resultType="java.lang.String">
SELECT dept_name
from power_dept
WHERE dept_code = #{deptCode}
</select>
<select id="getDeptCodeAndDeptCodeChinese" resultType="com.manage.entity.Power_Dept">
SELECT dept_name, dept_code
from power_dept
WHERE dept_code = #{deptCode}
</select>
<select id="selectDeptCode" resultType="com.manage.entity.Power_Dept">
SELECT dept_code
FROM power_dept
WHERE dept_id = #{deptId}
</select>
<!--批量插入-->
<insert id="SimpleInsert" parameterType="java.util.List">

24
power-dao/src/main/resources/mapper/Power_UserMapper.xml
Unescape Escape View File

@ -712,13 +712,11 @@
<select id="selectAllForRecordRoom" resultType="com.manage.entity.Power_User">
SELECT user_id,
user_name,
power_user.name
power_user.name,
role_id
from power_user
where dept_id like concat( '%',(select dept_id
from power_dept
where dept_code = #{deptCode}<![CDATA[),]]>'%')
and effective = 1
and role_id in (20，22)
where effective = 1
and role_id in (20, 22)
</select>
<select id="selectForDoctorName" resultType="java.lang.String">
select power_user.`name`
@ -756,5 +754,19 @@
FROM power_user
where user_name = #{userName}
</select>
<select id="selectAllUserInfo" resultType="com.manage.entity.Power_User">
select *
from power_user
</select>
<select id="selectAllForEveryOne" resultType="com.manage.entity.Power_User">
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}<![CDATA[),]]> '%')
and effective = 1
</select>
</mapper>

6
power-foundaton/pom.xml
Unescape Escape View File

@ -107,9 +107,9 @@
<version>3.11-beta2</version>
</dependency>
<dependency>
<groupId>org.hyperic.sigar</groupId>
<artifactId>com.springsource.org.hyperic.sigar</artifactId>
<version>1.6.3</version>
<groupId>org.fusesource</groupId>
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
<!--系统使用率导包开始-->
<dependency> <!--工具类 小数格式化 可以改为其他-->

Write Preview
Loading…
Cancel
Save