From 5c565bfb77f22c26fedb4f7c317c52e578c2dc47 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 19 Apr 2024 17:07:21 +0800
Subject: [PATCH] 图斑修改
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 5 +-
src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java | 2 +
src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java | 2
src/main/resources/template/wpmz/waylines.wpml | 80 ++++++++++++++++++++--------------------
src/main/resources/application-dev.yml | 9 +++-
src/main/resources/application-prod.yml | 7 +++
6 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java b/src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java
index 12c8da9..435acc5 100644
--- a/src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java
+++ b/src/main/java/com/dji/sample/territory/model/entity/TbFjEntity.java
@@ -54,4 +54,6 @@
private String jym;
+ private String url;
+
}
diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
index f3c4b40..bb4cd4f 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
@@ -38,7 +38,7 @@
* @DATE: 2024/4/10 11:19
*/
@Service
-@DS("sqlite")
+@DS("sqlite-resource")
public class TbDkjbxxServiceImpl extends ServiceImpl<ITbDkjbxxMapper, TbDkjbxxEntity> implements ITbDkjbxxService {
private static final String RESOURCE_FILE_PATH = "DB/resource_db.db";
@Autowired
diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
index 6e85ecb..721c116 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
@@ -20,7 +20,7 @@
import java.util.UUID;
@Service
-@DS("sqlite")
+@DS("sqlite-ret")
public class TbFjServiceImpl implements ITbFJService {
@Autowired
private ITbFjMapper mapper;
@@ -89,7 +89,7 @@
.jdgd(absoluteAltitude)
.Latitude(lat)
.longitude(lng)
- .fj(FJ)
+// .fj(FJ)
.fjmc(fjmc)
.fjlx(1)
.psfyj(gimbalYawDegree)
@@ -100,6 +100,7 @@
.zsdm(zsdm)
.psry(psry)
.jym(jym)
+ .url(url)
.build();
} else {
throw new IllegalArgumentException("未匹配到相关地块");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 689de01..e467728 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,9 +15,14 @@
url: jdbc:mysql://139.196.74.78:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
password: jxpskj_2018
- sqlite:
+ sqlite-resource:
driver-class-name: org.sqlite.JDBC
- url: jdbc:sqlite:DB/resource_db.db
+ url: jdbc:sqlite:D:\汇图信息\空天一体检测系统\图斑\resource_db.db
+ username:
+ password:
+ sqlite-ret:
+ driver-class-name: org.sqlite.JDBC
+ url: jdbc:sqlite:D:\汇图信息\空天一体检测系统\图斑\result_db.db
username:
password:
# url: jdbc:mysql://192.168.2.104:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index a102ac4..655bec5 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -12,11 +12,16 @@
url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
password: jxpskj_2018
- sqlite:
+ sqlite-resource:
driver-class-name: org.sqlite.JDBC
url: jdbc:sqlite:/home/drone/server/sqlite/resource_db.db
username:
password:
+ sqlite-ret:
+ driver-class-name: org.sqlite.JDBC
+ url: jdbc:sqlite:/home/drone/server/sqlite/result_db.db
+ username:
+ password:
# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
# username: root
# password: yshb@123
diff --git a/src/main/resources/template/wpmz/waylines.wpml b/src/main/resources/template/wpmz/waylines.wpml
index 7b1bc36..011399d 100644
--- a/src/main/resources/template/wpmz/waylines.wpml
+++ b/src/main/resources/template/wpmz/waylines.wpml
@@ -27,7 +27,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8576,28.5751
+ 115.86,28.6203
</coordinates>
</Point>
<wpml:index>0</wpml:index>
@@ -85,7 +85,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8576,28.5729
+ 115.86,28.6142
</coordinates>
</Point>
<wpml:index>1</wpml:index>
@@ -143,7 +143,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8591,28.5729
+ 115.8664,28.6142
</coordinates>
</Point>
<wpml:index>2</wpml:index>
@@ -201,7 +201,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8591,28.5751
+ 115.8664,28.6203
</coordinates>
</Point>
<wpml:index>3</wpml:index>
@@ -259,7 +259,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8834,28.5772
+ 115.8643,28.6357
</coordinates>
</Point>
<wpml:index>4</wpml:index>
@@ -317,7 +317,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8834,28.5721
+ 115.8643,28.6331
</coordinates>
</Point>
<wpml:index>5</wpml:index>
@@ -375,7 +375,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8875,28.5721
+ 115.867,28.6331
</coordinates>
</Point>
<wpml:index>6</wpml:index>
@@ -433,7 +433,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8875,28.5772
+ 115.867,28.6357
</coordinates>
</Point>
<wpml:index>7</wpml:index>
@@ -491,7 +491,7 @@
<Placemark>
<Point>
<coordinates>
- 115.86,28.6203
+ 115.841,28.6317
</coordinates>
</Point>
<wpml:index>8</wpml:index>
@@ -549,7 +549,7 @@
<Placemark>
<Point>
<coordinates>
- 115.86,28.6142
+ 115.841,28.6305
</coordinates>
</Point>
<wpml:index>9</wpml:index>
@@ -607,7 +607,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8664,28.6142
+ 115.844,28.6305
</coordinates>
</Point>
<wpml:index>10</wpml:index>
@@ -665,7 +665,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8664,28.6203
+ 115.844,28.6317
</coordinates>
</Point>
<wpml:index>11</wpml:index>
@@ -723,7 +723,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8643,28.6357
+ 115.8381,28.6187
</coordinates>
</Point>
<wpml:index>12</wpml:index>
@@ -781,7 +781,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8643,28.6331
+ 115.8381,28.6161
</coordinates>
</Point>
<wpml:index>13</wpml:index>
@@ -839,7 +839,7 @@
<Placemark>
<Point>
<coordinates>
- 115.867,28.6331
+ 115.8413,28.6161
</coordinates>
</Point>
<wpml:index>14</wpml:index>
@@ -897,7 +897,7 @@
<Placemark>
<Point>
<coordinates>
- 115.867,28.6357
+ 115.8413,28.6187
</coordinates>
</Point>
<wpml:index>15</wpml:index>
@@ -955,7 +955,7 @@
<Placemark>
<Point>
<coordinates>
- 115.841,28.6317
+ 115.8059,28.6239
</coordinates>
</Point>
<wpml:index>16</wpml:index>
@@ -1013,7 +1013,7 @@
<Placemark>
<Point>
<coordinates>
- 115.841,28.6305
+ 115.8059,28.622
</coordinates>
</Point>
<wpml:index>17</wpml:index>
@@ -1071,7 +1071,7 @@
<Placemark>
<Point>
<coordinates>
- 115.844,28.6305
+ 115.8102,28.622
</coordinates>
</Point>
<wpml:index>18</wpml:index>
@@ -1129,7 +1129,7 @@
<Placemark>
<Point>
<coordinates>
- 115.844,28.6317
+ 115.8102,28.6239
</coordinates>
</Point>
<wpml:index>19</wpml:index>
@@ -1187,7 +1187,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8381,28.6187
+ 115.8297,28.6659
</coordinates>
</Point>
<wpml:index>20</wpml:index>
@@ -1245,7 +1245,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8381,28.6161
+ 115.8297,28.6604
</coordinates>
</Point>
<wpml:index>21</wpml:index>
@@ -1303,7 +1303,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8413,28.6161
+ 115.837,28.6604
</coordinates>
</Point>
<wpml:index>22</wpml:index>
@@ -1361,7 +1361,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8413,28.6187
+ 115.837,28.6659
</coordinates>
</Point>
<wpml:index>23</wpml:index>
@@ -1419,7 +1419,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8059,28.6239
+ 115.8575,28.6791
</coordinates>
</Point>
<wpml:index>24</wpml:index>
@@ -1477,7 +1477,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8059,28.622
+ 115.8575,28.6762
</coordinates>
</Point>
<wpml:index>25</wpml:index>
@@ -1535,7 +1535,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8102,28.622
+ 115.8637,28.6762
</coordinates>
</Point>
<wpml:index>26</wpml:index>
@@ -1593,7 +1593,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8102,28.6239
+ 115.8637,28.6791
</coordinates>
</Point>
<wpml:index>27</wpml:index>
@@ -1651,7 +1651,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8297,28.6659
+ 115.9122,28.6232
</coordinates>
</Point>
<wpml:index>28</wpml:index>
@@ -1709,7 +1709,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8297,28.6604
+ 115.9122,28.6212
</coordinates>
</Point>
<wpml:index>29</wpml:index>
@@ -1767,7 +1767,7 @@
<Placemark>
<Point>
<coordinates>
- 115.837,28.6604
+ 115.916,28.6212
</coordinates>
</Point>
<wpml:index>30</wpml:index>
@@ -1825,7 +1825,7 @@
<Placemark>
<Point>
<coordinates>
- 115.837,28.6659
+ 115.916,28.6232
</coordinates>
</Point>
<wpml:index>31</wpml:index>
@@ -1883,7 +1883,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8575,28.6791
+ 115.8834,28.5772
</coordinates>
</Point>
<wpml:index>32</wpml:index>
@@ -1941,7 +1941,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8575,28.6762
+ 115.8834,28.5721
</coordinates>
</Point>
<wpml:index>33</wpml:index>
@@ -1999,7 +1999,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8637,28.6762
+ 115.8875,28.5721
</coordinates>
</Point>
<wpml:index>34</wpml:index>
@@ -2057,7 +2057,7 @@
<Placemark>
<Point>
<coordinates>
- 115.8637,28.6791
+ 115.8875,28.5772
</coordinates>
</Point>
<wpml:index>35</wpml:index>
@@ -2115,7 +2115,7 @@
<Placemark>
<Point>
<coordinates>
- 115.9122,28.6232
+ 115.8576,28.5751
</coordinates>
</Point>
<wpml:index>36</wpml:index>
@@ -2173,7 +2173,7 @@
<Placemark>
<Point>
<coordinates>
- 115.9122,28.6212
+ 115.8576,28.5729
</coordinates>
</Point>
<wpml:index>37</wpml:index>
@@ -2231,7 +2231,7 @@
<Placemark>
<Point>
<coordinates>
- 115.916,28.6212
+ 115.8591,28.5729
</coordinates>
</Point>
<wpml:index>38</wpml:index>
@@ -2289,7 +2289,7 @@
<Placemark>
<Point>
<coordinates>
- 115.916,28.6232
+ 115.8591,28.5751
</coordinates>
</Point>
<wpml:index>39</wpml:index>
--
Gitblit v1.9.3