From 7b4c8991dca9cf2a809a95e239d144697d3afb56 Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期四, 06 一月 2022 12:15:34 +0800
Subject: [PATCH] 2022.1.6
---
src/main/java/com/hxzkoa/controller/ShowController.java | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/hxzkoa/controller/ShowController.java b/src/main/java/com/hxzkoa/controller/ShowController.java
index 805c5b0..ed5d3bb 100644
--- a/src/main/java/com/hxzkoa/controller/ShowController.java
+++ b/src/main/java/com/hxzkoa/controller/ShowController.java
@@ -94,6 +94,7 @@
// }
// }
String toPage = "forward:/hxzk/index.jsp";
+ //String toPage = "forward:/hxzk/mapshow/mapShow.jsp";
// 鍩虹珯淇℃伅
List<tb_achor> anchorManagementList = anchorService.getAnchorManagementsi();
// List<tb_shebei> shebei = anchorService.getShebei();
@@ -129,25 +130,25 @@
}
// 瀹炴椂鑰冨嫟
- List<vo_kaoqin_p> realAttendanceList = attendanceService.getRealAttendance(1);
- List<vo_kaoqin_p> reRealAttendanceList = new ArrayList<vo_kaoqin_p>();
- if (realAttendanceList.size()>4){
- for (int i = 0; i < 4; i++) {
- String time =realAttendanceList.get(i).getIntime();
- time = time.split(" ")[1];
- time = time.split("\\.")[0];
- realAttendanceList.get(i).setIntime(time);
- reRealAttendanceList.add(realAttendanceList.get(i));
- }
- } else {
- for (int i = 0; i < realAttendanceList.size(); i++) {
- String time =realAttendanceList.get(i).getIntime();
- time = time.split(" ")[1];
- time = time.split("\\.")[0];
- realAttendanceList.get(i).setIntime(time);
- reRealAttendanceList.add(realAttendanceList.get(i));
- }
- }
+// List<vo_kaoqin_p> realAttendanceList = attendanceService.getRealAttendance(1);
+// List<vo_kaoqin_p> reRealAttendanceList = new ArrayList<vo_kaoqin_p>();
+// if (realAttendanceList.size()>4){
+// for (int i = 0; i < 4; i++) {
+// String time =realAttendanceList.get(i).getIntime();
+// time = time.split(" ")[1];
+// time = time.split("\\.")[0];
+// realAttendanceList.get(i).setIntime(time);
+// reRealAttendanceList.add(realAttendanceList.get(i));
+// }
+// } else {
+// for (int i = 0; i < realAttendanceList.size(); i++) {
+// String time =realAttendanceList.get(i).getIntime();
+// time = time.split(" ")[1];
+// time = time.split("\\.")[0];
+// realAttendanceList.get(i).setIntime(time);
+// reRealAttendanceList.add(realAttendanceList.get(i));
+// }
+// }
// 鍛婅姹囨��
Map warningSummaryTypeMap = warningService.getWarningSummaryType();
@@ -194,7 +195,7 @@
// request.setAttribute("shebei", shebei);
request.setAttribute("anchorManagementList", anchorManagementList);
request.setAttribute("labelManagementList", reLabelManagementList);
- request.setAttribute("realAttendanceList", reRealAttendanceList);
+// request.setAttribute("realAttendanceList", reRealAttendanceList);
request.setAttribute("reWarningSummary_k", reWarningSummary_k);
request.setAttribute("reWarningSummary_v", reWarningSummary_v);
request.setAttribute("realAttendance_k", realAttendance_k);
@@ -226,7 +227,7 @@
}
String filePath = Config.getBaowenConfig();
ModifyConfig.writeData(filePath, "baowenSwitch", "0");
- System.out.print(filePath);
+ //System.out.print(filePath);
ModifyConfig.writeData(filePath, "debugSwitch", "0");
clearInfoForFile(request.getServletContext().getRealPath("/")+Config.getYuanshiMessagePath());
clearInfoForFile(request.getServletContext().getRealPath("/")+Config.getHEXMessagePath());
@@ -278,16 +279,29 @@
@RequestMapping(value = "/setgongzhongnum.do", method = { RequestMethod.POST, RequestMethod.GET })
@ResponseBody
- public List<Integer> setgongzhongnum(){
- List<Integer> gongzhongnum = attendanceService.getgongzhongnum();
+ public List<Object> setgongzhongnum(){
+ List<Object> gongzhongnum = attendanceService.getgongzhongnum();
return gongzhongnum;
}
@RequestMapping(value = "/setgaojingnum.do", method = { RequestMethod.POST, RequestMethod.GET })
@ResponseBody
- public List<Integer> setgaojingnum(){
- List<Integer> gaojingnum = attendanceService.getgaojingnum();
- return gaojingnum;
+ public JSONObject setgaojingnum(){
+// List<Integer> gaojingnum = attendanceService.getgaojingnum();
+// return gaojingnum;
+ JSONObject jsons = new JSONObject();
+ Map warningSummaryTypeMap = warningService.getWarningSummaryType();
+ List<String> reWarningSummary_k = new ArrayList<String>();
+ List<Integer> reWarningSummary_v = new ArrayList<Integer>();
+ Iterator<String> warningSummaryTypeIter = warningSummaryTypeMap.keySet().iterator();
+ while (warningSummaryTypeIter.hasNext()) {
+ String key = warningSummaryTypeIter.next();
+ reWarningSummary_k.add(key);
+ reWarningSummary_v.add((int) warningSummaryTypeMap.get(key));
+ }
+ jsons.put("key", reWarningSummary_k);
+ jsons.put("value", reWarningSummary_v);
+ return jsons;
}
}
--
Gitblit v1.10.0