liquanyu / talkonline

Authored by cfl about 2 years ago

Exists in dev

Showing 5 changed files with 31 additions and 13 deletions

1	1	package com.lyms.talkonlineweb.controller;
2	2
	3	+import com.alibaba.fastjson.JSONObject;
3	4	import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
4	5	import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5	6	import com.fasterxml.jackson.databind.ser.Serializers;
6	7
...	...	@@ -13,8 +14,10 @@
13	14	import com.lyms.talkonlineweb.service.LymsDoctorService;
14	15	import com.lyms.talkonlineweb.service.LymsPatientService;
15	16	import com.lyms.talkonlineweb.service.LymsTkrecordService;
	17	+import com.lyms.talkonlineweb.util.HXService;
16	18	import org.springframework.beans.factory.annotation.Autowired;
17	19	import org.springframework.web.bind.annotation.GetMapping;
	20	+import org.springframework.web.bind.annotation.PostMapping;
18	21	import org.springframework.web.bind.annotation.RequestMapping;
19	22	import org.springframework.web.bind.annotation.RestController;
20	23
...	...	@@ -33,6 +36,22 @@
33	36	private LymsDoctorService lymsDoctorService;
34	37	@Autowired
35	38	private LymsPatientService lymsPatientService;
	39	+ @Autowired
	40	+ private HXService hxService;
	41	+
	42	+ @GetMapping("getToken")
	43	+ @TokenRequired
	44	+ public BaseResponse token(){
	45	+ String token = hxService.getToken();
	46	+ return BaseResponse.ok().setObject(token);
	47	+ }
	48	+
	49	+ @PostMapping("addHxUser")
	50	+ @TokenRequired
	51	+ public BaseResponse addHxUser(String userName,String passwd){
	52	+ JSONObject json = hxService.addUser(userName,passwd,"nickName");
	53	+ return BaseResponse.ok().setObject(json);
	54	+ }
36	55
37	56	@GetMapping("endTalk")
38	57	@TokenRequired

...	...	@@ -239,16 +239,9 @@
239	239	map.put("doctor",doctor);
240	240	map.put("token",jwt);
241	241	map.put("hxuser",hxService.getHxuser());
242		-// if (StringUtil.isEmpty(doctor.getHxid())) {
243		-// JSONObject json = hxService.addUser(doctor.getDlogin(), Constant.COMMON_PASSWD, doctor.getDname());
244		-// JSONArray rArr = json.getJSONArray("entities");
245		-// if (rArr.size() > 0) {
246		-// LymsDoctor doctor2=new LymsDoctor();
247		-// doctor2.setDid(doctor.getDid());
248		-// doctor2.setHxid(rArr.getJSONObject(0).getString("uuid"));
249		-// lymsDoctorService.updateById(doctor2);
250		-// }
251		-// }
	242	+ if (StringUtil.isEmpty(doctor.getHxid())) {
	243	+ lymsDoctorService.addDoctorHxId(doctor);
	244	+ }
252	245	baseResponse.setErrorcode(0);
253	246	baseResponse.setObject(map);
254	247	}

...	...	@@ -441,6 +441,10 @@
441	441
442	442	}
443	443
	444	+ //登录时没有环信账号，增加环信账号
	445	+ if(StringUtil.isEmpty(patient2.getHxid())){
	446	+ lymsPatientService.addPatientHxId(patient2);
	447	+ }
444	448
445	449	patient.setPpasswd(null);
446	450	map.put("patient", patient2);

...	...	@@ -343,12 +343,14 @@
343	343	*/
344	344	public JSONObject addChatGroups(String description,String owner,String[] members){
345	345	JSONObject rs=new JSONObject();
346		- Map<String,Object> param=new HashMap<>();
	346	+
347	347	HttpHeaders headers=new HttpHeaders();
	348	+ headers.add("Authorization","Bearer "+getToken());
	349	+ Map<String,Object> param=new HashMap<>();
348	350	for(int i = 0 ;i < members.length;i++){
349	351	members[i] = assembleHxLoginAccout(members[i]);
350	352	}
351		- headers.add("Authorization","Bearer "+getToken());
	353	+
352	354	List lParam=new ArrayList();
353	355	param.put("groupname", Arrays.toString(members));
354	356	param.put("desc",description);