From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件
---
src/main/java/com/lf/server/helper/WebHelper.java | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/WebHelper.java b/src/main/java/com/lf/server/helper/WebHelper.java
index 57a4a1b..2d4c289 100644
--- a/src/main/java/com/lf/server/helper/WebHelper.java
+++ b/src/main/java/com/lf/server/helper/WebHelper.java
@@ -16,9 +16,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
@@ -254,21 +252,33 @@
}
/**
- * 杈撳嚭json鏁版嵁鍒板墠绔�
+ * 杈撳嚭str鑷冲墠绔�
*/
- public static boolean write2Page(HttpServletResponse response, String jsonPack) throws IOException {
- response.setContentType("application/json;charset=UTF-8");
- response.setHeader("Cache-Control", "no-cache");
- response.setHeader("Pragma", "No-cache");
- response.setDateHeader("Expires", 0);
+ public static boolean writeStr2Page(HttpServletResponse res, String str) {
+ try {
+ res.setContentType("application/json;charset=UTF-8");
+ res.setHeader("Cache-Control", "no-cache");
+ res.setHeader("Pragma", "No-cache");
+ res.setDateHeader("Expires", 0);
- PrintWriter out = response.getWriter();
- out.print(jsonPack);
+ PrintWriter out = res.getWriter();
+ out.print(str);
- out.flush();
- out.close();
+ out.flush();
+ out.close();
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
return false;
+ }
+
+ /**
+ * 杈撳嚭json鑷冲墠绔�
+ */
+ public static void writeJson2Page(HttpServletResponse res, String str) {
+ String json = JSON.toJSONString(new ResponseMsg<>(HttpStatus.ERROR, str));
+ writeStr2Page(res, json);
}
/**
@@ -282,11 +292,7 @@
* 鍐欏搷搴斾俊鎭�
*/
public static void writeInfo(HttpStatus status, String info, HttpServletResponse res) {
- try {
- WebHelper.write2Page(res, WebHelper.getErrJson(status, info));
- } catch (Exception e) {
- //
- }
+ WebHelper.writeStr2Page(res, WebHelper.getErrJson(status, info));
}
/**
@@ -298,20 +304,28 @@
/**
* 涓嬭浇鏂囦欢
+ */
+ public static void download(String file, String fileName, HttpServletResponse res) throws Exception {
+ download(file, fileName, false, res);
+ }
+
+ /**
+ * 涓嬭浇鏂囦欢
*
* @param file 鏂囦欢
* @param fileName 鏂囦欢鍚�
* @param res 鍝嶅簲
* @throws Exception 寮傚父
*/
- public static void download(String file, String fileName, HttpServletResponse res) throws Exception {
+ public static void download(String file, String fileName, boolean inline, HttpServletResponse res) throws Exception {
if (StringHelper.isEmpty(fileName)) {
fileName = StringHelper.YMDHMS2_FORMAT.format(new Date());
}
fileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
+ String dispose = inline ? "inline" : "attachment";
// 璁剧疆鍝嶅簲澶翠腑鏂囦欢鐨勪笅杞芥柟寮忎负闄勪欢鏂瑰紡锛屼互鍙婅缃枃浠跺悕
- res.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + fileName);
+ res.setHeader("Content-Disposition", dispose + "; filename*=UTF-8''" + fileName);
// 璁剧疆鍝嶅簲澶寸殑缂栫爜鏍煎紡涓� UTF-8
res.setCharacterEncoding("UTF-8");
@@ -352,6 +366,30 @@
}
/**
+ * 鎵ц鍛戒护
+ *
+ * @param cmd 鍛戒护
+ */
+ public static String exec2(String cmd) {
+ try {
+ StringBuilder sb = new StringBuilder();
+ Process process = Runtime.getRuntime().exec(cmd);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+
+ String line;
+ while ((line = reader.readLine()) != null) {
+ sb.append(line).append("\n");
+ }
+ reader.close();
+
+ return sb.toString();
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ return null;
+ }
+ }
+
+ /**
* 鑾峰彇璇锋眰鐨勫弬鏁板��
*
* @param req 璇锋眰
--
Gitblit v1.9.3