Merge branch 'dev' of yeshijie/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -77,7 +77,7 @@ public class MonitorPlatformService  {
                    jsonObject.put("page",page);
                    jsonObject.put("size",size);
                    List<LocationDataVO> locationDataVOList = iotPatientDeviceService.findDeviceLocationsByIdCard(jsonObject.toString());
                    figureLabelSerachService.getFigureLabelByList(locationDataVOList);
                    //figureLabelSerachService.getFigureLabelByList(locationDataVOList);
                    envelop.getDetailModelList().addAll(locationDataVOList);
                }
            }
@@ -98,8 +98,8 @@ public class MonitorPlatformService  {
            jsonObject.put("page",page);
            jsonObject.put("size",size);
            List<LocationDataVO> locationDataVOList = iotPatientDeviceService.findDeviceLocationsByIdCard(jsonObject.toString());
            figureLabelSerachService.getFigureLabelByList(locationDataVOList);
            //figureLabelSerachService.getFigureLabelByList(locationDataVOList);
            envelop.getDetailModelList().addAll(locationDataVOList);
            envelop.setTotalCount(iotPatientDeviceService.getESCount(jsonObject.toString()));
            return envelop;
        }

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

@@ -194,9 +194,9 @@ spring:
    password: jkzlehr@123
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 10.90.32.2:20010,10.90.32.2:20012 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 10.90.32.2:20011,10.90.32.2:20011 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://10.90.32.2:20009,http://10.90.32.2:20011
      uris: http://10.90.32.2:20011,http://10.90.32.2:20012
  wlyy:
    url: http://www.xmtyw.cn/wlyytest/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee62

svr/svr-iot/src/main/resources/bootstrap.yml

@@ -95,5 +95,5 @@ spring:
  profiles: iotprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      uri: ${wlyy.pring.config.uri:http://192.168.120.216:1221}
      label: ${wlyy.spring.config.label:master}