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 8910588..5c42379 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -201,7 +201,7 @@ public class ChatGroupController { public BaseResponse getHistoryLogs(String targetId,Integer current, Integer size){ if (StringUtil.isEmpty(targetId)){ - BaseResponse.error("聊天组ID不能为空"); + return BaseResponse.error("聊天组ID不能为空"); } BaseResponse baseResponse = new BaseResponse(); Page page = new Page(current,size); 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 880395c..44f81b7 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java @@ -15,6 +15,6 @@ public interface LymsUserService extends IService { List getPermissionByUsername(String username) throws Exception; LymsUser getUserByToken(String token); - Map pLoginInfo(Integer pid) + Map pLoginInfo(Integer pid,Integer type); } 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 1ac917e..d9c2976 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 @@ -92,7 +92,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl orderList= lymsOrderService.selectPushOrder(patient.getId()); if (CollectionUtils.isNotEmpty(orderList)){ - orderList.stream().forEach(order -> { + PushOrderResult order= orderList.get(0); //推送微信公众号 Map map=new HashMap<>(); map.put("keyword1",new DataEntity(order.getPname(),"#173177")); @@ -100,17 +100,15 @@ public class LymsHisInfoServiceImpl extends ServiceImpl mapInfo =lymsUserService.pLoginInfo(order.getPid()); + Map mapInfo =lymsUserService.pLoginInfo(order.getPid(),3); try { Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo); log.info("SendWeChatMsg--->code, "+code); } catch (Exception e) { log.error("serviceContent Exception,"+e.getMessage()); } - }); } } - } }).start(); 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 0657da8..3a9c17e 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 @@ -100,7 +100,7 @@ public class LymsUserServiceImpl extends ServiceImpl @Autowired private PatientInfoService patientInfoService; //用户登录id - public Map pLoginInfo(Integer pid){ + public Map pLoginInfo(Integer pid,Integer type){ //获取登录信息 Map map=new HashMap<>(); String plogin=null; @@ -115,6 +115,7 @@ public class LymsUserServiceImpl extends ServiceImpl } map.put("plogin", plogin); map.put("passwd", lymsPatient.getPpasswd()); + map.put("type",type); return map; } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/DoctorMsgNotifyTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/DoctorMsgNotifyTask.java index f5c8d17..a87a96e 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/DoctorMsgNotifyTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/DoctorMsgNotifyTask.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.domain.DoctorChatCount; import com.lyms.talkonlineweb.domain.LymsDoctor; import com.lyms.talkonlineweb.domain.LymsDoctorWorkTime; +import com.lyms.talkonlineweb.param.DataEntity; import com.lyms.talkonlineweb.service.LymsDoctorWorktimeService; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.DateUtil; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java index 3f24cf3..dc7c211 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.enums.VisitEnum; +import com.lyms.talkonlineweb.param.DataEntity; import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.*; import lombok.Data; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java index f4c7bde..7742d2c 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java @@ -3,6 +3,7 @@ package com.lyms.talkonlineweb.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.lyms.talkonlineweb.domain.*; +import com.lyms.talkonlineweb.param.DataEntity; import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.DateUtil; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java index 6f09221..4796e67 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java @@ -58,8 +58,9 @@ public class ServiceContentTask { map.put("keyword3",new DataEntity(order.getDname(),"#173177")); //公众号跳转小程序需要的登录信息 - Map mapInfo =lymsUserService.pLoginInfo(order.getPid()); + Map mapInfo =lymsUserService.pLoginInfo(order.getPid(),3); try { + Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo); log.info("SendWeChatMsg--->code, "+code); } catch (Exception e) { diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/XljcTracePushTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/XljcTracePushTask.java index f11de6e..2ea04e9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/XljcTracePushTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/XljcTracePushTask.java @@ -3,6 +3,7 @@ package com.lyms.talkonlineweb.task; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.lyms.talkonlineweb.domain.LymsXljcTracePushRecord; +import com.lyms.talkonlineweb.param.DataEntity; import com.lyms.talkonlineweb.service.LymsXljcTracePushRecordService; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.DateUtil; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java index e763dba..c77fea3 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java @@ -93,8 +93,10 @@ public class WeiXinUtil { miniprogram.put("appid",Constant.PAT_APP_ID); //登录数据 if(CollectionUtils.isNotEmpty(mapInfo) && null!=mapInfo.get("plogin") && null!=mapInfo.get("passwd")){ - if(null==mapInfo.get("type") || 1==(int) mapInfo.get("type")) {//null是正常推送状态。 1有值是亲属关注时的状态 2没有病例的时候 + if(null==mapInfo.get("type") || 1==(int) mapInfo.get("type")) {//null是正常推送状态。 1有值是亲属关注时的状态 2没有病例的时候 3是服务推送 miniprogram.put("pagepath", "pages/news/news?plogin=" + mapInfo.get("plogin") + "&passwd=" + mapInfo.get("passwd"));// 注意,这里是支持传参的!!! + }else if(3==(int) mapInfo.get("type")){ + miniprogram.put("pagepath","pages/serviceContent/serviceContent?plogin="+mapInfo.get("plogin")+"&passwd="+mapInfo.get("passwd"));// 服务推送跳转地址 }else { miniprogram.put("pagepath","pages/concernList/concernList?plogin="+mapInfo.get("plogin")+"&passwd="+mapInfo.get("passwd"));// 没有病例跳转地址 }