From c62d8002bec6dfd520649a435085dc1f7e3ce147 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:19 +0800
Subject: [PATCH] 1.押运
---
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 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 a346f6d..e865cea 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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;
@@ -12,6 +15,9 @@
import org.springblade.modules.equipage.service.EquipageService;
import org.springblade.modules.equipage.vo.EquipageVo;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* @author zhongrj
@@ -84,4 +90,43 @@
return R.data(detail);
}
+ /**
+ * 枪支定位
+ * @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
+ */
+ @GetMapping("/selectGun")
+ public R selectGun() {
+ List<Map<Object, Object>> maps = equipageService.selectGun();
+ return R.data(maps);
+ }
+
}
--
Gitblit v1.9.3