From d8e403a8b1c8fa64b4920afd5785cbc8a6c0603d Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 17 May 2022 15:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=9C=A8=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=97=B6=E6=B3=A8=E5=86=8C=E7=8E=AF=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChatGroupController.java | 23 ++++++++++++-- .../talkonlineweb/controller/DoctorController.java | 37 +++++++++++----------- .../controller/PatientController.java | 21 ++++++++---- .../controller/TkRecordController.java | 22 ++++++++++++- 4 files changed, 74 insertions(+), 29 deletions(-) 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 1e6cdbc..5337fd2 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -13,6 +13,7 @@ import com.lyms.talkonlineweb.constants.ErrorCodeConstants; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.*; +import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.DateUtil; import com.lyms.talkonlineweb.util.HXService; import com.lyms.talkonlineweb.util.StringUtil; @@ -79,6 +80,26 @@ public class ChatGroupController { LymsChatgroup group2 = gLst.get(0); group = group2; } else { + LymsPatient patient= lymsPatientService.getOne(new QueryWrapper().lambda().eq(LymsPatient::getIdno, group.getFromp())); + LymsDoctor doctor= lymsDoctorService.getOne(new QueryWrapper().lambda().eq(LymsDoctor::getDlogin, group.getTarget())); + //患者注册环信 + if (StringUtil.isEmpty(patient.getHxid())) { + JSONObject json = hxService.addUser(patient.getIdno(), Constant.COMMON_PASSWD, patient.getPname()); + JSONArray rArr = json.getJSONArray("entities"); + if (rArr.size() > 0) { + patient.setHxid(rArr.getJSONObject(0).getString("uuid")); + lymsPatientService.updateById(patient); + } + } + //医生注册环信 + if (StringUtil.isEmpty(doctor.getHxid())) { + JSONObject json = hxService.addUser(doctor.getDlogin(), Constant.COMMON_PASSWD, doctor.getDname()); + JSONArray rArr = json.getJSONArray("entities"); + if (rArr.size() > 0) { + doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); + lymsDoctorService.updateById(doctor); + } + } log.info("创建环信组:{} from:{} target:{}", group.getOwnerk(), group.getFromp(), group.getTarget()); JSONObject rJson = hxService.addChatGroups(group.getFromp() + "," + group.getTarget(), group.getOwnerk(), new String[]{group.getFromp(), group.getTarget()}); log.info("rJson:" + rJson); @@ -86,8 +107,6 @@ public class ChatGroupController { group.setDescription(group.getFromp() + "," + group.getTarget()); // group.setGroupname(group.getFromp() + "," + group.getTarget()); //环信群组名称更改为姓名串-用于PC端问诊展示 - LymsPatient patient= lymsPatientService.getOne(new QueryWrapper().lambda().eq(LymsPatient::getIdno, group.getFromp())); - LymsDoctor doctor= lymsDoctorService.getOne(new QueryWrapper().lambda().eq(LymsDoctor::getDlogin, group.getTarget())); group.setGroupname(patient.getPname() + "," + doctor.getDdname()); group.setCtime(new Date()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java index 46c2a22..b4a31f9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java @@ -126,15 +126,14 @@ public class DoctorController { baseResponse.setErrorcode(1); return baseResponse; } - LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid()); - if(doctor.getHxid()==null ){ - JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname()); - JSONArray rArr=json.getJSONArray("entities"); - if(rArr.size()>0){ - doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); - } -// lymsDoctorService.saveOrUpdate(doctor); - } +// LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid()); +// if(doctor.getHxid()==null ){ +// JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname()); +// JSONArray rArr=json.getJSONArray("entities"); +// if(rArr.size()>0){ +// doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); +// } +// } }else{ did=1; doctor.setUpdatedTime(new Date()); @@ -197,16 +196,16 @@ public class DoctorController { Map map=new HashMap<>(); map.put("doctor",doctor); map.put("token",jwt); - if (StringUtil.isEmpty(doctor.getHxid())) { - JSONObject json = hxService.addUser(doctor.getDlogin(), Constant.COMMON_PASSWD, doctor.getDname()); - JSONArray rArr = json.getJSONArray("entities"); - if (rArr.size() > 0) { - LymsDoctor doctor2=new LymsDoctor(); - doctor2.setDid(doctor.getDid()); - doctor2.setHxid(rArr.getJSONObject(0).getString("uuid")); - lymsDoctorService.updateById(doctor2); - } - } +// if (StringUtil.isEmpty(doctor.getHxid())) { +// JSONObject json = hxService.addUser(doctor.getDlogin(), Constant.COMMON_PASSWD, doctor.getDname()); +// JSONArray rArr = json.getJSONArray("entities"); +// if (rArr.size() > 0) { +// LymsDoctor doctor2=new LymsDoctor(); +// doctor2.setDid(doctor.getDid()); +// doctor2.setHxid(rArr.getJSONObject(0).getString("uuid")); +// lymsDoctorService.updateById(doctor2); +// } +// } baseResponse.setErrorcode(0); baseResponse.setObject(map); } 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 26b4155..eb64269 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -194,6 +194,13 @@ public class PatientController { if (!StringUtils.isEmpty(patient.getCode())) { patient.setOpenid(WeiXinUtil.getWxOpenId(patient.getCode())); } +// if (StringUtil.isEmpty(patient.getHxid())) { +// JSONObject json = hxService.addUser(patient.getIdno(), Constant.COMMON_PASSWD, patient.getPname()); +// JSONArray rArr = json.getJSONArray("entities"); +// if (rArr.size() > 0) { +// patient.setHxid(rArr.getJSONObject(0).getString("uuid")); +// } +// } boolean f = lymsPatientService.saveOrUpdate(patient); @@ -373,13 +380,13 @@ public class PatientController { if (StringUtils.isEmpty(patient2.getHxid()) || StringUtils.isEmpty(patient2.getOpenid())) { - if (patient2.getHxid() == null) { - JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname()); - JSONArray rArr = json.getJSONArray("entities"); - if (rArr.size() > 0) { - patient2.setHxid(rArr.getJSONObject(0).getString("uuid")); - } - } +// if (patient2.getHxid() == null) { +// JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname()); +// JSONArray rArr = json.getJSONArray("entities"); +// if (rArr.size() > 0) { +// patient2.setHxid(rArr.getJSONObject(0).getString("uuid")); +// } +// } if (StringUtils.isEmpty(patient2.getOpenid())) { patient2.setOpenid(WeiXinUtil.getWxOpenId(patient.getCode())); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java index 0b9900c..1eb5b2a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java @@ -1,12 +1,15 @@ package com.lyms.talkonlineweb.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lyms.talkonlineweb.annotation.TokenRequired; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.*; +import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.HXService; +import com.lyms.talkonlineweb.util.StringUtil; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -77,7 +80,24 @@ public class TkRecordController { LymsChatgroup group =new LymsChatgroup(); LymsDoctor doctor=lymsDoctorService.getById(tkrecord.getDid()); LymsPatient patient=lymsPatientService.getById(tkrecord.getPid()); - + //患者注册环信 + if (StringUtil.isEmpty(patient.getHxid())) { + JSONObject json = hxService.addUser(patient.getIdno(), Constant.COMMON_PASSWD, patient.getPname()); + JSONArray rArr = json.getJSONArray("entities"); + if (rArr.size() > 0) { + patient.setHxid(rArr.getJSONObject(0).getString("uuid")); + lymsPatientService.updateById(patient); + } + } + //医生注册环信 + if (StringUtil.isEmpty(doctor.getHxid())) { + JSONObject json = hxService.addUser(doctor.getDlogin(), Constant.COMMON_PASSWD, doctor.getDname()); + JSONArray rArr = json.getJSONArray("entities"); + if (rArr.size() > 0) { + doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); + lymsDoctorService.updateById(doctor); + } + } group.setFromp(patient.getIdno()); group.setTarget(doctor.getDlogin()); group.setOwnerk("test"); -- 1.8.3.1