hwf453
/
admin-client-temperature
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change jdk to jdk8

Browse Source
master
wenfei 6 months ago
parent eb8f8d5d12
commit edb7160cd6
11 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
.idea/misc.xml
Unescape Escape View File

@ -11,5 +11,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
</project>

17
.idea/workspace.xml
Unescape Escape View File

@ -5,11 +5,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/SqlServerTemperatureService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/SqlServerTemperatureServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -55,7 +61,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$USER_HOME$/Documents/admin-client-temperature" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.20052427" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
@ -185,6 +191,9 @@
<workItem from="1749631886392" duration="23000" />
<workItem from="1749631913172" duration="1277000" />
<workItem from="1749633212032" duration="397000" />
<workItem from="1749708239180" duration="743000" />
<workItem from="1749709132145" duration="302000" />
<workItem from="1749710037722" duration="288000" />
</task>
<servers />
</component>

4
pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.9</version>
<version>2.5.3</version>
<relativePath/>
</parent>
<groupId>com.rehome</groupId>
@ -15,7 +15,7 @@
<name>admin-client-temperature</name>
<description>admin-client-temperature</description>
<properties>
<java.version>21</java.version>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>

3
src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
Unescape Escape View File

@ -2,7 +2,6 @@ package com.rehome.mqttclienttemperature;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import jakarta.annotation.Resource;
import org.springframework.beans.BeansException;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
@ -13,6 +12,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.annotation.Resource;
import java.util.Map;
@EnableJpaAuditing

3
src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
Unescape Escape View File

@ -9,10 +9,11 @@ import com.rehome.mqttclienttemperature.dto.TemperatureDto;
import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import com.rehome.mqttclienttemperature.utils.JdbcUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.*;

2
src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java
Unescape Escape View File

@ -6,13 +6,13 @@ import com.rehome.mqttclienttemperature.dto.RequestTemperatureDto;
import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.response.Result;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import jakarta.annotation.Resource;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**

3
src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java
Unescape Escape View File

@ -6,11 +6,12 @@ import com.rehome.mqttclienttemperature.dto.RequestTemperatureDto;
import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.response.Result;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import jakarta.annotation.Resource;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**

3
src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java
Unescape Escape View File

@ -1,11 +1,12 @@
package com.rehome.mqttclienttemperature.entity;
import jakarta.persistence.*;
import lombok.Data;
import org.hibernate.annotations.Proxy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

2
src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java
Unescape Escape View File

@ -5,10 +5,10 @@ package com.rehome.mqttclienttemperature.service;
import com.google.gson.Gson;
import com.rehome.mqttclienttemperature.controller.JdbcDemoController;
import com.rehome.mqttclienttemperature.dto.ResponseDto;
import jakarta.annotation.Resource;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**

9
src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java
Unescape Escape View File

@ -7,13 +7,14 @@ import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.service.OracleTemperatureService;
import com.rehome.mqttclienttemperature.service.SqlServerTemperatureService;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -66,12 +67,12 @@ public class TemperatureServiceImpl implements TemperatureService {
temperature.setHumidity(strDataTemperature[0]);
temperature.setTemperature(strDataTemperature[1]);
// this.temperatureRepository.save(temperature);
this.temperatureRepository.save(temperature);
// ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature);
// log.info(new Gson().toJson(responseDto));
ResponseDto responseDto = this.sqlServerTemperatureService.saveTemperature(temperature);
log.info(new Gson().toJson(responseDto));
// ResponseDto responseDto = this.sqlServerTemperatureService.saveTemperature(temperature);
// log.info(new Gson().toJson(responseDto));
}
}

18
src/main/resources/application.yml
Unescape Escape View File

@ -10,12 +10,12 @@ logging:
spring:
datasource:
type: com.zaxxer.hikari.HikariDataSource
# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=appserver;encrypt=false;
# username: sa
# password: Skyinno251,
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false;
username: sa
password: 452131wW
#url: jdbc:mysql://192.168.3.29:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.2.18:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.1.92:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
@ -25,15 +25,15 @@ spring:
#url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver
username: root
password: Skyinno251,
# driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver
# username: root
# password: Skyinno251,
# driverClassName: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
# username: appserver
# password: appserver
jpa:
database: mysql # 配置 DBMS 类型
database: sql_server # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志
open-in-view: true
hibernate:

Write Preview
Loading…
Cancel
Save