From 52cffc4ab8e9787a6f233295502c7c9788dddae1 Mon Sep 17 00:00:00 2001
From: fxl <473369119@qq.com>
Date: 星期二, 07 三月 2023 10:45:17 +0800
Subject: [PATCH] 3.7
---
src/main/java/com/hxzkoa/controller/SysSettingController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/hxzkoa/controller/SysSettingController.java b/src/main/java/com/hxzkoa/controller/SysSettingController.java
index 1148711..ee16138 100644
--- a/src/main/java/com/hxzkoa/controller/SysSettingController.java
+++ b/src/main/java/com/hxzkoa/controller/SysSettingController.java
@@ -34,6 +34,7 @@
import com.hxzkoa.json.tb_bsbaowen;
import com.hxzkoa.json.tb_forward_data;
import com.hxzkoa.json.tb_map;
+import com.hxzkoa.json.tb_nav;
import com.hxzkoa.json.tb_suanfa;
import com.hxzkoa.json.tb_system;
import com.hxzkoa.json.tb_tag;
@@ -41,6 +42,7 @@
import com.hxzkoa.json.tb_yuan_shi_bao_wen;
import com.hxzkoa.services.MapService;
import com.hxzkoa.services.SysSettingService;
+import com.hxzkoa.services.ZhwService;
import com.hxzkoa.udp.Panduan;
import com.hxzkoa.udp.Udp_Out;
/*import com.hxzkoa.udp.Udp_Receive;*/
@@ -61,6 +63,8 @@
private SysSettingService sysSettingService;
@Autowired
private MapService mapService;
+ @Autowired
+ private ZhwService zhwService;
@ResponseBody
@RequestMapping(value = "/to_cs_start_.do", method = { RequestMethod.POST, RequestMethod.GET })
@@ -331,6 +335,7 @@
words.add(user.getDeleteall());
words.add(user.getAlertq());
words.add(user.getJustlook());
+ words.add(user.getFenceq());
words.add(String.valueOf(user.getAddtime()));
String[] array = words.toArray(new String[0]);
reList.add(array);
@@ -343,7 +348,7 @@
public String userManagement_export(HttpServletRequest request, HttpServletResponse response) {
String toPage = "forward:/hxzk/sysSetting/userManagement.jsp";
List<tb_user> userManagementList = sysSettingService.getuserManagement();
- String[] rowName = { "搴忓彿","鐢ㄦ埛","绾у埆","鍒犻櫎","淇敼","鍏ㄩ儴鍒犻櫎","浠呰鐪�","娣诲姞鏃堕棿 "};
+ String[] rowName = { "搴忓彿","鐢ㄦ埛","绾у埆","鍒犻櫎","淇敼","鍏ㄩ儴鍒犻櫎","浠呰鐪�","鏂板","娣诲姞鏃堕棿"};
List<Object[]> dataList = objectToArray(userManagementList);
ExcelUtils excel = new ExcelUtils("鐢ㄦ埛绠＄悊", rowName, dataList);
OutputStream out;
@@ -428,6 +433,7 @@
user.setAlertq(request.getParameter("alertq"));
user.setDeleteall(request.getParameter("deleteall"));
user.setJustlook(request.getParameter("justlook"));
+ user.setFenceq(request.getParameter("insert"));
sysSettingService.userManagement_add(user);
}
@@ -459,6 +465,7 @@
user.setAlertq(request.getParameter("alertq"));
user.setDeleteall(request.getParameter("deleteall"));
user.setJustlook(request.getParameter("justlook"));
+ user.setFenceq(request.getParameter("insert"));
sysSettingService.userManagement_modify(user);
}
@@ -467,6 +474,8 @@
String toPage = "forward:hxzk/sysSetting/sysSetting.jsp";
List<tb_system> settingList = sysSettingService.getSetting();
List<tb_map> maplist = mapService.getMapManagement();
+ List<tb_nav> navList = zhwService.getnav();
+ request.setAttribute("dataList", navList);
request.setAttribute("settingList", settingList);
request.setAttribute("maplist", maplist);
return toPage;
@@ -507,7 +516,7 @@
setting.setOffView(request.getParameter("offView"));
setting.setAnckicon(request.getParameter("anckicon"));
setting.setGas_show(request.getParameter("gas_show"));
- setting.setQuiet(request.getParameter("quiet"));
+// setting.setQuiet(request.getParameter("quiet"));
setting.setReal_trak_time(request.getParameter("real_trak_time"));
setting.setReal_trak_color(request.getParameter("real_trak_color"));
setting.setYulan_map(request.getParameter("yulan_map_tu"));
@@ -518,7 +527,49 @@
setting.setGas_hz(request.getParameter("gas_hz"));
setting.setRssid(request.getParameter("rssid"));
setting.setFence_show(request.getParameter("fence_show"));
+ tb_nav nav = new tb_nav();
+ nav.setLabel(request.getParameter("label"));
+ nav.setAchor(request.getParameter("achor"));
+ nav.setGps(request.getParameter("gps"));
+ nav.setFence(request.getParameter("fence"));
+ nav.setWarning(request.getParameter("warning"));
+ nav.setHistory(request.getParameter("history"));
+ nav.setAttendance(request.getParameter("attendance"));
+ nav.setBasiclnfo(request.getParameter("basiclnfo"));
+ nav.setVideo(request.getParameter("video"));
+ nav.setGas(request.getParameter("gas"));
sysSettingService.sysSetting_modify(setting);
+ zhwService.updatenav(nav);
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "/sysSetting_modifya.do", method = { RequestMethod.POST, RequestMethod.GET })
+ public String sysSetting_modifya(HttpServletRequest request) {
+ tb_system setting = new tb_system();
+ setting.setUdpAdress(request.getParameter("ip"));
+ setting.setBaoliu20(request.getParameter("port"));
+ setting.setBaoliu13(request.getParameter("sxtime"));
+ setting.setBaoliu14(request.getParameter("tagupp"));
+ setting.setBaoliu15(request.getParameter("fenceupp"));
+ setting.setReal_trak_time(request.getParameter("realtraktime"));
+ setting.setFence_show(request.getParameter("fenceshow"));
+ setting.setViewAnckid(request.getParameter("viewAnckid"));
+ setting.setBaoliu16(request.getParameter("showtracks"));
+ setting.setBaoliu17(request.getParameter("shownews"));
+ setting.setYulan_map(request.getParameter("map"));
+ String xieyi = "BSTOCS1,U1ALTERSYSTEM,"+setting.getUdpAdress()+","+setting.getBaoliu20()+","+setting.getBaoliu13()+","+setting.getBaoliu14()+","+setting.getBaoliu15()+","+setting.getReal_trak_time()+","+setting.getFence_show()+","+setting.getViewAnckid()+","+setting.getBaoliu16()+","+setting.getBaoliu17()+","+setting.getYulan_map()+",END";
+ Udp_Out.udp_to_cs(xieyi);
+ int aaa = sysSettingService.sysSetting_modifya(setting);
+ return ""+aaa;
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "/getSysSettinga.do", method = { RequestMethod.POST, RequestMethod.GET })
+ public JSONObject getSysSettinga(HttpServletRequest request) {
+ JSONObject json = new JSONObject();
+ List<tb_system> settingList = sysSettingService.getSetting();
+ json.put("dataList", settingList);
+ return json;
}
@RequestMapping(value = "/algorithmConfiguration.do", method = { RequestMethod.POST, RequestMethod.GET })
--
Gitblit v1.10.0