Skip to content

T
TDLCloud
Commit 75f2203e authored by chenying's avatar chenying
Browse files
Options

6.15修改下载仓库数据接口

parent c3747a59
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 209 deletions
src/main/java/com/example/tdl/common/WarehouseExcel.java
View file @ 75f2203e
......@@ -20,20 +20,20 @@ public class WarehouseExcel {
private Logger logger = LoggerFactory.getLogger(WarehouseExcel.class);
//导出的文件名
private String fileName;
// private String fileName;
private String userName;
private HttpServletResponse response;
private List<ResultWarehouseNoAndTDLSNAndTimeVo> resultWarehouseNoAndTDLSNAndTimeVo;
private ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo;
// private List<DownloadWarehouseVo> downloadWarehouseVos;
public WarehouseExcel(String fileName, List<ResultWarehouseNoAndTDLSNAndTimeVo> resultWarehouseNoAndTDLSNAndTimeVo , String userName, HttpServletResponse response) {
public WarehouseExcel( ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo , String userName, HttpServletResponse response) {
this.userName = userName;
this.resultWarehouseNoAndTDLSNAndTimeVo=resultWarehouseNoAndTDLSNAndTimeVo;
this.fileName = fileName;
// this.fileName = fileName;
this.response = response;
// this.downloadWarehouseVos=downloadWarehouseVos;
}
......@@ -45,7 +45,7 @@ public class WarehouseExcel {
// 创建工作簿对象
HSSFWorkbook workbook = new HSSFWorkbook();
try {
HSSFSheet sheet = workbook.createSheet("仓库温湿度观测记录表"); // 创建工作表
HSSFSheet sheet = workbook.createSheet(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"仓库温湿度观测记录表"); // 创建工作表
HSSFCellStyle style = getStyle(workbook);
/*
......@@ -61,7 +61,7 @@ public class WarehouseExcel {
//设置列的格式
cell1.setCellStyle(rowStyle1);
//将标题添加到列中
cell1.setCellValue(new HSSFRichTextString("仓库温湿度观测记录表"));
cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()));
}
//设置行高
row1.setHeight((short) (30 * 20));
......@@ -69,7 +69,6 @@ public class WarehouseExcel {
sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
int rowCount=1;
for (int a=0;a<resultWarehouseNoAndTDLSNAndTimeVo.size();a++){
/*
* 创建第二行
* */
......@@ -87,7 +86,7 @@ public class WarehouseExcel {
//设置列的格式
cell2.setCellStyle(rowStyle2);
//将标题添加到列中
cell2.setCellValue("库房适宜温度为"+resultWarehouseNoAndTDLSNAndTimeVo.get(a).getTemMin()+"℃-"+resultWarehouseNoAndTDLSNAndTimeVo.get(a).getTemMax()+"℃，湿度保持"+resultWarehouseNoAndTDLSNAndTimeVo.get(a).getHumidityMin()+"%-"+resultWarehouseNoAndTDLSNAndTimeVo.get(a).getHumidityMax()+"%,超标要做必要调节。");
cell2.setCellValue("库房适宜温度为"+resultWarehouseNoAndTDLSNAndTimeVo.getTemMin()+"℃-"+resultWarehouseNoAndTDLSNAndTimeVo.getTemMax()+"℃，湿度保持"+resultWarehouseNoAndTDLSNAndTimeVo.getHumidityMin()+"%-"+resultWarehouseNoAndTDLSNAndTimeVo.getHumidityMax()+"%,超标要做必要调节。");
sheet.addMergedRegion(new CellRangeAddress(rowCount, rowCount, 2, 5));
}
cell2 = row2.createCell(6);
......@@ -160,7 +159,7 @@ public class WarehouseExcel {
/** 循环创建仓库数据行数
* */
rowCount=rowCount+1;
if (resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().size()==0){
if (resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().size()==0){
HSSFRow row = sheet.createRow((short) rowCount);
HSSFCell cell = null;
HSSFCellStyle rowStyle = getStyle(workbook);
......@@ -169,19 +168,18 @@ public class WarehouseExcel {
//设置列的格式
cell.setCellStyle(rowStyle);
//将标题添加到列中
cell.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.get(a).getGatewaySN()+"该时间段没有数据"));
cell.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN()+"该时间段没有数据"));
}
//设置行高
row.setHeight((short) (26 * 20));
//合并单元格（参数1：起始行，参数2：截至行，参数3：起始列，参数4：截至列）
sheet.addMergedRegion(new CellRangeAddress(rowCount, rowCount, 0, 6));
rowCount=rowCount+1;
}else{
HSSFCellStyle rowStyle = getStyle(workbook);
for(int i = 0;i<resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().size();i++) {
for(int i = 0;i<resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().size();i++) {
HSSFRow row = sheet.createRow((short) rowCount + i);
HSSFCell cell = null;
Long time=Long.valueOf(resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().get(i).getTime());
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);
......@@ -201,19 +199,17 @@ public class WarehouseExcel {
cell.setCellValue("-");
cell.setCellStyle(rowStyle);
cell = row.createCell(4);
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().get(i).getTemperature());
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().get(i).getTemperature());
cell.setCellStyle(rowStyle);
cell = row.createCell(5);
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().get(i).getHumidity());
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().get(i).getHumidity());
cell.setCellStyle(rowStyle);
cell = row.createCell(6);
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().get(i).getAlarm());
cell.setCellValue(resultWarehouseNoAndTDLSNAndTimeVo.getDownloadWarehouseVos().get(i).getAlarm());
cell.setCellStyle(rowStyle);
row.setHeight((short) (26 * 20));
}
}
rowCount=rowCount+resultWarehouseNoAndTDLSNAndTimeVo.get(a).getDownloadWarehouseVos().size();
}
sheet.setColumnWidth(0, 10 * 256);
sheet.setColumnWidth(1, 10 * 256);
sheet.setColumnWidth(2, 10 * 256);
......
src/main/java/com/example/tdl/domain/vo/ResultWarehouseNoAndTDLSNAndTimeVo.java
View file @ 75f2203e
......@@ -21,28 +21,29 @@ public class ResultWarehouseNoAndTDLSNAndTimeVo {
private Float humidityMin;
private String createTime;
private Long createTime;
private String endTime;
private Long endTime;
public String getCreateTime() {
private List<DownloadWarehouseVo> downloadWarehouseVos;
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public String getEndTime() {
public Long getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
public void setEndTime(Long endTime) {
this.endTime = endTime;
}
private List<DownloadWarehouseVo> downloadWarehouseVos;
public List<DownloadWarehouseVo> getDownloadWarehouseVos() {
return downloadWarehouseVos;
}
......
src/main/java/com/example/tdl/mapper/TDLLogMapper.java
View file @ 75f2203e
......@@ -27,6 +27,6 @@ public interface TDLLogMapper {
Long getTimeByWarehouseNo(@Param("warehouseNo")String warehouseNo,@Param("gatewaySN")String gatewaySN);
List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTDLSNAndTime(DownloadForWarehouseVo downloadForWarehouseVo);
List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTime(DownloadForWarehouseVo downloadForWarehouseVo);
}
src/main/java/com/example/tdl/service/TDLLogService.java
View file @ 75f2203e
......@@ -51,7 +51,7 @@ public class TDLLogService {
return tdlLogMapper.getTimeByWarehouseNo(warehouseNo,SN);
}
public List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTDLSNAndTime(DownloadForWarehouseVo downloadForWarehouseVo){
return tdlLogMapper.getByWarehouseNoAndTDLSNAndTime(downloadForWarehouseVo);
public List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTime(DownloadForWarehouseVo downloadForWarehouseVo){
return tdlLogMapper.getByWarehouseNoAndTime(downloadForWarehouseVo);
}
}
src/main/java/com/example/tdl/web/DownloadController.java
View file @ 75f2203e
package com.example.tdl.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.OSSClient;
import com.example.tdl.common.WarehouseExcel;
import com.example.tdl.domain.dto.CommFeedback;
......@@ -17,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.shiro.SecurityUtils;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
import org.slf4j.Logger;
......@@ -56,12 +53,6 @@ public class DownloadController {
@Autowired
private InfluxDBTemplate influxDBTemplate;
@Autowired
private InfoRedisService infoRedisService;
@Autowired
private TDLDeviceService tdlDeviceService;
@Autowired
private I18nController i18n;
......@@ -99,29 +90,31 @@ public class DownloadController {
fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb);
}
List<ResultWarehouseNoAndTDLSNAndTimeVo> resultWarehouseNoAndTDLSNAndTimeVos=tdlLogService.getByWarehouseNoAndTDLSNAndTime(downloadForWarehouseVo);
List<ResultWarehouseNoAndTDLSNAndTimeVo> resultWarehouseNoAndTDLSNAndTimeVos=tdlLogService.getByWarehouseNoAndTime(downloadForWarehouseVo);
if (resultWarehouseNoAndTDLSNAndTimeVos.size()==0){
fb.setCode(0);
fb.setMessage("没有数据");
return gson.toJson(fb);
}
String sqls="";
String fileName = downloadForWarehouseVo.getWarehouseNo() + "仓库温湿度观测记录表-" + System.currentTimeMillis();
File file = new File("E:" + File.separator + fileName);
String fileName ="";
String name="仓库温湿度观测记录"+System.currentTimeMillis();
File file = new File("E:" + File.separator + name);
if (!file.exists()) {
file.mkdir();
}
for (int a=0;a<resultWarehouseNoAndTDLSNAndTimeVos.size();a++) {
ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo=new ResultWarehouseNoAndTDLSNAndTimeVo();
List<DownloadWarehouseVo> downloadWarehouseVos = new ArrayList<>();
if (resultWarehouseNoAndTDLSNAndTimeVos.get(a).getEndTime() == null) {
sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getTDLSN() + "') and time >= '" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getCreateTime() + "' ORDER BY time ";
ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo;
resultWarehouseNoAndTDLSNAndTimeVo=resultWarehouseNoAndTDLSNAndTimeVos.get(a);
fileName =downloadForWarehouseVo.getWarehouseNo() + "仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()+"-"+ + System.currentTimeMillis();
List<DownloadWarehouseVo> downloadWarehouseVos = null;
if (resultWarehouseNoAndTDLSNAndTimeVo.getEndTime() == null) {
sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN() + "') and time >= " + resultWarehouseNoAndTDLSNAndTimeVo.getCreateTime()*1000000 + " ORDER BY time ";
} else {
sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getTDLSN() + "') and time >= '" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getCreateTime() + "' and time<= '" + resultWarehouseNoAndTDLSNAndTimeVos.get(a).getEndTime() + "' ORDER BY time ";
sqls = "SELECT \"b\", \"T\", \"h\" FROM \"tdl_policy\".\"" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewayType() + "_" + resultWarehouseNoAndTDLSNAndTimeVo.getGatewaySN() + "\" WHERE (\"tdl\" = 'TDL-" + resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN() + "') and time >= " + resultWarehouseNoAndTDLSNAndTimeVo.getCreateTime()*1000000 + " and time<= " + resultWarehouseNoAndTDLSNAndTimeVo.getEndTime()*1000000 + " ORDER BY time ";
}
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
downloadWarehouseVos = getWarehouseData(queryResults);
if (downloadWarehouseVos.size()>0){
for (int i = 0; i < downloadWarehouseVos.size(); i++) {
if (downloadWarehouseVos.get(i).getTemperature() > resultWarehouseNoAndTDLSNAndTimeVos.get(a).getTemMax() ||
downloadWarehouseVos.get(i).getTemperature() < resultWarehouseNoAndTDLSNAndTimeVos.get(a).getTemMin() ||
......@@ -132,16 +125,16 @@ public class DownloadController {
downloadWarehouseVos.get(i).setAlarm("正常");
}
}
resultWarehouseNoAndTDLSNAndTimeVos.get(a).setDownloadWarehouseVos(downloadWarehouseVos);
resultWarehouseNoAndTDLSNAndTimeVo.setDownloadWarehouseVos(downloadWarehouseVos);
try {
WarehouseExcel warehouseExcel = new WarehouseExcel(fileName, resultWarehouseNoAndTDLSNAndTimeVos, user.getUserName(), response);
WarehouseExcel warehouseExcel = new WarehouseExcel(resultWarehouseNoAndTDLSNAndTimeVo, user.getUserName(), response);
HSSFWorkbook wb = warehouseExcel.downloadExcel();
if (wb != null) {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
OutputStream os = new FileOutputStream(new File(file + ".xls"));
OutputStream os = new FileOutputStream(new File(file+File.separator+fileName + ".xls"));
wb.write(os);
os.flush();
os.close();
......@@ -155,22 +148,16 @@ public class DownloadController {
fb.setCode(0);
fb.setMessage("上传失败");
}
}else{
fb.setCode(0);
fb.setMessage("没有数据");
return gson.toJson(fb);
}
}
try {
ZipCompressUtil zipCom = new ZipCompressUtil(file + ".zip", file + ".xls");
ZipCompressUtil zipCom = new ZipCompressUtil(file + ".zip", file+"");
zipCom.zip();
// OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
// AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(file +".zip"));
if (new File(file + ".xls").delete()) {
OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(file +".zip"));
if (deleteFile(file)) {
new File(file+".zip").delete();
fb.setCode(1);
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/warehouse/" + fileName + ".zip");
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/warehouse/" + name + ".zip");
return gson.toJson(fb);
} else {
fb.setCode(0);
......@@ -185,6 +172,30 @@ public class DownloadController {
return gson.toJson(fb);
}
/**
* 先根遍历序递归删除文件夹
*
* @param dirFile 要被删除的文件或者目录
* @return 删除成功返回true, 否则返回false
*/
public static boolean deleteFile(File dirFile) {
// 如果dir对应的文件不存在，则退出
if (!dirFile.exists()) {
return false;
}
if (dirFile.isFile()) {
return dirFile.delete();
} else {
for (File file : dirFile.listFiles()) {
deleteFile(file);
}
}
return dirFile.delete();
}
public List<DownloadWarehouseVo> getWarehouseData(QueryResult queryResult){
List<List<Object>> values = getValues(queryResult);
List<DownloadWarehouseVo> downloadWarehouseVos = new ArrayList<>();
......
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