Skip to content

T
TDLCloud
Commit 8ce43ef4 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

9.11-线路下载的时间问题，报警时间问题，线路折线图增加返回报警数据

parent 20241ea7
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 169 deletions
src/main/java/com/example/tdl/common/WarehouseExcel.java
View file @ 8ce43ef4
......@@ -183,6 +183,7 @@ public class WarehouseExcel {
Long time=Long.valueOf(resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().get(i).getTime());
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date=new Date(time);
cell2 = row2.createCell(1);
cell2.setCellValue(date.getYear());
cell2.setCellStyle(rowStyle);
......
src/main/java/com/example/tdl/domain/vo/DeviceConfigVo.java
View file @ 8ce43ef4
......@@ -4,10 +4,20 @@ import java.util.List;
public class DeviceConfigVo {
private Integer Type;
private String config = "Config";
private List<GConfigVo> configList;
public Integer getType() {
return Type;
}
public void setType(Integer type) {
Type = type;
}
public String getConfig() {
return config;
}
......@@ -24,8 +34,16 @@ public class DeviceConfigVo {
this.configList = configList;
}
@Override
public String toString() {
return "{" + "\"" + config +"\"" + ":"+ configList + '}';
return "{" + "\"" +
"Type" +"\"" + ":"+ Type +
","+ "\"" + config +"\"" + ":"+ configList + '}';
}
// @Override
// public String toString() {
// return "{" + "\"" + config +"\"" + ":"+ configList + '}';
// }
}
src/main/java/com/example/tdl/domain/vo/GatewaySNAndTypeVo.java
View file @ 8ce43ef4
......@@ -5,6 +5,8 @@ public class GatewaySNAndTypeVo {
private String type;
private Integer New;
public GatewaySNAndTypeVo() {
}
......@@ -13,6 +15,21 @@ public class GatewaySNAndTypeVo {
this.type = type;
}
public GatewaySNAndTypeVo(String SN, String type, Integer New) {
this.SN = SN;
this.type = type;
New = New;
}
public Integer getNew() {
return New;
}
public void setNew(Integer New) {
New = New;
}
public String getSN() {
return SN;
}
......
src/main/java/com/example/tdl/domain/vo/HistoryDataVo.java
View file @ 8ce43ef4
......@@ -11,6 +11,8 @@ public class HistoryDataVo {
private List<HistoryData> dataList;
private List<HistoryData> alarmList;
public String getTDLSN() {
return TDLSN;
}
......@@ -42,4 +44,12 @@ public class HistoryDataVo {
public void setDataList(List<HistoryData> dataList) {
this.dataList = dataList;
}
public List<HistoryData> getAlarmList() {
return alarmList;
}
public void setAlarmList(List<HistoryData> alarmList) {
this.alarmList = alarmList;
}
}
src/main/java/com/example/tdl/domain/vo/ResultGatewayVo.java
View file @ 8ce43ef4
......@@ -13,6 +13,8 @@ public class ResultGatewayVo {
private Integer useScene;
private Long createTime;
private String companyName;
public String getCompanyName() {
......@@ -70,4 +72,12 @@ public class ResultGatewayVo {
public void setUseScene(Integer useScene) {
this.useScene = useScene;
}
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
}
src/main/java/com/example/tdl/mapper/AlarmLogMapper.java
View file @ 8ce43ef4
......@@ -34,4 +34,6 @@ public interface AlarmLogMapper {
List<AlarmLogVo> getRealTimeAlarm(String companyNo);
Integer getAlarmCount(String companyNo);
List<HistoryData> getValue(@Param("transportationNo")String transportationNo,@Param("TDLSN")String TDLSN ,@Param("classify")String classify);
}
src/main/java/com/example/tdl/service/AlarmLogService.java
View file @ 8ce43ef4
......@@ -60,4 +60,7 @@ public class AlarmLogService {
}
public List<HistoryData> getValue(String transportationNo,String TDLSN ,String classify){
return alarmLogMapper.getValue(transportationNo,TDLSN,classify);
}
}
src/main/java/com/example/tdl/util/DataUtil.java
View file @ 8ce43ef4
package com.example.tdl.util;
import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.*;
import com.example.tdl.service.AlarmLogService;
import com.example.tdl.service.CircuitService;
//import com.example.tdl.service.InfluxDBService;
import com.example.tdl.service.TDLLogService;
import com.example.tdl.web.I18nController;
import com.google.gson.Gson;
import org.apache.commons.lang3.StringUtils;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
import org.slf4j.Logger;
......@@ -28,9 +30,8 @@ public class DataUtil {
private static CommFeedback fb = new CommFeedback();
public static String getData(String transportationNo, HttpServletRequest request,I18nController i18n,String companyNo,CircuitService circuitService,TDLLogService tdlLogService,InfluxDBTemplate influxDBTemplate,String database,String field,String event ){
public static String getData(String transportationNo, HttpServletRequest request, I18nController i18n, String companyNo, CircuitService circuitService, TDLLogService tdlLogService, InfluxDBTemplate influxDBTemplate, String database, String field, String event, AlarmLogService alarmLogService,String classify){
Long t1 = System.currentTimeMillis();
logger.info(t1+"---------t1");
ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
if (resultCircuitVo == null) {
fb.setCode(0);
......@@ -63,6 +64,11 @@ public class DataUtil {
HistoryDataVo historyDataVo = new HistoryDataVo();
String TDLSN = devList.get(i).replace("TDL-", "").trim();
historyDataVo.setTDLSN(TDLSN);
List<HistoryData> alarmList =new ArrayList<>();
if(!StringUtils.isEmpty(classify)){
alarmList = alarmLogService.getValue(transportationNo,TDLSN,classify);
}
historyDataVo.setAlarmList(alarmList);
if("\"T\"".equals(field) || "\"h\"".equals(field)){
ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
//根据tdl货物报警信息
......@@ -115,7 +121,6 @@ public class DataUtil {
historyDataVoList.add(historyDataVo);
}
}
logger.info(System.currentTimeMillis()-t1+"_______");
return gson.toJson(historyDataVoList);
}
......@@ -197,8 +202,6 @@ public class DataUtil {
public static List<HistoryData> getHistoryDatas(QueryResult queryResult, String alias) {
String dateResult = null;
List<List<Object>> value = new ArrayList<>();
Long t0 = System.currentTimeMillis();
logger.info(t0 +"-------t0");
for (QueryResult.Result result : queryResult.getResults()) {
if (result.getSeries() != null) {
for (QueryResult.Series series : result.getSeries()) {
......@@ -212,8 +215,6 @@ public class DataUtil {
continue;
}
}
Long tm = System.currentTimeMillis();
logger.info(System.currentTimeMillis()-t0 +"-------tm");
List<HistoryData> historyDataList = new ArrayList<>();
for (int i = 0; i < value.size(); i++) {
HistoryData historyData = new HistoryData();
......@@ -221,7 +222,6 @@ public class DataUtil {
historyData.setValue(value.get(i).get(1).toString());
historyDataList.add(historyData);
}
logger.info(System.currentTimeMillis()-tm +"-------tn");
return historyDataList;
}
......
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ 8ce43ef4
......@@ -208,7 +208,11 @@ public class AlarmLogController {
desp = "倾角" + map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
classify = "4";
}
AlarmLog alarmLog = new AlarmLog(transportationNo,resultCircuitVo.getStartCity(),resultCircuitVo.getEndCity(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),addAlarmLogVo.getAlarm().get(i).getTs()*1000,classify,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno());
Long time = addAlarmLogVo.getAlarm().get(i).getTs();
if(time.toString().length() == 10){
time=time*1000;
}
AlarmLog alarmLog = new AlarmLog(transportationNo,resultCircuitVo.getStartCity(),resultCircuitVo.getEndCity(),addAlarmLogVo.getAlarm().get(i).getTdlsn().replace("TDL-","").trim(),desp,addAlarmLogVo.getAlarm().get(i).getValue(),time,classify,addAlarmLogVo.getAlarm().get(i).getDesp(),addAlarmLogVo.getAlarm().get(i).getAlarmno());
int a = alarmLogServcie.addAlarmLog(alarmLog);
if(a == 0){
fb.setCode(0);
......
src/main/java/com/example/tdl/web/DataController.java
View file @ 8ce43ef4
......@@ -75,6 +75,10 @@ public class DataController {
// @Autowired
// private InfluxDBService influxDBService;
@Autowired
private AlarmLogService alarmLogService;
@Autowired
private I18nController i18n;
......@@ -207,128 +211,7 @@ public class DataController {
}
//获取历史数据
// @ApiOperation(value = "获取历史数据", notes = "获取历史数据:")
// @PostMapping("/getHistoryData")
// @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 getHistoryData(@RequestBody String transportationNo, HttpServletRequest request) {
// String token = request.getHeader("Account_token");
// String datum = tokenRedisService.get("TOKEN_" + token);
// UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
// String port = request.getHeader("AccountLanguage");
// JSONObject jsonObject = JSON.parseObject(transportationNo);
// transportationNo = jsonObject.getString("transportationNo");
// List<DataVo> dataVoList = new ArrayList<>();
// if (StringUtils.isEmpty(transportationNo)) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "transportationNo"));
// return gson.toJson(fb);
// }
// 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);
// }
// Map<String, String> map = new HashMap<>();
// map.put("\"T\"", "temp");
// map.put("\"h\"", "humidity");
// map.put("\"p\"", "pressure");
// map.put("\"a0\"", "shockEnergy");
// map.put("\"a1\"", "shock");
// map.put("\"ta\"", "tilt");
// for (int j = 0; j < list.size(); j++) {
// DataVo dataVo = new DataVo();
// dataVo.setDescription(map.get(list.get(j)));
// List<HistoryDataVo> historyDataVoList = new ArrayList<>();
// for (int i = 0; i < devList.size(); i++) {
// HistoryDataVo historyDataVo = new HistoryDataVo();
// String TDLSN = devList.get(i).replace("TDL-", "").trim();
// historyDataVo.setTDLSN(TDLSN);
// ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
// if (list.get(j).equals("\"T\"")) {
// //根据tdl货物报警信息
// historyDataVo.setMax(resultAlarmVo.getTemMax().toString());
// historyDataVo.setMin(resultAlarmVo.getTemMin().toString());
// } else if (list.get(j).equals("\"h\"")) {
// historyDataVo.setMax(resultAlarmVo.getHumidityMax().toString());
// historyDataVo.setMin(resultAlarmVo.getHumidityMin().toString());
// }
// List<HistoryData> historyData = new ArrayList<>();
// String sqls = "";
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l;
// } else {
// sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + System.currentTimeMillis() * 1000000l;
// }
// QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
// Integer count;
// if (queryResults.getResults().get(0).getSeries() != null) {
// count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue();
// } else {
// historyDataVo.setDataList(historyData);
// historyDataVoList.add(historyDataVo);
// continue;
// }
// String sql = "";
// 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);
// } else {
// sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, System.currentTimeMillis() * 1000000l);
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
// if (queryResult.getResults() != null) {
// historyData =DataUtil.getHistoryDatas(queryResult, list.get(j));
// }
// historyDataVo.setDataList(historyData);
// historyDataVoList.add(historyDataVo);
// } else {
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// 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 = "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().get(0).getSeries() != null) {
// //解析数据
// historyData = DataUtil.getHistoryData(queryResult, list.get(j));
// }
// historyDataVo.setDataList(historyData);
// historyDataVoList.add(historyDataVo);
// }
//
// }
// dataVo.setDataList(historyDataVoList);
// dataVoList.add(dataVo);
// }
// return gson.toJson(dataVoList);
// }
//1-温度，2-湿度，3-震动，4-倾角
@ApiOperation(value = "获取温度数据", notes = "获取温度数据:" +
" TDLSN:tdl编号," +
" temperatureDataVos:," +
......@@ -349,7 +232,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"T\"","Regular measurement");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"T\"","Regular measurement",alarmLogService,"1");
}
......@@ -374,7 +257,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"h\"","Regular measurement");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"h\"","Regular measurement",alarmLogService,"2");
}
......@@ -396,7 +279,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"ta\"","TIlt event");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"ta\"","TIlt event",alarmLogService,"4");
}
......@@ -417,7 +300,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a0\"","Shock event");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a0\"","Shock event",alarmLogService,"");
}
......@@ -437,7 +320,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a1\"","Shock event");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a1\"","Shock event",alarmLogService,"3");
}
......@@ -457,7 +340,7 @@ public class DataController {
}
JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"p\"","Regular measurement");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"p\"","Regular measurement",alarmLogService,"");
}
......@@ -534,9 +417,11 @@ public class DataController {
for (int j = 0; j < objs.length; j++) {
if(j==0){
try {
objs[j] =timeStampDate(new Long(dateToStamp(String.valueOf(value.get(j)))));
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 {
......@@ -580,8 +465,6 @@ public class DataController {
}
//解析数据
public List<LocationDataVo> getLocation(QueryResult queryResult) {
List<List<Object>> values = getValues(queryResult);
......@@ -687,6 +570,7 @@ public class DataController {
return sdf.format(new Date(seconds));
}
public static String timeStampDate(Long seconds) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
return sdf.format(new Date(seconds));
......@@ -764,8 +648,6 @@ public class DataController {
return historyDataList;
}
}
// 获取历史数据
......
src/main/java/com/example/tdl/web/DownloadController.java
View file @ 8ce43ef4
......@@ -80,6 +80,11 @@ public class DownloadController {
fb.setMessage(i18n.getMessage(request,"downloadEndTime"));
return gson.toJson(fb);
}
if(downloadForWarehouseVo.getStopTime()<downloadForWarehouseVo.getStartTime()){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"downLoad"));
return gson.toJson(fb);
}
if (StringUtils.isEmpty(downloadForWarehouseVo.getWarehouseNo())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"warehouseNo"));
......@@ -93,15 +98,13 @@ public class DownloadController {
List<ResultWarehouseNoAndTDLSNAndTimeVo> resultWarehouseNoAndTDLSNAndTimeVos=tdlLogService.getByWarehouseNoAndTime(downloadForWarehouseVo);
if (resultWarehouseNoAndTDLSNAndTimeVos.size()==0){
fb.setCode(0);
fb.setMessage("没有数据");
fb.setMessage(i18n.getMessage(request,"noData"));
return gson.toJson(fb);
}
File zipFile = new File("./export/" +downloadForWarehouseVo.getWarehouseNo()+"仓库温湿度观测记录.zip");
File[] srcFiles = new File[resultWarehouseNoAndTDLSNAndTimeVos.size()];
for (int a=0;a<resultWarehouseNoAndTDLSNAndTimeVos.size();a++) {
ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo=resultWarehouseNoAndTDLSNAndTimeVos.get(a);
String fileName =downloadForWarehouseVo.getWarehouseNo() + "仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN();
srcFiles[a] = new File("./export/"+fileName+".xls") ;
Long startTime = 0l;
Long stopTime = 0l;
if(downloadForWarehouseVo.getStartTime() >=resultWarehouseNoAndTDLSNAndTimeVo.getCreateTime()){
......@@ -110,9 +113,13 @@ public class DownloadController {
startTime = resultWarehouseNoAndTDLSNAndTimeVo.getCreateTime()*1000000l;
}
stopTime = downloadForWarehouseVo.getStopTime()*1000000l;
String sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN() + "') and time >= " + startTime + " and time<= " + stopTime + " ORDER BY time ";
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
if(queryResults.getResults().get(0).getSeries()==null){
continue;
}
String fileName =downloadForWarehouseVo.getWarehouseNo() + "仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN();
srcFiles[a] = new File("./export/"+fileName+".xls") ;
List<DownloadWarehouseVo> downloadWarehouseVos = getWarehouseData(queryResults);
for (int i = 0; i < downloadWarehouseVos.size(); i++) {
if (downloadWarehouseVos.get(i).getTemperature() > resultWarehouseNoAndTDLSNAndTimeVos.get(a).getTemMax() ||
......@@ -140,10 +147,15 @@ public class DownloadController {
e.printStackTrace();
logger.info(e.toString());
fb.setCode(0);
fb.setMessage("上传失败");
fb.setMessage(i18n.getMessage(request,"fileUpload"));
return gson.toJson(fb);
}
}
if(srcFiles.length== 0){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"noData"));
return gson.toJson(fb);
}
try {
ZipCompressUtil.zipFiles(srcFiles,zipFile);
OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
......@@ -158,13 +170,13 @@ public class DownloadController {
return gson.toJson(fb);
} else {
fb.setCode(0);
fb.setMessage("上传失败");
fb.setMessage(i18n.getMessage(request,"fileUpload"));
}
} catch (Exception e) {
e.printStackTrace();
logger.info(e.toString());
fb.setCode(0);
fb.setMessage("上传失败");
fb.setMessage(i18n.getMessage(request,"fileUpload"));
return gson.toJson(fb);
}
return gson.toJson(fb);
......
src/main/java/com/example/tdl/web/GatewayController.java
View file @ 8ce43ef4
......@@ -349,6 +349,15 @@ public class GatewayController {
return gson.toJson(fb);
}
DeviceConfigVo deviceConfig = new DeviceConfigVo();
//获取网关创建时间
ResultGatewayVo resultGatewayVo = gatewayService.getBySNAndType(device.getSN(),device.getType());
Integer New = 0;
if(resultGatewayVo.getCreateTime()>1535940000000l){
deviceConfig.setType(1);
New =1;
}else{
deviceConfig.setType(0);
}
List<GConfigVo> configList = new ArrayList<>();
for (ResultProbesVo devChannel : list) {
GConfigVo con = new GConfigVo(devChannel.getPort(), devChannel.getUnit(), devChannel.getDescription(), devChannel.getAlias());
......@@ -391,7 +400,7 @@ public class GatewayController {
infoRedisService.hmSet("PubTopic", device.getType() + "_" + device.getSN(), pubList.toString());
if (device.getState() == 0) {
//挂载
String sr = HttpRequester.sendPost(addmount, gson.toJson(new GatewaySNAndTypeVo(device.getSN(), device.getType())));
String sr = HttpRequester.sendPost(addmount, gson.toJson(new GatewaySNAndTypeVo(device.getSN(), device.getType(),New)));
device.setState(1);
} else if (device.getState() == 1) {
//卸载
......
src/main/java/com/example/tdl/web/PicUploadController.java
View file @ 8ce43ef4
......@@ -81,34 +81,34 @@ public class PicUploadController {
if("truck".equals(imageType)){
if(sourceImg.getWidth()>90){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"truckPictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>60){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"truckPictureDimension"));
return gson.toJson(fb);
}
}else if("warehouse".equals(imageType)){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"warePictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>120){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"warePictureDimension"));
return gson.toJson(fb);
}
}else if("company".equals(imageType)){
if(sourceImg.getWidth()>24){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"comPictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>24){
if(sourceImg.getHeight()>200){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"comPictureDimension"));
return gson.toJson(fb);
}
}
......@@ -193,34 +193,34 @@ public class PicUploadController {
if("truck".equals(imageType)){
if(sourceImg.getWidth()>90){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"truckPictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>60){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"truckPictureDimension"));
return gson.toJson(fb);
}
}else if("warehouse".equals(imageType)){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"warePictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>120){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"warePictureDimension"));
return gson.toJson(fb);
}
}else if("company".equals(imageType)){
if(sourceImg.getWidth()>24){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"comPictureDimension"));
return gson.toJson(fb);
}
if(sourceImg.getHeight()>24){
if(sourceImg.getHeight()>200){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"pictureDimension"));
fb.setMessage(i18n.getMessage(request,"comPictureDimension"));
return gson.toJson(fb);
}
}
......
src/main/resources/i18n/messages_en.properties
View file @ 8ce43ef4
......@@ -292,4 +292,7 @@ fontColors=Font color cannot be empty
postCode=Zip code cannot be empty
wrongFontColors=The format of the font color cannot be empty
wrongThemeColors=The format of the theme color is incorrect
comPictureDimension=Width*Height150*200
warePictureDimension=Width*Height150*120
truckPictureDimension=Width*Height90*60
src/main/resources/i18n/messages_zh_CN.properties
View file @ 8ce43ef4
......@@ -262,13 +262,18 @@ adminInoperable=\u7BA1\u7406\u5458\u89D2\u8272\u4E0D\u80FD\u64CD\u4F5C
#\u4ED3\u5E93\u6570\u636E\u4E0B\u8F7D
downloadStartTime=\u67E5\u8BE2\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
downLoad=\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u5927\u4E8E\u7ED3\u675F\u65F6\u95F4
noData = \u8FD9\u6BB5\u65F6\u95F4\u6CA1\u6709\u6570\u636E
fileUpload = \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25
#\u4F20\u611F\u5668
TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
#\u56FE\u7247
nonePicture= \u56FE\u7247\u4E0D\u80FD\u4E3A\u7A7A
pictureSize = \u4E0A\u4F20\u56FE\u7247\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7500K\uFF01
pictureFormat = \u4E0A\u4F20\u56FE\u7247\u683C\u5F0F\u4E0D\u6B63\u786E
pictureDimension = \u4E0A\u4F20\u56FE\u7247\u5C3A\u5BF8\u4E0D\u6B63\u786E
comPictureDimension =\u56FE\u7247\u5BBD\u9AD8\u6700\u5927\u4E3A150*200
warePictureDimension = \u56FE\u7247\u5BBD\u9AD8\u6700\u5927\u4E3A150*120
truckPictureDimension =\u56FE\u7247\u5BBD\u9AD8\u6700\u5927\u4E3A90*60
uploadFailure = \u4E0A\u4F20\u5931\u8D25
#\u89D2\u8272\u540D\u79F0
systemManage=\u7CFB\u7EDF\u7BA1\u7406\u5458
......
src/main/resources/mapper/AlarmLogMapper.xml
View file @ 8ce43ef4
......@@ -125,4 +125,12 @@
</select>
<select id="getValue" parameterType="java.lang.String" resultType="com.example.tdl.domain.vo.HistoryData">
select data as value ,alarmTime time from alarm_log where transportationNo=#{transportationNo,jdbcType=VARCHAR}
and TDLSN = #{TDLSN,jdbcType=VARCHAR}
and classify = #{classify,jdbcType=VARCHAR}
order by time
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/GatewayMapper.xml
View file @ 8ce43ef4
......@@ -56,7 +56,7 @@
</delete>
<select id="getBySNAndType" parameterType="String" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
SELECT SN,name,type,g.state,bConfig,useScene,companyName
SELECT SN,name,type,g.state,bConfig,useScene,companyName,g.createTime
from gateway g INNER JOIN company c on g.company_id=c.id
WHERE SN=#{SN,jdbcType=VARCHAR}
AND type=#{type,jdbcType=VARCHAR}
......
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