From acd8bc764569dcd6a89df4186537e210ffafb283 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 15:21:34 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 7 +++++--
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 920bf4b..d9a2e78 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.Rows;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
@@ -362,8 +363,10 @@
// response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("���������������������" + params.get("time").toString() + ".docx", "utf-8"));
// FileOutputStream fileOutputStream = new FileOutputStream("���������������������" + params.get("time").toString() + ".docx");
// compile.write(fileOutputStream);
- compile.writeToFile("G:\\home\\mon1\\" + "���������������������"+params.get("time").toString()+".docx");
-// compile.write();
+// compile.writeToFile("G:\\hme\\mon1\\" + "���������������������"+params.get("time").toString()+".docx");
+
+// FileOutputStream out = new FileOutputStream("���������������������" + params.get("time").toString() + ".docx");
+ compile.write(response.getOutputStream());
compile.close();
// return compile;
}
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 081b133..f69bdb2 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -76,6 +76,6 @@
FROM `history_second_cruiser`
WHERE mac = #{mac}
AND `time` <![CDATA[>=]]> #{startTime}
- AND `time` <![CDATA[<=]]> #{endTtime}
+ AND `time` <![CDATA[<=]]> #{endTime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0