Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2698,4 +2698,22 @@ public class ImService {
		List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
		return list;
	}
	
	/**
	 * 发送医生取消IM消息
	 * @param patientName
	 * @param doctor
	 * @param doctorName
	 * @param session_id
	 * @param cancleReason
	 * @param cancleContent
	 * @return
	 */
	public String sendOutPatientCancle(String patientName, String doctor, String doctorName, String session_id, String cancleReason, String cancleContent) {
		JSONObject msg = new JSONObject();
		msg.put("content",patientName+",您好！您的复诊已被医生取消");
		msg.put("cancleReason",cancleReason);
		msg.put("cancleContent",cancleContent);
		return imUtil.sendImMsg(doctor, doctorName, session_id, "36",msg.toString(),"1");
	}
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1000,6 +1000,9 @@ public class BaseHospitalRequestMapping {
        
        //医生端：获取咨询建议
        public static final String getConsultSuggest = "getConsultSuggest";
    
        //医生端：发送医生取消IM消息
        public static final String sendOutPatientCancle = "sendOutPatientCancle";
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -751,5 +751,31 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	)throws Exception  {
		return success("操作成功",prescriptionService.getConsultSuggest(consultcode));
	}
	
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.sendOutPatientCancle)
	@ApiOperation(value = "医生端：发送医生取消IM消息", notes = "医生端：发送医生取消IM消息")
	public Envelop sendOutPatientCancle(@ApiParam(name = "patientName", value = "patientName")
	                                     @RequestParam(value = "patientName", required = true)String patientName,
	                                     @ApiParam(name = "session_id", value = "咨询sessionid")
	                                     @RequestParam(value = "session_id", required = true)String session_id,
	                                     @ApiParam(name = "doctor", value = "医生CODE")
	                                     @RequestParam(value = "doctor", required = true)String doctor,
	                                     @ApiParam(name = "doctorName", value = "")
	                                     @RequestParam(value = "doctorName", required = true)String doctorName,
	                                    @ApiParam(name = "cancleReason", value = "取消原因")
	                                        @RequestParam(value = "cancleReason", required = true)String cancleReason,
	                                    @ApiParam(name = "cancleContent", value = "取消说明")
	                                        @RequestParam(value = "cancleContent", required = true)String cancleContent
	
	)throws Exception  {
		try {
			String immsg = imService.sendOutPatientCancle(patientName,doctor,doctorName,session_id,cancleReason,cancleContent);
			System.out.println("发送医生取消IM消息成功："+immsg);
		}catch (Exception e){
			System.out.println("发送医生取消IM消息失败："+e.getMessage());
//            e.printStackTrace();
		}
		return success("操作成功");
	}
}

svr/svr-iot/sql-scripts/body_health_data_es.txt

@@ -85,7 +85,7 @@ POST http://172.26.0.112:9200/body_health_data/signs_data/_mapping
                "type": "string",
                "index": "not_analyzed"
            },
            "idcard": {
            "idcard_type": {
                "type": "string",
                "index": "not_analyzed"
            },

svr/svr-iot/src/main/java/com/yihu/iot/datainput/service/DataSearchService.java

@@ -2,19 +2,14 @@ package com.yihu.iot.datainput.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
//import com.yihu.base.hbase.HBaseHelper;
import com.yihu.elasticsearch.ElasticSearchHelper;
import com.yihu.iot.datainput.util.ConstantUtils;
import com.yihu.iot.datainput.util.RowKeyUtils;
import com.yihu.iot.service.common.ElasticSearchQueryGenerator;
import com.yihu.jw.restmodel.iot.datainput.DataBodySignsVO;
import com.yihu.jw.restmodel.iot.datainput.WeRunDataVO;
import com.yihu.jw.util.date.DateUtil;
import io.searchbox.core.SearchResult;
import org.apache.commons.lang.StringUtils;
//import org.apache.hadoop.hbase.Cell;
//import org.apache.hadoop.hbase.client.Result;
//import org.apache.hadoop.hbase.util.Bytes;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,7 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
//import com.yihu.base.hbase.HBaseHelper;
//import org.apache.hadoop.hbase.Cell;
//import org.apache.hadoop.hbase.client.Result;
//import org.apache.hadoop.hbase.util.Bytes;
@Component
public class DataSearchService {
@@ -104,7 +106,7 @@ public class DataSearchService {
            //inner，nested object在es中修改只支持替换整个的object
            resultObject = (JSONObject) JSONObject.parse(String.valueOf(resultSource));
            //文档里的data数组对象数据
            datas = (JSONArray) resultObject.get("data");
            datas = (JSONArray) resultObject.get("measure_data");
            for (Object data : datas) {
                JSONObject dataJson = (JSONObject) data;
                if (StringUtils.equalsIgnoreCase(rid, dataJson.getString("rid"))) {
@@ -119,7 +121,7 @@ public class DataSearchService {
        }
        JSONObject updateObj = new JSONObject();
        updateObj.put("data",datas);
        updateObj.put("measure_data",datas);
//        boolean bool = elastricSearchHelper.update(ConstantUtils.esIndex, ConstantUtils.esType, _id, updateObj.toJSONString());
//        Update update = new Update();
//        update.

svr/svr-iot/src/main/java/com/yihu/iot/service/analyzer/IotAnalyzerService.java

@@ -100,7 +100,7 @@ public class IotAnalyzerService extends BaseJpaService<WlyyIotD, WlyyIotDDao> {
                deviceHealthyInfoMappingDao.save(infos);
                //下一次
                id = list.get(list.size()-1).getInteger("id");
//                list = myJdbcTemplate.queryJson(sql,new Object[]{id});
                list = myJdbcTemplate.queryJson(sql,new Object[]{id});
            }
        }catch (Exception e){
@@ -134,6 +134,7 @@ public class IotAnalyzerService extends BaseJpaService<WlyyIotD, WlyyIotDDao> {
            }
        }
        json.put("idcard",StringUtils.trimToEmpty(jsonObject.getString("idcard")));
        json.put("idcard_type","1");
        json.put("username",StringUtils.trimToEmpty(jsonObject.getString("name")));
        json.put("usercode",StringUtils.trimToEmpty(jsonObject.getString("user")));
        json.put("del",StringUtils.trimToEmpty(jsonObject.getString("del")));