Browse Source

奕拓小屋,体征数据上传接口完成

hill9868 6 years ago
parent
commit
c680797e3a

+ 0 - 5
svr/svr-iot/src/main/java/com/yihu/iot/controller/analyzer/IotAnalyzerController.java

@ -3,18 +3,15 @@ package com.yihu.iot.controller.analyzer;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.iot.datainput.service.DataInputService;
import com.yihu.iot.datainput.util.ConstantUtils;
import com.yihu.iot.service.common.DfsTemplate;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@ -44,8 +41,6 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
    @Autowired
    private FastDFSUtil fastDFSHelper;
    @Autowired
    private DfsTemplate dfsTemplate;
    /**
     * 基于奕拓小屋上传的体征数据,进行解析入库

+ 8 - 8
svr/svr-iot/src/main/resources/application.yml

@ -144,17 +144,17 @@ fastDFS:
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://10.95.22.143:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: abc.123
    url: jdbc:mysql://59.61.92.90:9069/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy
    password: jkzlehr@123
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 10.95.22.155:9300,10.95.22.156:9300 #配置es节点信息,逗号分隔,如果没有指定,则启动ClientNode
    cluster-nodes: 59.61.92.90:9066,59.61.92.90:9068 #配置es节点信息,逗号分隔,如果没有指定,则启动ClientNode
    jest:
      uris: http://10.95.22.155:9200,http://10.95.22.156:9200
      uris: http://59.61.92.90:9065,http://59.61.92.90:9067
  wlyy:
    url: http://www.xmtyw.cn/wlyy/
fast-dfs:
  tracker-server: 10.95.22.139:22122 #服务器地址
#fast-dfs:
  #tracker-server: 10.95.22.139:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://10.95.22.139:22122/
  fastdfs_file_url: http://www.xmtyw.cn/