From 280677314d1fe7cbcc444aa2a4849e633751f181 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 11:48:51 +0800
Subject: [PATCH] 1.押运
---
src/main/java/org/springblade/modules/location/controller/LiveLocationController.java | 33 ++++++++++++++++
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 8 +++
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 28 --------------
3 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index e865cea..042d758 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -91,34 +91,6 @@
}
/**
- * 枪支定位
- * @param startTime
- * @param endTime
- * @return
- */
- @GetMapping("/Gun")
- public R Gun(String startTime,String endTime) {
- String s = httpGetOne(startTime, endTime);
- return R.data(s);
- }
-
-
-
- public static String httpGetOne(String startTime,String endTime) {
- OkHttpClient client = new OkHttpClient();
- Request request = new Request.Builder()
- .url("http://47.49.36.190/api/investigate/gun?startTime="+startTime+"&endTime="+endTime)
- .get()
- .build();
- try {
- Response response = client.newCall(request).execute();
- return response.body().string();
- } catch (Exception e) {
-
- }
- return null;
- }
- /**
* 查询枪支信息
*
* @return
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index 77272ce..bc2beaa 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -48,6 +48,12 @@
</if>
</select>
<select id="selectGun" resultType="java.util.HashMap">
- SELECT * FROM `sys_gun`
+ SELECT sg.*,
+ bt.dept_name AS tenantName
+ FROM sys_gun sg
+ LEFT JOIN
+ blade_dept bt
+ ON
+ sg.dept_id = bt.id
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
index 423c215..561036b 100644
--- a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
+++ b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
@@ -3,7 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.S;
import lombok.AllArgsConstructor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -182,4 +186,33 @@
return R.data(liveLocationService.getDirectiveLiveLocationVoList(liveLocationVo));
}
+ /**
+ * 枪支定位
+ * @param
+ * @param
+ * @return
+ */
+ @GetMapping("/Gun")
+ public R Gun(String hwysfzh, String szdw, String kssj, String jssj) {
+ String s = httpGetOne(hwysfzh, szdw, kssj, jssj);
+ return R.data(s);
+ }
+
+
+
+ public static String httpGetOne(String hwysfzh, String szdw, String kssj, String jssj) {
+ OkHttpClient client = new OkHttpClient();
+ Request request = new Request.Builder()
+ .url("http://47.49.36.190/api/investigate/gun?hwysfzh="+hwysfzh+"&szdw="+szdw+"&kssj="+kssj+"&jssj="+jssj)
+ .get()
+ .build();
+ try {
+ Response response = client.newCall(request).execute();
+ return response.body().string();
+ } catch (Exception e) {
+
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3