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/AnchorController.java | 149 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/hxzkoa/controller/AnchorController.java b/src/main/java/com/hxzkoa/controller/AnchorController.java
index 3fdffa5..32ceacb 100644
--- a/src/main/java/com/hxzkoa/controller/AnchorController.java
+++ b/src/main/java/com/hxzkoa/controller/AnchorController.java
@@ -21,6 +21,7 @@
import com.hxzkoa.json.tb_achor;
import com.hxzkoa.json.tb_anchor_nearby;
+import com.hxzkoa.json.tb_anchorhistory;
import com.hxzkoa.json.tb_tongbuanchor;
import com.hxzkoa.json.tb_wifi;
import com.hxzkoa.services.AnchorService;
@@ -72,6 +73,12 @@
public JSONObject anchorManagementa(HttpServletRequest request) {
JSONObject json = new JSONObject();
List<tb_achor> achorManagementList = anchorService.getAnchorManagementa();
+ for (int i=0; i<achorManagementList.size(); i++) {
+ if (!achorManagementList.get(i).getPOSX().equals("") && !achorManagementList.get(i).getPOSY().equals("")) {
+ achorManagementList.get(i).setPOSX(""+((double)Math.round(Double.parseDouble(achorManagementList.get(i).getPOSX()))/100));
+ achorManagementList.get(i).setPOSY(""+((double)Math.round(Double.parseDouble(achorManagementList.get(i).getPOSY()))/100));
+ }
+ }
json.put("dataList", achorManagementList);
return json;
}
@@ -130,49 +137,59 @@
@ResponseBody
@RequestMapping(value = "/anchorManagement_adda.do", method = { RequestMethod.POST, RequestMethod.GET })
- public int anchorManagement_adda(HttpServletRequest request) throws IOException {
+ public String anchorManagement_adda(HttpServletRequest request) throws IOException {
tb_achor anchor = new tb_achor();
- int aaa = 0;
+ String aaa = "";
String anchorid = request.getParameter("anchorid");
if (("").equals(anchorid) || anchorid == null) {
String jsonString = RequestUtils.getRequestJsonString(request, Config.getCharset());
anchor = (tb_achor) JSONObject.toBean(JSONObject.fromObject(jsonString), tb_achor.class);
List<tb_achor> searchAnchorList = anchorService.searchAnchorManagement(anchor.getAnchorid());
if (searchAnchorList.size() == 0) {
- anchorService.anchorManagement_add(anchor);
+ anchorService.anchorManagement_addaa(anchor);
}
} else {
anchor.setAnchorid(anchorid);
- anchor.setPOSX(request.getParameter("POSX"));
- anchor.setPOSY(request.getParameter("POSY"));
+// anchor.setPOSX(request.getParameter("POSX"));
+// anchor.setPOSY(request.getParameter("POSY"));
+ anchor.setPOSX("0");
+ anchor.setPOSY("0");
anchor.setPOSZ(request.getParameter("POSZ"));
- anchor.setLayer(request.getParameter("layer"));
- anchor.setZu(request.getParameter("zu"));
- anchor.setLiangcheng(request.getParameter("liangcheng"));
- if(("").equals(anchor.getLiangcheng())){
- anchor.setLiangcheng("100000");
- }
- anchor.setAnchorip(request.getParameter("anchorip"));
+// anchor.setLayer(request.getParameter("layer"));
+// anchor.setZu(request.getParameter("zu"));
+// anchor.setLiangcheng(request.getParameter("liangcheng"));
+// anchor.setAnchorip(request.getParameter("anchorip"));
+ anchor.setLayer("0");
+ anchor.setZu("0");
+ anchor.setLiangcheng("0");
+// if(("").equals(anchor.getLiangcheng())){
+// anchor.setLiangcheng("100000");
+// }
+ anchor.setAnchorip("0");
anchor.setAnchormode("1");
anchor.setVersion(Config.getVersion());
// 濡傛灉璇nchorid涓嶅瓨鍦紝鏂板涓�鏉�
List<tb_achor> searchAnchorList = anchorService.searchAnchorManagement(anchorid);
if (searchAnchorList.size() == 0) {
- aaa = anchorService.anchorManagement_add(anchor);
+// aaa = anchorService.anchorManagement_addaa(anchor);
String xieyi = "BSTOCS1,ADDANC,"+anchor.getAnchorid()+","+anchor.getPOSX()+","+anchor.getPOSY()+","+anchor.getPOSZ()+","+anchor.getLayer()+","+anchor.getZu()+","+anchor.getLiangcheng()+","+anchor.getAnchorip()+",END";
+ System.out.print("++++++++"+xieyi);
Udp_Out.udp_to_cs(xieyi);
+ aaa = "1";
+ } else {
+ aaa = "鍩虹珯ID宸插瓨鍦�";
}
}
//鏂板涓磋繎鍩虹珯鍜屽悓姝ュ熀绔�
- tb_anchor_nearby nearby = new tb_anchor_nearby();
- nearby.setAnchorid(anchor.getAnchorid());
- nearby.setQiehuan("0");
- anchorService.proximityConfiguration_add(nearby);
- tb_tongbuanchor tongbu = new tb_tongbuanchor();
- tongbu.setAnchorid(anchor.getAnchorid());
- tongbu.setType(anchor.getAnchormode());
- tongbu.setState("0");
- anchorService.syncConfiguration_add(tongbu);
+// tb_anchor_nearby nearby = new tb_anchor_nearby();
+// nearby.setAnchorid(anchor.getAnchorid());
+// nearby.setQiehuan("0");
+// anchorService.proximityConfiguration_add(nearby);
+// tb_tongbuanchor tongbu = new tb_tongbuanchor();
+// tongbu.setAnchorid(anchor.getAnchorid());
+// tongbu.setType(anchor.getAnchormode());
+// tongbu.setState("0");
+// anchorService.syncConfiguration_add(tongbu);
return aaa;
}
@@ -199,7 +216,7 @@
@ResponseBody
@RequestMapping(value = "/anchorManagement_modifya.do", method = { RequestMethod.POST, RequestMethod.GET })
- public int anchorManagement_modifya(HttpServletRequest request) {
+ public String anchorManagement_modifya(HttpServletRequest request) {
tb_achor anchor = new tb_achor();
anchor.setAnchorid(request.getParameter("anchorid"));
anchor.setPOSX(request.getParameter("POSX"));
@@ -209,15 +226,15 @@
anchor.setZu(request.getParameter("zu"));
anchor.setLiangcheng(request.getParameter("liangcheng"));
anchor.setAnchorip(request.getParameter("anchorip"));
- int aaa = anchorService.anchorManagement_modify(anchor);
+// int aaa = anchorService.anchorManagement_modifyaa(anchor);
String xieyi = "BSTOCS1,ALTERANC,"+anchor.getAnchorid()+","+anchor.getPOSX()+","+anchor.getPOSY()+","+anchor.getPOSZ()+","+anchor.getLayer()+","+anchor.getZu()+","+anchor.getLiangcheng()+","+anchor.getAnchorip()+",END";
Udp_Out.udp_to_cs(xieyi);
//淇敼涓磋繎鍩虹珯鍜屽悓姝ュ熀绔�
- tb_tongbuanchor tongbu = new tb_tongbuanchor();
- tongbu.setAnchorid(anchor.getAnchorid());
- tongbu.setType(anchor.getAnchormode());
- anchorService.syncConfiguration_modify(tongbu);
- return aaa;
+// tb_tongbuanchor tongbu = new tb_tongbuanchor();
+// tongbu.setAnchorid(anchor.getAnchorid());
+// tongbu.setType(anchor.getAnchormode());
+// anchorService.syncConfiguration_modify(tongbu);
+ return "1";
}
@RequestMapping(value = "/anchorManagement_heart.do", method = { RequestMethod.POST, RequestMethod.GET })
@@ -254,7 +271,7 @@
@ResponseBody
@RequestMapping(value = "/anchorManagement_deletea.do", method = { RequestMethod.POST, RequestMethod.GET })
- public int anchorManagement_deletea(HttpServletRequest request) {
+ public String anchorManagement_deletea(HttpServletRequest request) {
String checkValStr = request.getParameter("checkVal");
checkValStr = checkValStr.replaceAll("\"", "");
String[] checkVal = checkValStr.split(",");
@@ -264,10 +281,14 @@
// System.out.print(anchors.get(0).getAnchorid());
// anchorid[i] = anchors.get(0).getAnchorid();
// }
- int aaa = anchorService.anchorManagement_deletea(checkVal);
- anchorService.anchorProx_delete(checkVal);
- anchorService.anchorSync_delete(checkVal);
- return aaa;
+ for(int i = 0; i < checkVal.length; i++) {
+ String xieyi = "BSTOCS1,DELETEANC,"+checkVal[i]+",END";
+ Udp_Out.udp_to_cs(xieyi);
+ }
+// int aaa = anchorService.anchorManagement_deletea(checkVal);
+// anchorService.anchorProx_delete(checkVal);
+// anchorService.anchorSync_delete(checkVal);
+ return "1";
}
@ResponseBody
@@ -280,11 +301,11 @@
@ResponseBody
@RequestMapping(value = "/anchorManagement_deleteAlla.do", method = { RequestMethod.POST, RequestMethod.GET })
- public int anchorManagement_deleteAlla(HttpServletRequest request) {
- int aaa = anchorService.anchorManagement_deleteAll();
+ public String anchorManagement_deleteAlla(HttpServletRequest request) {
+// int aaa = anchorService.anchorManagement_deleteAll();
String xieyi = "BSTOCS1,DELETEALLANC,END";
Udp_Out.udp_to_cs(xieyi);
- return aaa;
+ return "1";
}
@ResponseBody
@@ -323,14 +344,14 @@
String jsonString = RequestUtils.getRequestJsonString(request, Config.getCharset());
tb_achor anchor = (tb_achor) JSONObject.toBean(JSONObject.fromObject(jsonString), tb_achor.class);
input = anchor.getAnchorid();
- List<tb_achor> anchorManagementList = anchorService.searchAnchorManagement(input);
+ List<tb_achor> anchorManagementList = anchorService.searchAnchorManagementaa(input);
if (anchorManagementList.size()>0){
json.put("result", anchorManagementList.get(0));
} else {
json.put("result", "null");
}
} else {
- List<tb_achor> anchorManagementList = anchorService.searchAnchorManagement(input);
+ List<tb_achor> anchorManagementList = anchorService.searchAnchorManagementaa(input);
json.put("dataList", anchorManagementList);
}
return json;
@@ -502,18 +523,23 @@
String anchormode = sheet.getCell(5, i).getContents();
String anchorip = sheet.getCell(6, i).getContents();
if (!("").equals(anchorid)) {
- tb_achor anchor = new tb_achor();
- anchor.setAnchorid(anchorid);
- anchor.setPOSX(POSX);
- anchor.setPOSY(POSY);
- anchor.setPOSZ(POSZ);
- anchor.setLayer(layer);
- anchor.setZu("鏃�");
- anchor.setLiangcheng("鏃�");
- anchor.setAnchormode(anchormode);
- anchor.setAnchorip(anchorip);
- anchor.setVersion(Config.getVersion());
- result = anchorService.anchorManagement_add(anchor);
+ List<tb_achor> anchorManagementList = anchorService.searchAnchorManagement(anchorid);
+ if (anchorManagementList.size() == 0) {
+ tb_achor anchor = new tb_achor();
+ anchor.setAnchorid(anchorid);
+ anchor.setPOSX(POSX);
+ anchor.setPOSY(POSY);
+ anchor.setPOSZ(POSZ);
+ anchor.setLayer(layer);
+ anchor.setZu("鏃�");
+ anchor.setLiangcheng("鏃�");
+ anchor.setAnchormode(anchormode);
+ anchor.setAnchorip(anchorip);
+ anchor.setVersion(Config.getVersion());
+ result = anchorService.anchorManagement_add(anchor);
+ String xieyi = "BSTOCS1,ADDANC,"+anchor.getAnchorid()+","+anchor.getPOSX()+","+anchor.getPOSY()+","+anchor.getPOSZ()+","+anchor.getLayer()+","+anchor.getZu()+","+anchor.getLiangcheng()+","+anchor.getAnchorip()+",END";
+ Udp_Out.udp_to_cs(xieyi);
+ }
}
}
// 閲婃斁璧勬簮
@@ -942,4 +968,25 @@
}
return nn;
}
+
+ @ResponseBody
+ @RequestMapping(value = "/anchorhistory.do", method = { RequestMethod.POST, RequestMethod.GET })
+ public JSONObject anchorhistory(HttpServletRequest request) {
+ JSONObject json = new JSONObject();
+ List<tb_anchorhistory> achorManagementList = anchorService.getAnchorhistory();
+ json.put("dataList", achorManagementList);
+ return json;
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "/findidanchorhistory.do", method = { RequestMethod.POST, RequestMethod.GET })
+ public JSONObject anchorhistoryaa(HttpServletRequest request) {
+ String date = request.getParameter("date");
+ StringBuffer string = new StringBuffer(date);
+ String insert = string.insert(4, "-").toString();
+ JSONObject json = new JSONObject();
+ List<tb_anchorhistory> achorManagementList = anchorService.getidAnchorhistory(insert);
+ json.put("dataList", achorManagementList);
+ return json;
+ }
}
--
Gitblit v1.10.0