diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java index 20e0dbf..b20e6f3 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.annotation.TokenRequired; +import com.lyms.talkonlineweb.domain.LymsPermission; import com.lyms.talkonlineweb.domain.LymsUser; import com.lyms.talkonlineweb.mapper.LymsUserMapper; import com.lyms.talkonlineweb.result.BaseResponse; @@ -71,6 +72,7 @@ public class UserContoller { user.setHxid(rArr.getJSONObject(0).getString("uuid")); } } + JSONObject json=hxService.getChatMessages("2021090617"); lymsUserService.saveOrUpdate(user); user.setPasswd(null); tMap.put("user",user); @@ -95,7 +97,7 @@ public class UserContoller { Claims claims =JwtUtils.parseJWT(authorization); String username=claims.getSubject(); - List> permiss=lymsUserService.getPermissionByUsername(username); + List permiss=lymsUserService.getPermissionByUsername(username); baseResponse.setObject(permiss); } catch (Exception e) { log.error(e.getMessage()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPermission.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPermission.java index a269d72..5664932 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPermission.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPermission.java @@ -32,6 +32,11 @@ public class LymsPermission implements Serializable { */ @TableField(value = "purl") private String purl; + /** + * 前端资源 + */ + @TableField(value = "res") + private String res; /** * 上级菜单ID;根菜单默认0 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java index 126fb33..086454b 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java @@ -1,5 +1,6 @@ package com.lyms.talkonlineweb.service; +import com.lyms.talkonlineweb.domain.LymsPermission; import com.lyms.talkonlineweb.domain.LymsUser; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,7 +12,7 @@ import java.util.Map; */ public interface LymsUserService extends IService { - List> getPermissionByUsername(String username) throws Exception; + List getPermissionByUsername(String username) throws Exception; LymsUser getUserByToken(String token); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java index 6aa73b8..ba258a8 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java @@ -43,8 +43,8 @@ public class LymsUserServiceImpl extends ServiceImpl * @return */ @Override - public List> getPermissionByUsername(String username) throws Exception { - List> rs=new ArrayList<>(); + public List getPermissionByUsername(String username) throws Exception { + List rs=new ArrayList<>(); Map param=new HashMap<>(); param.put("login",username); @@ -58,14 +58,15 @@ public class LymsUserServiceImpl extends ServiceImpl int rid=rLst.get(0).getRid(); // 首次取一次菜单 List pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU); - + rs.addAll(pLst); for (LymsPermission p:pLst) { //获取二级菜单 List sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId()); - Map oneMap=new HashMap<>(); - oneMap.put("menu",p); - oneMap.put("children",sLst); - rs.add(oneMap); +// Map oneMap=new HashMap<>(); +// oneMap.put("menu",p); +// oneMap.put("children",sLst); +// rs.add(oneMap); + rs.addAll(sLst); } return rs; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java index 9d1e472..c829c8d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java @@ -4,7 +4,7 @@ public class Constant { public static final String JWT_SECERT = "bHltc3dlbnpoZW5waW5ndGFpMjEwODMw"; public static final int JWT_ERRCODE_EXPIRE = 500; public static final int JWT_ERRCODE_FAIL = 501; - public static final long JWT_TTL=24*60*60*1000;//1天 + public static final long JWT_TTL=24*60*60*1000*30;//1天 public static final int ROOT_MENU = 0;//一级菜单 public static final String CUR_USER = "cur_user";//当前用户 public static final String COMMON_PASSWD = "123456";//通用密码 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/HXService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/HXService.java index 15253f0..7c36a8e 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/HXService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/HXService.java @@ -151,5 +151,54 @@ public class HXService { return rs; } + /** + * 获取聊天记录 + * @param time 查询的时间格式为10位数字形式(YYYYMMDDHH) + * @return + */ + public JSONObject getChatMessages(String time){ + JSONObject msg=new JSONObject(); + String token=getToken(); + HttpHeaders headers=new HttpHeaders(); + headers.add("Authorization","Bearer "+token); + HttpEntity param=new HttpEntity(headers); + resp=restTemplate.exchange(getUrl()+"chatmessages/"+time, HttpMethod.GET,param,String.class); + if (resp.getStatusCodeValue()==200){ + msg= JSON.parseObject(resp.getBody()); + } + return msg; + } + + /** + * 创建聊天室 + * @param name + * @param description + * @param owner + * @param members + * @return + */ + public JSONObject addChatRooms(String name,String description,String owner,String[] members){ + JSONObject rs=new JSONObject(); + Map param=new HashMap<>(); + HttpHeaders headers=new HttpHeaders(); + + headers.add("Authorization","Bearer "+getToken()); + List lParam=new ArrayList(); + param.put("name",name); + param.put("description",description); + param.put("owner",owner); + param.put("members",members); + + lParam.add(param); + HttpEntity entity=new HttpEntity(param,headers); + resp=restTemplate.postForEntity(getUrl()+"chatrooms",entity,String.class); + if (resp.getStatusCodeValue()==200){ + rs= JSON.parseObject(resp.getBody()); + } + log.info(rs); + return rs; + } + + }