|
|
|
@ -3,21 +3,20 @@ package com.manage.controller;
|
|
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
|
|
import com.manage.dao.Power_NoticeMapper;
|
|
|
|
|
import com.manage.dao.Power_UserMapper;
|
|
|
|
|
import com.manage.encrypt.Base64;
|
|
|
|
|
import com.manage.encrypt.MD5;
|
|
|
|
|
import com.manage.entity.*;
|
|
|
|
|
import com.manage.entity.Power_Dept;
|
|
|
|
|
import com.manage.entity.Power_Menu;
|
|
|
|
|
import com.manage.entity.Power_Notice;
|
|
|
|
|
import com.manage.entity.Power_User;
|
|
|
|
|
import com.manage.service.*;
|
|
|
|
|
import com.manage.service.cache.Cache;
|
|
|
|
|
import com.manage.service.cache.CacheManager;
|
|
|
|
|
import com.manage.service.ipml.Power_NoticeServiceImpl;
|
|
|
|
|
import com.manage.service.webSocket.WebServer;
|
|
|
|
|
import com.manage.service.webSocket.WsPool;
|
|
|
|
|
import com.manage.util.DateUtils;
|
|
|
|
|
import com.manage.util.ExceptionPrintUtil;
|
|
|
|
|
import com.manage.util.Msg;
|
|
|
|
|
import com.manage.vo.*;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.java_websocket.WebSocket;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
@ -585,35 +584,34 @@ public class FontController {
|
|
|
|
|
String deptId = power_userMapper.selectForDeptId(userId);
|
|
|
|
|
//获取deptcode
|
|
|
|
|
String result = "";
|
|
|
|
|
String [] deptIdSingle = deptId.split(",");
|
|
|
|
|
if (deptIdSingle!=null&&deptIdSingle.length>0){
|
|
|
|
|
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+",";
|
|
|
|
|
result += deptCode + ",";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @MethodName sendMessage
|
|
|
|
|
* @Description: 发送信息接口
|
|
|
|
|
* @Param applyType 申请类型
|
|
|
|
|
* @Param count 新的待审批份数
|
|
|
|
|
* @Returnt Msg
|
|
|
|
|
* @Author: 曾文和
|
|
|
|
|
* @CreateDate: 2020-04-24
|
|
|
|
|
* @UpdateUser: 曾文和
|
|
|
|
|
* @UpdateDate: 2020-04-24
|
|
|
|
|
* @UpdateRemark: 更新说明
|
|
|
|
|
* @Version:
|
|
|
|
|
*
|
|
|
|
|
* 通过userName获取realName
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping("/getRealName")
|
|
|
|
|
@ResponseBody
|
|
|
|
|
public String getRealName(String userName) {
|
|
|
|
|
//获取realName
|
|
|
|
|
String realName = power_userMapper.selectForRealName(userName);
|
|
|
|
|
return realName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 从高明更新至湛江,2021/11/20
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping("sendMessage")
|
|
|
|
|
@ResponseBody
|
|
|
|
|
public Msg sendMessage(Message message) throws Exception{
|
|
|
|
|
if(null == message.getUserId()){
|
|
|
|
|
public Msg sendMessage(Message message) throws Exception {
|
|
|
|
|
if (null == message.getUserId()) {
|
|
|
|
|
return Msg.fail("消息用户id不能为空");
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isBlank(message.getSysFlag())){
|
|
|
|
|