Skip to content

T
TDLCloud
Commit 22f43585 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

5.27-修改中文乱码问题

parent eee8b1ae
Show whitespace changes
Inline Side-by-side
Showing with 963 additions and 344 deletions
build.gradle
View file @ 22f43585
...@@ -36,8 +36,8 @@ dependencies { ...@@ -36,8 +36,8 @@ dependencies {
compile('org.apache.shiro:shiro-ehcache:1.2.4') compile('org.apache.shiro:shiro-ehcache:1.2.4')
compile('com.google.code.gson:gson:2.6.2') compile('com.google.code.gson:gson:2.6.2')
compile('com.mangofactory:swagger-springmvc:0.9.4') compile('com.mangofactory:swagger-springmvc:0.9.4')
compile('io.springfox:springfox-swagger2:2.2.2') compile('io.springfox:springfox-swagger2:2.8.0')
compile('io.springfox:springfox-swagger-ui:2.2.2') compile('io.springfox:springfox-swagger-ui:2.8.0')
compile('org.apache.commons:commons-lang3:3.3.2') compile('org.apache.commons:commons-lang3:3.3.2')
compile('org.apache.commons:commons-io:1.3.2') compile('org.apache.commons:commons-io:1.3.2')
compile('commons-codec:commons-codec:1.6') compile('commons-codec:commons-codec:1.6')
......
src/main/java/com/example/tdl/mqtt/MqttListener.java
View file @ 22f43585
...@@ -191,12 +191,6 @@ public class MqttListener implements MqttCallback { ...@@ -191,12 +191,6 @@ public class MqttListener implements MqttCallback {
mqttconfig.getUsername(), mqttconfig.getPassword(),mqttconfig.getQos(), mqttconfig.getUsername(), mqttconfig.getPassword(),mqttconfig.getQos(),
mqttconfig.getCacrt(),mqttconfig.getClientkey(), mqttconfig.getClientcrt(),mqttconfig.getClientpwd()); mqttconfig.getCacrt(),mqttconfig.getClientkey(), mqttconfig.getClientcrt(),mqttconfig.getClientpwd());
result = configthreadPool.submit(gcconfig); result = configthreadPool.submit(gcconfig);
// while (result.isDone())
// {
// String respcmd = result.get();
// }
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println("mqttAsyncClient: message " + Message + " received syntax error."); System.out.println("mqttAsyncClient: message " + Message + " received syntax error.");
...@@ -250,9 +244,9 @@ public class MqttListener implements MqttCallback { ...@@ -250,9 +244,9 @@ public class MqttListener implements MqttCallback {
return 3;//重发 return 3;//重发
} }
if (compare(configCMDVo.getDevList(),checkInVo.getDevList()) if (compare(configCMDVo.getDevList(),checkInVo.getDevList())
&& checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod()) && checkInVo.getGprsPeriod()==configCMDVo.getGprsPeriod()
&& checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod()) && checkInVo.getGpsPeriod()==configCMDVo.getGpsPeriod()
&& checkInVo.getMode().equals(configCMDVo.getMode()) && checkInVo.getMode()==configCMDVo.getMode()
&& compare(configCMDVo.getTempL(),checkInVo.getTempL()) && compare(configCMDVo.getTempL(),checkInVo.getTempL())
&& compare(configCMDVo.getTempH(),checkInVo.getTempH()) && compare(configCMDVo.getTempH(),checkInVo.getTempH())
&& compare(configCMDVo.getHumiL(),checkInVo.getHumiL()) && compare(configCMDVo.getHumiL(),checkInVo.getHumiL())
...@@ -275,9 +269,9 @@ public class MqttListener implements MqttCallback { ...@@ -275,9 +269,9 @@ public class MqttListener implements MqttCallback {
} }
//判断两者的devList是否一致 //判断两者的devList是否一致
if (compare(configCMDVo.getDevList(),checkInVo.getDevList()) if (compare(configCMDVo.getDevList(),checkInVo.getDevList())
&& checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod()) && checkInVo.getGprsPeriod()==(configCMDVo.getGprsPeriod())
&& checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod()) && checkInVo.getGpsPeriod()==(configCMDVo.getGpsPeriod())
&& checkInVo.getMode().equals(configCMDVo.getMode())) { && checkInVo.getMode()==(configCMDVo.getMode())) {
//一致 //一致
return 0;//休眠 return 0;//休眠
} else { } else {
......
src/main/java/com/example/tdl/util/AlarmLogForABBExcelUtil.java
View file @ 22f43585
...@@ -5,7 +5,6 @@ import org.apache.poi.hssf.usermodel.*; ...@@ -5,7 +5,6 @@ import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
......
src/main/java/com/example/tdl/util/CSVUtils.java 0 → 100644
View file @ 22f43585
package com.example.tdl.util;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CSVUtils {
private static final Logger log = LoggerFactory.getLogger(CSVUtils.class);
public static File createCSVFile(List<Object> head, List<List<Object>> dataList,String outPutPath, String filename) {
File csvFile = null;
BufferedWriter csvWtriter = null;
try {
csvFile = new File(outPutPath + File.separator + filename + ".csv");
File parent = csvFile.getParentFile();
if (parent != null && !parent.exists()){
parent.mkdirs();
}
csvFile.createNewFile();
FileOutputStream fos = new FileOutputStream(csvFile);
// 写入bom头
byte[] uft8bom={(byte)0xef,(byte)0xbb,(byte)0xbf};
//String bOM = new String(new byte[] { (byte) 0xEF, (byte) 0xBB, (byte) 0xBF });
fos.write(uft8bom);
// GB2312使正确读取分隔符","
csvWtriter = new BufferedWriter(new OutputStreamWriter(fos, "UTF-8"));
// 写入文件头部
writeRow(head, csvWtriter);
// 写入文件内容
for (List<Object> row : dataList) {
writeRow(row, csvWtriter);
}
csvWtriter.flush();
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
csvWtriter.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return csvFile;
}
/* *
* 写一行数据方法
* @param row
* @param csvWriter
* @throws IOException*/
private static void writeRow(List<Object> row, BufferedWriter csvWriter) throws IOException {
// 写入文件头部
for (Object data : row) {
StringBuffer sb = new StringBuffer();
String rowStr = sb.append("\"").append(data).append("\",").toString();
csvWriter.write(rowStr);
}
csvWriter.newLine();
}
/**
* 测试数据
*
* @param args
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public static void main(String[] args) {
List<Object> head = new ArrayList<Object>(){{
add("时间");
add("最大值");
add("最小值");
add("平均值");
}};
List<List<Object>> dataList = new ArrayList<>();
createCSVFile(head,dataList,"E:/","小时粗糙度");
}
}
src/main/java/com/example/tdl/util/MapUtils.java
View file @ 22f43585
...@@ -32,30 +32,43 @@ public class MapUtils { ...@@ -32,30 +32,43 @@ public class MapUtils {
return s; return s;
} }
public static double getTransSpeed(double lat1, double lng1, double lat2, double lng2,Long time){
if(time ==0){
return 0d;
}
double s = getDistance( lat1, lng1, lat2, lng2);
double speed = (double) s/time;
System.out.println("lng:" + lng1 +" ----lat:" +lat1 +" ----speed:" + speed +" ---time :" +time +" -----distance:"+s);
if(s< 10000){
//计算速度 //计算速度
public static double getSpeed(double lat1, double lng1, double lat2, double lng2,Long time,Float sppeed){ if(speed>60){
return 0;
}
return s/time;
}else{
return s/time;
}
}
//计算速度
public static double getSpeed(double lat1, double lng1, double lat2, double lng2,Long time,Float sppeed){
if(time ==0){ if(time ==0){
return 0d; return 0d;
} }
double s = getDistance( lat1, lng1, lat2, lng2); double s = getDistance( lat1, lng1, lat2, lng2);
double speed = (double) s/time; double speed = (double) s/time;
// if((lng1+"") .contains("110.")){ System.out.println("lng:" + lng1 +" ----lat:" +lat1 +" ----speed:" + speed +" ---time :" +time +" -----distance:"+s);
// System.out.println("lng:" + lng1 +" ----lat:" +lat1 +" ----speed:" + speed +" ---time :" +time +" -----distance:"+s);
// }
// System.out.println("lng:" + lng1 +" ----lat:" +lat1 +" ----speed:" + speed +" ---time :" +time +" -----distance:"+s);
if(s <1000 || s> 10000){ if(s <1000 || s> 10000){
//计算速度 //计算速度
if(speed>250 || speed <sppeed){ if(speed>60 || speed <sppeed){
// if((lng1+"") .contains("110.")){
// System.out.println("lng:" + lng1 +" ----lat:" +lat1 +" ----speed:" + speed +" ---time :" +time +" -----distance:"+s);
// }
return 0; return 0;
} }
return s/time; return s/time;
}else{ }else{
if(speed>60 || speed <sppeed){
return 0;
}
return s/time; return s/time;
} }
......
src/main/java/com/example/tdl/web/AlarmLogABBController.java
View file @ 22f43585
...@@ -8,6 +8,7 @@ import com.example.tdl.domain.vo.*; ...@@ -8,6 +8,7 @@ import com.example.tdl.domain.vo.*;
import com.example.tdl.service.*; import com.example.tdl.service.*;
import com.example.tdl.service.redis.TokenRedisService; import com.example.tdl.service.redis.TokenRedisService;
import com.example.tdl.util.AliyunOSSClientUtil; import com.example.tdl.util.AliyunOSSClientUtil;
import com.example.tdl.util.CSVUtils;
import com.example.tdl.util.ZipCompressUtil; import com.example.tdl.util.ZipCompressUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -259,30 +261,38 @@ public class AlarmLogABBController { ...@@ -259,30 +261,38 @@ public class AlarmLogABBController {
alarmTermABBVo.setCompanyNo(user.getCompanyNo()); alarmTermABBVo.setCompanyNo(user.getCompanyNo());
List<ResultAlarmLogABBVo> resultAlarmLogVos=alarmLogABBService.getByTermForDownload(alarmTermABBVo); List<ResultAlarmLogABBVo> resultAlarmLogVos=alarmLogABBService.getByTermForDownload(alarmTermABBVo);
if (resultAlarmLogVos.size()>0){ if (resultAlarmLogVos.size()>0){
try { List<Object> head = new ArrayList<Object>(){{
String address="./export/"; add("运输编号");
String fileName="报警日志数据-"+System.currentTimeMillis(); add("货物编号");
CsvWriter csvWriter = new CsvWriter(address + fileName+".csv", ',', Charset.forName("GB2312")); add("传感器序列号");
// 创建CSV写对象 例如:CsvWriter(文件路径，分隔符，编码格式); add("描述");
String[] rowsName={"运输编号","货物编号","传感器序列号","描述","报警数据","报警时间","报警参数"}; add("报警数据");
add("报警时间");
csvWriter.writeRecord(rowsName); add("报警参数");
}};
List<List<Object>> dataList = new ArrayList<>();
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (int i = 0; i < resultAlarmLogVos.size(); ++i) { for (int i = 0; i < resultAlarmLogVos.size(); ++i) {
String[] objs = new String[rowsName.length]; List<Object> values= new ArrayList<>();
objs[0] = String.valueOf(resultAlarmLogVos.get(i).getTransportationNo()); values.add(resultAlarmLogVos.get(i).getTransportationNo());
objs[1] = String.valueOf(resultAlarmLogVos.get(i).getCargoNo()); values.add(resultAlarmLogVos.get(i).getCargoNo());
objs[2] = String.valueOf(resultAlarmLogVos.get(i).getTDLSN()); values.add(resultAlarmLogVos.get(i).getTDLSN());
objs[3] = String.valueOf(resultAlarmLogVos.get(i).getDescription()); values.add(resultAlarmLogVos.get(i).getDescription());
objs[4] = String.valueOf(resultAlarmLogVos.get(i).getData()); values.add(resultAlarmLogVos.get(i).getData());
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//这个是你要转成后的时间的格式 //这个是你要转成后的时间的格式
objs[5] = String.valueOf(sdf.format(new Date(resultAlarmLogVos.get(i).getAlarmTime()))); values.add(sdf.format(new Date(resultAlarmLogVos.get(i).getAlarmTime())));
objs[6] = String.valueOf(resultAlarmLogVos.get(i).getClassify()); values.add(resultAlarmLogVos.get(i).getClassify());
csvWriter.writeRecord(objs); dataList.add(values);
} }
csvWriter.flush(); String fileName="报警日志数据-"+System.currentTimeMillis();
csvWriter.close(); String address="./export/";
CSVUtils.createCSVFile(head,dataList,address,fileName);
ZipCompressUtil zipCom = new ZipCompressUtil(address + fileName+".zip", address + fileName+".csv"); ZipCompressUtil zipCom = new ZipCompressUtil(address + fileName+".zip", address + fileName+".csv");
try {
zipCom.zip(); zipCom.zip();
} catch ( Exception e ) {
e.printStackTrace();
}
OSSClient ossClient = AliyunOSSClientUtil.getOSSClient(); OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(address + fileName+ ".zip")); String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(address + fileName+ ".zip"));
if (md5Key != null) { if (md5Key != null) {
...@@ -294,11 +304,43 @@ public class AlarmLogABBController { ...@@ -294,11 +304,43 @@ public class AlarmLogABBController {
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传失败"); fb.setMessage("上传失败");
} }
} catch (Exception e) { // try {
e.printStackTrace(); // CsvWriter csvWriter = new CsvWriter(address + fileName+".csv", ',', Charset.forName("GB2312"));
fb.setCode(0); // // 创建CSV写对象 例如:CsvWriter(文件路径，分隔符，编码格式);
fb.setMessage("下载失败"); // String[] rowsName={"运输编号","货物编号","传感器序列号","描述","报警数据","报警时间","报警参数"};
} //
// csvWriter.writeRecord(rowsName);
// for (int i = 0; i < resultAlarmLogVos.size(); ++i) {
// String[] objs = new String[rowsName.length];
// objs[0] = String.valueOf(resultAlarmLogVos.get(i).getTransportationNo());
// objs[1] = String.valueOf(resultAlarmLogVos.get(i).getCargoNo());
// objs[2] = String.valueOf(resultAlarmLogVos.get(i).getTDLSN());
// objs[3] = String.valueOf(resultAlarmLogVos.get(i).getDescription());
// objs[4] = String.valueOf(resultAlarmLogVos.get(i).getData());
// objs[5] = String.valueOf(sdf.format(new Date(resultAlarmLogVos.get(i).getAlarmTime())));
// objs[6] = String.valueOf(resultAlarmLogVos.get(i).getClassify());
// csvWriter.writeRecord(objs);
// }
// csvWriter.flush();
// csvWriter.close();
// ZipCompressUtil zipCom = new ZipCompressUtil(address + fileName+".zip", address + fileName+".csv");
// zipCom.zip();
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
// String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(address + fileName+ ".zip"));
// if (md5Key != null) {
// fb.setCode(1);
// fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/abbAlarm/" + fileName+ ".zip");
// new File(address + fileName).delete();
// return gson.toJson(fb);
// } else {
// fb.setCode(0);
// fb.setMessage("上传失败");
// }
// } catch (Exception e) {
// e.printStackTrace();
// fb.setCode(0);
// fb.setMessage("下载失败");
// }
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage("没有数据可以下载"); fb.setMessage("没有数据可以下载");
......
src/main/java/com/example/tdl/web/DataController.java
View file @ 22f43585
...@@ -14,6 +14,7 @@ import com.example.tdl.service.redis.RealRedisService; ...@@ -14,6 +14,7 @@ import com.example.tdl.service.redis.RealRedisService;
import com.example.tdl.service.redis.TokenRedisService; import com.example.tdl.service.redis.TokenRedisService;
import com.example.tdl.util.AliyunOSSClientUtil; import com.example.tdl.util.AliyunOSSClientUtil;
import com.example.tdl.util.CSVUtils;
import com.example.tdl.util.DataUtil; import com.example.tdl.util.DataUtil;
import com.example.tdl.util.MapUtils; import com.example.tdl.util.MapUtils;
import com.example.tdl.util.ZipCompressUtil; import com.example.tdl.util.ZipCompressUtil;
...@@ -21,6 +22,7 @@ import com.google.gson.Gson; ...@@ -21,6 +22,7 @@ import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.influxdb.dto.Query; import org.influxdb.dto.Query;
...@@ -102,9 +104,7 @@ public class DataController { ...@@ -102,9 +104,7 @@ public class DataController {
@ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"), @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
}) })
public Object getLocation(@RequestBody SearchLocationVo searchLocationVo, HttpServletRequest request) { public Object getLocation(@RequestBody SearchLocationVo searchLocationVo, HttpServletRequest request) {
String token = request.getHeader("Account_token"); UserRedisVo user = gson.fromJson(tokenRedisService.get("TOKEN_" + request.getHeader("Account_token")), UserRedisVo.class);
String datum = tokenRedisService.get("TOKEN_" + token);
UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
if (StringUtils.isEmpty(searchLocationVo.getTransportationNo())) { if (StringUtils.isEmpty(searchLocationVo.getTransportationNo())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "transportationNo")); fb.setMessage(i18n.getMessage(request, "transportationNo"));
...@@ -121,8 +121,7 @@ public class DataController { ...@@ -121,8 +121,7 @@ public class DataController {
} }
Long startTime = resultCircuitVo.getStartTime() * 1000000l; Long startTime = resultCircuitVo.getStartTime() * 1000000l;
if(resultCircuitVo.getEndTime() !=null && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){ if(resultCircuitVo.getEndTime() !=null && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){
Object ret = infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo()); return infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo());
return ret;
} }
//获取gateway的信息 //获取gateway的信息
TDLLogVo tdlLogVo = tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo()); TDLLogVo tdlLogVo = tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo());
...@@ -134,15 +133,16 @@ public class DataController { ...@@ -134,15 +133,16 @@ public class DataController {
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
Long time = resultCircuitVo.getEndTime() * 1000000l; Long time = resultCircuitVo.getEndTime() * 1000000l;
if ("baidu".equals(searchLocationVo.getType())) { if ("baidu".equals(searchLocationVo.getType())) {
sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time "; sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
} else { } else {
sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time "; sql = "SELECT \"lng\",\"lat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
} }
} else { } else {
if ("baidu".equals(searchLocationVo.getType())) { if ("baidu".equals(searchLocationVo.getType())) {
sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time "; // sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= 1552579200000000000 ORDER BY time ";
} else { } else {
sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time "; sql = "SELECT \"lng\",\"lat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
} }
} }
//获取tdl信息 //获取tdl信息
...@@ -151,11 +151,7 @@ public class DataController { ...@@ -151,11 +151,7 @@ public class DataController {
List<LocationDataVo> locationDataVos = new ArrayList<>(); List<LocationDataVo> locationDataVos = new ArrayList<>();
if (queryResult.getResults().get(0).getSeries() != null) { if (queryResult.getResults().get(0).getSeries() != null) {
//博士测试线路：CHN20181016G3039 //博士测试线路：CHN20181016G3039
if(searchLocationVo.getTransportationNo().equals("CHN20181016G3039")){ locationDataVos =getLocationData(queryResult);
locationDataVos =getLocation(queryResult);
}else{
locationDataVos = getData(queryResult);
}
}else{ }else{
return gson.toJson(locationDataVoList); return gson.toJson(locationDataVoList);
} }
...@@ -469,20 +465,45 @@ public class DataController { ...@@ -469,20 +465,45 @@ public class DataController {
return gson.toJson(fb); return gson.toJson(fb);
} }
OSSClient ossClient = AliyunOSSClientUtil.getOSSClient(); OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
String[] rowsName;
List<Object> head ;
if("cn".equals(request.getHeader("AccountLanguage"))){ if("cn".equals(request.getHeader("AccountLanguage"))){
rowsName = new String[]{"时间","压力(MPa)","温度(℃)","湿度(%RH)","震动能量(w)","震动强度(g)","倾斜角度(°)","经度","纬度"}; head = new ArrayList<Object>(){{
add("时间");
add("压力(MPa)");
add("温度(℃)");
add("湿度(%RH)");
add("震动能量(w)");
add("震动强度(g)");
add("倾斜角度(°)");
add("经度");
add("纬度");
}};
}else if("jp".equals(request.getHeader("AccountLanguage"))){ }else if("jp".equals(request.getHeader("AccountLanguage"))){
rowsName = new String[]{"时间","圧力(MPa)","温度(℃)","湿度(%RH)","振動エネルギー(w)","振動(g)","回転(°)","経度","緯度"}; head = new ArrayList<Object>(){{
add("时间");
add("压力(MPa)");
add("温度(℃)");
add("湿度(%RH)");
add("振動エネルギー(w)");
add("振動(g)");
add("回転(°)");
add("経度");
add("緯度");
}};
}else{ }else{
rowsName = new String[]{"Time","Pressure(MPa)","Temperature(℃)","Humidity(%RH)","Shock Intensity(w)","Shock(g)","Tilt(°)","Longitude","Latitude"}; head = new ArrayList<Object>(){{
add("Time");
} add("Pressure(MPa)");
File file = new File("./export"); add("Temperature(℃)");
if(!file.exists()){ add("Humidity(%RH)");
file.mkdir(); add("Shock Intensity(w)");
add("Shock(g)");
add("Tilt(°)");
add("Longitude");
add("Latitude");
}};
} }
try {
String sqls = ""; String sqls = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time "; sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
...@@ -493,32 +514,25 @@ public class DataController { ...@@ -493,32 +514,25 @@ public class DataController {
File[] srcFiles = new File[devList.size()]; File[] srcFiles = new File[devList.size()];
File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip"); File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
if (queryResult.getResults().get(0).getSeries().get(0) != null) { if (queryResult.getResults().get(0).getSeries().get(0) != null) {
for(int i = 0;i<devList.size();i++){ for(int i = 0;i<devList.size();i++){
CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv" , ',', Charset.forName("GBK")); String address = "./export/";
csvWriter.writeRecord(rowsName); String fileName = devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data");
List<List<Object>> values = DataUtil.getValues(queryResult); List<List<Object>> values = new ArrayList<>();
for(List<Object> value : values){ for(List<Object> value : DataUtil.getValues(queryResult)){
if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){ if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
String[] objs = new String[rowsName.length]; List<Object> data = new ArrayList<>();
for (int j = 0; j < objs.length; j++) { for (int j = 0; j < head.size(); j++) {
if(j==0){ if(j==0){
try { data.add(timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset()))));
objs[j] =timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset())));
} catch (Exception e) {
e.printStackTrace();
logger.info(e.toString());
fb.setMessage(i18n.getMessage(request,"timeparse"));
}
}else { }else {
objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString(); data.add(value.get(j+1) == null ? "-" :value.get(j+1).toString());
} }
} }
csvWriter.writeRecord(objs); values.add(data);
csvWriter.flush();
} }
} }
csvWriter.close(); CSVUtils.createCSVFile(head,values,address,fileName);
srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv"); srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv");
} }
} }
...@@ -541,11 +555,6 @@ public class DataController { ...@@ -541,11 +555,6 @@ public class DataController {
e.printStackTrace(); e.printStackTrace();
logger.info(e.toString()); logger.info(e.toString());
} }
}catch (Exception e){
e.printStackTrace();
logger.info(e.toString());
}
return gson.toJson(fb); return gson.toJson(fb);
} }
...@@ -591,22 +600,47 @@ public class DataController { ...@@ -591,22 +600,47 @@ public class DataController {
return gson.toJson(fb); return gson.toJson(fb);
} }
OSSClient ossClient = AliyunOSSClientUtil.getOSSClient(); OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
String[] rowsName;
List<Object> head ;
if("cn".equals(request.getHeader("AccountLanguage"))){ if("cn".equals(request.getHeader("AccountLanguage"))){
rowsName = new String[]{"时间","圧力(MPa)","海拔(m)","温度(℃)","湿度(%RH)","震动强度(g)","倾斜角度(°)","经度","纬度"}; head = new ArrayList<Object>(){{
add("时间");
add("压力(MPa)");
add("海拔(m)");
add("温度(℃)");
add("湿度(%RH)");
add("震动强度(g)");
add("倾斜角度(°)");
add("经度");
add("纬度");
}};
}else if("jp".equals(request.getHeader("AccountLanguage"))){ }else if("jp".equals(request.getHeader("AccountLanguage"))){
rowsName = new String[]{"时间","圧力(MPa)","海抜(m)","温度(℃)","湿度(%RH)","振動(g)","回転(°)","経度","緯度"}; head = new ArrayList<Object>(){{
add("时间");
add("压力(MPa)");
add("海抜(m)");
add("温度(℃)");
add("湿度(%RH)");
add("振動(g)");
add("回転(°)");
add("経度");
add("緯度");
}};
}else{ }else{
rowsName = new String[]{"Time","Pressure(MPa)","Altitude(m)","Temperature(℃)","Humidity(%RH)","Shock(g)","Tilt(°)","Longitude","Latitude"}; head = new ArrayList<Object>(){{
add("Time");
} add("Pressure(MPa)");
File file = new File("./export"); add("Altitude(m)");
if(!file.exists()){ add("Temperature(℃)");
file.mkdir(); add("Humidity(%RH)");
add("Shock(g)");
add("Tilt(°)");
add("Longitude");
add("Latitude");
}};
} }
DecimalFormat df = new DecimalFormat("0.00"); DecimalFormat df = new DecimalFormat("0.00");
df.getRoundingMode(); df.getRoundingMode();
try {
String sqls = ""; String sqls = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time "; sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
...@@ -617,38 +651,35 @@ public class DataController { ...@@ -617,38 +651,35 @@ public class DataController {
File[] srcFiles = new File[devList.size()]; File[] srcFiles = new File[devList.size()];
File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip"); File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
if (queryResult.getResults().get(0).getSeries().get(0) != null) { if (queryResult.getResults().get(0).getSeries().get(0) != null) {
for(int i = 0;i<devList.size();i++){ for(int i = 0;i<devList.size();i++){
CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv" , ',', Charset.forName("GBK")); String address = "./export/";
csvWriter.writeRecord(rowsName); String fileName = devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data");
List<List<Object>> values = DataUtil.getValues(queryResult); List<List<Object>> values = new ArrayList<>();
for(List<Object> value : values){ for(List<Object> value : DataUtil.getValues(queryResult)){
if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){ if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
String[] objs = new String[rowsName.length]; List<Object> data = new ArrayList<>();
for (int j = 0; j < objs.length; j++) { for (int j = 0; j < head.size(); j++) {
logger.info(j+"=-----"+ rowsName[j]);
if(j==0){ if(j==0){
try { try {
objs[j] =timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset()))); data.add(timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset()))));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info(e.toString()); logger.info(e.toString());
continue; continue;
} }
}else if(j ==1) { }else if(j ==1) {
objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString(); data.add(value.get(j+1) == null ? "-" :value.get(j+1).toString());
}else if(j ==2){ }else if(j ==2){
Double altitude = value.get(2) == null ? null : 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(value.get(2).toString())))/1013.25), (float)1/5.256))); Double altitude = value.get(2) == null ? null : 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(value.get(2).toString())))/1013.25), (float)1/5.256)));
objs[j] = altitude == null ? "-" : altitude.toString(); data.add( altitude == null ? "-" : altitude.toString());
}else{ }else{
objs[j] =value.get(j) == null ? "-" :value.get(j).toString(); data.add(value.get(j) == null ? "-" :value.get(j).toString());
} }
} }
csvWriter.writeRecord(objs); values.add(data);
csvWriter.flush();
} }
} }
csvWriter.close(); CSVUtils.createCSVFile(head,values,address,fileName);
srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv"); srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv");
} }
} }
...@@ -671,135 +702,10 @@ public class DataController { ...@@ -671,135 +702,10 @@ public class DataController {
e.printStackTrace(); e.printStackTrace();
logger.info(e.toString()); logger.info(e.toString());
} }
}catch (Exception e){
e.printStackTrace();
logger.info(e.toString());
}
return gson.toJson(fb); return gson.toJson(fb);
} }
// @ApiOperation(value = "下载线路数据", notes = "下载线路数据")
// @PostMapping("/downLoad")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
// })
// public String downLoad(@RequestBody String transportationNo, HttpServletRequest request){
// String token = request.getHeader("Account_token");
// String datum = tokenRedisService.get("TOKEN_" + token);
// UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
// if (StringUtils.isEmpty(transportationNo)) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "transportationNo"));
// return gson.toJson(fb);
// }
// JSONObject jsonObject = JSON.parseObject(transportationNo);
// transportationNo = jsonObject.getString("transportationNo");
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, user.getCompanyNo());
// if (resultCircuitVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "notStarted"));
// return gson.toJson(fb);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo);
// if (gatewayVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
// //获取tdl信息
// List<String> devList = tdlLogService.getTdlSN(transportationNo);
// if (devList.size() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
//
// String[] rowsName = new String[]{"时间","压力(MPa)","温度(℃)","湿度(%RH)","震动能量(w)","震动强度(g)","倾斜角度(°)","经度","纬度"};
// File file = new File("./export");
// if(!file.exists()){
// file.mkdir();
// }
// try {
// String sqls = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
// } else {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time ";
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
// File[] srcFiles = new File[devList.size()];
// File zipFile = new File("./export/" +transportationNo+"运输数据.zip");
// if (queryResult.getResults().get(0).getSeries().get(0) != null) {
//
// for(int i = 0;i<devList.size();i++){
//
// CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+"运输数据.csv" , ',', Charset.forName("GB2312"));
// csvWriter.writeRecord(rowsName);
// List<List<Object>> values = getValues(queryResult);
// for(List<Object> value : values){
//// logger.info(value.get(1)==null ? " " :value.get(1).toString() +"---------"+devList.get(i));
// if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
// String[] objs = new String[rowsName.length];
// for (int j = 0; j < objs.length; j++) {
// if(j==0){
// try {
// objs[j] =timeStampDate(new Long(UTCToCST(String.valueOf(value.get(j)))));
//// objs[j] =timeStampDate(new Long(dateToStamp(String.valueOf(value.get(j)))));
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// fb.setMessage("时间解析异常");
// }
// }else {
// objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString();
// }
// }
// csvWriter.writeRecord(objs);
// csvWriter.flush();
// }
// }
// csvWriter.close();
// srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+"运输数据.csv");
// }
// }
//
// ZipCompressUtil.zipFiles(srcFiles,zipFile);
// try {
// String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, zipFile);
// if (md5Key != null) {
// for(int a =0;a<srcFiles.length;a++){
// srcFiles[a].delete();
// }
// zipFile.delete();
// fb.setCode(1);
// fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/circuit/"+transportationNo+"运输数据.zip");
// return gson.toJson(fb);
// } else {
// fb.setCode(0);
// fb.setMessage("上传失败");
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// }
// }catch (Exception e){
// e.printStackTrace();
// logger.info(e.toString());
// }
//
// return gson.toJson(fb);
// }
//解析数据 //解析数据
public List<LocationDataVo> getLocation(QueryResult queryResult) { public List<LocationDataVo> getLocation(QueryResult queryResult) {
...@@ -820,6 +726,53 @@ public class DataController { ...@@ -820,6 +726,53 @@ public class DataController {
return historyDataList; return historyDataList;
} }
public List<LocationDataVo> getLocationData(QueryResult queryResult){
List<List<Object>> values = DataUtil.getValues(queryResult);
List<LocationDataVo> historyDataList = new ArrayList<>();
for (int i =0,length = values.size();i<length;i++) {
LocationDataVo historyData = new LocationDataVo();
Integer motion = values.get(i).get(3) == null ? 0 :Double.valueOf(values.get(i).get(3).toString()).intValue();
if(i == 0){
historyData.setTime(DataUtil.parseTime(values.get(i).get(0).toString()));
historyData.setLng(Double.parseDouble(values.get(i).get(1).toString()));
historyData.setLat(Double.parseDouble(values.get(i).get(2).toString()));
historyData.setError(0);
}else{
if(motion == 2){ //静止状态
String time = DataUtil.parseTime(values.get(i).get(0).toString());
historyDataList.get(historyDataList.size()-1).setTime(time);
}else{
String time1 = DataUtil.parseTime(values.get(i).get(0).toString());
String time2 = DataUtil.parseTime(values.get(i-1).get(0).toString());
Double lng1 = Double.parseDouble(values.get(i).get(1).toString());
Double lat1 = Double.parseDouble(values.get(i).get(2).toString());
Double lng2 = Double.parseDouble(values.get(i-1).get(1).toString());
Double lat2 = Double.parseDouble(values.get(i-1).get(2).toString());
Double speed=0d;
if(motion == 1){
speed = MapUtils.getTransSpeed(lat1, lng1,lat2,lng2,(Long.valueOf(time1)-Long.valueOf(time2))/1000);
}else if(motion == 0){
speed = MapUtils.getSpeed(lat1, lng1,lat2,lng2,(Long.valueOf(time1)-Long.valueOf(time2))/1000,3.3f);
}
if(speed >0){
historyData.setTime(time1);
historyData.setLng(lng1);
historyData.setLat(lat1);
historyData.setError(0);
}else{
LocationDataVo historyDatas = historyDataList.get(historyDataList.size()-1);
historyDataList.remove(historyDataList.size()-1);
historyDatas.setTime(time1);
historyDataList.add(historyDatas);
continue;
}
}
}
historyDataList.add(historyData);
}
return historyDataList;
}
public List<LocationDataVo> getData(QueryResult queryResult) { public List<LocationDataVo> getData(QueryResult queryResult) {
List<List<Object>> values = DataUtil.getValues(queryResult); List<List<Object>> values = DataUtil.getValues(queryResult);
Float sppeed = 3.3f; Float sppeed = 3.3f;
...@@ -827,7 +780,7 @@ public class DataController { ...@@ -827,7 +780,7 @@ public class DataController {
sppeed =1.7f; sppeed =1.7f;
} }
List<LocationDataVo> historyDataList = new ArrayList<>(); List<LocationDataVo> historyDataList = new ArrayList<>();
for (int i =0,length = values.size()-1;i<length;i++) { for (int i =0,length = values.size();i<length;i++) {
LocationDataVo historyData = new LocationDataVo(); LocationDataVo historyData = new LocationDataVo();
if(values.size()<5){ if(values.size()<5){
if (values.get(i).get(1).toString().equals("0.0")) { if (values.get(i).get(1).toString().equals("0.0")) {
...@@ -859,6 +812,11 @@ public class DataController { ...@@ -859,6 +812,11 @@ public class DataController {
historyData.setLng(lng1); historyData.setLng(lng1);
historyData.setLat(lat1); historyData.setLat(lat1);
}else{ }else{
historyDataList.remove(historyDataList.size()-1);
historyData.setTime(time1);
historyData.setLng(lng1);
historyData.setLat(lat1);
historyDataList.add(historyData);
continue; continue;
} }
} }
...@@ -972,16 +930,6 @@ public class DataController { ...@@ -972,16 +930,6 @@ public class DataController {
//解析震动时间 //解析震动时间
public List<String> getTime(QueryResult queryResult) { public List<String> getTime(QueryResult queryResult) {
// for (List<Object> value : values) {
// try {
// //判断两个时间相差是否超过一分钟
//
// time.add(DataUtil.UTCToCST(value.get(0).toString(),"+8"));
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// }
// }
List<List<Object>> values = DataUtil.getValues(queryResult); List<List<Object>> values = DataUtil.getValues(queryResult);
List<String> time = new ArrayList<>(); List<String> time = new ArrayList<>();
for(int i = 0,length=values.size();i<length;i++){ for(int i = 0,length=values.size();i<length;i++){
...@@ -1035,8 +983,412 @@ public class DataController { ...@@ -1035,8 +983,412 @@ public class DataController {
return historyDataList; return historyDataList;
} }
} }
// //下载数据
// @ApiOperation(value = "下载线路数据", notes = "下载线路数据")
// @PostMapping("/downLoad")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
// @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = true, dataType = "String"),
// })
// public String downLoad(@RequestBody TransportationNoVo transportationNo, HttpServletRequest request){
// UserRedisVo user = gson.fromJson(tokenRedisService.get("TOKEN_" + request.getHeader("Account_token")), UserRedisVo.class);
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo.getTransportationNo(), user.getCompanyNo());
// if (resultCircuitVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// if(StringUtils.isEmpty(transportationNo.getOffset())){
// transportationNo.setOffset("8");
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "notStarted"));
// return gson.toJson(fb);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo.getTransportationNo());
// if (gatewayVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
// //获取tdl信息
// List<String> devList = tdlLogService.getTdlSN(transportationNo.getTransportationNo());
// if (devList.size() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
//
// List<Object> head ;
// if("cn".equals(request.getHeader("AccountLanguage"))){
// head = new ArrayList<Object>(){{
// add("时间");
// add("压力(MPa)");
// add("温度(℃)");
// add("湿度(%RH)");
// add("震动能量(w)");
// add("震动强度(g)");
// add("倾斜角度(°)");
// add("经度");
// add("纬度");
// }};
// }else if("jp".equals(request.getHeader("AccountLanguage"))){
// head = new ArrayList<Object>(){{
// add("时间");
// add("压力(MPa)");
// add("温度(℃)");
// add("湿度(%RH)");
// add("振動エネルギー(w)");
// add("振動(g)");
// add("回転(°)");
// add("経度");
// add("緯度");
// }};
// }else{
// head = new ArrayList<Object>(){{
// add("Time");
// add("Pressure(MPa)");
// add("Temperature(℃)");
// add("Humidity(%RH)");
// add("Shock Intensity(w)");
// add("Shock(g)");
// add("Tilt(°)");
// add("Longitude");
// add("Latitude");
// }};
// }
//
// String[] rowsName;
// if("cn".equals(request.getHeader("AccountLanguage"))){
// rowsName = new String[]{"时间","压力(MPa)","温度(℃)","湿度(%RH)","震动能量(w)","震动强度(g)","倾斜角度(°)","经度","纬度"};
// }else if("jp".equals(request.getHeader("AccountLanguage"))){
// rowsName = new String[]{"时间","圧力(MPa)","温度(℃)","湿度(%RH)","振動エネルギー(w)","振動(g)","回転(°)","経度","緯度"};
// }else{
// rowsName = new String[]{"Time","Pressure(MPa)","Temperature(℃)","Humidity(%RH)","Shock Intensity(w)","Shock(g)","Tilt(°)","Longitude","Latitude"};
//
// }
// File file = new File("./export");
// if(!file.exists()){
// file.mkdir();
// }
// try {
// String sqls = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
// } else {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time ";
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
// File[] srcFiles = new File[devList.size()];
// File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
// if (queryResult.getResults().get(0).getSeries().get(0) != null) {
// for(int i = 0;i<devList.size();i++){
// CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv" , ',', Charset.forName("GBK"));
// csvWriter.writeRecord(rowsName);
// List<List<Object>> values = DataUtil.getValues(queryResult);
// for(List<Object> value : values){
// if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
// String[] objs = new String[rowsName.length];
// for (int j = 0; j < objs.length; j++) {
// if(j==0){
// try {
// objs[j] =timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset())));
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// fb.setMessage(i18n.getMessage(request,"timeparse"));
// }
// }else {
// objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString();
// }
// }
// csvWriter.writeRecord(objs);
// csvWriter.flush();
// }
// }
// csvWriter.close();
// srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv");
// }
// }
// ZipCompressUtil.zipFiles(srcFiles,zipFile);
// try {
// String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, zipFile);
// if (md5Key != null) {
// for(int a =0;a<srcFiles.length;a++){
// srcFiles[a].delete();
// }
// zipFile.delete();
// fb.setCode(1);
// fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/circuit/"+transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
// return gson.toJson(fb);
// } else {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"fileUpload"));
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// }
// }catch (Exception e){
// e.printStackTrace();
// logger.info(e.toString());
// }
//
// return gson.toJson(fb);
// }
//
//
//
//
// //下载数据
// @ApiOperation(value = "abb下载线路数据", notes = "abb下载线路数据")
// @PostMapping("/downLoadfForABB")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
// @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = true, dataType = "String"),
// })
// public String downLoadfForABB(@RequestBody TransportationNoVo transportationNo, HttpServletRequest request){
// UserRedisVo user = gson.fromJson(tokenRedisService.get("TOKEN_" + request.getHeader("Account_token")), UserRedisVo.class);
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo.getTransportationNo(), user.getCompanyNo());
// if (resultCircuitVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// if(StringUtils.isEmpty(transportationNo.getOffset())){
// transportationNo.setOffset("8");
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "notStarted"));
// return gson.toJson(fb);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo.getTransportationNo());
// if (gatewayVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
// //获取tdl信息
// List<String> devList = tdlLogService.getTdlSN(transportationNo.getTransportationNo());
// if (devList.size() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
// String[] rowsName;
// if("cn".equals(request.getHeader("AccountLanguage"))){
// rowsName = new String[]{"时间","圧力(MPa)","海拔(m)","温度(℃)","湿度(%RH)","震动强度(g)","倾斜角度(°)","经度","纬度"};
// }else if("jp".equals(request.getHeader("AccountLanguage"))){
// rowsName = new String[]{"时间","圧力(MPa)","海抜(m)","温度(℃)","湿度(%RH)","振動(g)","回転(°)","経度","緯度"};
// }else{
// rowsName = new String[]{"Time","Pressure(MPa)","Altitude(m)","Temperature(℃)","Humidity(%RH)","Shock(g)","Tilt(°)","Longitude","Latitude"};
//
// }
// File file = new File("./export");
// if(!file.exists()){
// file.mkdir();
// }
// DecimalFormat df = new DecimalFormat("0.00");
// df.getRoundingMode();
// try {
// String sqls = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
// } else {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time ";
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
// File[] srcFiles = new File[devList.size()];
// File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
// if (queryResult.getResults().get(0).getSeries().get(0) != null) {
//
// for(int i = 0;i<devList.size();i++){
// CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv" , ',', Charset.forName("GBK"));
// csvWriter.writeRecord(rowsName);
// List<List<Object>> values = DataUtil.getValues(queryResult);
// for(List<Object> value : values){
// if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
// String[] objs = new String[rowsName.length];
// for (int j = 0; j < objs.length; j++) {
// logger.info(j+"=-----"+ rowsName[j]);
// if(j==0){
// try {
// objs[j] =timeStamp2Date(new Long(DataUtil.UTCToCST(String.valueOf(value.get(j)),transportationNo.getOffset())));
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// continue;
// }
// }else if(j ==1) {
// objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString();
// }else if(j ==2){
// Double altitude = value.get(2) == null ? null : 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(value.get(2).toString())))/1013.25), (float)1/5.256)));
// objs[j] = altitude == null ? "-" : altitude.toString();
// }else{
// objs[j] =value.get(j) == null ? "-" :value.get(j).toString();
// }
// }
// csvWriter.writeRecord(objs);
// csvWriter.flush();
// }
// }
// csvWriter.close();
// srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+i18n.getMessage(request,"data")+".csv");
// }
// }
// ZipCompressUtil.zipFiles(srcFiles,zipFile);
// try {
// String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, zipFile);
// if (md5Key != null) {
// for(int a =0;a<srcFiles.length;a++){
// srcFiles[a].delete();
// }
// zipFile.delete();
// fb.setCode(1);
// fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/circuit/"+transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
// return gson.toJson(fb);
// } else {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"fileUpload"));
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// }
// }catch (Exception e){
// e.printStackTrace();
// logger.info(e.toString());
// }
//
// return gson.toJson(fb);
// }
// @ApiOperation(value = "获取坐标数据数据", notes = "获取坐标数据数据:" +
// " time:时间," +
// " lng：经度," +
// " lat: 纬度.")
// @PostMapping("/getLocation")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
// @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
// })
// public Object getLocation(@RequestBody SearchLocationVo searchLocationVo, HttpServletRequest request) {
// String token = request.getHeader("Account_token");
// String datum = tokenRedisService.get("TOKEN_" + token);
// UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
// if (StringUtils.isEmpty(searchLocationVo.getTransportationNo())) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "transportationNo"));
// return gson.toJson(fb);
// }
// //根据运输编号获取线路信息
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(searchLocationVo.getTransportationNo(), user.getCompanyNo());
// List<LocationDataVo> locationDataVoList = new ArrayList<>();
// if (resultCircuitVo == null) {
// return gson.toJson(locationDataVoList);
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// return gson.toJson(locationDataVoList);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// if(resultCircuitVo.getEndTime() !=null && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){
// Object ret = infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo());
// return ret;
// }
// //获取gateway的信息
// TDLLogVo tdlLogVo = tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo());
// if (tdlLogVo == null) {
// return gson.toJson(locationDataVoList);
// }
// String device = tdlLogVo.getgType() + "_" + tdlLogVo.getgSN();
// String sql = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// Long time = resultCircuitVo.getEndTime() * 1000000l;
// if ("baidu".equals(searchLocationVo.getType())) {
// sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
// } else {
// sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
// }
// } else {
// if ("baidu".equals(searchLocationVo.getType())) {
// sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
// } else {
// sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
// }
// }
// //获取tdl信息
// QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
// //解析经纬度数据
// List<LocationDataVo> locationDataVos = new ArrayList<>();
// if (queryResult.getResults().get(0).getSeries() != null) {
// //博士测试线路：CHN20181016G3039
// if(searchLocationVo.getTransportationNo().equals("CHN20181016G3039")){
// locationDataVos =getLocation(queryResult);
// }else{
// locationDataVos = getData(queryResult);
// }
// }else{
// return gson.toJson(locationDataVoList);
// }
// //获取震动的数据
// String sql2 = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// Long time = resultCircuitVo.getEndTime() * 1000000l;
// sql2 = "SELECT \"a1\" FROM \"tdl_policy\".\"" + device + "\" where \"event\" = 'Shock event' and \"a1\" >= 1.5 and time >= " + startTime + " and time<=" + time + " ORDER BY time";
// } else {
// sql2 = "SELECT \"a1\" FROM \"tdl_policy\".\"" + device + "\" where \"event\" = 'Shock event' and \"a1\" >= 1.5 and time >= " + startTime + " ORDER BY time";
// }
// QueryResult queryResult2 = influxDBTemplate.query(new Query(sql2, database));
// List<String> timeList = new ArrayList<>();
// if (queryResult2.getResults().get(0).getSeries() != null) {
// //获取震动的时间戳
// timeList = getTime(queryResult2);
// }
// if (timeList.size() > 0) {
// //获取震动数据的坐标
// String sql3 = "";
// for (String time : timeList) {
// Long t = Long.valueOf(time) * 1000000l;
// if ("baidu".equals(searchLocationVo.getType())) {
// sql3 = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\" where \"data_type\" = 'location' and time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3;
// } else {
// sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\" where \"data_type\" = 'location' and time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3;
// }
// }
// QueryResult queryResult3 = influxDBTemplate.query(new Query(sql3, database));
// List<String> time = new ArrayList<>();
// if (queryResult3.getResults() != null) {
// time = getShockLocation(queryResult3);
// }
// for (LocationDataVo locationDataVo : locationDataVos) {
// if (time.contains(locationDataVo.getTime())) {
// locationDataVo.setError(1);
// locationDataVoList.add(locationDataVo);
// } else {
// locationDataVo.setError(0);
// locationDataVoList.add(locationDataVo);
// }
// }
// return gson.toJson(locationDataVoList);
// } else {
// //如果是已经完结保存到redis中
// return gson.toJson(locationDataVos);
// }
// }
// 获取历史数据 // 获取历史数据
// @ApiOperation(value = "获取历史数据",notes = "获取历史数据:") // @ApiOperation(value = "获取历史数据",notes = "获取历史数据:")
// @PostMapping("/getHistoryData") // @PostMapping("/getHistoryData")
...@@ -1373,3 +1725,124 @@ public class DataController { ...@@ -1373,3 +1725,124 @@ public class DataController {
// return gson.toJson(liveDataVos); // return gson.toJson(liveDataVos);
// } // }
//} //}
// @ApiOperation(value = "下载线路数据", notes = "下载线路数据")
// @PostMapping("/downLoad")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
// })
// public String downLoad(@RequestBody String transportationNo, HttpServletRequest request){
// String token = request.getHeader("Account_token");
// String datum = tokenRedisService.get("TOKEN_" + token);
// UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
// if (StringUtils.isEmpty(transportationNo)) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "transportationNo"));
// return gson.toJson(fb);
// }
// JSONObject jsonObject = JSON.parseObject(transportationNo);
// transportationNo = jsonObject.getString("transportationNo");
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, user.getCompanyNo());
// if (resultCircuitVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "notStarted"));
// return gson.toJson(fb);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo);
// if (gatewayVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
// //获取tdl信息
// List<String> devList = tdlLogService.getTdlSN(transportationNo);
// if (devList.size() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
//
// String[] rowsName = new String[]{"时间","压力(MPa)","温度(℃)","湿度(%RH)","震动能量(w)","震动强度(g)","倾斜角度(°)","经度","纬度"};
// File file = new File("./export");
// if(!file.exists()){
// file.mkdir();
// }
// try {
// String sqls = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +resultCircuitVo.getEndTime() * 1000000l+" ORDER BY time ";
// } else {
// sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time ";
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
// File[] srcFiles = new File[devList.size()];
// File zipFile = new File("./export/" +transportationNo+"运输数据.zip");
// if (queryResult.getResults().get(0).getSeries().get(0) != null) {
//
// for(int i = 0;i<devList.size();i++){
//
// CsvWriter csvWriter = new CsvWriter("./export/"+devList.get(i).replace("TDL-", "").trim()+"运输数据.csv" , ',', Charset.forName("GB2312"));
// csvWriter.writeRecord(rowsName);
// List<List<Object>> values = getValues(queryResult);
// for(List<Object> value : values){
//// logger.info(value.get(1)==null ? " " :value.get(1).toString() +"---------"+devList.get(i));
// if(value.get(1) == null || value.get(1).toString().equals(devList.get(i))){
// String[] objs = new String[rowsName.length];
// for (int j = 0; j < objs.length; j++) {
// if(j==0){
// try {
// objs[j] =timeStampDate(new Long(UTCToCST(String.valueOf(value.get(j)))));
//// objs[j] =timeStampDate(new Long(dateToStamp(String.valueOf(value.get(j)))));
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// fb.setMessage("时间解析异常");
// }
// }else {
// objs[j] =value.get(j+1) == null ? "-" :value.get(j+1).toString();
// }
// }
// csvWriter.writeRecord(objs);
// csvWriter.flush();
// }
// }
// csvWriter.close();
// srcFiles[i]=new File("./export/"+devList.get(i).replace("TDL-", "").trim()+"运输数据.csv");
// }
// }
//
// ZipCompressUtil.zipFiles(srcFiles,zipFile);
// try {
// String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, zipFile);
// if (md5Key != null) {
// for(int a =0;a<srcFiles.length;a++){
// srcFiles[a].delete();
// }
// zipFile.delete();
// fb.setCode(1);
// fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/circuit/"+transportationNo+"运输数据.zip");
// return gson.toJson(fb);
// } else {
// fb.setCode(0);
// fb.setMessage("上传失败");
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.info(e.toString());
// }
// }catch (Exception e){
// e.printStackTrace();
// logger.info(e.toString());
// }
//
// return gson.toJson(fb);
// }
src/main/resources/application-dev.properties
View file @ 22f43585
spring.datasource.url=jdbc:mysql://192.168.1.200:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false spring.datasource.url=jdbc:mysql://172.16.1.200:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.redis.host=192.168.1.200 spring.redis.host=172.16.1.200
server.port=8092 server.port=8092
tdl.influxdb.host=http://192.168.1.200:8086 tdl.influxdb.host=http://172.16.1.200:8086
src/main/resources/application.properties
View file @ 22f43585
#spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false #spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url=jdbc:mysql://47.110.153.44:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false #spring.datasource.url=jdbc:mysql://47.110.153.44:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url=jdbc:mysql://172.16.1.13:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=37774020 spring.datasource.password=37774020
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
...@@ -24,7 +25,7 @@ spring.messages.cache-seconds= 3600 ...@@ -24,7 +25,7 @@ spring.messages.cache-seconds= 3600
spring.messages.encoding=UTF-8 spring.messages.encoding=UTF-8
tdl.redis.host=127.0.0.1 tdl.redis.host=172.16.1.24
tdl.redis.index=0 tdl.redis.index=0
tdl.redis.port=6379 tdl.redis.port=6379
tdl.redis.password= tdl.redis.password=
...@@ -50,13 +51,15 @@ tdl.mqtt.timeout = 20 ...@@ -50,13 +51,15 @@ tdl.mqtt.timeout = 20
tdl.mqtt.cacrt = ca.crt tdl.mqtt.cacrt = ca.crt
tdl.mqtt.clientkey = witcd.pem tdl.mqtt.clientkey = witcd.pem
tdl.mqtt.clientcrt = witcd.crt tdl.mqtt.clientcrt = witcd.crt
tdl.mqtt.clientpwd =
# InfluxDB # InfluxDB
spring.influxdb.username=admin spring.influxdb.username=admin
spring.influxdb.password=37774020 spring.influxdb.password=37774020
#spring.influxdb.url=http://47.97.184.225:8086 #spring.influxdb.url=http://47.97.184.225:8086
spring.influxdb.url=http://47.110.153.44:8086 #spring.influxdb.url=http://47.110.153.44:8086
spring.influxdb.url=http://172.16.1.24:8086
spring.influxdb.database=original spring.influxdb.database=original
spring.influxdb.retentionPolicy = tdl_policy spring.influxdb.retentionPolicy = tdl_policy
spring.influxdb.connent-timeout=10 spring.influxdb.connent-timeout=10
...@@ -65,8 +68,8 @@ spring.influxdb.write-timeout=10 ...@@ -65,8 +68,8 @@ spring.influxdb.write-timeout=10
spring.influxdb.gzip=true spring.influxdb.gzip=true
tdl.core.add =http://172.16.1.16:8079/witium/addMount tdl.core.add =http://172.16.1.52:8079/witium/addMount
tdl.core.delete =http://172.16.1.16:8079/witium/delMount tdl.core.delete =http://172.16.52:8079/witium/delMount
mqtt.userName = ugen mqtt.userName = ugen
mqtt.password = ugen mqtt.password = ugen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment