diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java index 8dcf7a5..ea6481a 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -26,13 +26,13 @@ import java.util.Date; //同时创建普通索引和组合索引,注意普通索引每个索引名都不同,注意组合索引每个索引名都相同 @Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")}) public class Temperature implements Serializable { -// @Id -// @GeneratedValue(strategy = GenerationType.IDENTITY) -// @ApiModelProperty(value = "主键") @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @ApiModelProperty(value = "主键") - @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq") - @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver",initialValue = 1,allocationSize = 1) +// @Id +// @ApiModelProperty(value = "主键") +// @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq") +// @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver",initialValue = 1,allocationSize = 1) private Long id; @ApiModelProperty(value = "温度") diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/OracleTemperatureServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/OracleTemperatureServiceImpl.java index 0c8b266..d839ec1 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/OracleTemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/OracleTemperatureServiceImpl.java @@ -55,13 +55,19 @@ public class OracleTemperatureServiceImpl implements OracleTemperatureService { log.info(dbQueryResult); jdbcParamValues.clear(); - return "数据库同步成功"; + if(responseDto.isSuccess()){ + return "数据库同步成功"; + } + return "数据库同步失败"; }, customPool); - future.thenApply(result -> { + ResponseDto responseDto = future.thenApply(result -> { log.info("Result: " + result); - return ResponseDto.successWithMsg(result); + if("数据库同步成功".equals(result)){ + return ResponseDto.successWithMsg(result); + } + return ResponseDto.fail(result); }).join(); - return ResponseDto.successWithMsg("数据库正在同步..."); + return responseDto; } } diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java index 05b33b2..6e44f1b 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -1,9 +1,12 @@ package com.rehome.mqttclienttemperature.service.impl; +import com.google.gson.Gson; import com.rehome.mqttclienttemperature.dao.TemperatureRepository; +import com.rehome.mqttclienttemperature.dto.ResponseDto; import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.service.OracleTemperatureService; import com.rehome.mqttclienttemperature.service.TemperatureService; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -17,6 +20,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; +@Slf4j @Service public class TemperatureServiceImpl implements TemperatureService { @@ -59,8 +63,9 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setHumidity(strDataTemperature[0]); temperature.setTemperature(strDataTemperature[1]); - //this.temperatureRepository.save(temperature); - this.oracleTemperatureService.saveTemperature(temperature); + this.temperatureRepository.save(temperature); + ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDto)); } } diff --git a/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java b/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java index 2f45243..f0ed8ae 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java +++ b/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java @@ -76,6 +76,9 @@ public class JdbcUtil { return ResponseDto.apiSuccess(list); } else { int updateCount = statement.getUpdateCount(); + if(updateCount==-1){ + return ResponseDto.fail("sql执行失败:" + updateCount); + } return ResponseDto.apiSuccess("sql修改数据行数:" + updateCount); } } catch (Exception e) {