diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index 2e5ca2a..8a7671e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -44,6 +44,7 @@ import com.newfiber.termite.enums.EHeatingFlag; import com.newfiber.termite.enums.EIdentColle; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.service.jingchu.IJingchuDeviceConfigService; import com.newfiber.termite.service.jingchu.IJingchuProjectConfigService; @@ -109,6 +110,9 @@ // @Resource // private MqttClient mqttClient; + @Resource + private IMonitoringWarnRecordService monitoringWarnRecordService; + private final String JINGCHU_UPLOAD_API = "/waterDataTermites/insertDataBatch"; CountDownLatch countDownLatch = new CountDownLatch(1); @@ -170,6 +174,8 @@ deviceMonitoringData.setId(Long.parseLong(dataDto.getId())); deviceMonitoringData.setYesnoant(dataDto.getYesnoant()); deviceMonitoringData.setIdenpitcu(url); + deviceMonitoringData.setAntNumber(dataDto.getAntNumber()); + deviceMonitoringData.setOtherAntNumber(dataDto.getOtherAntNumber()); deviceMonitoringDataService.updateById(deviceMonitoringData); Query updateQuery = new Query().addCriteria(Criteria.where("sn").is(existedDeviceMonitoringData.getSn())). @@ -181,6 +187,9 @@ BeanUtils.copyProperties(deviceMonitoringData, deviceMonitoringDataRealtime); deviceMonitoringDataRealtimeService.updateById(deviceMonitoringDataRealtime); + // 添加告警记录 + monitoringWarnRecordService.insert(deviceMonitoringDataRealtime, existedDeviceMonitoringData); + // 上传荆楚平台 jingchuExecutorService.execute(() -> jingChuUpload(existedDeviceMonitoringData, dataDto.getYesnoant())); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index 2e5ca2a..8a7671e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -44,6 +44,7 @@ import com.newfiber.termite.enums.EHeatingFlag; import com.newfiber.termite.enums.EIdentColle; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.service.jingchu.IJingchuDeviceConfigService; import com.newfiber.termite.service.jingchu.IJingchuProjectConfigService; @@ -109,6 +110,9 @@ // @Resource // private MqttClient mqttClient; + @Resource + private IMonitoringWarnRecordService monitoringWarnRecordService; + private final String JINGCHU_UPLOAD_API = "/waterDataTermites/insertDataBatch"; CountDownLatch countDownLatch = new CountDownLatch(1); @@ -170,6 +174,8 @@ deviceMonitoringData.setId(Long.parseLong(dataDto.getId())); deviceMonitoringData.setYesnoant(dataDto.getYesnoant()); deviceMonitoringData.setIdenpitcu(url); + deviceMonitoringData.setAntNumber(dataDto.getAntNumber()); + deviceMonitoringData.setOtherAntNumber(dataDto.getOtherAntNumber()); deviceMonitoringDataService.updateById(deviceMonitoringData); Query updateQuery = new Query().addCriteria(Criteria.where("sn").is(existedDeviceMonitoringData.getSn())). @@ -181,6 +187,9 @@ BeanUtils.copyProperties(deviceMonitoringData, deviceMonitoringDataRealtime); deviceMonitoringDataRealtimeService.updateById(deviceMonitoringDataRealtime); + // 添加告警记录 + monitoringWarnRecordService.insert(deviceMonitoringDataRealtime, existedDeviceMonitoringData); + // 上传荆楚平台 jingchuExecutorService.execute(() -> jingChuUpload(existedDeviceMonitoringData, dataDto.getYesnoant())); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml index da9a8c0..927fcf3 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml @@ -13,6 +13,8 @@ + + @@ -29,6 +31,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.uptime diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index 2e5ca2a..8a7671e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -44,6 +44,7 @@ import com.newfiber.termite.enums.EHeatingFlag; import com.newfiber.termite.enums.EIdentColle; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.service.jingchu.IJingchuDeviceConfigService; import com.newfiber.termite.service.jingchu.IJingchuProjectConfigService; @@ -109,6 +110,9 @@ // @Resource // private MqttClient mqttClient; + @Resource + private IMonitoringWarnRecordService monitoringWarnRecordService; + private final String JINGCHU_UPLOAD_API = "/waterDataTermites/insertDataBatch"; CountDownLatch countDownLatch = new CountDownLatch(1); @@ -170,6 +174,8 @@ deviceMonitoringData.setId(Long.parseLong(dataDto.getId())); deviceMonitoringData.setYesnoant(dataDto.getYesnoant()); deviceMonitoringData.setIdenpitcu(url); + deviceMonitoringData.setAntNumber(dataDto.getAntNumber()); + deviceMonitoringData.setOtherAntNumber(dataDto.getOtherAntNumber()); deviceMonitoringDataService.updateById(deviceMonitoringData); Query updateQuery = new Query().addCriteria(Criteria.where("sn").is(existedDeviceMonitoringData.getSn())). @@ -181,6 +187,9 @@ BeanUtils.copyProperties(deviceMonitoringData, deviceMonitoringDataRealtime); deviceMonitoringDataRealtimeService.updateById(deviceMonitoringDataRealtime); + // 添加告警记录 + monitoringWarnRecordService.insert(deviceMonitoringDataRealtime, existedDeviceMonitoringData); + // 上传荆楚平台 jingchuExecutorService.execute(() -> jingChuUpload(existedDeviceMonitoringData, dataDto.getYesnoant())); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml index da9a8c0..927fcf3 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml @@ -13,6 +13,8 @@ + + @@ -29,6 +31,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.uptime diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml index 2466b8c..c93fb88 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml @@ -13,6 +13,8 @@ + + @@ -30,6 +32,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.druing_datetime , t.heating diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index 2e5ca2a..8a7671e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -44,6 +44,7 @@ import com.newfiber.termite.enums.EHeatingFlag; import com.newfiber.termite.enums.EIdentColle; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.service.jingchu.IJingchuDeviceConfigService; import com.newfiber.termite.service.jingchu.IJingchuProjectConfigService; @@ -109,6 +110,9 @@ // @Resource // private MqttClient mqttClient; + @Resource + private IMonitoringWarnRecordService monitoringWarnRecordService; + private final String JINGCHU_UPLOAD_API = "/waterDataTermites/insertDataBatch"; CountDownLatch countDownLatch = new CountDownLatch(1); @@ -170,6 +174,8 @@ deviceMonitoringData.setId(Long.parseLong(dataDto.getId())); deviceMonitoringData.setYesnoant(dataDto.getYesnoant()); deviceMonitoringData.setIdenpitcu(url); + deviceMonitoringData.setAntNumber(dataDto.getAntNumber()); + deviceMonitoringData.setOtherAntNumber(dataDto.getOtherAntNumber()); deviceMonitoringDataService.updateById(deviceMonitoringData); Query updateQuery = new Query().addCriteria(Criteria.where("sn").is(existedDeviceMonitoringData.getSn())). @@ -181,6 +187,9 @@ BeanUtils.copyProperties(deviceMonitoringData, deviceMonitoringDataRealtime); deviceMonitoringDataRealtimeService.updateById(deviceMonitoringDataRealtime); + // 添加告警记录 + monitoringWarnRecordService.insert(deviceMonitoringDataRealtime, existedDeviceMonitoringData); + // 上传荆楚平台 jingchuExecutorService.execute(() -> jingChuUpload(existedDeviceMonitoringData, dataDto.getYesnoant())); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml index da9a8c0..927fcf3 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml @@ -13,6 +13,8 @@ + + @@ -29,6 +31,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.uptime diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml index 2466b8c..c93fb88 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml @@ -13,6 +13,8 @@ + + @@ -30,6 +32,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.druing_datetime , t.heating diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml index 43b1e0e..8956280 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml @@ -12,11 +12,8 @@ - - - - - + + @@ -37,11 +34,8 @@ , t.yesnoant , t.rtpitcu , t.idenpitcu - , t.idencolle - , t.druing - , t.druing_datetime - , t.heating - , t.heating_datetime + , t.ant_number + , t.other_ant_number , t.uptime , t.remark , t.status diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 7a14a13..6a53e92 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -7,10 +7,10 @@ import com.newfiber.common.log.annotation.Log; import com.newfiber.common.log.enums.BusinessType; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.domain.request.UploadApiRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.service.IProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java index 9764f91..114d761 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringData.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java index 60c7270..e9aa1ce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/DeviceMonitoringDataRealtime.java @@ -75,6 +75,18 @@ private String idencolle; /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + + /** * 是否投药 1：是 2否 默认2 */ @ApiModelProperty(value = "是否投药 1：是 2否 默认2") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java index f4e9aa7..7c88f5c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/KillRecord.java @@ -1,15 +1,14 @@ package com.newfiber.termite.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.newfiber.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 消杀记录对象 ter_kill_record * @@ -44,7 +43,8 @@ @ApiModelProperty(value = "累计未告警天数") - private Integer count; + private Integer continueWarnDays; + /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java index 9ddb017..e36ab63 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/MonitoringWarnRecord.java @@ -54,34 +54,16 @@ private String idenpitcu; /** - * 确认是否属实 + * 白蚁数量 */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; /** - * 是否投药 1：是 2否 默认2 + * 其他白蚁数量（若蚁+工蚁） */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - private Date heatingDatetime; + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; /** * 上传时间 @@ -89,7 +71,6 @@ @ApiModelProperty(value = "上传时间") private Date uptime; - /** * 项目编号 */ diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index ce24347..eb34165 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -12,7 +12,6 @@ import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -72,6 +71,18 @@ private String centerPoint; /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + + /** * 生产人员 */ @TableField(exist = false) diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java index 4e9b6e5..cb7a9c2 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/dto/PhotoIdentifyDto.java @@ -1,10 +1,24 @@ package com.newfiber.termite.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class PhotoIdentifyDto { private String id; private String yesnoant; + + /** + * 白蚁数量 + */ + @ApiModelProperty(value = "白蚁数量") + private Integer antNumber; + + /** + * 其他白蚁数量（若蚁+工蚁） + */ + @ApiModelProperty(value = "其他白蚁数量（若蚁+工蚁）") + private Integer otherAntNumber; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java deleted file mode 100644 index abad960..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoQueryRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newfiber.termite.domain.request; - -import com.newfiber.common.core.web.request.BaseQueryRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ProjectInfoQueryRequest extends BaseQueryRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java deleted file mode 100644 index 9975cce..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoSaveRequest { - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java deleted file mode 100644 index 7103515..0000000 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.newfiber.termite.domain.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 项目信息表 - * - * @author yanghui - * @date 2024-05-11 - */ -@Data -public class ProjectInfoUpdateRequest { - - /** - * 项目编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - private String projectCode; - - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - private String projectName; - - - /** - * 上传地址 - */ - @ApiModelProperty(value = "上传地址") - private String uploadApi; - - /** - * 字段解释 - */ - @ApiModelProperty(value = "字段解释") - private String fieldExplain; - - /** - * 生产人员 - */ - @ApiModelProperty(value = "生产人员") - private String productionUsers; - - /** - * 安装人员 - */ - @ApiModelProperty(value = "安装人员") - private String installUsers; - - /** - * 分析人员 - */ - @ApiModelProperty(value = "分析人员") - private String analysisUsers; - - /** - * 地图中心点 - */ - @ApiModelProperty(value = "地图中心点") - private String centerPoint; - -} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java index daf4c50..79e7999 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordSaveRequest.java @@ -1,17 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - /** * 告警记录对象 ter_monitoring_warn_record * @@ -59,40 +55,6 @@ private String idenpitcu; /** - * 确认是否属实 - */ - @ApiModelProperty(value = "确认是否属实") - private String idencolle; - - /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java index faa6e7f..ddd3a62 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/monitoringWarnRecord/MonitoringWarnRecordUpdateRequest.java @@ -1,16 +1,13 @@ package com.newfiber.termite.domain.request.monitoringWarnRecord; -import lombok.Data; +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; - import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 告警记录对象 ter_monitoring_warn_record @@ -66,34 +63,6 @@ private String idencolle; /** - * 是否投药 1：是 2否 默认2 - */ - @ApiModelProperty(value = "是否投药 1：是 2否 默认2") - private String druing; - - /** - * 投药时间 - */ - @ApiModelProperty(value = "投药时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date druingDatetime; - - /** - * 是否加热（1是 | 2否） - */ - @ApiModelProperty(value = "是否加热（1是 | 2否）") - private String heating; - - /** - * 加热时间 - */ - @ApiModelProperty(value = "加热时间") - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - private Date heatingDatetime; - - /** * 上传时间 */ @ApiModelProperty(value = "上传时间") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java new file mode 100644 index 0000000..526d9fc --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoQueryRequest.java @@ -0,0 +1,43 @@ +package com.newfiber.termite.domain.request.project; + +import com.newfiber.common.core.web.request.BaseQueryRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProjectInfoQueryRequest extends BaseQueryRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java new file mode 100644 index 0000000..d65f8bd --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoSaveRequest.java @@ -0,0 +1,77 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoSaveRequest { + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java new file mode 100644 index 0000000..ff7eec1 --- /dev/null +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/project/ProjectInfoUpdateRequest.java @@ -0,0 +1,83 @@ +package com.newfiber.termite.domain.request.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目信息表 + * + * @author yanghui + * @date 2024-05-11 + */ +@Data +public class ProjectInfoUpdateRequest { + + /** + * 项目编码 + */ + @ApiModelProperty(value = "主键id") + private Long id; + + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + private String projectCode; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + + /** + * 上传地址 + */ + @ApiModelProperty(value = "上传地址") + private String uploadApi; + + /** + * 字段解释 + */ + @ApiModelProperty(value = "字段解释") + private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 航拍图坐标 + */ + @ApiModelProperty(value = "航拍图坐标") + private String aerialCoordinate; + + /** + * 航拍图 + */ + @ApiModelProperty(value = "航拍图") + private String aerialPicture; + +} diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java index 35f955b..6452d15 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/response/WarnMonthAlarmsResponse.java @@ -1,9 +1,8 @@ package com.newfiber.termite.domain.response; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data @@ -27,7 +26,7 @@ * 对应告警站点开始月份 */ @ApiModelProperty(value = "对应告警站点开始月份") - private String startMonth; + private String maxStartMonth; /** @@ -41,7 +40,7 @@ * 对应月份告警站点总数 */ @ApiModelProperty(value = "告警站点总数") - private Integer deviceCount; + private Integer warnDeviceCount; /** diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java index 51a93ae..66e42b0 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/mapper/ProjectInfoMapper.java @@ -1,13 +1,10 @@ package com.newfiber.termite.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newfiber.common.core.domain.ClientInfo; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import org.apache.ibatis.annotations.Param; - +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; import java.util.List; -import java.util.Map; +import org.apache.ibatis.annotations.Param; public interface ProjectInfoMapper extends BaseMapper { diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java index 85c0812..11a7adb 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IMonitoringWarnRecordService.java @@ -1,11 +1,13 @@ package com.newfiber.termite.service; -import java.util.List; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import java.util.List; /** * 告警记录Service接口 @@ -24,6 +26,13 @@ long insert(MonitoringWarnRecordSaveRequest request); /** + * 新增告警记录 + * + * @return 结果 + */ + long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData); + + /** * 修改告警记录 * * @param request 修改参数 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index eed1f59..b2cfe9c 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -1,9 +1,9 @@ package com.newfiber.termite.service; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import java.util.List; import java.util.Set; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java index 4e3ee81..9d3a995 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/MonitoringWarnRecordServiceImpl.java @@ -1,23 +1,24 @@ package com.newfiber.termite.service.impl; -import java.util.List; -import com.newfiber.common.core.utils.DateUtils; -import java.util.Optional; -import java.util.ArrayList; -import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.exception.ServiceException; +import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.termite.domain.DeviceMonitoringData; +import com.newfiber.termite.domain.DeviceMonitoringDataRealtime; +import com.newfiber.termite.domain.MonitoringWarnRecord; import com.newfiber.termite.domain.MonitoringWarnResponseStatistics; -import org.springframework.transaction.annotation.Transactional; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; +import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; +import com.newfiber.termite.enums.EExistsAnt; +import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; +import java.util.List; +import java.util.Optional; import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.newfiber.termite.mapper.MonitoringWarnRecordMapper; -import com.newfiber.termite.domain.MonitoringWarnRecord; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordSaveRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordUpdateRequest; -import com.newfiber.termite.domain.request.monitoringWarnRecord.MonitoringWarnRecordQueryRequest; -import com.newfiber.termite.service.IMonitoringWarnRecordService; +import org.springframework.transaction.annotation.Transactional; /** * 告警记录Service业务层处理 @@ -40,6 +41,22 @@ } @Override + public long insert(DeviceMonitoringDataRealtime deviceMonitoringDataRealtime, DeviceMonitoringData existedDeviceMonitoringData) { + + if(EExistsAnt.True.getCode().equals(deviceMonitoringDataRealtime.getYesnoant())){ + MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); + BeanUtils.copyProperties(deviceMonitoringDataRealtime, monitoringWarnRecord); + monitoringWarnRecord.setSn(existedDeviceMonitoringData.getSn()); + monitoringWarnRecord.setDate(existedDeviceMonitoringData.getDate()); + monitoringWarnRecord.setRtpitcu(existedDeviceMonitoringData.getRtpitcu()); + save(monitoringWarnRecord); + return Optional.of(monitoringWarnRecord).map(BaseEntity::getId).orElse(0L); + } + + return 0L; + } + + @Override public boolean update(MonitoringWarnRecordUpdateRequest request) { MonitoringWarnRecord monitoringWarnRecord = new MonitoringWarnRecord(); BeanUtils.copyProperties(request, monitoringWarnRecord); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index b149b2f..f4e0b6e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -4,9 +4,9 @@ import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; import com.newfiber.termite.domain.ProjectInfo; -import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; -import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; -import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoQueryRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoSaveRequest; +import com.newfiber.termite.domain.request.project.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; import java.util.HashSet; diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index 2e5ca2a..8a7671e 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -44,6 +44,7 @@ import com.newfiber.termite.enums.EHeatingFlag; import com.newfiber.termite.enums.EIdentColle; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IMonitoringWarnRecordService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.service.jingchu.IJingchuDeviceConfigService; import com.newfiber.termite.service.jingchu.IJingchuProjectConfigService; @@ -109,6 +110,9 @@ // @Resource // private MqttClient mqttClient; + @Resource + private IMonitoringWarnRecordService monitoringWarnRecordService; + private final String JINGCHU_UPLOAD_API = "/waterDataTermites/insertDataBatch"; CountDownLatch countDownLatch = new CountDownLatch(1); @@ -170,6 +174,8 @@ deviceMonitoringData.setId(Long.parseLong(dataDto.getId())); deviceMonitoringData.setYesnoant(dataDto.getYesnoant()); deviceMonitoringData.setIdenpitcu(url); + deviceMonitoringData.setAntNumber(dataDto.getAntNumber()); + deviceMonitoringData.setOtherAntNumber(dataDto.getOtherAntNumber()); deviceMonitoringDataService.updateById(deviceMonitoringData); Query updateQuery = new Query().addCriteria(Criteria.where("sn").is(existedDeviceMonitoringData.getSn())). @@ -181,6 +187,9 @@ BeanUtils.copyProperties(deviceMonitoringData, deviceMonitoringDataRealtime); deviceMonitoringDataRealtimeService.updateById(deviceMonitoringDataRealtime); + // 添加告警记录 + monitoringWarnRecordService.insert(deviceMonitoringDataRealtime, existedDeviceMonitoringData); + // 上传荆楚平台 jingchuExecutorService.execute(() -> jingChuUpload(existedDeviceMonitoringData, dataDto.getYesnoant())); diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml index da9a8c0..927fcf3 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml @@ -13,6 +13,8 @@ + + @@ -29,6 +31,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.uptime diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml index 2466b8c..c93fb88 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataRealtimeMapper.xml @@ -13,6 +13,8 @@ + + @@ -30,6 +32,8 @@ , t.rtpitcu , t.idenpitcu , t.idencolle + , t.ant_number + , t.other_ant_number , t.druing , t.druing_datetime , t.heating diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml index 43b1e0e..8956280 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml @@ -12,11 +12,8 @@ - - - - - + + @@ -37,11 +34,8 @@ , t.yesnoant , t.rtpitcu , t.idenpitcu - , t.idencolle - , t.druing - , t.druing_datetime - , t.heating - , t.heating_datetime + , t.ant_number + , t.other_ant_number , t.uptime , t.remark , t.status diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml index 932d76c..e5d18db 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml @@ -16,6 +16,8 @@ + + @@ -36,6 +38,8 @@ , t.install_users , t.analysis_users , t.center_point + , t.aerial_coordinate + , t.aerial_picture , t.status , t.del_flag , t.create_by