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

change to oracle

Browse Source
oracle
WIN-GO9R0BBSA6U\Administrator 7 months ago
parent b11d0b94a8
commit 648fd03e4c
13 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File

12
.idea/workspace.xml
Unescape Escape View File

@ -5,11 +5,18 @@
</component>
<component name="ChangeListManager">
<list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/WeatherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/dto/TemperatureDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/dto/TemperatureDto.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/entity/WebServiceCity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.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/task/AgencyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/task/AgencyTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/task/WebServiceWeatherTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/task/WebServiceWeatherTask.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" />
@ -56,7 +63,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<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="Project" />
<property name="project.structure.proportion" value="0.0" />
@ -172,6 +179,7 @@
<workItem from="1746845668767" duration="670000" />
<workItem from="1747540249390" duration="112000" />
<workItem from="1747540902720" duration="2539000" />
<workItem from="1747553672823" duration="9032000" />
</task>
<servers />
</component>

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

@ -68,32 +68,32 @@ public class JdbcDemoController {
public static DataSource ds = new DataSource();
static {
//配置数据源
// ds.setId("1");
// ds.setName("mysql");
// ds.setUrl("jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
// ds.setUsername("root");
// ds.setPassword("Skyinno251,");
// ds.setDriver("com.mysql.cj.jdbc.Driver");
ds.setId("2");
ds.setName("oracle");
ds.setUrl("jdbc:oracle:thin:@192.168.3.7:1521/orcl");
ds.setUsername("appserver");
ds.setPassword("appserver");
ds.setDriver("oracle.jdbc.driver.OracleDriver");
ds.setId("1");
ds.setName("mysql");
ds.setUrl("jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
ds.setUsername("root");
ds.setPassword("Skyinno251,");
ds.setDriver("com.mysql.cj.jdbc.Driver");
// ds.setId("2");
// ds.setName("oracle");
// ds.setUrl("jdbc:oracle:thin:@192.168.1.9:1521/orcl");
// ds.setUsername("appserver");
// ds.setPassword("appserver");
// ds.setDriver("oracle.jdbc.driver.OracleDriver");
}
/**
* 查询测试
* @return
*/
//@RequestMapping("/api/list")
@RequestMapping("/api/list")
public ResponseDto queryList()
{
String sql = "select * from temperature where id = ?";
List<Object> jdbcParamValues = new ArrayList<>();
for(int i=1659797;i<1669689;i++){
for(int i=0;i<2362254;i++){
// try {
// Thread.sleep(5);
// } catch (InterruptedException e) {

4
src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java
Unescape Escape View File

@ -157,7 +157,7 @@ public class WeatherController {
if(provinceDb==null){
WebServiceProvince province = new WebServiceProvince();
province.setProvinceName(provinceName);
province.setCreateDate(nowDate);
//province.setCreateDate(nowDate);
province.setDataHour(nowHour);
province.setDataMinute(dataMinute);
province.setDataSecond(dataSecond);
@ -196,7 +196,7 @@ public class WeatherController {
citySave.setCityName(cityNameCn);
citySave.setCityNameEn(cityNameEn);
citySave.setCode(cityCode);
citySave.setCreateDate(nowDate);
//citySave.setCreateDate(now);
citySave.setDataHour(nowHour);
citySave.setDataMinute(dataMinute);
citySave.setDataSecond(dataSecond);

2
src/main/java/com/rehome/mqttclienttemperature/dto/TemperatureDto.java
Unescape Escape View File

@ -41,6 +41,6 @@ public class TemperatureDto implements Serializable {
@ApiModelProperty(value = "时间")
@SerializedName("create_date")
private String createDate;
private Date createDate;
}

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

@ -3,6 +3,7 @@ package com.rehome.mqttclienttemperature.entity;
import io.swagger.annotations.ApiModelProperty;
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;
@ -59,8 +60,9 @@ public class Temperature implements Serializable {
@Column(length=80)
private String locationDesc;
@ApiModelProperty(value = "时间")
@Column(length=20)
@ApiModelProperty(value = "创建时间")
@Temporal(TemporalType.TIMESTAMP)
@CreatedDate
private Date createDate;
}

10
src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java
Unescape Escape View File

@ -3,10 +3,14 @@ package com.rehome.mqttclienttemperature.entity;
import io.swagger.annotations.ApiModelProperty;
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;
@EntityListeners(AuditingEntityListener.class)
@Proxy(lazy = false)
@Data
@Entity
@ -20,13 +24,15 @@ public class WebServiceCity implements Serializable {
@ApiModelProperty(value = "国内外城市中文名称")
@Column(length=100)
private String cityName;
@ApiModelProperty(value = "国内外城市英文名称")
@Column(length=100)
private String cityNameEn;
@ApiModelProperty(value = "日期")
@Column(length=20)
private String createDate;
@Temporal(TemporalType.TIMESTAMP)
@CreatedDate
private Date createDate;
@ApiModelProperty(value = "时")
@Column(length=20)

11
src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java
Unescape Escape View File

@ -4,10 +4,14 @@ package com.rehome.mqttclienttemperature.entity;
import io.swagger.annotations.ApiModelProperty;
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;
@EntityListeners(AuditingEntityListener.class)
@Proxy(lazy = false)
@Data
@Entity
@ -17,7 +21,7 @@ public class WebServiceProvince implements Serializable {
// @ApiModelProperty(value = "主键")
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_province_seq")
@SequenceGenerator(name = "webService_province_seq", sequenceName = "webService_province_seq_name_appserver")
@SequenceGenerator(name = "webService_province_seq", sequenceName = "webService_province_seq")
private Long id;
@ApiModelProperty(value = "洲、国内外省份")
@ -25,8 +29,9 @@ public class WebServiceProvince implements Serializable {
private String provinceName;
@ApiModelProperty(value = "日期")
@Column(length = 20)
private String createDate;
@Temporal(TemporalType.TIMESTAMP)
@CreatedDate
private Date createDate;
@ApiModelProperty(value = "时")
@Column(length = 20)

17
src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
Unescape Escape View File

@ -3,8 +3,11 @@ package com.rehome.mqttclienttemperature.entity;
import io.swagger.annotations.ApiModelProperty;
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.util.Date;
/**
@ -18,12 +21,13 @@ import javax.persistence.*;
* String(17) 到 String(21)：第三天的 气温，概况，风向和风力，图标一，图标二。
* String(22) 被查询的城市或地区的介绍
*/
@EntityListeners(AuditingEntityListener.class)
@Proxy(lazy = false)
@Data
@Entity
@Table(indexes = {@Index(name = "idx_cityName", columnList = "cityName"), @Index(name = "idx_cityCode", columnList = "cityCode"), @Index(name = "idx_createDate", columnList = "createDate"), @Index(name = "idx_dataHour", columnList = "dataHour"), @Index(name = "idx_dataMinute", columnList = "dataMinute"), @Index(name = "idx_dataSecond", columnList = "dataSecond"),
@Index(name = "data_create_date_city_code", columnList = "cityCode"), @Index(name = "data_create_date_city_code", columnList = "createDate"),
@Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")})
//@Table(indexes = {@Index(name = "idx_cityName", columnList = "cityName"), @Index(name = "idx_cityCode", columnList = "cityCode"), @Index(name = "idx_createDate", columnList = "createDate"), @Index(name = "idx_dataHour", columnList = "dataHour"), @Index(name = "idx_dataMinute", columnList = "dataMinute"), @Index(name = "idx_dataSecond", columnList = "dataSecond"),
// @Index(name = "data_create_date_city_code", columnList = "cityCode"), @Index(name = "data_create_date_city_code", columnList = "createDate"),
// @Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")})
public class WebServiceWeatherInfo {
// @Id
@ -31,7 +35,7 @@ public class WebServiceWeatherInfo {
// @ApiModelProperty(value = "主键")
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_weather_info_seq")
@SequenceGenerator(name = "webService_weather_info_seq", sequenceName = "webService_weather_info_seq_name_appserver")
@SequenceGenerator(name = "webService_weather_info_seq", sequenceName = "webService_weather_info_seq")
private Long id;
@Column(length = 100)
@ -132,8 +136,9 @@ public class WebServiceWeatherInfo {
private String cityIntroduce;
@ApiModelProperty(value = "日期")
@Column(length = 20)
private String createDate;
@Temporal(TemporalType.TIMESTAMP)
@CreatedDate
private Date createDate;
@ApiModelProperty(value = "时")
@Column(length = 20)

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

@ -37,7 +37,7 @@ public class TemperatureServiceImpl implements TemperatureService {
String dataMinute = sdfMinute.format(now);
String dataSecond = sdfSecond.format(now);
Temperature temperature = new Temperature();
temperature.setCreateDate(dataSecond);
//temperature.setCreateDate(now);
temperature.setDataDate(nowDate);
temperature.setDataHour(nowHour);
temperature.setDataMinute(dataMinute);

2
src/main/java/com/rehome/mqttclienttemperature/task/AgencyTask.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class AgencyTask {
//每1分钟执行一次
@Scheduled(cron="0 0/1 * * * ?")
//@Scheduled(cron="0 0/1 * * * ?")
protected void addRfqs(){
log.info("调用本地布署的Webservice，时间：{}",new Date());

6
src/main/java/com/rehome/mqttclienttemperature/task/WebServiceWeatherTask.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.util.*;
/***
* 调用本地布署的Webservice
*/
@Component
//@Component
public class WebServiceWeatherTask {
private static final Logger log = LoggerFactory.getLogger(AgencyTask.class);
@ -41,7 +41,7 @@ public class WebServiceWeatherTask {
}
//每5分钟执行一次,获取全球所有城市天气
@Scheduled(cron = "0 0 0/3 * * ?")
//@Scheduled(cron = "0 0 0/3 * * ?")
protected void scheduledGetAllCityWeather() {
log.info("每5分钟执行一次,获取全球所有城市天气，时间：{}", new Date());
@ -69,7 +69,7 @@ public class WebServiceWeatherTask {
String dataSecond = sdfSecond.format(now);
WebServiceWeatherInfo WebServiceWeatherInfo = new WebServiceWeatherInfo();
WebServiceWeatherInfo.setCreateDate(nowDate);
WebServiceWeatherInfo.setCreateDate(now);
WebServiceWeatherInfo.setDataHour(nowHour);
WebServiceWeatherInfo.setDataMinute(dataMinute);
WebServiceWeatherInfo.setDataSecond(dataSecond);

14
src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java
Unescape Escape View File

@ -57,17 +57,17 @@ public class JdbcUtil {
JSONObject jo = new JSONObject();
columns.stream().forEach(t -> {
try {
// if(t.equals("create_date")){
// Timestamp timestamp = rs.getTimestamp("create_date");
// Date date = new Date(timestamp.getTime());
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// jo.put(t, sdf.format(date));
// }else{
if(t.equals("create_date")){
Timestamp timestamp = rs.getTimestamp("create_date");
Date date = new Date(timestamp.getTime());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
jo.put(t, sdf.format(date));
}else{
Object value = rs.getObject(t);
String key = t;
String keyLow = key.toLowerCase(Locale.ROOT);
jo.put(keyLow, value);
//}
}
} catch (SQLException e) {
e.printStackTrace();
}

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

@ -15,15 +15,17 @@ spring:
#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
#url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.1.24:3306/weather?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
# 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.1.9:1521/orcl
username: appserver
password: appserver
username: huangwenfei
password: huangwenfei
# username: appserver
# password: appserver
jpa:
database: oracle # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志

Write Preview
Loading…
Cancel
Save