From 0ad508e9836a4021e6cf29effb5dbd395de4df8f Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 18 Mar 2024 16:50:42 +0800 Subject: [PATCH] =?UTF-8?q?#fix=20=E4=BC=98=E5=8C=96token=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E6=8F=90=E9=86=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E3=80=81=E4=B8=8B=E6=9E=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/config/MyWebInterceptor.java | 4 +- .../controller/ArticleController.java | 46 +++++++++++++++-- .../talkonlineweb/controller/DepartController.java | 12 ++--- .../service/impl/LymsHisInfoServiceImpl.java | 60 ++++++++++++++-------- 4 files changed, 89 insertions(+), 33 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java index 84cae05..d884098 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java @@ -53,8 +53,8 @@ public class MyWebInterceptor implements HandlerInterceptor { if(!checkResult.isSuccess()){ BaseResponse baseResponse=new BaseResponse(); - baseResponse.setErrorcode(1); - baseResponse.setErrormsg("无效token"); + baseResponse.setErrorcode(checkResult.getErrCode()); + baseResponse.setErrormsg(checkResult.getErrCode()==500?"登录过期，请重新登录":"登录异常，请重新登录"); response.setCharacterEncoding("UTF-8"); response.setHeader("Cache-Control", "no-cache"); response.setContentType("application/json;charset=UTF-8"); 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 3216c1f..14d59e2 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java @@ -1,5 +1,6 @@ package com.lyms.talkonlineweb.controller; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -69,7 +70,8 @@ public class ArticleController { */ @PostMapping("upFile") @TokenRequired - public String upFile(MultipartFile imgFile) { + public BaseResponse upFile(MultipartFile imgFile) { + BaseResponse baseResponse = new BaseResponse(); String furl = ""; if (Objects.nonNull(imgFile)) { try { @@ -80,13 +82,14 @@ public class ArticleController { furl = file.getAbsolutePath(); log.info("上传文件:" + furl); furl = imgUrlPre + file.getName(); + baseResponse.setObject(furl); } catch (Exception e) { log.error(e.getMessage()); e.printStackTrace(); } } - return furl; + return baseResponse; } /** @@ -124,6 +127,20 @@ public class ArticleController { baseResponse.setErrorcode(f == true ? 0 : 1); return baseResponse; } + /** + * 是否发布. 0,否;1是 + */ + @GetMapping("upArticle") + @TokenRequired + public BaseResponse saveArticle(Integer aid,Byte stat){ + BaseResponse baseResponse = new BaseResponse(); + LymsArticle lymsArticle= new LymsArticle(); + lymsArticle.setStat(stat); + lymsArticle.setAid(aid); + boolean f =lymsArticleService.updateById(lymsArticle); + baseResponse.setErrorcode(f == true ? 0 : 1); + return baseResponse; + } /** * PC-获取文章列表 @@ -141,6 +158,7 @@ public class ArticleController { Page page = new Page<>(current, size); Page articlePagePage = new Page<>(); QueryWrapper query=new QueryWrapper(); + query.select("id,aid,did,iid,title,uname,createdtime,value,stat,dname,cname,article_type as articleType"); if(!StringUtils.isEmpty(article.getIid())){ query.eq("iid",article.getIid()); } @@ -169,6 +187,22 @@ public class ArticleController { return baseResponse; } + + /** + * 获取文章详情接口 + * @param aid + * @return + */ + @GetMapping("getArticle") + @TokenRequired + public BaseResponse getArticle(Integer aid){ + BaseResponse baseResponse = new BaseResponse(); + QueryWrapper query=new QueryWrapper(); + query.eq("aid",aid); + ArticleInfo articleInfo= articleInfoService.getOne(query); + baseResponse.setObject(articleInfo); + return baseResponse; + } /** * 小程序-获取文章列表 * @@ -303,7 +337,11 @@ public class ArticleController { BaseResponse baseResponse=new BaseResponse(); try { Page page=new Page<>(current,size); - Page pushedartlogsInfoPage=pushedartlogsInfoService.page(page,Wrappers.query(pushedartlogsInfo).orderByDesc("createdtime")); + QueryWrapper query=new QueryWrapper(); + query.select("title,createdtime,illness,dname,createdtime,pname"); + query.setEntity(pushedartlogsInfo); + query.orderByDesc("createdtime"); + Page pushedartlogsInfoPage=pushedartlogsInfoService.page(page,query); baseResponse.setObject(pushedartlogsInfoPage); baseResponse.setErrormsg("成功"); } catch (Exception e) { @@ -312,6 +350,7 @@ public class ArticleController { } return baseResponse; } + /** * 根据患者id,问诊id,状态类型1为已读更新推送文章记录 */ @@ -440,6 +479,7 @@ public class ArticleController { try { Page page=new Page<>(current,size); QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,pname,mobile,hname,dname,iname,dtname,atitle,article_type as articleType,isweixin_one as isweixinOne,isweixin_two as isweixinTwo,push_time as pushTime,state,remark"); queryWrapper.setEntity(lymsPushMessages); if(null!=lymsPushMessages.getStartDate()&&null!=lymsPushMessages.getEndDate()){ queryWrapper.ge("push_time", lymsPushMessages.getStartDate()).le("push_time",lymsPushMessages.getEndDate()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java index 6641d67..8f05056 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -15,10 +15,7 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 科室管理 @@ -122,13 +119,16 @@ public class DepartController { if(depart.getIllsName()!=null){ iArrName=depart.getIllsName().split(","); } - + List departillList=new ArrayList<>(); for (int i = 0; i < iArr.length; i++) { LymsDepartill departill=new LymsDepartill(); departill.setDid(depart.getDid()); departill.setIid(Integer.parseInt(iArr[i])); departill.setIname(iArrName[i]); - lymsDepartillService.save(departill); + departillList.add(departill); + } + if (CollectionUtils.isNotEmpty(departillList)){ + lymsDepartillService.saveBatch(departillList); } //保存操作记录 lymsLogsCrud(depart,hid); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index 8c93b6e..8d41e57 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -379,7 +379,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl diagnoses = Arrays.asList(lymsHisInfo.getDiagnose().split(",")); Map diagnoseMap = new HashMap<>(); List diagnoseIds = new ArrayList<>();//疾病ids @@ -395,11 +395,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl1){ - String remark= "该患者存在多种疾病,请手动上传"; - //lymsHisInfo.setRemark(remark); - params.put(10,remark); - } + /* List diagnoseOrmIds = new ArrayList<>();//疾病映射ids if (null != diagnoses) { @@ -437,6 +433,11 @@ public class LymsHisInfoServiceImpl extends ServiceImpl1){ + String remark= "该患者存在多种疾病,请手动上传"; + //lymsHisInfo.setRemark(remark); + params.put(10,remark); + } //知识库 if (diagnoseIds.size()>0){ List articleList= articleInfoService.list(new QueryWrapper() @@ -446,6 +447,10 @@ public class LymsHisInfoServiceImpl extends ServiceImpl workMessageList=new ArrayList<>(); StringBuffer sb=new StringBuffer(); + QueryWrapper wr = new QueryWrapper<>(); params.entrySet().stream().forEach(entry -> { LymsWorkMessage lymsWorkMessage=new LymsWorkMessage(); Integer key = entry.getKey(); String value = entry.getValue(); - if (key==9 ||key==10 ){ - lymsWorkMessage.setType(1); - }else if (key==11 ||key==12){ - lymsWorkMessage.setType(2); - }else { - lymsWorkMessage.setType(3); + wr.eq("hospital_id",lymsHospital.getHid()); + wr.eq("phone",phone); + wr.eq("remark",value); + List list= lymsWorkMessageService.list(wr); + if (CollectionUtils.isEmpty(list)){ + if (key==9 ||key==10 ){ + lymsWorkMessage.setType(1); + }else if (key==11 ||key==12){ + lymsWorkMessage.setType(2); + }else { + lymsWorkMessage.setType(3); + } + sb.append(value).append(","); + lymsWorkMessage.setRemark(value); + lymsWorkMessage.setCreated(new Date()); + lymsWorkMessage.setDept(deptName); + lymsWorkMessage.setHisInfoId(lymsHisInfo.getId()); + lymsWorkMessage.setHospital(lymsHospital.getHname()); + lymsWorkMessage.setHospitalId(lymsHospital.getHid()); + lymsWorkMessage.setPhone(phone); + lymsWorkMessage.setUsername(name); + workMessageList.add(lymsWorkMessage); } - sb.append(value).append(","); - lymsWorkMessage.setRemark(value); - lymsWorkMessage.setCreated(new Date()); - lymsWorkMessage.setDept(deptName); - lymsWorkMessage.setHisInfoId(lymsHisInfo.getId()); - lymsWorkMessage.setHospital(lymsHospital.getHname()); - lymsWorkMessage.setHospitalId(lymsHospital.getHid()); - lymsWorkMessage.setPhone(phone); - lymsWorkMessage.setUsername(name); - workMessageList.add(lymsWorkMessage); }); if (CollectionUtils.isNotEmpty(workMessageList)){ lymsWorkMessageService.saveBatch(workMessageList); -- 1.8.3.1