From 321a74059773cfecc01d6313f7c2e2d45545d6d3 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期五, 18 四月 2025 17:46:31 +0800
Subject: [PATCH] 4.18v1.1.0
---
src/main/java/com/hxzkappboot/controller/TbFenceController.java | 102 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 78 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/hxzkappboot/controller/TbFenceController.java b/src/main/java/com/hxzkappboot/controller/TbFenceController.java
index a0edd80..bf78a09 100644
--- a/src/main/java/com/hxzkappboot/controller/TbFenceController.java
+++ b/src/main/java/com/hxzkappboot/controller/TbFenceController.java
@@ -1,7 +1,6 @@
package com.hxzkappboot.controller;
-
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +32,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wangfei
@@ -51,8 +50,8 @@
@GetMapping("/api/wx/findAllFence")
- public R findAllFence(String company){
- R response ;
+ public R findAllFence(String company) {
+ R response;
response = new R(StatusCode.Success);
response.setData(tbFenceService.findAllFence(company));
return response;
@@ -63,7 +62,7 @@
public R earlyWarning(String name) throws ParseException {
String xieyi = "BSTOCS1,DELETEFENCE," + name + ",END";
Udp_Out.udp_to_cs(xieyi);
- R response ;
+ R response;
// List<TbFence> fenceList = new ArrayList();
System.out.println(name);
// fenceList = tbFenceService.earlyWarning();
@@ -73,9 +72,9 @@
}
@GetMapping("/api/wx/findFence")
- public R findAll(Page page, String objectid,String company) {
+ public R findAll(Page page, String objectid, String company) {
R response;
- IPage<TbFence> ipage = tbFenceService.findFence(page,objectid,company);
+ IPage<TbFence> ipage = tbFenceService.findFence(page, objectid, company);
response = new R(StatusCode.Success);
response.setData(ipage);
return response;
@@ -83,36 +82,43 @@
@PostMapping("/api/wx/updateFence")
public R processingWarn(@Valid @RequestBody TbFence tbFence) {
- R response ;
+ R response;
response = new R(StatusCode.Success);
- TbFence gpsList =tbFenceService.updateFence(tbFence);
+ TbFence gpsList = tbFenceService.updateFence(tbFence);
response.setData(gpsList);
return response;
}
@GetMapping("/api/wx/FenceKaiQi")
- public void fenceKai(TbFence fence){
+ public void fenceKai(TbFence fence) {
// TbUser user = sessionManager.getCurrentUser(request);
- String xieyi = "BSTOCS1,FENCE,OPEN," +fence.getName()+",END";
+ String xieyi = "BSTOCS1,FENCE,OPEN," + fence.getName() + ",END";
Udp_Out.udp_to_cs(xieyi);
// String content = "寮�鍚簡涓�涓洿鏍忚鍥存爮鍚嶇О涓猴細"+fence.getName();
// String contentew = "袨褌泻褉褘胁邪械褌褋褟 蟹邪斜芯褉, 泻芯褌芯褉褘泄 薪邪蟹褘胁邪械褌褋褟锛�"+fence.getName();
// SystemLogController.InsertSystemLog(user.getUsername(),gettime(),content,contentew);
}
+
@GetMapping("/api/wx/FenceGuanBi")
- public void fenceGuan(TbFence fence){
+ public void fenceGuan(TbFence fence) {
// TbUser user = sessionManager.getCurrentUser(request);
- String xieyi = "BSTOCS1,FENCE,CLOSE," +fence.getName()+",END";
+ String xieyi = "BSTOCS1,FENCE,CLOSE," + fence.getName() + ",END";
System.out.println();
Udp_Out.udp_to_cs(xieyi);
// String content = "鍏抽棴浜嗕竴涓洿鏍忚鍥存爮鍚嶇О涓猴細"+fence.getName();
// String contentew= "袟邪泻褉褘谢懈 蟹邪斜芯褉, 泻芯褌芯褉褘泄 薪邪蟹褘胁邪械褌褋褟锛�"+fence.getName();
// SystemLogController.InsertSystemLog(user.getUsername(),gettime(),content,contentew);
}
-
+ public static double ublox_d2dm(double deg) {
+ double deg0 =Math.floor(deg);
+ double ddeg = deg-deg0;
+ double m = ddeg*60;
+ double ddmm = deg0*100+m;
+ return ddmm;
+ }
@PostMapping("/api/wx/submitper")
public R submitper(@Valid @RequestBody TbFence tbFence) {
- R response ;
+ R response;
// for (int i = 0; i < ; i++) {
//
@@ -120,14 +126,14 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("status","鏈鐞�");
// if (objectid!=null){
- queryWrapper.eq("name",tbFence.getName());
+ queryWrapper.eq("name", tbFence.getName());
// }
// queryWrapper.orderByDesc("addtime");
- List<TbFence> CompanyPage = tbPersonMapper.selectList( queryWrapper);
- if (CompanyPage.size()>0){
+ List<TbFence> CompanyPage = tbPersonMapper.selectList(queryWrapper);
+ if (CompanyPage.size() > 0) {
response = new R(StatusCode.Fail);
response.setData("鍥存爮鍚嶇О閲嶅锛屼繚瀛樺洿鏍忓け璐ワ紒");
- }else{
+ } else {
response = new R(StatusCode.Success);
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -135,14 +141,44 @@
String shengxiao = "00:00:00";
String shixiao = "23:59:59";
String xieyi = "";
- if (Objects.equals(tbFence.getShape(), "鍦嗗舰")){
+ if (Objects.equals(tbFence.getShape(), "鍦嗗舰")) {
+ String[] zuobiao1 = tbFence.getZuobiao().split(":");
+ double jingdu = ublox_d2dm(Double.parseDouble(zuobiao1[0]));
+ double weidu = ublox_d2dm(Double.parseDouble(zuobiao1[1].replace(";","")));
+ String zuobiao = jingdu+";"+weidu;
// xieyi = "BSTOCS1,ADDFENCE," + layer + ","+weilanleixing+","+guanlianduixiang+","+quyumingcheng+","+sd+","+xingzhuang+","+shengxiao+","+shixiao+","+formattedDateTime+","+yanse+","+gao+",END";
- xieyi = "BSTOCS1,ADDFENCEYUAN,鐧惧害鍦板浘" + ","+tbFence.getType()+","+tbFence.getBumen()+","+tbFence.getBanjing()+","+tbFence.getName()+","+tbFence.getZuobiao().split(":")[0] +";"+tbFence.getZuobiao().split(":")[0]+","+"鍦嗗舰"+","+"00:00:00"+","+"23:59:59"+","+formattedDateTime+","+"绾㈣壊"+",END";
- }else{
- xieyi = "BSTOCS1,ADDFENCE,鐧惧害鍦板浘,"+tbFence.getType()+","+tbFence.getBumen()+","+tbFence.getName()+","+tbFence.getZuobiao()+","+tbFence.getShape()+","+shengxiao+","+shixiao+","+formattedDateTime+","+"绾㈣壊"+","+tbFence.getBaoliu1()+",END";
- }
+ xieyi = "BSTOCS1,ADDFENCEYUAN,鐧惧害鍦板浘" + "," + tbFence.getType() + "," + tbFence.getBumen() + "," + tbFence.getBanjing() + "," + tbFence.getName() + "," + zuobiao + "," + "鍦嗗舰" + "," + "00:00:00" + "," + "23:59:59" + "," + formattedDateTime + "," + "绾㈣壊" + ",END";
+ } else {
+ xieyi = "BSTOCS1,ADDFENCE,鐧惧害鍦板浘," + tbFence.getType() + "," + tbFence.getBumen() + "," + tbFence.getName() + "," + tbFence.getZuobiao() + "," + tbFence.getShape() + "," + shengxiao + "," + shixiao + "," + formattedDateTime + "," + "绾㈣壊" + "," + tbFence.getBaoliu1() + ",END";
+ }
System.out.println(xieyi);
Udp_Out.udp_to_cs(xieyi);
+
+ QueryWrapper queryWrapper1= new QueryWrapper<>();
+// queryWrapper.eq("status","鏈鐞�");
+// if (objectid!=null){
+ queryWrapper1.eq("name",tbFence.getName());
+
+// 缁檆s浼犲�煎欢鏃朵竴绉掍慨鏀逛慨鏀筩s淇濆瓨鐨勫唴瀹�
+ try {
+ Thread.sleep(1000);
+
+ }catch (InterruptedException e){
+ Thread.currentThread().interrupt();
+// logUtil.error("绾跨▼涓柇"+e.getMessage());
+ }
+// queryWrapper.orderByDesc("addtime");
+
+ TbFence CompanyPage1 = tbPersonMapper.selectOne(queryWrapper1);
+ CompanyPage1.setCompany(tbFence.getCompany());
+ CompanyPage1.setBaoliu1(tbFence.getBaoliu1());
+// if (CompanyPage1==null){
+// this.findfence(name);
+// }else{
+ TbFence gpsList = tbFenceService.updateFence(CompanyPage1);
+// }
+//
+// this.findfence(tbFence.getName());
}
//淇濆瓨鏁版嵁鍒癱s鐨勬牸寮�
@@ -153,5 +189,23 @@
return response;
}
+ public TbFence findfence( String name) {
+
+ QueryWrapper queryWrapper1= new QueryWrapper<>();
+// queryWrapper.eq("status","鏈鐞�");
+// if (objectid!=null){
+ queryWrapper1.eq("name",name);
+
+// }
+// queryWrapper.orderByDesc("addtime");
+ TbFence CompanyPage1 = tbPersonMapper.selectOne( queryWrapper1);
+ if (CompanyPage1==null){
+ this.findfence(name);
+ }else{
+ TbFence gpsList = tbFenceService.updateFence(CompanyPage1);
+ }
+ return CompanyPage1;
+ }
+
}
--
Gitblit v1.9.3