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

@@ -12,13 +12,18 @@ import com.yihu.jw.datainput.DataBodySignsDO;
import com.yihu.jw.datainput.WeRunDataDO;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import io.searchbox.client.JestResult;
import org.apache.commons.lang.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.DateUtils;
import org.apache.http.message.BasicNameValuePair;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -48,6 +53,10 @@ public class DataInputService {
    private ElasticSearchQueryGenerator elasticSearchQueryGenerator;
    @Autowired
    private ElasticSearchHelper elasticSearchHelper;
    @Value("${spring.profiles}")
    private String profiles;
    @Autowired
    private HttpClientUtil httpClientUtil;
//    @Autowired
//    private HBaseHelper hBaseHelper;
@@ -332,6 +341,10 @@ public class DataInputService {
            result.put("msg","upload signBodyData to elasticsearch failed," + e.getMessage());
        }
        if(success){
            String idcard = dataBodySignsDO.getIdCard();
            if (StringUtils.isNotBlank(idcard)){
                uploadDataToWlyy(json);
            }
            dataProcessLogService.saveLog(fileName, fileAbsPath, dataSource, "", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss), "1", "4", "com.yihu.iot.datainput.service.DataInputService.uploadData", DataOperationTypeEnum.upload1.getName(), 0);
            JSONArray rids = new JSONArray();
            rids.addAll(rowkeyList);
@@ -360,6 +373,19 @@ public class DataInputService {
        return result.toJSONString();
    }
    @Async
    public void uploadDataToWlyy(String json){
        String url ="https://www.xmtyw.cn/wlyytest/third/syncDisPatient/common/iotDataImportData";
        if ("iotprodIn".equals(profiles)){
            url = "http://10.95.22.10:8011/wlyy/third/syncDisPatient/common/iotDataImportData";
        }
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("json",json));
        if ("iotprodIn".equals(profiles)){//内网才推数据
            httpClientUtil.post(url,params,"UTF-8");
        }
    }
    /**
     * 上传数据（三诺体征数据）