|
|
@ -139,6 +139,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
getBaseSurperviseDict();
|
|
|
WsapiProxy proxy = new WsapiProxy();
|
|
|
proxy.setEndpoint(url);
|
|
|
logger.info("入参:"+JSONUtils.toString(params));
|
|
|
Wsapi wsapi = proxy.getWsapi();
|
|
|
|
|
|
// logger.info("postToInter:"+JSONUtils.toString(new String[] {token, params.toString()}));
|
|
|
@ -188,11 +189,12 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
|
|
|
// 2 医院基本信息 micc.upNsOrganBas --- 完成
|
|
|
public String upNsOrganBas() throws Exception {
|
|
|
logger.info("开始进入==============");
|
|
|
getBaseSurperviseDict();
|
|
|
BaseSuperviseDataDict superviseDataDict = superviseDataDictDao.selectByDictName();
|
|
|
String url = getUrl();
|
|
|
String api = "micc.upNsOrganBase";
|
|
|
|
|
|
logger.info("开始进入++++++++"+superviseDataDict.getDictName());
|
|
|
JSONObject jb = new JSONObject();
|
|
|
jb.put("organ_code", orgCode);
|
|
|
jb.put("organ_name",orgName);
|
|
|
@ -289,8 +291,6 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
jsonArray.add(jb);
|
|
|
|
|
|
logger.info("入参:"+jsonArray.toJSONString()+"入参："+jb.toJSONString());
|
|
|
|
|
|
String token = upNsUserToken(url);
|
|
|
String res = postToInter(token, api, jsonArray,url);
|
|
|
|
|
|
@ -795,10 +795,10 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
"\tM.content AS \"content\",\n" +
|
|
|
"\tM.content_type AS \"content_type\",\n" +
|
|
|
"\tT.id AS \"id\",\n" +
|
|
|
"\tM.sender_id AS \"session_id\"\n" +
|
|
|
"\tM.session_id AS \"session_id\"\n" +
|
|
|
"FROM\n" +
|
|
|
"\t"+base+".topics T\n" +
|
|
|
"JOIN "+base+".muc_messages M ON M.sender_id = T.session_id\n" +
|
|
|
"JOIN "+base+".muc_messages M ON M.session_id = T.session_id\n" +
|
|
|
"AND M.timestamp >= T.create_time\n" +
|
|
|
"AND M.timestamp <= T.end_time\n" +
|
|
|
"AND T.id='"+info.get("consult").toString()+"' "+
|
|
|
@ -828,9 +828,21 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
object.put("receiver",patientDO.getName());
|
|
|
}
|
|
|
}
|
|
|
String msg = "";
|
|
|
String msgType = "";
|
|
|
if (map.get("content_type").toString().equalsIgnoreCase("2")){
|
|
|
msg = consultUpNsOnlineImg(map.get("content").toString(),map.get("id").toString());
|
|
|
msgType = "1";
|
|
|
}else if (map.get("content_type").toString().equalsIgnoreCase("1")){
|
|
|
msg = map.get("content").toString();
|
|
|
msgType = "0";
|
|
|
}else {
|
|
|
msg = map.get("content").toString();
|
|
|
msgType = map.get("content_type").toString();
|
|
|
}
|
|
|
object.put("sender",map.get("sender_name"));
|
|
|
object.put("msg",map.get("content"));
|
|
|
object.put("msg_type",map.get("content_type"));
|
|
|
object.put("msg",msg);
|
|
|
object.put("msg_type",msgType);
|
|
|
object.put("send_time",DateUtil.dateToStr(DateUtil.strToDate(map.get("timestamp").toString(),"yyyy-MM-dd HH:mm:ss"),"yyyy-MM-dd HH:mm:ss"));
|
|
|
array.add(object);
|
|
|
}
|
|
|
@ -1825,4 +1837,57 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
|
|
|
public String testImg(String path){
|
|
|
return ImgUtils.getImageStr(path);
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public String consultUpNsOnlineImg(String imgPath,String consult) throws Exception {
|
|
|
String msgCode = "";
|
|
|
getBaseSurperviseDict();
|
|
|
String url = getUrl();
|
|
|
String api = "micc.upNsOnlineImg";
|
|
|
String upid = getCode();
|
|
|
String token = upNsUserToken(url);
|
|
|
String res = "";
|
|
|
int total = 0;
|
|
|
int success = 0;
|
|
|
int error = 0;
|
|
|
int dataError = 0;
|
|
|
|
|
|
JSONObject jb = new JSONObject();
|
|
|
Boolean errorFlag = false;
|
|
|
String code = getCode();
|
|
|
try {
|
|
|
jb.put("id_online_img",code);
|
|
|
jb.put("id_onlne_base", orgCode+"_"+consult);
|
|
|
jb.put("online_type","1");
|
|
|
String base64 =getImg(imgPath);
|
|
|
jb.put("img_path",base64);
|
|
|
jb.put("img_sort", 1);
|
|
|
jb.put("upload_time", DateUtil.dateToStr(new Date(),"yyyy-MM-dd hh:mm:ss"));
|
|
|
}catch (Exception e){
|
|
|
errorFlag = true;
|
|
|
saveErrorLog(upid,"12",consult,res,1);
|
|
|
dataError++;
|
|
|
logger.error(e.toString());
|
|
|
}
|
|
|
|
|
|
if(!errorFlag){
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
jsonArray.add(jb);
|
|
|
res = postToInter(token,api, jsonArray,url);
|
|
|
|
|
|
JSONObject resJson = (JSONObject) JSONObject.parse(res);
|
|
|
if("200".equals(resJson.get("msg").toString())){
|
|
|
msgCode = code;
|
|
|
success++;
|
|
|
}else{
|
|
|
saveErrorLog(upid,"12",imgPath,res,2);
|
|
|
error++;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
String resInfo = "此次共上传：" + total + "条数据，其中成功 ：" + success + "条，上传失败 ： " + error + "条。格式错误："+dataError+"条。";
|
|
|
saveUpLog(upid,"12",new Date(),new Date(),success,error,dataError,resInfo);
|
|
|
return msgCode;
|
|
|
}
|
|
|
}
|
wangzhinan