diff --git a/pom.xml b/pom.xml index 0ef39b07..ad57f8bd 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ sec-beidou sec-beidou-rtcm sec-api - sec-beidou-rtcm-api diff --git a/sec-beidou-rtcm-api/pom.xml b/sec-beidou-rtcm-api/pom.xml deleted file mode 100644 index b9d02604..00000000 --- a/sec-beidou-rtcm-api/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - security-monitor - com.imdroid - 1.0-SNAPSHOT - - 4.0.0 - - sec-beidou-rtcm-api - 1.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - com.google.code.findbugs - jsr305 - - - - - - - - \ No newline at end of file diff --git a/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java b/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java deleted file mode 100644 index b4eb61cb..00000000 --- a/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.imdroid.sideslope.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * @author LiGang - * @date 2023/10/22 19:40 - */ -@FeignClient(name = "rtcm-server", url = "http://localhost:9904/gnss") -public interface BeidouRtcmApi { - - @GetMapping("/clean-tilt") - String cleanTilt(@RequestParam(name = "deviceId") String deviceId); -} diff --git a/sec-beidou-rtcm/pom.xml b/sec-beidou-rtcm/pom.xml index 9fe3da97..74ff081e 100644 --- a/sec-beidou-rtcm/pom.xml +++ b/sec-beidou-rtcm/pom.xml @@ -16,8 +16,7 @@ 8 8 UTF-8 - 1.0-SNAPSHOT - 1.0-SNAPSHOT + @@ -110,16 +109,6 @@ 1.0-SNAPSHOT - - dt20.io - dt20-common - ${dt20.common.version} - - - dt20.io - dt20-util - ${dt20.util.version} - org.projectlombok lombok diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/SideSlopeRtcmApp.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/SideSlopeRtcmApp.java index 46090a1c..bbc5fb97 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/SideSlopeRtcmApp.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/SideSlopeRtcmApp.java @@ -6,7 +6,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; /** @@ -15,9 +14,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; */ @SpringBootApplication(scanBasePackages = {"com.imdroid"}) @MapperScan({"com.imdroid.secapi","com.imdroid.beidou.entity"}) -@ComponentScan({"io.dt20.*", "com.imdroid.*"}) -@EntityScan({"io.dt20.common.persistence", "com.imdroid.*"}) -@EnableJpaRepositories({"io.dt20.common.repo", "com.imdroid.*"}) +@ComponentScan({"com.imdroid.*"}) +@EntityScan({"com.imdroid.*"}) @EnableFeignClients(basePackages = "com.imdroid.*") public class SideSlopeRtcmApp { diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java index f2513e4a..eb707f38 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.imdroid.secapi.dto.*; import com.imdroid.sideslope.bd.Tilt; import com.imdroid.sideslope.message.D341LocationMessage; -import com.imdroid.sideslope.util.GsonUtil; import com.imdroid.sideslope.util.NumberUtils; -import io.dt20.common.persistence.Attribute; -import io.dt20.common.repo.AttributeRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +37,6 @@ public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRe //private RabbitTemplate rabbitTemplate; ThirdPartyClient thirdPartyClient; - @Autowired - private AttributeRepository attributeRepository; - public static final long FILTER_SHORT_CYCLE = 4 * 60 * 60 * 1000; public static final long FILTER_LONG_CYCLE = 25 * 60 * 60 * 1000; static final int FILTER_MAX_RECORD_NUM = 50; diff --git a/sec-beidou-rtcm/src/test/java/GnssLocationFilterTest.java b/sec-beidou-rtcm/src/test/java/GnssLocationFilterTest.java index f1435151..85657701 100644 --- a/sec-beidou-rtcm/src/test/java/GnssLocationFilterTest.java +++ b/sec-beidou-rtcm/src/test/java/GnssLocationFilterTest.java @@ -13,7 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import javax.sql.DataSource; -import java.sql.Timestamp; +import java.util.Date; import java.util.List; @RunWith(SpringRunner.class) @@ -42,7 +42,6 @@ public class GnssLocationFilterTest { int end = 0; int pos = 0; boolean beginFound = false; - boolean endFound = false; double[] value = {0,0,0}; int valueId = 0; long now = System.currentTimeMillis(); @@ -65,13 +64,10 @@ public class GnssLocationFilterTest { else continue; } // 找结束位 - if(!endFound) { - if (dataSrc.charAt(pos) == ' ') { - endFound = true; - end = pos; - } - else continue; + if (dataSrc.charAt(pos) == ' ') { + end = pos; } + else continue; // 读数据 value[valueId] = Double.parseDouble(dataSrc.substring(begin, end)); valueId++; @@ -85,7 +81,6 @@ public class GnssLocationFilterTest { else now += 30*60*1000; } beginFound = false; - endFound = false; } } @@ -96,7 +91,7 @@ public class GnssLocationFilterTest { gnssCalcData.setB562e(xyz[0]); gnssCalcData.setB562n(xyz[1]); gnssCalcData.setB562d(xyz[2]); - gnssCalcData.setCreatetime(new Timestamp(recordTime)); + gnssCalcData.setCreatetime(new Date(recordTime)); gnssCalcData.setTenantid(0); gnssCalcData.setEnabled(true); diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql index 5523e2a1..eed55573 100644 --- a/sec-beidou/src/main/resources/db/schema.sql +++ b/sec-beidou/src/main/resources/db/schema.sql @@ -205,32 +205,6 @@ CREATE TABLE IF NOT EXISTS `gnsstrxmsg` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE IF NOT EXISTS `metadatas` ( - `id` bigint NOT NULL, - `object` varchar(32) NOT NULL, - `keyname` varchar(32) NOT NULL, - `type` varchar(1) NOT NULL, - `mandatory` int NOT NULL, - `message` varchar(64) DEFAULT NULL, - `notes` varchar(256) DEFAULT NULL, - `format` varchar(128) DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `object` (`object`,`keyname`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; - -CREATE TABLE IF NOT EXISTS `attributes` ( - `id` bigint NOT NULL, - `object` varchar(32) NOT NULL, - `pid` bigint NOT NULL, - `keyname` varchar(32) NOT NULL, - `type` varchar(1) NOT NULL, - `valuestring` varchar(255) DEFAULT NULL, - `valuenumber` double DEFAULT NULL, - `valuedate` datetime DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `object` (`object`,`pid`,`keyname`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; - CREATE TABLE IF NOT EXISTS `warninginfo` ( `id` bigint AUTO_INCREMENT, `tenantid` int NOT NULL,