diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml new file mode 100644 index 0000000..60dcaf7 --- /dev/null +++ b/admin-client-temperature.iml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java index 0127317..666f448 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java @@ -6,6 +6,7 @@ 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 org.apache.ibatis.annotations.Param; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.annotation.Validated; @@ -59,5 +60,14 @@ public class TemperatureController { return temperatureService.queryFirst10ByDataDateAndLocationDesc(dto.getDataDate(),dto.getLocationDesc()); } + /** + * APP更新版本号 + */ + @GetMapping("/save") + private String save(@Param("temperature")String temperature, @Param("humidity")String humidity) { + System.out.println(temperature); + System.out.println(humidity); + return "success"; + } } diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/TemperatureEsp.java b/src/main/java/com/rehome/mqttclienttemperature/entity/TemperatureEsp.java new file mode 100644 index 0000000..ca9a907 --- /dev/null +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/TemperatureEsp.java @@ -0,0 +1,73 @@ +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 +//普通索引,不指定索引名，表自动创建索引名 +//@Table(indexes = {@Index(columnList = "dataDate"),@Index(columnList = "locationDesc")}) +//普通索引,指定索引名,创建单个索引 +//在这个例子中，Temperature实体类通过@Table注解的indexes属性定义了一个名为idx_dataDate的索引，它覆盖了dataDate字段。这意味着在数据库层面，针对dataDate字段的查询将会利用这个索引，从而提高查询效率。 +//@Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate")}) +//同时创建多个普通索引,注意每个索引名都不同 +//@Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc")}) +//@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")}) +//创建组合索引,注意每个索引名都相同 +//@Table(indexes = {@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")}) +//同时创建普通索引和组合索引,注意普通索引每个索引名都不同，注意组合索引每个索引名都相同 +@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 TemperatureEsp implements Serializable { + // @Id +// @GeneratedValue(strategy = GenerationType.IDENTITY) +// @ApiModelProperty(value = "主键") + @Id + @ApiModelProperty(value = "主键") + @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq") + @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver",initialValue = 1,allocationSize = 1) + //@GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @ApiModelProperty(value = "温度") + @Column(length=10) + private String temperature; + + @ApiModelProperty(value = "湿度") + @Column(length=10) + private String humidity; + + @ApiModelProperty(value = "日期") + @Column(length=20) + private String dataDate; + + @ApiModelProperty(value = "时") + @Column(length=20) + private String dataHour; + + @ApiModelProperty(value = "分") + @Column(length=20) + private String dataMinute; + + @ApiModelProperty(value = "主题") + @Column(length=60) + private String topic; + + @ApiModelProperty(value = "位置描述") + @Column(length=80) + private String locationDesc; + + //@CreatedDate + @ApiModelProperty(value = "创建时间") + @Temporal(TemporalType.TIMESTAMP) + private Date createDate; + +} \ No newline at end of file