6.27--修改线路，仓库，常用地址的经度正则校验，增加错误信息的英文提示

4703944b · zhuangzhuang · 75f2203e · 4703944b · 4703944b · 4703944b
Commit 4703944b authored Jun 27, 2018 by zhuangzhuang
16 changed files
--- a/src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
+++ b/src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
@@ -22,12 +22,14 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(loginInterceptor()).excludePathPatterns("/alarmLog/**")
+        registry.addInterceptor(loginInterceptor())
+                .excludePathPatterns("/alarmLog/addAlarmLog")
                    .excludePathPatterns("/login/**");
        registry.addInterceptor(permissionInterceptor())
                .excludePathPatterns("/login/**")
-                .excludePathPatterns("/alarmLog/add")
-                .excludePathPatterns("/side/**");
+                .excludePathPatterns("/alarmLog/addAlarmLog")
+                .excludePathPatterns("/side/**")
+        .excludePathPatterns("/test");
        super.addInterceptors(registry);
    }


--- a/src/main/java/com/example/tdl/mqtt/MqttListener.java
+++ b/src/main/java/com/example/tdl/mqtt/MqttListener.java
@@ -156,7 +156,6 @@ public class MqttListener implements MqttCallback {
        if(SN.matches("^[0-9]*$")){
            try {
                Integer flag = parseData(Message,SN,Type);
-                // System.out.print(System.currentTimeMillis()+"------"+flag +"------");
                String ConfigData;
                Future<String> result = null;
                GWConfigWorker gcconfig = null;

--- a/src/main/java/com/example/tdl/util/DataUtil.java
+++ b/src/main/java/com/example/tdl/util/DataUtil.java
@@ -224,4 +224,8 @@ public class DataUtil {
        logger.info(System.currentTimeMillis()-tm +"-------tn");
        return historyDataList;
    }
+
+
+
+
 }
--- a/src/main/java/com/example/tdl/util/HttpRequester.java
+++ b/src/main/java/com/example/tdl/util/HttpRequester.java
@@ -71,18 +71,19 @@ public class HttpRequester {
        BufferedReader in = null;
        try {
            URL realUrl = new URL(url);
-            // 打开和URL之间的连接
+
            URLConnection connection = realUrl.openConnection();
-            // 设置通用的请求属性
+
            connection.setRequestProperty("accept", "*/*");
            connection.setRequestProperty("connection", "Keep-Alive");
            connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");
            connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+
            connection.setConnectTimeout(5000);
            connection.setReadTimeout(20000);
-            // 建立实际的连接
+
            connection.connect();
-            // 定义 BufferedReader输入流来读取URL的响应
+
            in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
            StringBuffer sb = new StringBuffer();
            String line;
@@ -93,9 +94,8 @@ public class HttpRequester {
        } catch (Exception e) {
            e.printStackTrace();
            logger.info(e.toString());
-        }
-        // 使用finally块来关闭输入流
-        finally {
+        } finally {
+
            try {
                if (in != null) {
                    in.close();
@@ -123,27 +123,27 @@ public class HttpRequester {
            //设置连接超时时间和读取超时时间
            conn.setConnectTimeout(10000);
            conn.setReadTimeout(10000);
-            conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-            //连接服务器
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+
            conn.connect();
-            // 取得输入流，并使用Reader读取
+
            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
            String line;
            while ((line = in.readLine()) != null) {
                result.append(line);
            }
-            conn.disconnect();
+
        } catch (Exception e) {
            e.printStackTrace();
-        }
-        //关闭输入流
-        finally{
+        } finally{
            try{
                if(in!=null){
                    in.close();
                }
-            }
-            catch(IOException ex){
+            } catch(IOException ex){
                ex.printStackTrace();
            }
        }

--- a/src/main/java/com/example/tdl/web/CircuitController.java
+++ b/src/main/java/com/example/tdl/web/CircuitController.java
@@ -631,7 +631,7 @@ public class CircuitController {
            fb.setMessage(i18n.getMessage(request,"startLng"));
            return gson.toJson(fb);
        }
-        if(!addCircuitVo.getStartAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addCircuitVo.getStartAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongStartLng"));
            return gson.toJson(fb);
@@ -694,7 +694,7 @@ public class CircuitController {
                    fb.setMessage(i18n.getMessage(request,"addressVoLng"));
                    return gson.toJson(fb);
                }
-                if(!addCircuitVo.getAddressVoList().get(i).getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+                if(!addCircuitVo.getAddressVoList().get(i).getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
                    fb.setCode(0);
                    fb.setMessage(i18n.getMessage(request,"wrongaddressVoLng"));
                    return gson.toJson(fb);
@@ -768,7 +768,7 @@ public class CircuitController {
            fb.setMessage(i18n.getMessage(request,"endLng"));
            return gson.toJson(fb);
        }
-        if(!addCircuitVo.getEndAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addCircuitVo.getEndAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongEndLng"));
            return gson.toJson(fb);
@@ -1047,7 +1047,7 @@ public class CircuitController {
            fb.setMessage(i18n.getMessage(request,"startLng"));
            return gson.toJson(fb);
        }
-        if(!addCircuitVo.getStartAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addCircuitVo.getStartAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongStartLng"));
            return gson.toJson(fb);
@@ -1092,7 +1092,7 @@ public class CircuitController {
            fb.setMessage(i18n.getMessage(request,"endLng"));
            return gson.toJson(fb);
        }
-        if(!addCircuitVo.getEndAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addCircuitVo.getEndAddressVo().getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongEndLng"));
            return gson.toJson(fb);

--- a/src/main/java/com/example/tdl/web/DataController.java
+++ b/src/main/java/com/example/tdl/web/DataController.java
@@ -213,7 +213,6 @@ public class DataController {
            @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
    })
    public Object getHistoryData(@RequestBody String transportationNo, HttpServletRequest request) {
-        long time = System.currentTimeMillis();
        String token = request.getHeader("Account_token");
        String datum = tokenRedisService.get("TOKEN_" + token);
        UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
@@ -296,10 +295,8 @@ public class DataController {
                if (count > 500) {
                    if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
                        sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, resultCircuitVo.getEndTime() * 1000000l);
-//                            sql = "SELECT "+list.get(j)+" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"='"+devList.get(i)+"'  and time >="+startTime + "  and time<="+resultCircuitVo.getEndTime() *1000000l+" ORDER BY time ";
                    } else {
                        sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, System.currentTimeMillis() * 1000000l);
-//                            sql = "SELECT "+list.get(j)+" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"='"+devList.get(i)+"'  and time >="+startTime + "  ORDER BY time";
                    }
                    QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
                    if (queryResult.getResults() != null) {
@@ -326,7 +323,6 @@ public class DataController {
            dataVo.setDataList(historyDataVoList);
            dataVoList.add(dataVo);
        }
-        logger.info(System.currentTimeMillis()-time+"-----time");
        return gson.toJson(dataVoList);
    }

@@ -379,6 +375,8 @@ public class DataController {
        return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"h\"");
    }

+
+
    //获取倾斜度数据
    @ApiOperation(value = "获取倾斜度数据", notes = "获取倾斜度数据")
    @PostMapping("/getTiltAngle")
@@ -637,6 +635,8 @@ public class DataController {
        return historyDataList;
    }

+
+
 }

 //    获取历史数据

--- a/src/main/java/com/example/tdl/web/LoginController.java
+++ b/src/main/java/com/example/tdl/web/LoginController.java
@@ -80,7 +80,7 @@ public class LoginController {
            String token = DigestUtils.md5Hex(System.currentTimeMillis() + userVo.getUserName());
            UserRedisVo redisVo = new UserRedisVo(userVo.getUserName(),userVo.getUserNumber(),userVo.getNickName(),userVo.getEmail(),userVo.getPhone(),userVo.getRoleName(),userVo.getCompanyName(),userVo.getCompanyNo());
            //将用户数据保存到redis中
-            userTokenService.hmSet(userVo.getUserNumber(),"TOKEN_" + token,System.currentTimeMillis()+"");
+            userTokenService.setHash(userVo.getUserNumber(),"TOKEN_" + token,System.currentTimeMillis()+"",60*60*24);
            tokenRedisService.set("TOKEN_" + token, gson.toJson(redisVo), 60 * 30);
            String ip = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getRemoteAddr();
            int a=loginLogService.addLoginLog(new LoginLog(loginUserVo.getUserName(),System.currentTimeMillis(),ip));

--- a/src/main/java/com/example/tdl/web/RoleController.java
+++ b/src/main/java/com/example/tdl/web/RoleController.java
@@ -278,7 +278,7 @@ public class RoleController {
            ms.put("msg",map.get("msg"));
            if (ms.get("msg").equals("删除角色成功")){
                fb.setCode(1);
-                fb.setMessage(ms.get("msg").toString());
+                fb.setMessage(i18n.getMessage(request,"deleteSuccess"));
            }else {
                fb.setCode(0);
                fb.setMessage(ms.get("msg").toString());
@@ -286,7 +286,7 @@ public class RoleController {
        }catch (Exception e){
            e.printStackTrace();
            fb.setCode(0);
-            fb.setMessage("删除失败");
+            fb.setMessage(i18n.getMessage(request,"deleteFailure"));
        }
        return gson.toJson(fb);
    }

--- a/src/main/java/com/example/tdl/web/TransferModelConfigController.java
+++ b/src/main/java/com/example/tdl/web/TransferModelConfigController.java
@@ -145,7 +145,7 @@ public class TransferModelConfigController {
                    fb.setMessage("经度不能为空");
                    return gson.toJson(fb);
                }
-                if (!updateTransferModelConfigVo.getInfo().get(i).getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+                if (!updateTransferModelConfigVo.getInfo().get(i).getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
                    fb.setCode(0);
                    fb.setMessage("经度的范围为-180~180");
                    return gson.toJson(fb);

--- a/src/main/java/com/example/tdl/web/UserAddressController.java
+++ b/src/main/java/com/example/tdl/web/UserAddressController.java
@@ -125,7 +125,7 @@ public class UserAddressController {
            fb.setMessage(i18n.getMessage(request,"lng"));
            return gson.toJson(fb);
        }
-        if(!addUserAddressVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addUserAddressVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongLng"));
            return gson.toJson(fb);
@@ -135,6 +135,11 @@ public class UserAddressController {
            fb.setMessage(i18n.getMessage(request,"repeatedName"));
            return gson.toJson(fb);
        }
+        if(StringUtils.isEmpty(addUserAddressVo.getPostCode())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"postCode"));
+            return gson.toJson(fb);
+        }
        Map<Object,Object> map=new HashMap<>();
        map.put("userNumber",user.getUserNumber());
        map.put("name",addUserAddressVo.getName());
@@ -219,17 +224,21 @@ public class UserAddressController {
            fb.setMessage(i18n.getMessage(request,"lng"));
            return gson.toJson(fb);
        }
-        if(!updateUserAddressVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!updateUserAddressVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongLng"));
            return gson.toJson(fb);
        }
+        if(StringUtils.isEmpty(updateUserAddressVo.getPostCode())){
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"postCode"));
+            return gson.toJson(fb);
+        }
        if (!updateUserAddressVo.getOldName().equals(updateUserAddressVo.getName()) && userAddressService.getByUserNumberAndName(user.getUserNumber(),updateUserAddressVo.getName())!=null){
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"modifiedRepeatedName"));
            return gson.toJson(fb);
        }
-
        Map<Object,Object> map=new HashMap<>();
        map.put("userNumber",user.getUserNumber());
        map.put("oldName", updateUserAddressVo.getOldName());

--- a/src/main/java/com/example/tdl/web/WarehouseController.java
+++ b/src/main/java/com/example/tdl/web/WarehouseController.java
@@ -72,6 +72,8 @@ public class WarehouseController {

    private final static String database ="original";

+
+
    //查询所有仓库信息
    @ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" +
            "   warehouseName:仓库名," +
@@ -108,6 +110,8 @@ public class WarehouseController {
        return warehouseService.getAll(userRedisVo.getCompanyNo());
    }

+
+
    //根据条件查询仓库信息
    @ApiOperation(value = "根据条件查询仓库信息",notes = "根据条件查询仓库信息,传值说明：" +
            "   warehouseName:仓库名," +
@@ -170,6 +174,8 @@ public class WarehouseController {
        return warehouseService.getAllByTerm(warehouseTermVo);
    }

+
+
    //获取仓库以及设备数据
    @ApiOperation(value = "获取仓库以及设备数据",notes = "获取仓库以及设备数据,传值说明：" +
            "   warehouseName:仓库名," +
@@ -496,7 +502,7 @@ public class WarehouseController {
            fb.setMessage(i18n.getMessage(request,"wrongLat"));
            return gson.toJson(fb);
        }
-        if(!addWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!addWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongLng"));
            return gson.toJson(fb);
@@ -684,7 +690,7 @@ public class WarehouseController {
            fb.setMessage(i18n.getMessage(request,"wrongLat"));
            return gson.toJson(fb);
        }
-        if(!updateWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+        if(!updateWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[0-7]\\d)((\\.\\d{1,6})?)|180)$")) {
            fb.setCode(0);
            fb.setMessage(i18n.getMessage(request,"wrongLng"));
            return gson.toJson(fb);
@@ -1173,6 +1179,7 @@ public class WarehouseController {
    }


+
    //生成仓库编号
    public String getWarehouseNo(String companyNo){
        String warehouseNo = "WH" +System.currentTimeMillis() ;
@@ -1185,6 +1192,7 @@ public class WarehouseController {
        return warehouseNo;
    }

+
    public List<WarehouseTimeAndDataVo> getData(QueryResult queryResult){
        List<List<Object>> values = getValues(queryResult);
        List<WarehouseTimeAndDataVo> historyDataList = new ArrayList<>();
@@ -1197,6 +1205,8 @@ public class WarehouseController {
        return historyDataList;
    }

+
+
    public List<WarehouseTimeAndDataVo> getDatas(QueryResult queryResult){
        List<List<Object>> values = getValues(queryResult);
        List<WarehouseTimeAndDataVo> historyDataList = new ArrayList<>();
@@ -1209,6 +1219,8 @@ public class WarehouseController {
        return historyDataList;
    }

+
+
    //解析数据格式
    public List<List<Object>>  getValues( QueryResult  queryResult){
        List<List<Object>> values = new ArrayList<>();
@@ -1224,6 +1236,8 @@ public class WarehouseController {
        return values;
    }

+
+
    //解析时间
    public String parseTime(String time){
        String dateResult =null;
@@ -1238,6 +1252,8 @@ public class WarehouseController {
        return dateResult;
    }

+
+
    //将utc时间转换成时间戳
    public static String dateToStamp(String s) throws ParseException {
        Date date =null ;
@@ -1249,6 +1265,8 @@ public class WarehouseController {
        return String.valueOf(date.getTime());
    }

+
+
    public SimpleWarehouseVo  dataData(QueryResult queryResult){
        SimpleWarehouseVo simpleWarehouseVo = new SimpleWarehouseVo();
        List<List<Object>> value = new ArrayList<>();
@@ -1278,6 +1296,8 @@ public class WarehouseController {
        return  simpleWarehouseVo;
    }

+
+
    public String  getValue(List<Double> data){
        String s = "";
        Collections.sort(data);
@@ -1305,63 +1325,67 @@ public class WarehouseController {
        }
    }

-   public  TdlDataVo parseData(QueryResult queryResult,String humidityMax,String humidityMin,String tempMax,String tempMin){
-       TdlDataVo tdlDataVo = new TdlDataVo();
-      List<List<Object>> values = new ArrayList<>();
-       for(QueryResult.Result result : queryResult.getResults()){
-           if(result.getSeries() !=null){
-               for (QueryResult.Series series : result.getSeries()) {
-                   if(series !=null){
+
+
+    public  TdlDataVo parseData(QueryResult queryResult,String humidityMax,String humidityMin,String tempMax,String tempMin){
+        TdlDataVo tdlDataVo = new TdlDataVo();
+        List<List<Object>> values = new ArrayList<>();
+        for(QueryResult.Result result : queryResult.getResults()){
+            if(result.getSeries() !=null){
+                for (QueryResult.Series series : result.getSeries()) {
+                    if(series !=null){
                        values = series.getValues();
-                   }else{
-                       continue;
-                   }
-               }
-           }else{
-               continue;
-           }
-       }
-       List<GraphicDataVo>  graphicDataList = new ArrayList<>();
-       GraphicDataVo temp = new GraphicDataVo();
-       temp.setDescption("temp");
-       temp.setMax(tempMax);
-       temp.setMin(tempMin);
-       List<HistoryData> tempData = new ArrayList<>();
-       GraphicDataVo hum = new GraphicDataVo();
-       hum.setDescption("humidity");
-       hum.setMin(humidityMin);
-       hum.setMax(humidityMax);
-       List<HistoryData> humpData = new ArrayList<>();
-       List<TdlDataVo.HistoryDataVo> historyDataList = new ArrayList<>();
-       for (int i =0,length = values.size();i<length;i++){
-           TdlDataVo.HistoryDataVo historyDataVo = new TdlDataVo.HistoryDataVo();
-           historyDataVo.setHumidity(values.get(i).get(2)==null ?"" :values.get(i).get(2).toString() );
-           historyDataVo.setTemp(values.get(i).get(1)==null ?"" :values.get(i).get(1).toString() );
-           String time =UTCToCST(values.get(i).get(0).toString());
-           historyDataVo.setTime(Long.valueOf(time));
-           historyDataList.add(historyDataVo);
-           HistoryData tem = new HistoryData();
-           tem.setTime(time);
-           tem.setValue(values.get(i).get(1)==null ?"" :values.get(i).get(1).toString());
-           tempData.add(tem);
-           HistoryData hump = new HistoryData();
-           hump.setTime(time);
-           hump.setValue(values.get(i).get(2)==null ?"" :values.get(i).get(2).toString());
-           humpData.add(hump);
-           if( i == length-1){
+                    }else{
+                        continue;
+                    }
+                }
+            }else{
+                continue;
+            }
+        }
+        List<GraphicDataVo>  graphicDataList = new ArrayList<>();
+        GraphicDataVo temp = new GraphicDataVo();
+        temp.setDescption("temp");
+        temp.setMax(tempMax);
+        temp.setMin(tempMin);
+        List<HistoryData> tempData = new ArrayList<>();
+        GraphicDataVo hum = new GraphicDataVo();
+        hum.setDescption("humidity");
+        hum.setMin(humidityMin);
+        hum.setMax(humidityMax);
+        List<HistoryData> humpData = new ArrayList<>();
+        List<TdlDataVo.HistoryDataVo> historyDataList = new ArrayList<>();
+        for (int i =0,length = values.size();i<length;i++){
+            TdlDataVo.HistoryDataVo historyDataVo = new TdlDataVo.HistoryDataVo();
+            historyDataVo.setHumidity(values.get(i).get(2)==null ?"" :values.get(i).get(2).toString() );
+            historyDataVo.setTemp(values.get(i).get(1)==null ?"" :values.get(i).get(1).toString() );
+            String time =UTCToCST(values.get(i).get(0).toString());
+            historyDataVo.setTime(Long.valueOf(time));
+            historyDataList.add(historyDataVo);
+            HistoryData tem = new HistoryData();
+            tem.setTime(time);
+            tem.setValue(values.get(i).get(1)==null ?"" :values.get(i).get(1).toString());
+            tempData.add(tem);
+            HistoryData hump = new HistoryData();
+            hump.setTime(time);
+            hump.setValue(values.get(i).get(2)==null ?"" :values.get(i).get(2).toString());
+            humpData.add(hump);
+            if( i == length-1){
                tdlDataVo.setHumidity(values.get(i).get(2)==null ?"" :values.get(i).get(2).toString());
                tdlDataVo.setTemp(values.get(i).get(1)==null ?"" :values.get(i).get(1).toString());
-           }
-       }
-       temp.setHistoryDataList(tempData);
-       hum.setHistoryDataList(humpData);
-       graphicDataList.add(temp);
-       graphicDataList.add(hum);
-       tdlDataVo.setHistoryDataList(historyDataList);
-       tdlDataVo.setGraphicDataList(graphicDataList);
-       return  tdlDataVo;
+            }
+        }
+        temp.setHistoryDataList(tempData);
+        hum.setHistoryDataList(humpData);
+        graphicDataList.add(temp);
+        graphicDataList.add(hum);
+        tdlDataVo.setHistoryDataList(historyDataList);
+        tdlDataVo.setGraphicDataList(graphicDataList);
+        return  tdlDataVo;
    }

+
+
    public  String UTCToCST(String UTCStr) {
        Date date =null ;
        try {
@@ -1381,4 +1405,6 @@ public class WarehouseController {
        //format的格式可以任意
        return String.valueOf(calendar.getTimeInMillis());
    }
+
+
 }
--- a/src/main/resources/application-docker.properties
+++ b/src/main/resources/application-docker.properties
@@ -27,3 +27,9 @@ spring.influxdb.url=http://housetest-influxdb:8086
 #tdl.mqtt.port = 8883
 #tdl.mqtt.username = logistics
 #tdl.mqtt.password = logistics37774020
+#
+#tdl.core.add =http://logisticscore-java:8079/witium/addMount
+#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
+#
+#mqtt.userName = wtlogistics
+#mqtt.password = wtlogistics
\ No newline at end of file
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -68,11 +68,7 @@ mqtt.userName = ugen
 mqtt.password = ugen


-#tdl.core.add =http://logisticscore-java:8079/witium/addMount
-#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
-#
-#mqtt.userName = wtlogistics
-#mqtt.password = wtlogistics
+



--- a/src/main/resources/i18n/messages_en.properties
+++ b/src/main/resources/i18n/messages_en.properties
@@ -160,4 +160,91 @@ sql=SQLException
 badSql=BadSqlGrammarException
 error=The server code has been exceptions, please contact the administrator
 wrongTemp=The upper limit of temperature should not be less than the limit of temperature
-wrongHumidity=The lower humidity limit is not greater than the upper limit of humidity
\ No newline at end of file
+wrongHumidity=The lower humidity limit is not greater than the upper limit of humidity
+nonexistentTruck=The plate number doesn't exist
+repeateAlias=The company name must not repeat
+alias=The company name must not be null
+regionNo=Region's serial name must not be null
+regionName=Region's name must not be null
+addRegionSuccess=Added the region successfully
+addRegionFailure=Failed to add the region
+updateRegionSuccess=Modified the region successfully
+updateRegionFailure=Failed to modify the region
+deleteRegionSuccess=Deleted the region successfully
+deleteRegionFailure=Failed to delete the region
+repetitionRegionName=The region name is repeat
+useingRegion=The region is being used
+carNo=Truck's plate number must not be null
+type=The vehicle type must not be null
+repetitionCarNo=Truck's plate number is repeat
+addCarSuccess=Added the vehicle successfully
+addCarFailure=Failed to add the vehicle
+updateCarSuccess=Modified the vehicle successfully
+updateCarFailure=Failed to modify the vehicle
+deleteCarSuccess=Deleted the vehicle successfully
+deleteCarFailure=Failed to delete the vehicle
+gatewaySN=The gateway number can not be empty
+gatewaySNRule=The gateway number must be 8 digits
+gatewayName=The gateway name can not be empty
+gatewayType=The gateway type can not be empty
+badGatewayType=The gateway type must be English or numeric
+gatewayModelName=The template name can not be empty
+existModelName=The template does not exist
+repeatedSN=The added gateway has already existed
+existGateway=The gateway does not exist
+addGatewaySuccess=You have added the gateway successfully
+updateGatewaySuccess=You have modified gateway successfully
+updateGatewayFailure=Failed to modify the gateway
+updateGatewayByModelSuccess=You have modified the device successfully through a template
+deleteGatewaySuccess=You have deleted the gateway successfully
+isState=The gateway is being mounted
+beingUsed=The gateway is being used
+updateGatewayCompanySuccess=Gateway to distribute company success
+updateGatewayCompanyFailure=Failed to assign the gateway to the company
+TDLSN=Sensor's serial number must not be null
+TDLName=Sensor's name must not be null
+updateTDLSuccess=Modified the sensor successfully
+updateTDLFailure=Failed to modify the sensor
+deleteTDLSuccess=Deleted  the gateway successfully 
+deleteTDLFailure=
+updateTDLCompanySuccess=Allocate sensor  to the company successfully
+updateTDLCompanyFailure=Failed to allocate the sensor  to the company
+warehouseName=Warehouse's name must not be null
+property=Warehouse's property must not be null
+wrongProperty=Please enter the correct property
+warehouseType=Warehouse's type must not be null
+wrongWarehouseType=Please enter the correct warehouse type
+hardwareLevel=Hardware class must not be null
+wrongHardwareLevel=Please select the correct hardware class
+areaIndoor=The indoor flat area must not be null
+areaRack=The storage shelves area must not be null
+areaOutdoor=The outdoor area must not be null
+areaPlanIndoor=The  total indoor area must not be null
+office=The office must not be null
+timeZone=The time zone must not be null
+repeateWarehouseName=The warehosue name must not repeat
+addWarehouseSuccess=Added the warehouse successfully
+addWarehouseFailure=Failed to add the warehouse
+warehouseNo=The warehouse serial number must not be null
+modifiedWarehouseSuccess=Modified the warehouse successfully
+modifiedWarehouseFailure=Failed to modify the warehouse
+Nonexistent=The warehouse doesn't exist
+deleteWarehouseSuccess=Delete the warehouse successfully
+deleteWarehouseFailure=Failed to warehouse the warehouse
+bindingGatewaySuccess=Paired the gateway successfully
+bindingGatewayFailure=Failed to paire the gateway
+addAlarmContactsSuccess=Added the emergency contact successfully
+addAlarmContactsFailure=Failed to add the emergeny contact
+NonexistentUser=The user doesn't exist
+repeatedRole=The role already exists
+usedRole=The user is being used
+addRoleSuccess=Added the user successfully
+addRoleFailure=Failed to add the user
+updateSuccess=Modified the user successfully
+updateFailure=Failed to modify the user
+deleteSuccess=Deleted the user successfully
+deleteFailure=Failed to delete the user
+adminInoperable=You can't operate the administrator account
+downloadStartTime=Query start time must not be null
+downloadEndTime=Query end time must not be null
+TDL=Sensor's serial number must not be null
\ No newline at end of file
--- a/src/main/resources/i18n/messages_ja.properties
+++ b/src/main/resources/i18n/messages_ja.properties
@@ -161,3 +161,21 @@ badSql=\u30C7\u30FC\u30BF\u306E\u7570\u5E38
 error=\u30B5\u30FC\u30D0\u30FC\u30B3\u30FC\u30C9\u304C\u7570\u5E38\u306B\u767A\u751F\u3057\u305F\u5834\u5408\u3001\u7BA1\u7406\u8005\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044
 wrongTemp=\u6E29\u5EA6\u4E0B\u9650\u3088\u308A\u306A\u3044\u6E29\u5EA6\u306E\u4E0A\u9650
 wrongHumidity=\u6E7F\u5EA6\u306E\u4E0A\u9650\u306F\u6E7F\u5EA6\u306E\u4E0B\u9650\u3088\u308A\u5C0F\u3055\u304F\u306F\u3042\u308A\u307E\u305B\u3093
+gatewaySN=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u756A\u53F7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+gatewaySNRule=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u756A\u53F7\u306F8\u6841\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+gatewayName=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u540D\u524D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+gatewayType=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u30BF\u30A4\u30D7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+badGatewayType=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u30BF\u30A4\u30D7\u306F\u82F1\u8A9E\u307E\u305F\u306F\u6570\u5B57\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+gatewayModelName=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+existModelName=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u540D\u304C\u65E2\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+repeatedSN=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u304C\u65E2\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+existGateway=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093
+addGatewaySuccess=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u8FFD\u52A0\u6210\u529F
+updateGatewaySuccess=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u4FEE\u6B63\u6210\u529F
+updateGatewayFailure=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u4FEE\u6B63\u5931\u6557
+updateGatewayByModelSuccess=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u30C7\u30D0\u30A4\u30B9\u3092\u6B63\u5E38\u306B\u5909\u66F4\u3059\u308B
+deleteGatewaySuccess=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u524A\u9664\u6210\u529F
+isState=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306F\u307B\u304B\u306E\u30EB\u30FC\u30C8\u306B\u5229\u7528\u3057\u3066\u3044\u307E\u3059
+beingUsed=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+updateGatewayCompanySuccess=\u4F1A\u793E\u306E\u6210\u529F\u3092\u914D\u308B\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4
+updateGatewayCompanyFailure=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u4F1A\u793E\u306B\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -94,7 +94,7 @@ startCircuitSuccess = \u7EBF\u8DEF\u5F00\u59CB\u8FD0\u8F93\u6210\u529F
 startCircuitFailure = \u7EBF\u8DEF\u5F00\u59CB\u8FD0\u8F93\u5931\u8D25
 #\u516C\u53F8
 companyName = \u516C\u53F8\u540D\u4E0D\u80FD\u4E3A\u7A7A
-alias= \u522B\u540D\u4E0D\u80FD\u4E3A\u7A7A
+alias= \u516C\u53F8\u7B80\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 country = \u56FD\u5BB6\u4E0D\u80FD\u4E3A\u7A7A
 city = \u57CE\u5E02\u4E0D\u80FD\u4E3A\u7A7A
 addressDetail = \u5177\u4F53\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A
@@ -102,7 +102,7 @@ tel = \u8054\u7CFB\u7535\u8BDD\u4E0D\u80FD\u4E3A\u7A7A
 manager = \u8D1F\u8D23\u4EBA\u4E0D\u80FD\u4E3A\u7A7A
 wrongTel = \u624B\u673A\u53F7\u4E0D\u89C4\u8303
 repeateCompanyName = \u516C\u53F8\u540D\u4E0D\u80FD\u91CD\u590D
-repeateAlias = \u522B\u540D\u4E0D\u80FD\u91CD\u590D
+repeateAlias = \u516C\u53F8\u7B80\u79F0\u4E0D\u80FD\u91CD\u590D
 addCompanySuccess = \u6DFB\u52A0\u516C\u53F8\u6210\u529F
 addCompanyFailure = \u6DFB\u52A0\u516C\u53F8\u5931\u8D25
 companyNo = \u516C\u53F8\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
@@ -126,6 +126,7 @@ lat = \u7EAC\u5EA6\u4E0D\u80FD\u4E3A\u7A7A
 wrongLat = \u7EAC\u5EA6\u7684\u8303\u56F4\u4E3A-90~90
 lng = \u7ECF\u5EA6\u4E0D\u80FD\u4E3A\u7A7A
 wrongLng = \u7ECF\u5EA6\u7684\u8303\u56F4\u4E3A-180~180
+postCode=\u90AE\u7F16\u4E0D\u80FD\u4E3A\u7A7A
 repeatedName = \u6DFB\u52A0\u7684\u5E38\u7528\u5730\u5740\u522B\u540D\u4E0D\u80FD\u91CD\u590D
 addAddressSuccess = \u6DFB\u52A0\u7528\u6237\u5E38\u7528\u5730\u5740\u6210\u529F
 addAddressFailure = \u6DFB\u52A0\u7528\u6237\u5E38\u7528\u5730\u5740\u5931\u8D25
@@ -190,10 +191,10 @@ deleteCarSuccess=\u8F66\u8F86\u5220\u9664\u6210\u529F
 deleteCarFailure=\u8F66\u8F86\u5220\u9664\u5931\u8D25
 #\u7F51\u5173
 gatewaySN=\u7F51\u5173\u5E8F\u5217\u53F7\u4E0D\u80FD\u4E3A\u7A7A
-gatewaySNRule=gateway\u7F16\u53F7\u5FC5\u987B\u662F8\u4F4D\u6570\u5B57
+gatewaySNRule=\u7F51\u5173\u7F16\u53F7\u5FC5\u987B\u662F8\u4F4D\u6570\u5B57
 gatewayName=\u7F51\u5173\u540D\u4E0D\u80FD\u4E3A\u7A7A
 gatewayType=\u7F51\u5173\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
-badGatewayType = \u7F51\u5173\u7C7B\u578B\u4E0D\u80FD\u5B58\u5728\u4E2D\u6587
+badGatewayType=\u7F51\u5173\u7C7B\u578B\u5FC5\u987B\u662F\u82F1\u6587\u6216\u8005\u6570\u5B57
 gatewayModelName=\u7F51\u5173\u6A21\u677F\u540D\u4E0D\u80FD\u4E3A\u7A7A
 existModelName=\u8BE5\u6A21\u677F\u4E0D\u5B58\u5728
 repeatedSN=\u6DFB\u52A0\u7684\u7F51\u5173\u5DF2\u5B58\u5728
@@ -210,12 +211,12 @@ updateGatewayCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25
 #TDL
 TDLSN=\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
 TDLName=\u4F20\u611F\u5668\u540D\u5B57\u4E0D\u80FD\u4E3A\u7A7A
-updateTDLSuccess=\u4FEE\u6539\u7F51\u5173\u6210\u529F
+updateTDLSuccess=\u4FEE\u6539\u4F20\u611F\u5668\u6210\u529F
 updateTDLFailure=\u4FEE\u6539\u7F51\u5173\u5931\u8D25
-deleteTDLSuccess=\u5220\u9664\u7F51\u5173\u6210\u529F
-deleteTDLFailure=\u5220\u9664\u7F51\u5173\u5931\u8D25
-updateTDLCompanySuccess=\u7F51\u5173\u5206\u914D\u516C\u53F8\u6210\u529F
-updateTDLCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25
+deleteTDLSuccess=\u5220\u9664\u4F20\u611F\u5668\u6210\u529F
+deleteTDLFailure=\u5220\u9664\u4F20\u611F\u5668\u5931\u8D25
+updateTDLCompanySuccess=\u4F20\u611F\u5668\u5206\u914D\u516C\u53F8\u6210\u529F
+updateTDLCompanyFailure=\u4F20\u611F\u5668\u5206\u914D\u516C\u53F8\u5931\u8D25
 #\u4ED3\u5E93
 warehouseName = \u4ED3\u5E93\u540D\u4E0D\u80FD\u4E3A\u7A7A
 property =\u4ED3\u5E93\u5C5E\u6027\u4E0D\u80FD\u4E3A\u7A7A
@@ -237,8 +238,8 @@ warehouseNo=\u4ED3\u5E93\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
 modifiedWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
 modifiedWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
 Nonexistent = \u8BE5\u4ED3\u5E93\u4E0D\u5B58\u5728
-deleteWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
-deleteWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
+deleteWarehouseSuccess=\u5220\u9664\u4ED3\u5E93\u6210\u529F
+deleteWarehouseFailure=\u5220\u9664\u4ED3\u5E93\u5931\u8D25
 bindingGatewaySuccess = \u7ED1\u5B9A\u7F51\u5173\u6210\u529F
 bindingGatewayFailure = \u7ED1\u5B9A\u7F51\u5173\u5931\u8D25
 addAlarmContactsSuccess=\u6DFB\u52A0\u7D27\u6025\u8054\u7CFB\u4EBA\u6210\u529F
@@ -259,3 +260,7 @@ downloadStartTime=\u67E5\u8BE2\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
 downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
 #\u4F20\u611F\u5668
 TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+systemManage=\u7CFB\u7EDF\u7BA1\u7406\u5458
+superManage=\u8D85\u7EA7\u7BA1\u7406\u5458
+warehouse=\u4ED3\u5E93\u7BA1\u7406\u5458
+transportManage=\u8FD0\u8F93\u7BA1\u7406\u5458