diff --git a/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java b/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java index 413c86b5..6797aec0 100644 --- a/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java +++ b/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java @@ -4,6 +4,28 @@ package com.ccsens.logistics.Util; * @author 逗 */ public class Constant { + + + //温湿度登录的账号密码及访问路径 + /** + * 温湿度登录账号 + */ + public static final String USERNAME = "t210510sxck"; + /** + * 温湿度登录密码 + */ + public static final String PASSWORD = "ccsens123"; + /** + * 温湿度登录的URL + */ + public static final String LOGIN_URL = "http://iot.0531yun.cn/app/Login"; + /** + * 查询温湿度数据URL + */ + public static final String FIND_DATA_URL = "http://iot.0531yun.cn/app/Login"; + + + /** * 心跳信息 */ @@ -33,6 +55,8 @@ public class Constant { */ public static final String NO_WATER = "无水"; + + //车辆识别摄像头相关 /** * 心跳 diff --git a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java index d486e52d..17a4d3af 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java @@ -48,8 +48,8 @@ public class HttpService implements IHttpService{ try { List groupsList = new ArrayList<>(); HttpDto.Login login = new HttpDto.Login(); - login.setLoginName("t210510sxck"); - login.setPassword("ccsens123"); + login.setLoginName(Constant.USERNAME); + login.setPassword(Constant.PASSWORD); //调取登录接口 获取userId String userId = getUserId(login); //获取设备分组列表 @@ -63,7 +63,7 @@ public class HttpService implements IHttpService{ // } //循环查询分组id下的设备数据并存入数据库 - String getDataAndSaveOfUrl = "http://iot.0531yun.cn/wsjc/app/GetDeviceData?groupId="; + String getDataAndSaveOfUrl = Constant.FIND_DATA_URL; String environmentOfData = getBody(getDataAndSaveOfUrl, userId); JSONObject jsonObject = JSONObject.parseObject(environmentOfData); @@ -126,7 +126,7 @@ public class HttpService implements IHttpService{ * @return userId */ public String getUserId(HttpDto.Login login){ - String requestUrl = "http://iot.0531yun.cn/app/Login"; + String requestUrl = Constant.LOGIN_URL; String s = RestTemplateUtil.postBody(requestUrl, login); JsonResponse a = JSONObject.parseObject(s, JsonResponse.class); JSONObject data = a.getData();