From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/java/org/springblade/modules/electronrail/controller/ElectronRailController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/electronrail/controller/ElectronRailController.java b/src/main/java/org/springblade/modules/electronrail/controller/ElectronRailController.java
index b9ad3e0..1325d6b 100644
--- a/src/main/java/org/springblade/modules/electronrail/controller/ElectronRailController.java
+++ b/src/main/java/org/springblade/modules/electronrail/controller/ElectronRailController.java
@@ -63,8 +63,15 @@
//设置时间
electronRail.setCreateTime(new Date());
electronRail.setUpdateTime(new Date());
- //返回
- return R.data(electronRailService.save(electronRail));
+ if (null!=electronRail.getCoordinate() && !electronRail.getCoordinate().equals("")) {
+ //替换逗号为空格
+ String sNull = electronRail.getCoordinate().replaceAll(",", " ");
+ //替换分号为逗号
+ String replaceAll = sNull.replaceAll(";", ",");
+ electronRail.setCoordinate("'POLYGON((" + replaceAll + "))'");
+ }
+ //自定义新增
+ return R.data(electronRailService.saveElectRailInfo(electronRail));
}
@@ -75,8 +82,15 @@
public R update(@RequestBody ElectronRail electronRail) {
//设置更新时间
electronRail.setUpdateTime(new Date());
- //修改并返回
- return R.data(electronRailService.updateById(electronRail));
+ if (null!=electronRail.getCoordinate() && !electronRail.getCoordinate().equals("")) {
+ //替换逗号为空格
+ String sNull = electronRail.getCoordinate().replaceAll(",", " ");
+ //替换分号为逗号
+ String replaceAll = sNull.replaceAll(";", ",");
+ electronRail.setCoordinate("'POLYGON((" + replaceAll + "))'");
+ }
+ //自定义修改并返回
+ return R.data(electronRailService.updateElectronRailInfo(electronRail));
}
/**
@@ -96,5 +110,15 @@
return R.status(electronRailService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 判断一个点是否在区域内
+ * @param electronRail
+ * @return
+ */
+ @GetMapping("/isOnArea")
+ public R isOnArea(ElectronRailVO electronRail){
+ return R.data(electronRailService.isOnArea(electronRail));
+ }
+
}
--
Gitblit v1.9.3