diff --git a/config/application-local.properties b/config/application-local.properties index 42fba6c..121e252 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -1,18 +1,24 @@ server.port=9276 - -# 多个项目放在nginx下同个端口，通过该配置区分 server.servlet.context-path=/tunnel -# mysql 配置 -# 配置数据源 +# mysql spring.datasource.url=jdbc:mysql://101.35.234.160:32306/beidou?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ =convertToNull&useUnicode=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=cmhi spring.datasource.password=cmHi10086! -#mybatis 配置 -# 下划线转驼峰 将带有下划线的表字段映射为驼峰格式的实体类属性 +#spring.datasource.type=org.apache.commons.dbcp2.BasicDataSource +spring.datasource.dbcp2.max-total=128 +spring.datasource.dbcp2.max-wait-millis=10000 +spring.datasource.dbcp2.max-idle=32 +spring.datasource.dbcp2.min-idle=8 +spring.datasource.dbcp2.initial-size=8 +spring.datasource.dbcp2.validation-query=SELECT 1 +spring.datasource.dbcp2.test-while-idle=true +spring.datasource.dbcp2.connection-properties=characterEncoding=utf8 + +#mybatis #mybatis.configuration.map-underscore-to-camel-case: true mybatis.mapper-locations=classpath*:mappers/*.xml mybatis.type-aliases-package=com.zjyr.beidouservice.pojo.entry diff --git a/pom.xml b/pom.xml index 357a63e..dcbbc90 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,16 @@ log4j-core 2.20.0 + + io.netty + netty-all + 4.1.96.Final + + + tk.mybatis + mapper-spring-boot-starter + 4.2.3 + diff --git a/src/main/java/com/zjyr/beidouservice/TunnelServiceApplication.java b/src/main/java/com/zjyr/beidouservice/TunnelServiceApplication.java index 720c631..7257c23 100644 --- a/src/main/java/com/zjyr/beidouservice/TunnelServiceApplication.java +++ b/src/main/java/com/zjyr/beidouservice/TunnelServiceApplication.java @@ -1,9 +1,11 @@ package com.zjyr.beidouservice; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication +@MapperScan(basePackages = {"com.zjyr.beidouservice.mapper"}) public class TunnelServiceApplication { public static void main(String[] args) { diff --git a/src/main/java/com/zjyr/beidouservice/adapter/ControlAdapter.java b/src/main/java/com/zjyr/beidouservice/adapter/ControlAdapter.java new file mode 100644 index 0000000..a17ebd6 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/adapter/ControlAdapter.java @@ -0,0 +1,4 @@ +package com.zjyr.beidouservice.adapter; + +public interface ControlAdapter { +} diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/TcpSocketAdapter.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/TcpSocketAdapter.java new file mode 100644 index 0000000..3994add --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/TcpSocketAdapter.java @@ -0,0 +1,5 @@ +package com.zjyr.beidouservice.adapter.impl; + +import com.zjyr.beidouservice.adapter.ControlAdapter; +public class TcpSocketAdapter implements ControlAdapter { +} diff --git a/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java b/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java index f3dcdcb..4b46d6f 100644 --- a/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java +++ b/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java @@ -1,7 +1,7 @@ package com.zjyr.beidouservice.controller; -import com.zjyr.beidouservice.pojo.entry.BaseProtocolDTO; -import com.zjyr.beidouservice.pojo.entry.GetUserConfig; +import com.zjyr.beidouservice.pojo.dto.BaseProtocolDTO; +import com.zjyr.beidouservice.pojo.dto.GetUserConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapper.java new file mode 100644 index 0000000..eee1aa0 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapper.java @@ -0,0 +1,12 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.entry.ControlDeviceType; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ControlDeviceTypeMapper { + List selectAll(); + + int addDeviceTypes(@Param("typeLists") List typeLists); +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/BaseProtocolDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/BaseProtocolDTO.java similarity index 93% rename from src/main/java/com/zjyr/beidouservice/pojo/entry/BaseProtocolDTO.java rename to src/main/java/com/zjyr/beidouservice/pojo/dto/BaseProtocolDTO.java index 52e5d59..91cea40 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/entry/BaseProtocolDTO.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/BaseProtocolDTO.java @@ -1,4 +1,4 @@ -package com.zjyr.beidouservice.pojo.entry; +package com.zjyr.beidouservice.pojo.dto; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/GetUserConfig.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/GetUserConfig.java similarity index 88% rename from src/main/java/com/zjyr/beidouservice/pojo/entry/GetUserConfig.java rename to src/main/java/com/zjyr/beidouservice/pojo/dto/GetUserConfig.java index 123b5b8..eb26910 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/entry/GetUserConfig.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/GetUserConfig.java @@ -1,4 +1,4 @@ -package com.zjyr.beidouservice.pojo.entry; +package com.zjyr.beidouservice.pojo.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/User.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/User.java new file mode 100644 index 0000000..ef0e282 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/User.java @@ -0,0 +1,4 @@ +package com.zjyr.beidouservice.pojo.dto; + +public class User { +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDevice.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDevice.java new file mode 100644 index 0000000..0c97b84 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDevice.java @@ -0,0 +1,29 @@ +package com.zjyr.beidouservice.pojo.entry; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import tk.mybatis.mapper.annotation.KeySql; +import tk.mybatis.mapper.annotation.NameStyle; +import tk.mybatis.mapper.code.Style; + +import javax.persistence.Id; +import javax.persistence.Table; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder(alphabetic = true) +@Table(name = "control_device") +@NameStyle(Style.normal) +public class ControlDevice { + @Id + @KeySql(useGeneratedKeys = true) + private Long id; + private Long deviceType; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDeviceType.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDeviceType.java new file mode 100644 index 0000000..e6305eb --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/entry/ControlDeviceType.java @@ -0,0 +1,29 @@ +package com.zjyr.beidouservice.pojo.entry; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import tk.mybatis.mapper.annotation.KeySql; +import tk.mybatis.mapper.annotation.NameStyle; +import tk.mybatis.mapper.code.Style; + +import javax.persistence.Id; +import javax.persistence.Table; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder(alphabetic = true) +@Table(name = "sonsor_data") +@NameStyle(Style.normal) +public class ControlDeviceType { + @Id + @KeySql(useGeneratedKeys = true) + private Long id; + private Long type; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java new file mode 100644 index 0000000..85b8101 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorData.java @@ -0,0 +1,29 @@ +package com.zjyr.beidouservice.pojo.entry; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import tk.mybatis.mapper.annotation.KeySql; +import tk.mybatis.mapper.annotation.NameStyle; +import tk.mybatis.mapper.code.Style; + +import javax.persistence.Id; +import javax.persistence.Table; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder(alphabetic = true) +@Table(name = "sonsor_data") +@NameStyle(Style.normal) +public class SensorData { + @Id + @KeySql(useGeneratedKeys = true) + private Long id; + private Long deviceId; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/User.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/User.java deleted file mode 100644 index 99f142d..0000000 --- a/src/main/java/com/zjyr/beidouservice/pojo/entry/User.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zjyr.beidouservice.pojo.entry; - -public class User { -} diff --git a/src/main/resources/mappers/ControlDeviceType.xml b/src/main/resources/mappers/ControlDeviceType.xml new file mode 100644 index 0000000..1f5b677 --- /dev/null +++ b/src/main/resources/mappers/ControlDeviceType.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + INSERT IGNORE INTO control_device_type(type) + VALUES + + (#{itme.type}) + + + \ No newline at end of file diff --git a/src/test/java/com/zjyr/beidouservice/TunnelServiceApplicationTests.java b/src/test/java/com/zjyr/beidouservice/TunnelServiceApplicationTests.java index 2c0d8c0..65da33e 100644 --- a/src/test/java/com/zjyr/beidouservice/TunnelServiceApplicationTests.java +++ b/src/test/java/com/zjyr/beidouservice/TunnelServiceApplicationTests.java @@ -8,6 +8,7 @@ class TunnelServiceApplicationTests { @Test void contextLoads() { + } } diff --git a/src/test/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapperTest.java b/src/test/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapperTest.java new file mode 100644 index 0000000..a12b604 --- /dev/null +++ b/src/test/java/com/zjyr/beidouservice/mapper/ControlDeviceTypeMapperTest.java @@ -0,0 +1,30 @@ +package com.zjyr.beidouservice.mapper; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.zjyr.beidouservice.pojo.entry.ControlDeviceType; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.Rollback; +import org.springframework.transaction.annotation.Transactional; +import org.junit.jupiter.api.Test; + +import java.util.List; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@Slf4j +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +@Transactional +@Rollback +public class ControlDeviceTypeMapperTest { + @Resource + private ControlDeviceTypeMapper mapper; + @Test + public void a5_getTaskInfo() { + List typeList = mapper.selectAll(); + Assertions.assertNotEquals(typeList.size(), 0); + } +}