From e150655a785de36a65a26a0dc4d3d6d65fe7e9d0 Mon Sep 17 00:00:00 2001
From: fxl <473369119@qq.com>
Date: 星期四, 04 五月 2023 18:03:37 +0800
Subject: [PATCH] 11111
---
src/main/java/com/hxzkoa/services/SysSettingService.java | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/hxzkoa/services/SysSettingService.java b/src/main/java/com/hxzkoa/services/SysSettingService.java
index f697ab2..19e3000 100644
--- a/src/main/java/com/hxzkoa/services/SysSettingService.java
+++ b/src/main/java/com/hxzkoa/services/SysSettingService.java
@@ -197,7 +197,7 @@
public List<tb_user> getuserManagement() {
String sql = null;
Query query = null;
- sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime FROM tb_user";
+ sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime,fenceq FROM tb_user";
query = this.em.createNativeQuery(sql);
List resultList = query.getResultList();
List<tb_user> tb_userList = new ArrayList<tb_user>();
@@ -213,6 +213,7 @@
user.setDeleteall(obj[5] == null ? "" : obj[5].toString());
user.setJustlook(obj[6] == null ? "" : obj[6].toString());
user.setAddtime(obj[7] == null ? "" : obj[7].toString());
+ user.setFenceq(obj[8] == null ? "" : obj[8].toString());
tb_userList.add(user);
}
}
@@ -225,7 +226,7 @@
int end = perPage;
String sql = null;
Query query = null;
- sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime FROM tb_user LIMIT :start,:end";
+ sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime,fenceq FROM tb_user LIMIT :start,:end";
query = this.em.createNativeQuery(sql);
query.setParameter("start", start);
query.setParameter("end", end);
@@ -243,6 +244,7 @@
user.setDeleteall(obj[5] == null ? "" : obj[5].toString());
user.setJustlook(obj[6] == null ? "" : obj[6].toString());
user.setAddtime(obj[7] == null ? "" : obj[7].toString());
+ user.setFenceq(obj[8] == null ? "" : obj[8].toString());
tb_userList.add(user);
}
}
@@ -278,7 +280,7 @@
String username = input;
String sql = null;
Query query = null;
- sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime FROM tb_user WHERE username = :username";
+ sql = "SELECT id,username,superuser,deleteq,alertq,deleteall,justlook,addtime,fenceq FROM tb_user WHERE username = :username";
query = this.em.createNativeQuery(sql);
query.setParameter("username", username);
List resultList = query.getResultList();
@@ -295,6 +297,7 @@
user.setDeleteall(obj[5] == null ? "" : obj[5].toString());
user.setJustlook(obj[6] == null ? "" : obj[6].toString());
user.setAddtime(obj[7] == null ? "" : obj[7].toString());
+ user.setFenceq(obj[8] == null ? "" : obj[8].toString());
tb_userList.add(user);
}
}
@@ -364,8 +367,8 @@
public int userManagement_add(tb_user user) {
String sql = null;
Query query = null;
- sql = "INSERT INTO tb_user(username,password,superuser,deleteq,alertq,deleteall,justlook,addtime) "
- + "VALUES(:username,:password,:superuser,:deleteq,:alertq,:deleteall,:justlook,now())";
+ sql = "INSERT INTO tb_user(username,password,superuser,deleteq,alertq,deleteall,justlook,addtime,fenceq) "
+ + "VALUES(:username,:password,:superuser,:deleteq,:alertq,:deleteall,:justlook,now(),:fenceq)";
cs.tb_caozuo("tb_user", 1);
query = this.em.createNativeQuery(sql);
query.setParameter("username", user.getUsername());
@@ -375,6 +378,7 @@
query.setParameter("alertq", user.getAlertq());
query.setParameter("deleteall", user.getDeleteall());
query.setParameter("justlook", user.getJustlook());
+ query.setParameter("fenceq", user.getFenceq());
int executeUpdate = query.executeUpdate();
return executeUpdate;
}
@@ -395,7 +399,7 @@
String sql = null;
Query query = null;
sql = "UPDATE tb_user SET username = :username,password = :password,superuser = :superuser,"
- + "deleteq = :deleteq,alertq = :alertq,deleteall = :deleteall,justlook = :justlook,addtime = now() WHERE id= :id";
+ + "deleteq = :deleteq,alertq = :alertq,deleteall = :deleteall,justlook = :justlook,addtime = now(),fenceq = :fenceq WHERE id= :id";
cs.tb_caozuo("tb_user", 3);
query = this.em.createNativeQuery(sql);
query.setParameter("id", user.getId());
@@ -406,6 +410,7 @@
query.setParameter("alertq", user.getAlertq());
query.setParameter("deleteall", user.getDeleteall());
query.setParameter("justlook", user.getJustlook());
+ query.setParameter("fenceq", user.getFenceq());
int executeUpdate = query.executeUpdate();
return executeUpdate;
}
@@ -437,7 +442,7 @@
sql = "SELECT dataname,datapass,gui_ji,bei_fen_di_zhi,data_time,title,udpPort,udpAdress,openudp,"
+ "know_tag_zu,wifi_mdel,tagZb,diskaoqing,viewAnckid,viewName,tunlDw,guiji_sava,viewPower,"
+ "viewTagid,viewAnckzb,offView,anckicon,gas_show,quiet,real_trak_time,"
- + "real_trak_color,gas_open,gas_port,gas_hz,rssid,bs_udp,origin_jingdu,origin_weidu,origin_jiaodu,fence_show,yulan_map,baidu_j,baidu_w,cs_udp,baoliu10 FROM tb_system";
+ + "real_trak_color,gas_open,gas_port,gas_hz,rssid,bs_udp,origin_jingdu,origin_weidu,origin_jiaodu,fence_show,yulan_map,baidu_j,baidu_w,cs_udp,baoliu10,baoliu13,baoliu14,baoliu15,baoliu16,baoliu17,baoliu19,baoliu20 FROM tb_system";
query = this.em.createNativeQuery(sql);
List resultList = query.getResultList();
List<tb_system> tb_systemList = new ArrayList<tb_system>();
@@ -485,34 +490,43 @@
setting.setBaidu_w(obj[37] == null ?"" :obj[37].toString());
setting.setCs_udp(obj[38] == null ?"" :obj[38].toString());
setting.setBaoliu10(obj[39] == null ?"" :obj[39].toString());
+ setting.setBaoliu13(obj[40] == null ?"" :obj[40].toString());
+ setting.setBaoliu14(obj[41] == null ?"" :obj[41].toString());
+ setting.setBaoliu15(obj[42] == null ?"" :obj[42].toString());
+ setting.setBaoliu16(obj[43] == null ?"" :obj[43].toString());
+ setting.setBaoliu17(obj[44] == null ?"" :obj[44].toString());
+ setting.setBaoliu19(obj[45] == null ?"" :obj[45].toString());
+ setting.setBaoliu20(obj[46] == null ?"" :obj[46].toString());
tb_systemList.add(setting);
}
}
return tb_systemList;
}
-
+ @Transactional
+ public int addVersion(String time,String BsVersion){
+ String sql = null;
+ Query query = null;
+ sql = "INSERT INTO tb_version(BsVersion,BsTime) VALUES(:BsVersion,:time)";
+ query = this.em.createNativeQuery(sql);
+ query.setParameter("time", time);
+ query.setParameter("BsVersion", BsVersion);
+ int executeUpdate = query.executeUpdate();
+ return executeUpdate;
+ }
@Transactional
public int sysSetting_modify(tb_system setting) {
String sql = null;
Query query = null;
- sql = "UPDATE tb_system SET dataname=:dataname,datapass=:datapass,gui_ji=:gui_ji,bei_fen_di_zhi=:bei_fen_di_zhi,data_time=:data_time,title=:title,udpPort=:udpPort,udpAdress=:udpAdress,openudp=:openudp,"
- + "know_tag_zu=:know_tag_zu,wifi_mdel=:wifi_mdel,tagZb=:tagZb,diskaoqing=:diskaoqing,viewAnckid=:viewAnckid,viewName=:viewName,tunlDw=:tunlDw,guiji_sava=:guiji_sava,viewPower=:viewPower,"
- + "viewTagid=:viewTagid,viewAnckzb=:viewAnckzb,offView=:offView,anckicon=:anckicon,gas_show=:gas_show,quiet=:quiet,real_trak_time=:real_trak_time,"
- + "real_trak_color=:real_trak_color,gas_open=:gas_open,gas_port=:gas_port,gas_hz=:gas_hz,rssid=:rssid,fence_show=:fence_show,yulan_map=:yulan_map,baidu_j=:baidu_j,baidu_w=:baidu_w WHERE id= 1";
- cs.tb_caozuo("tb_system", 3);
+ sql = "UPDATE tb_system SET gui_ji=:gui_ji,title=:title,"
+ + "diskaoqing=:diskaoqing,viewAnckid=:viewAnckid,viewName=:viewName,tunlDw=:tunlDw,guiji_sava=:guiji_sava,viewPower=:viewPower,"
+ + "viewTagid=:viewTagid,viewAnckzb=:viewAnckzb,offView=:offView,anckicon=:anckicon,gas_show=:gas_show,real_trak_time=:real_trak_time,"
+ + "real_trak_color=:real_trak_color,fence_show=:fence_show,yulan_map=:yulan_map,baidu_j=:baidu_j,baidu_w=:baidu_w WHERE id= 1";
query = this.em.createNativeQuery(sql);
- query.setParameter("dataname", setting.getDataname());
- query.setParameter("datapass", setting.getDatapass());
+
query.setParameter("gui_ji", setting.getGui_ji());
- query.setParameter("bei_fen_di_zhi", setting.getBei_fen_di_zhi());
- query.setParameter("data_time", setting.getData_time());
query.setParameter("title", setting.getTitle());
- query.setParameter("udpPort", setting.getUdpPort());
- query.setParameter("udpAdress", setting.getUdpAdress());
- query.setParameter("openudp", setting.getOpenudp());
- query.setParameter("know_tag_zu", setting.getKnow_tag_zu());
- query.setParameter("wifi_mdel", setting.getWifi_mdel());
- query.setParameter("tagZb", setting.getTagZb());
+
+
query.setParameter("diskaoqing", setting.getDiskaoqing());
query.setParameter("viewAnckid", setting.getViewAnckid());
query.setParameter("viewName", setting.getViewName());
@@ -524,13 +538,9 @@
query.setParameter("offView", setting.getOffView());
query.setParameter("anckicon", setting.getAnckicon());
query.setParameter("gas_show", setting.getGas_show());
- query.setParameter("quiet", setting.getQuiet());
+// query.setParameter("quiet", setting.getQuiet());
query.setParameter("real_trak_time", setting.getReal_trak_time());
query.setParameter("real_trak_color", setting.getReal_trak_color());
- query.setParameter("gas_open", setting.getGas_open());
- query.setParameter("gas_port", setting.getGas_port());
- query.setParameter("gas_hz", setting.getGas_hz());
- query.setParameter("rssid", setting.getRssid());
query.setParameter("fence_show", setting.getFence_show());
query.setParameter("yulan_map", setting.getYulan_map());
query.setParameter("baidu_j", setting.getBaidu_j());
@@ -539,6 +549,29 @@
return executeUpdate;
}
+ @Transactional
+ public int sysSetting_modifya(tb_system setting) {
+ String sql = null;
+ Query query = null;
+ sql = "UPDATE tb_system SET udpAdress=:udpAdress,baoliu13=:baoliu13,baoliu14=:baoliu14,baoliu15=:baoliu15,real_trak_time=:real_trak_time,fence_show=:fence_show,viewAnckid=:viewAnckid,baoliu16=:baoliu16,baoliu17=:baoliu17,yulan_map=:yulan_map,baoliu20=:baoliu20 WHERE id= 1";
+ cs.tb_caozuo("tb_system", 3);
+ query = this.em.createNativeQuery(sql);
+ query.setParameter("udpAdress", setting.getUdpAdress());
+ query.setParameter("baoliu20", setting.getBaoliu20());
+ query.setParameter("baoliu13", setting.getBaoliu13());
+ query.setParameter("baoliu14", setting.getBaoliu14());
+ query.setParameter("baoliu15", setting.getBaoliu15());
+ query.setParameter("real_trak_time", setting.getReal_trak_time());
+ query.setParameter("fence_show", setting.getFence_show());
+ query.setParameter("viewAnckid", setting.getViewAnckid());
+ query.setParameter("baoliu16", setting.getBaoliu16());
+ query.setParameter("baoliu17", setting.getBaoliu17());
+ query.setParameter("yulan_map", setting.getYulan_map());
+
+ int executeUpdate = query.executeUpdate();
+ return executeUpdate;
+ }
+
public List<tb_achor> getLayer() {
String sql = null;
Query query = null;
--
Gitblit v1.10.0