From 6cfa43779043441d0dd69845ecab9e46087c5b08 Mon Sep 17 00:00:00 2001 From: changpengfei Date: Thu, 9 Sep 2021 09:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=85=B3=E8=81=94=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArticleController.java | 11 ++++-- .../controller/ChatGroupController.java | 41 ++++++++++++++++++++++ .../controller/PatientController.java | 3 -- .../talkonlineweb/mapper/LymsChatroomMapper.java | 15 -------- .../talkonlineweb/service/LymsChatroomService.java | 11 ------ .../service/impl/LymsChatroomServiceImpl.java | 20 ----------- .../main/resources/mapper/LymsChatroomMapper.xml | 20 ----------- 7 files changed, 49 insertions(+), 72 deletions(-) create mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java delete mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatroomMapper.java delete mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatroomService.java delete mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatroomServiceImpl.java delete mode 100644 talkonlineweb/src/main/resources/mapper/LymsChatroomMapper.xml diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java index 991fff0..2756ce0 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java @@ -2,10 +2,12 @@ package com.lyms.talkonlineweb.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.lyms.talkonlineweb.domain.ArticleInfo; import com.lyms.talkonlineweb.domain.LymsArticle; import com.lyms.talkonlineweb.domain.LymsDoctor; import com.lyms.talkonlineweb.domain.LymsPushedart; import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.service.ArticleInfoService; import com.lyms.talkonlineweb.service.LymsArticleService; import com.lyms.talkonlineweb.service.LymsPushedartService; import lombok.extern.log4j.Log4j2; @@ -39,6 +41,9 @@ public class ArticleController { private LymsArticleService lymsArticleService; @Autowired + private ArticleInfoService articleInfoService; + + @Autowired private LymsPushedartService lymsPushedartService;//推送记录 /** @@ -88,10 +93,10 @@ public class ArticleController { * @return */ @GetMapping("sltArticleLst") - public BaseResponse sltArticleLst(LymsArticle article, int current, int size){ + public BaseResponse sltArticleLst(ArticleInfo article, int current, int size){ BaseResponse baseResponse=new BaseResponse(); - Page page=new Page<>(current,size); - Page articlePagePage=lymsArticleService.page(page, Wrappers.query(article).orderByDesc("updated_time","createdtime")); + Page page=new Page<>(current,size); + Page articlePagePage=articleInfoService.page(page, Wrappers.query(article).orderByDesc("updated_time","createdtime")); baseResponse.setObject(articlePagePage); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java new file mode 100644 index 0000000..3af9e7b --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -0,0 +1,41 @@ +package com.lyms.talkonlineweb.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.lyms.talkonlineweb.domain.LymsChatgroup; +import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.service.LymsChatgroupService; +import com.lyms.talkonlineweb.util.HXService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("chat") +public class ChatGroupController { + @Autowired + private LymsChatgroupService lymsChatgroupService; + + @Autowired + private HXService hxService; + /** + * 添加或删除聊天组 + * @param group + * @return + */ + @GetMapping("saveChatGroup") + public BaseResponse saveChatGroup(LymsChatgroup group){ + BaseResponse baseResponse=new BaseResponse(); + List gLst=lymsChatgroupService.list(Wrappers.query(group)); + if(gLst.size()>0){ + LymsChatgroup group2=gLst.get(0); + group.setId(group2.getId()); + } + lymsChatgroupService.saveOrUpdate(group); + baseResponse.setObject(group); + return baseResponse; + } +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java index c977eac..b788671 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -42,9 +42,6 @@ public class PatientController { private LymsTcardService lymsTcardService;//问诊卡信息 @Autowired - private LymsChatroomService lymsChatroomService;//聊天室 - - @Autowired private LymsLogsService lymsLogsService;//日志记录 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatroomMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatroomMapper.java deleted file mode 100644 index 1ab9bcc..0000000 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatroomMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lyms.talkonlineweb.mapper; - -import com.lyms.talkonlineweb.domain.LymsChatroom; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Entity com.lyms.talkonlineweb.domain.LymsChatroom - */ -public interface LymsChatroomMapper extends BaseMapper { - -} - - - - diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatroomService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatroomService.java deleted file mode 100644 index 4f12127..0000000 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatroomService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.talkonlineweb.service; - -import com.lyms.talkonlineweb.domain.LymsChatroom; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * - */ -public interface LymsChatroomService extends IService { - -} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatroomServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatroomServiceImpl.java deleted file mode 100644 index bf6bb99..0000000 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatroomServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.talkonlineweb.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lyms.talkonlineweb.domain.LymsChatroom; -import com.lyms.talkonlineweb.service.LymsChatroomService; -import com.lyms.talkonlineweb.mapper.LymsChatroomMapper; -import org.springframework.stereotype.Service; - -/** - * - */ -@Service -public class LymsChatroomServiceImpl extends ServiceImpl - implements LymsChatroomService{ - -} - - - - diff --git a/talkonlineweb/src/main/resources/mapper/LymsChatroomMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsChatroomMapper.xml deleted file mode 100644 index d156cf4..0000000 --- a/talkonlineweb/src/main/resources/mapper/LymsChatroomMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - id,name,description, - owner,from,target - - -- 1.8.3.1