diff --git a/src/pom.xml b/src/pom.xml index 93797ca..9dab566 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -2,12 +2,7 @@ 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.2.1 - - + com.my graphite_digester_bg 0.0.1-SNAPSHOT @@ -16,28 +11,29 @@ 17 + + + org.springframework.boot + spring-boot-starter-parent + 3.1.5 + + + org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - com.fazecast jSerialComm 2.6.2 - - org.yaml - snakeyaml - 1.33 - + + + + + org.xerial sqlite-jdbc @@ -48,11 +44,6 @@ mybatis-spring-boot-starter 3.0.2 - - org.flywaydb - flyway-core - 9.21.0 - @@ -63,5 +54,4 @@ - diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java index 2f0c1e4..612e674 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiActiveRecord.java @@ -1,4 +1,12 @@ package com.my.graphiteDigesterBg.diframe; +import com.my.graphiteDigesterBg.diframe.mapper.DiActiveRecordMapper; abstract public class DiActiveRecord { - + // find by id + public static void findOne(Integer id) { + var context = DiApplicationContextProvider.getContext(); + DiActiveRecordMapper mapper = context.getBean(DiActiveRecordMapper.class); + var row = mapper.findById("di_app_users", id); +// // @TODO : 这里要根据配置参数计算 ~~~ + System.out.println("DiActiveRecord.findById"); + } } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java new file mode 100644 index 0000000..02bc8a9 --- /dev/null +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiApplicationContextProvider.java @@ -0,0 +1,20 @@ +package com.my.graphiteDigesterBg.diframe; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +@Component +public class DiApplicationContextProvider implements ApplicationContextAware { + // context instance + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + DiApplicationContextProvider.applicationContext = applicationContext; + } + + // get context + public static ApplicationContext getContext() { + return DiApplicationContextProvider.applicationContext; + } +} diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java index 21992ca..5ec660d 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/api/DiApiUser.java @@ -1,5 +1,18 @@ package com.my.graphiteDigesterBg.diframe.api; -public class DiApiUser { - public void login() {} +import com.my.graphiteDigesterBg.diframe.DiApiControllerBase; +import com.my.graphiteDigesterBg.diframe.DiApiResponse; +import com.my.graphiteDigesterBg.diframe.model.DiMdbUser; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +@Controller +public class DiApiUser extends DiApiControllerBase { + @ResponseBody + @RequestMapping("/api/user/login") + public DiApiResponse login() { + DiMdbUser.findOne(1); + return this.success(); + } + public void logout() {} } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java similarity index 69% rename from src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java rename to src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java index f8a551b..b1c4d0a 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/MdbUser.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbUser.java @@ -1,5 +1,5 @@ package com.my.graphiteDigesterBg.diframe.model; import com.my.graphiteDigesterBg.diframe.DiActiveRecord; -public class MdbUser extends DiActiveRecord { +public class DiMdbUser extends DiActiveRecord { } diff --git a/src/src/main/resources/application.yml b/src/src/main/resources/application.yml index c7e5aad..d0910e1 100644 --- a/src/src/main/resources/application.yml +++ b/src/src/main/resources/application.yml @@ -1,14 +1,14 @@ spring: datasource: url: jdbc:sqlite:D:/device.db - username: - password: - driver-class-name: org.sqlite.JDBC # sqlite驱动 + username: 1 + password: 1 + driver-class-name: org.sqlite.JDBC device : connection : class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort - path : COM7 + path : COM11 baudRate : 921600 frameTimeout : 1000 mode : binary # text | hex | binary \ No newline at end of file diff --git a/src/src/main/resources/device.yml b/src/src/main/resources/device.yml index 236ecd7..2bb7baa 100644 --- a/src/src/main/resources/device.yml +++ b/src/src/main/resources/device.yml @@ -1,6 +1,6 @@ connection : class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort - path : COM7 + path : COM11 baudRate : 921600 frameTimeout : 100 callTimeout : 5000