liquanyu / talkonline

Download as
Browse Code »

Commit 8f946ae8688906b2b5e704a9f2440c9da458f66f

Authored by zhangchao
1 parent 4bd1a46c57
Exists in dev

#fix 优化问政卡服务推送问题

Showing 10 changed files with 15 additions and 9 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java View file @ 8f946ae
... ... @@ -201,7 +201,7 @@
201 201 public BaseResponse getHistoryLogs(String targetId,Integer current, Integer size){
202 202  
203 203 if (StringUtil.isEmpty(targetId)){
204   - BaseResponse.error("聊天组ID不能为空");
  204 + return BaseResponse.error("聊天组ID不能为空");
205 205 }
206 206 BaseResponse baseResponse = new BaseResponse();
207 207 Page<LymsMessage> page = new Page(current,size);
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java View file @ 8f946ae
... ... @@ -15,7 +15,7 @@
15 15 List<LymsPermission> getPermissionByUsername(String username) throws Exception;
16 16  
17 17 LymsUser getUserByToken(String token);
18   - Map<String,Object> pLoginInfo(Integer pid)
  18 + Map<String,Object> pLoginInfo(Integer pid,Integer type);
19 19  
20 20 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java View file @ 8f946ae
... ... @@ -92,7 +92,7 @@
92 92 if (patient!=null){
93 93 List<PushOrderResult> orderList= lymsOrderService.selectPushOrder(patient.getId());
94 94 if (CollectionUtils.isNotEmpty(orderList)){
95   - orderList.stream().forEach(order -> {
  95 + PushOrderResult order= orderList.get(0);
96 96 //推送微信公众号
97 97 Map<String,Object> map=new HashMap<>();
98 98 map.put("keyword1",new DataEntity(order.getPname(),"#173177"));
99 99  
100 100  
... ... @@ -100,17 +100,15 @@
100 100 map.put("keyword3",new DataEntity(order.getDname(),"#173177"));
101 101  
102 102 //公众号跳转小程序需要的登录信息
103   - Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid());
  103 + Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid(),3);
104 104 try {
105 105 Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo);
106 106 log.info("SendWeChatMsg--->code, "+code);
107 107 } catch (Exception e) {
108 108 log.error("serviceContent Exception,"+e.getMessage());
109 109 }
110   - });
111 110 }
112 111 }
113   -
114 112 }
115 113 }).start();
116 114  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java View file @ 8f946ae
... ... @@ -100,7 +100,7 @@
100 100 @Autowired
101 101 private PatientInfoService patientInfoService;
102 102 //用户登录id
103   - public Map<String,Object> pLoginInfo(Integer pid){
  103 + public Map<String,Object> pLoginInfo(Integer pid,Integer type){
104 104 //获取登录信息
105 105 Map<String,Object> map=new HashMap<>();
106 106 String plogin=null;
... ... @@ -115,6 +115,7 @@
115 115 }
116 116 map.put("plogin", plogin);
117 117 map.put("passwd", lymsPatient.getPpasswd());
  118 + map.put("type",type);
118 119 return map;
119 120 }
120 121  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/DoctorMsgNotifyTask.java View file @ 8f946ae
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.talkonlineweb.domain.DoctorChatCount;
6 6 import com.lyms.talkonlineweb.domain.LymsDoctor;
7 7 import com.lyms.talkonlineweb.domain.LymsDoctorWorkTime;
  8 +import com.lyms.talkonlineweb.param.DataEntity;
8 9 import com.lyms.talkonlineweb.service.LymsDoctorWorktimeService;
9 10 import com.lyms.talkonlineweb.util.Constant;
10 11 import com.lyms.talkonlineweb.util.DateUtil;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java View file @ 8f946ae
... ... @@ -7,6 +7,7 @@
7 7 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
8 8 import com.lyms.talkonlineweb.domain.*;
9 9 import com.lyms.talkonlineweb.enums.VisitEnum;
  10 +import com.lyms.talkonlineweb.param.DataEntity;
10 11 import com.lyms.talkonlineweb.service.*;
11 12 import com.lyms.talkonlineweb.util.*;
12 13 import lombok.Data;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java View file @ 8f946ae
... ... @@ -3,6 +3,7 @@
3 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
5 5 import com.lyms.talkonlineweb.domain.*;
  6 +import com.lyms.talkonlineweb.param.DataEntity;
6 7 import com.lyms.talkonlineweb.service.*;
7 8 import com.lyms.talkonlineweb.util.Constant;
8 9 import com.lyms.talkonlineweb.util.DateUtil;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java View file @ 8f946ae
... ... @@ -58,8 +58,9 @@
58 58 map.put("keyword3",new DataEntity(order.getDname(),"#173177"));
59 59  
60 60 //公众号跳转小程序需要的登录信息
61   - Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid());
  61 + Map<String,Object> mapInfo =lymsUserService.pLoginInfo(order.getPid(),3);
62 62 try {
  63 +
63 64 Integer code= WeiXinUtil.SendWeChatMsg(order.getGzopenid(),Constant.GZ_TEMPLATE_ID,map,mapInfo);
64 65 log.info("SendWeChatMsg--->code, "+code);
65 66 } catch (Exception e) {
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/XljcTracePushTask.java View file @ 8f946ae
... ... @@ -3,6 +3,7 @@
3 3  
4 4 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
5 5 import com.lyms.talkonlineweb.domain.LymsXljcTracePushRecord;
  6 +import com.lyms.talkonlineweb.param.DataEntity;
6 7 import com.lyms.talkonlineweb.service.LymsXljcTracePushRecordService;
7 8 import com.lyms.talkonlineweb.util.Constant;
8 9 import com.lyms.talkonlineweb.util.DateUtil;
talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java View file @ 8f946ae
... ... @@ -93,8 +93,10 @@
93 93 miniprogram.put("appid",Constant.PAT_APP_ID);
94 94 //登录数据
95 95 if(CollectionUtils.isNotEmpty(mapInfo) && null!=mapInfo.get("plogin") && null!=mapInfo.get("passwd")){
96   - if(null==mapInfo.get("type") || 1==(int) mapInfo.get("type")) {//null是正常推送状态。 1有值是亲属关注时的状态 2没有病例的时候
  96 + if(null==mapInfo.get("type") || 1==(int) mapInfo.get("type")) {//null是正常推送状态。 1有值是亲属关注时的状态 2没有病例的时候 3是服务推送
97 97 miniprogram.put("pagepath", "pages/news/news?plogin=" + mapInfo.get("plogin") + "&passwd=" + mapInfo.get("passwd"));// 注意，这里是支持传参的！！！
  98 + }else if(3==(int) mapInfo.get("type")){
  99 + miniprogram.put("pagepath","pages/serviceContent/serviceContent?plogin="+mapInfo.get("plogin")+"&passwd="+mapInfo.get("passwd"));// 服务推送跳转地址
98 100 }else {
99 101 miniprogram.put("pagepath","pages/concernList/concernList?plogin="+mapInfo.get("plogin")+"&passwd="+mapInfo.get("passwd"));// 没有病例跳转地址
100 102 }