diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java index a50c407..734c09b 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -3,8 +3,10 @@ package com.lyms.talkonlineweb.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lyms.talkonlineweb.domain.LymsChatgroup; +import com.lyms.talkonlineweb.domain.LymsMessage; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.LymsChatgroupService; +import com.lyms.talkonlineweb.service.LymsMessageService; import com.lyms.talkonlineweb.util.HXService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.BeanUtils; @@ -23,6 +25,9 @@ public class ChatGroupController { private LymsChatgroupService lymsChatgroupService; @Autowired + private LymsMessageService lymsMessageService; + + @Autowired private HXService hxService; /** * 添加或删除聊天组 @@ -51,4 +56,17 @@ public class ChatGroupController { baseResponse.setObject(group); return baseResponse; } + + /** + * 保存消息记录 + * @param message + * @return + */ + @PostMapping("saveMsg") + public BaseResponse saveMsg(LymsMessage message){ + BaseResponse baseResponse=new BaseResponse(); + boolean f=lymsMessageService.saveOrUpdate(message); + baseResponse.setErrorcode(f==true?0:1); + return baseResponse; + } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java index bc2d67c..cdcd2b9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java @@ -8,9 +8,12 @@ import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.LymsPermissionService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 权限管理 */ @@ -65,4 +68,19 @@ public class PermissController { return baseResponse; } + /** + * 获取所有权限列表 + * @param perm + * @return + */ + @GetMapping("getAllPerm") + public BaseResponse getAllPerm(LymsPermission perm){ + BaseResponse baseResponse=new BaseResponse(); + + List perIPage=lymsPermissionService.list(Wrappers.query(perm).orderByDesc("updated_time","createdtime")); + baseResponse.setObject(perIPage); + + return baseResponse; + } + }