From 073032661d377c177443e307641be4f486af8dbf Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 10 Jun 2025 12:52:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=B5=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/dto/AdditionalRecordDTO.java | 148 --------- .../entity/dto/MacQueryTrafficDTO.java | 66 ---- .../entity/dto/PassengerFlowByTimeDTO.java | 85 ----- .../entity/dto/PassengerFlowQueryDTO.java | 74 ----- .../core/kitchen/entity/dto/SummaryInfo.java | 250 --------------- .../dto/TimePeriodRegionPopulationDTO.java | 91 ------ .../entity/enums/CameraUseSceneEnum.java | 4 - .../entity/vo/DeviceQueryPresentNumVo.java | 58 ---- .../entity/vo/PassengerFlowByCanteenIdVO.java | 101 ------ .../kitchen/entity/vo/PassengerFlowVO.java | 114 ------- .../entity/vo/PresentFlowNowDayVO.java | 146 --------- .../core/kitchen/entity/vo/PresentFlowVO.java | 101 ------ .../entity/vo/RangePeriodPeopleNumVO.java | 77 ----- .../entity/vo/RegionNowPopulationVO.java | 119 ------- .../mapper/RegionalPopulationMapper.java | 21 -- .../mapper/RegionalPopulationMapper.xml | 20 -- .../kitchen/model/DevicePassengerFlow.java | 218 ------------- .../kitchen/model/RegionalPopulation.java | 300 ------------------ .../mq/PassengerFlowMessageListener.java | 50 --- .../service/RegionalPopulationService.java | 119 ------- .../kitchen}/DevicePassengerFlowMapper.xml | 12 +- 21 files changed, 6 insertions(+), 2168 deletions(-) delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/AdditionalRecordDTO.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/MacQueryTrafficDTO.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/SummaryInfo.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/TimePeriodRegionPopulationDTO.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RangePeriodPeopleNumVO.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RegionNowPopulationVO.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.xml delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/RegionalPopulation.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mq/PassengerFlowMessageListener.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/RegionalPopulationService.java rename bonus-modules/bonus-smart-canteen/src/main/{java/com/bonus/canteen/core/kitchen/mapper => resources/mapper/kitchen}/DevicePassengerFlowMapper.xml (74%) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/AdditionalRecordDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/AdditionalRecordDTO.java deleted file mode 100644 index 4ab91e0f..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/AdditionalRecordDTO.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; -import lombok.Generated; - -import java.time.LocalDateTime; - -@ApiModel("客流统计补录DTO") -public class AdditionalRecordDTO { - @ApiModelProperty("补录时间") - private @NotNull( - message = "请添加补录时间" -) LocalDateTime addRecordTime; - @ApiModelProperty("补录客流设备sn") - private String machineSn; - @ApiModelProperty("补录食堂id") - private Long canteenId; - @ApiModelProperty("补录人数") - private Integer personNum; - - @Generated - public LocalDateTime getAddRecordTime() { - return this.addRecordTime; - } - - @Generated - public String getMachineSn() { - return this.machineSn; - } - - @Generated - public Long getCanteenId() { - return this.canteenId; - } - - @Generated - public Integer getPersonNum() { - return this.personNum; - } - - @Generated - public void setAddRecordTime(final LocalDateTime addRecordTime) { - this.addRecordTime = addRecordTime; - } - - @Generated - public void setMachineSn(final String machineSn) { - this.machineSn = machineSn; - } - - @Generated - public void setCanteenId(final Long canteenId) { - this.canteenId = canteenId; - } - - @Generated - public void setPersonNum(final Integer personNum) { - this.personNum = personNum; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof AdditionalRecordDTO)) { - return false; - } else { - AdditionalRecordDTO other = (AdditionalRecordDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - label59: { - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId == null) { - break label59; - } - } else if (this$canteenId.equals(other$canteenId)) { - break label59; - } - - return false; - } - - Object this$personNum = this.getPersonNum(); - Object other$personNum = other.getPersonNum(); - if (this$personNum == null) { - if (other$personNum != null) { - return false; - } - } else if (!this$personNum.equals(other$personNum)) { - return false; - } - - Object this$addRecordTime = this.getAddRecordTime(); - Object other$addRecordTime = other.getAddRecordTime(); - if (this$addRecordTime == null) { - if (other$addRecordTime != null) { - return false; - } - } else if (!this$addRecordTime.equals(other$addRecordTime)) { - return false; - } - - Object this$machineSn = this.getMachineSn(); - Object other$machineSn = other.getMachineSn(); - if (this$machineSn == null) { - if (other$machineSn != null) { - return false; - } - } else if (!this$machineSn.equals(other$machineSn)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof AdditionalRecordDTO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $personNum = this.getPersonNum(); - result = result * 59 + ($personNum == null ? 43 : $personNum.hashCode()); - Object $addRecordTime = this.getAddRecordTime(); - result = result * 59 + ($addRecordTime == null ? 43 : $addRecordTime.hashCode()); - Object $machineSn = this.getMachineSn(); - result = result * 59 + ($machineSn == null ? 43 : $machineSn.hashCode()); - return result; - } - - @Generated - public String toString() { - String var10000 = String.valueOf(this.getAddRecordTime()); - return "AdditionalRecordDTO(addRecordTime=" + var10000 + ", machineSn=" + this.getMachineSn() + ", canteenId=" + this.getCanteenId() + ", personNum=" + this.getPersonNum() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/MacQueryTrafficDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/MacQueryTrafficDTO.java deleted file mode 100644 index 5b35e9a9..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/MacQueryTrafficDTO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Generated; - -@ApiModel("查询人流量统计入参") -public class MacQueryTrafficDTO { - @ApiModelProperty("设备sn码") - private String machineSn; - - @Generated - public String getMachineSn() { - return this.machineSn; - } - - @Generated - public void setMachineSn(final String machineSn) { - this.machineSn = machineSn; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof MacQueryTrafficDTO)) { - return false; - } else { - MacQueryTrafficDTO other = (MacQueryTrafficDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - Object this$machineSn = this.getMachineSn(); - Object other$machineSn = other.getMachineSn(); - if (this$machineSn == null) { - if (other$machineSn != null) { - return false; - } - } else if (!this$machineSn.equals(other$machineSn)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof MacQueryTrafficDTO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $machineSn = this.getMachineSn(); - result = result * 59 + ($machineSn == null ? 43 : $machineSn.hashCode()); - return result; - } - - @Generated - public String toString() { - return "MacQueryTrafficDTO(machineSn=" + this.getMachineSn() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowByTimeDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowByTimeDTO.java index 33441ff8..5033ae87 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowByTimeDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowByTimeDTO.java @@ -57,89 +57,4 @@ public class PassengerFlowByTimeDTO { return this; } - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PassengerFlowByTimeDTO)) { - return false; - } else { - PassengerFlowByTimeDTO other = (PassengerFlowByTimeDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - label59: { - Object this$timeNum = this.getTimeNum(); - Object other$timeNum = other.getTimeNum(); - if (this$timeNum == null) { - if (other$timeNum == null) { - break label59; - } - } else if (this$timeNum.equals(other$timeNum)) { - break label59; - } - - return false; - } - - Object this$flowNum = this.getFlowNum(); - Object other$flowNum = other.getFlowNum(); - if (this$flowNum == null) { - if (other$flowNum != null) { - return false; - } - } else if (!this$flowNum.equals(other$flowNum)) { - return false; - } - - Object this$enterNum = this.getEnterNum(); - Object other$enterNum = other.getEnterNum(); - if (this$enterNum == null) { - if (other$enterNum != null) { - return false; - } - } else if (!this$enterNum.equals(other$enterNum)) { - return false; - } - - Object this$exitNum = this.getExitNum(); - Object other$exitNum = other.getExitNum(); - if (this$exitNum == null) { - if (other$exitNum != null) { - return false; - } - } else if (!this$exitNum.equals(other$exitNum)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PassengerFlowByTimeDTO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $timeNum = this.getTimeNum(); - result = result * 59 + ($timeNum == null ? 43 : $timeNum.hashCode()); - Object $flowNum = this.getFlowNum(); - result = result * 59 + ($flowNum == null ? 43 : $flowNum.hashCode()); - Object $enterNum = this.getEnterNum(); - result = result * 59 + ($enterNum == null ? 43 : $enterNum.hashCode()); - Object $exitNum = this.getExitNum(); - result = result * 59 + ($exitNum == null ? 43 : $exitNum.hashCode()); - return result; - } - - @Generated - public String toString() { - Integer var10000 = this.getTimeNum(); - return "PassengerFlowByTimeDTO(timeNum=" + var10000 + ", flowNum=" + this.getFlowNum() + ", enterNum=" + this.getEnterNum() + ", exitNum=" + this.getExitNum() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowQueryDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowQueryDTO.java index 51284a82..35399cdd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowQueryDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/PassengerFlowQueryDTO.java @@ -3,7 +3,6 @@ package com.bonus.canteen.core.kitchen.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Generated; - import java.time.LocalDate; import java.util.List; @@ -46,77 +45,4 @@ public class PassengerFlowQueryDTO { this.presentDate = presentDate; } - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PassengerFlowQueryDTO)) { - return false; - } else { - PassengerFlowQueryDTO other = (PassengerFlowQueryDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - label47: { - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId == null) { - break label47; - } - } else if (this$canteenId.equals(other$canteenId)) { - break label47; - } - - return false; - } - - Object this$periods = this.getPeriods(); - Object other$periods = other.getPeriods(); - if (this$periods == null) { - if (other$periods != null) { - return false; - } - } else if (!this$periods.equals(other$periods)) { - return false; - } - - Object this$presentDate = this.getPresentDate(); - Object other$presentDate = other.getPresentDate(); - if (this$presentDate == null) { - if (other$presentDate != null) { - return false; - } - } else if (!this$presentDate.equals(other$presentDate)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PassengerFlowQueryDTO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $periods = this.getPeriods(); - result = result * 59 + ($periods == null ? 43 : $periods.hashCode()); - Object $presentDate = this.getPresentDate(); - result = result * 59 + ($presentDate == null ? 43 : $presentDate.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getCanteenId(); - return "PassengerFlowQueryDTO(canteenId=" + var10000 + ", periods=" + this.getPeriods() + ", presentDate=" + String.valueOf(this.getPresentDate()) + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/SummaryInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/SummaryInfo.java deleted file mode 100644 index e079ed8d..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/SummaryInfo.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.dto; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Generated; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -public class SummaryInfo { - @ApiModelProperty("区域内部人数") - public Long nInsidePeopleNum; - @ApiModelProperty("设备扩展信息") - public JSONObject extendInfo; - @ApiModelProperty("渠道ID") - private int nChannelID; - @ApiModelProperty("事件时间") - private String eventTime; - @ApiModelProperty("当天进入") - private int enteredToday; - @ApiModelProperty("当天进入小时") - private int enteredHour; - @ApiModelProperty("当天进入总数") - private int enteredTotal; - @ApiModelProperty("当天退出") - private int exitedToday; - @ApiModelProperty("当天退出小时") - private int exitedHour; - @ApiModelProperty("当天退出总数") - private int exitedTotal; - @ApiModelProperty("设备sn") - private String serialNumber; - - public LocalDateTime getEventTime() { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); - return LocalDateTime.parse(this.eventTime, formatter); - } - - @Generated - public Long getNInsidePeopleNum() { - return this.nInsidePeopleNum; - } - - @Generated - public JSONObject getExtendInfo() { - return this.extendInfo; - } - - @Generated - public int getNChannelID() { - return this.nChannelID; - } - - @Generated - public int getEnteredToday() { - return this.enteredToday; - } - - @Generated - public int getEnteredHour() { - return this.enteredHour; - } - - @Generated - public int getEnteredTotal() { - return this.enteredTotal; - } - - @Generated - public int getExitedToday() { - return this.exitedToday; - } - - @Generated - public int getExitedHour() { - return this.exitedHour; - } - - @Generated - public int getExitedTotal() { - return this.exitedTotal; - } - - @Generated - public String getSerialNumber() { - return this.serialNumber; - } - - @Generated - public void setNInsidePeopleNum(final Long nInsidePeopleNum) { - this.nInsidePeopleNum = nInsidePeopleNum; - } - - @Generated - public void setExtendInfo(final JSONObject extendInfo) { - this.extendInfo = extendInfo; - } - - @Generated - public void setNChannelID(final int nChannelID) { - this.nChannelID = nChannelID; - } - - @Generated - public void setEventTime(final String eventTime) { - this.eventTime = eventTime; - } - - @Generated - public void setEnteredToday(final int enteredToday) { - this.enteredToday = enteredToday; - } - - @Generated - public void setEnteredHour(final int enteredHour) { - this.enteredHour = enteredHour; - } - - @Generated - public void setEnteredTotal(final int enteredTotal) { - this.enteredTotal = enteredTotal; - } - - @Generated - public void setExitedToday(final int exitedToday) { - this.exitedToday = exitedToday; - } - - @Generated - public void setExitedHour(final int exitedHour) { - this.exitedHour = exitedHour; - } - - @Generated - public void setExitedTotal(final int exitedTotal) { - this.exitedTotal = exitedTotal; - } - - @Generated - public void setSerialNumber(final String serialNumber) { - this.serialNumber = serialNumber; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof SummaryInfo)) { - return false; - } else { - SummaryInfo other = (SummaryInfo)o; - if (!other.canEqual(this)) { - return false; - } else if (this.getNChannelID() != other.getNChannelID()) { - return false; - } else if (this.getEnteredToday() != other.getEnteredToday()) { - return false; - } else if (this.getEnteredHour() != other.getEnteredHour()) { - return false; - } else if (this.getEnteredTotal() != other.getEnteredTotal()) { - return false; - } else if (this.getExitedToday() != other.getExitedToday()) { - return false; - } else if (this.getExitedHour() != other.getExitedHour()) { - return false; - } else if (this.getExitedTotal() != other.getExitedTotal()) { - return false; - } else { - label76: { - Object this$nInsidePeopleNum = this.getNInsidePeopleNum(); - Object other$nInsidePeopleNum = other.getNInsidePeopleNum(); - if (this$nInsidePeopleNum == null) { - if (other$nInsidePeopleNum == null) { - break label76; - } - } else if (this$nInsidePeopleNum.equals(other$nInsidePeopleNum)) { - break label76; - } - - return false; - } - - Object this$extendInfo = this.getExtendInfo(); - Object other$extendInfo = other.getExtendInfo(); - if (this$extendInfo == null) { - if (other$extendInfo != null) { - return false; - } - } else if (!this$extendInfo.equals(other$extendInfo)) { - return false; - } - - Object this$eventTime = this.getEventTime(); - Object other$eventTime = other.getEventTime(); - if (this$eventTime == null) { - if (other$eventTime != null) { - return false; - } - } else if (!this$eventTime.equals(other$eventTime)) { - return false; - } - - Object this$serialNumber = this.getSerialNumber(); - Object other$serialNumber = other.getSerialNumber(); - if (this$serialNumber == null) { - if (other$serialNumber != null) { - return false; - } - } else if (!this$serialNumber.equals(other$serialNumber)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof SummaryInfo; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - result = result * 59 + this.getNChannelID(); - result = result * 59 + this.getEnteredToday(); - result = result * 59 + this.getEnteredHour(); - result = result * 59 + this.getEnteredTotal(); - result = result * 59 + this.getExitedToday(); - result = result * 59 + this.getExitedHour(); - result = result * 59 + this.getExitedTotal(); - Object $nInsidePeopleNum = this.getNInsidePeopleNum(); - result = result * 59 + ($nInsidePeopleNum == null ? 43 : $nInsidePeopleNum.hashCode()); - Object $extendInfo = this.getExtendInfo(); - result = result * 59 + ($extendInfo == null ? 43 : $extendInfo.hashCode()); - Object $eventTime = this.getEventTime(); - result = result * 59 + ($eventTime == null ? 43 : $eventTime.hashCode()); - Object $serialNumber = this.getSerialNumber(); - result = result * 59 + ($serialNumber == null ? 43 : $serialNumber.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getNInsidePeopleNum(); - return "SummaryInfo(nInsidePeopleNum=" + var10000 + ", extendInfo=" + String.valueOf(this.getExtendInfo()) + ", nChannelID=" + this.getNChannelID() + ", eventTime=" + String.valueOf(this.getEventTime()) + ", enteredToday=" + this.getEnteredToday() + ", enteredHour=" + this.getEnteredHour() + ", enteredTotal=" + this.getEnteredTotal() + ", exitedToday=" + this.getExitedToday() + ", exitedHour=" + this.getExitedHour() + ", exitedTotal=" + this.getExitedTotal() + ", serialNumber=" + this.getSerialNumber() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/TimePeriodRegionPopulationDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/TimePeriodRegionPopulationDTO.java deleted file mode 100644 index 7fb62a1e..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/dto/TimePeriodRegionPopulationDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Generated; - -import java.time.LocalDate; - -public class TimePeriodRegionPopulationDTO { - @ApiModelProperty("设备id") - private Long deviceId; - @ApiModelProperty("查询时间") - private LocalDate queryDate; - - @Generated - public Long getDeviceId() { - return this.deviceId; - } - - @Generated - public LocalDate getQueryDate() { - return this.queryDate; - } - - @Generated - public void setDeviceId(final Long deviceId) { - this.deviceId = deviceId; - } - - @Generated - public void setQueryDate(final LocalDate queryDate) { - this.queryDate = queryDate; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof TimePeriodRegionPopulationDTO)) { - return false; - } else { - TimePeriodRegionPopulationDTO other = (TimePeriodRegionPopulationDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - Object this$deviceId = this.getDeviceId(); - Object other$deviceId = other.getDeviceId(); - if (this$deviceId == null) { - if (other$deviceId != null) { - return false; - } - } else if (!this$deviceId.equals(other$deviceId)) { - return false; - } - - Object this$queryDate = this.getQueryDate(); - Object other$queryDate = other.getQueryDate(); - if (this$queryDate == null) { - if (other$queryDate != null) { - return false; - } - } else if (!this$queryDate.equals(other$queryDate)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof TimePeriodRegionPopulationDTO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $deviceId = this.getDeviceId(); - result = result * 59 + ($deviceId == null ? 43 : $deviceId.hashCode()); - Object $queryDate = this.getQueryDate(); - result = result * 59 + ($queryDate == null ? 43 : $queryDate.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getDeviceId(); - return "TimePeriodRegionPopulationDTO(deviceId=" + var10000 + ", queryDate=" + String.valueOf(this.getQueryDate()) + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/enums/CameraUseSceneEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/enums/CameraUseSceneEnum.java index b04dc43b..5eb5763b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/enums/CameraUseSceneEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/enums/CameraUseSceneEnum.java @@ -24,8 +24,4 @@ public enum CameraUseSceneEnum { return this.value; } - // $FF: synthetic method - private static CameraUseSceneEnum[] $values() { - return new CameraUseSceneEnum[]{PASSENGER_FLOW, REGION_POPULATION}; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/DeviceQueryPresentNumVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/DeviceQueryPresentNumVo.java index 0aee7705..c9285eaf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/DeviceQueryPresentNumVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/DeviceQueryPresentNumVo.java @@ -30,62 +30,4 @@ public class DeviceQueryPresentNumVo { this.presentNum = presentNum; return this; } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof DeviceQueryPresentNumVo)) { - return false; - } else { - DeviceQueryPresentNumVo other = (DeviceQueryPresentNumVo)o; - if (!other.canEqual(this)) { - return false; - } else { - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId != null) { - return false; - } - } else if (!this$canteenId.equals(other$canteenId)) { - return false; - } - - Object this$presentNum = this.getPresentNum(); - Object other$presentNum = other.getPresentNum(); - if (this$presentNum == null) { - if (other$presentNum != null) { - return false; - } - } else if (!this$presentNum.equals(other$presentNum)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof DeviceQueryPresentNumVo; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $presentNum = this.getPresentNum(); - result = result * 59 + ($presentNum == null ? 43 : $presentNum.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getCanteenId(); - return "DeviceQueryPresentNumVo(canteenId=" + var10000 + ", presentNum=" + this.getPresentNum() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowByCanteenIdVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowByCanteenIdVO.java index 76c65795..27a489e4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowByCanteenIdVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowByCanteenIdVO.java @@ -72,105 +72,4 @@ public class PassengerFlowByCanteenIdVO { return this; } - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PassengerFlowByCanteenIdVO)) { - return false; - } else { - PassengerFlowByCanteenIdVO other = (PassengerFlowByCanteenIdVO)o; - if (!other.canEqual(this)) { - return false; - } else { - label71: { - Object this$enters = this.getEnters(); - Object other$enters = other.getEnters(); - if (this$enters == null) { - if (other$enters == null) { - break label71; - } - } else if (this$enters.equals(other$enters)) { - break label71; - } - - return false; - } - - Object this$exits = this.getExits(); - Object other$exits = other.getExits(); - if (this$exits == null) { - if (other$exits != null) { - return false; - } - } else if (!this$exits.equals(other$exits)) { - return false; - } - - label57: { - Object this$deviceNum = this.getDeviceNum(); - Object other$deviceNum = other.getDeviceNum(); - if (this$deviceNum == null) { - if (other$deviceNum == null) { - break label57; - } - } else if (this$deviceNum.equals(other$deviceNum)) { - break label57; - } - - return false; - } - - Object this$deviceName = this.getDeviceName(); - Object other$deviceName = other.getDeviceName(); - if (this$deviceName == null) { - if (other$deviceName != null) { - return false; - } - } else if (!this$deviceName.equals(other$deviceName)) { - return false; - } - - Object this$machineSn = this.getMachineSn(); - Object other$machineSn = other.getMachineSn(); - if (this$machineSn == null) { - if (other$machineSn == null) { - return true; - } - } else if (this$machineSn.equals(other$machineSn)) { - return true; - } - - return false; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PassengerFlowByCanteenIdVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $enters = this.getEnters(); - result = result * 59 + ($enters == null ? 43 : $enters.hashCode()); - Object $exits = this.getExits(); - result = result * 59 + ($exits == null ? 43 : $exits.hashCode()); - Object $deviceNum = this.getDeviceNum(); - result = result * 59 + ($deviceNum == null ? 43 : $deviceNum.hashCode()); - Object $deviceName = this.getDeviceName(); - result = result * 59 + ($deviceName == null ? 43 : $deviceName.hashCode()); - Object $machineSn = this.getMachineSn(); - result = result * 59 + ($machineSn == null ? 43 : $machineSn.hashCode()); - return result; - } - - @Generated - public String toString() { - Integer var10000 = this.getEnters(); - return "PassengerFlowByCanteenIdVO(enters=" + var10000 + ", exits=" + this.getExits() + ", deviceNum=" + this.getDeviceNum() + ", deviceName=" + this.getDeviceName() + ", machineSn=" + this.getMachineSn() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowVO.java index e132f16e..d4e7d84c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PassengerFlowVO.java @@ -87,118 +87,4 @@ public class PassengerFlowVO { this.capacity = capacity; return this; } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PassengerFlowVO)) { - return false; - } else { - PassengerFlowVO other = (PassengerFlowVO)o; - if (!other.canEqual(this)) { - return false; - } else { - Object this$presentNum = this.getPresentNum(); - Object other$presentNum = other.getPresentNum(); - if (this$presentNum == null) { - if (other$presentNum != null) { - return false; - } - } else if (!this$presentNum.equals(other$presentNum)) { - return false; - } - - Object this$enters = this.getEnters(); - Object other$enters = other.getEnters(); - if (this$enters == null) { - if (other$enters != null) { - return false; - } - } else if (!this$enters.equals(other$enters)) { - return false; - } - - Object this$exits = this.getExits(); - Object other$exits = other.getExits(); - if (this$exits == null) { - if (other$exits != null) { - return false; - } - } else if (!this$exits.equals(other$exits)) { - return false; - } - - label62: { - Object this$capacity = this.getCapacity(); - Object other$capacity = other.getCapacity(); - if (this$capacity == null) { - if (other$capacity == null) { - break label62; - } - } else if (this$capacity.equals(other$capacity)) { - break label62; - } - - return false; - } - - label55: { - Object this$presentFlowVOList = this.getPresentFlowVOList(); - Object other$presentFlowVOList = other.getPresentFlowVOList(); - if (this$presentFlowVOList == null) { - if (other$presentFlowVOList == null) { - break label55; - } - } else if (this$presentFlowVOList.equals(other$presentFlowVOList)) { - break label55; - } - - return false; - } - - Object this$updateTime = this.getUpdateTime(); - Object other$updateTime = other.getUpdateTime(); - if (this$updateTime == null) { - if (other$updateTime != null) { - return false; - } - } else if (!this$updateTime.equals(other$updateTime)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PassengerFlowVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $presentNum = this.getPresentNum(); - result = result * 59 + ($presentNum == null ? 43 : $presentNum.hashCode()); - Object $enters = this.getEnters(); - result = result * 59 + ($enters == null ? 43 : $enters.hashCode()); - Object $exits = this.getExits(); - result = result * 59 + ($exits == null ? 43 : $exits.hashCode()); - Object $capacity = this.getCapacity(); - result = result * 59 + ($capacity == null ? 43 : $capacity.hashCode()); - Object $presentFlowVOList = this.getPresentFlowVOList(); - result = result * 59 + ($presentFlowVOList == null ? 43 : $presentFlowVOList.hashCode()); - Object $updateTime = this.getUpdateTime(); - result = result * 59 + ($updateTime == null ? 43 : $updateTime.hashCode()); - return result; - } - - @Generated - public String toString() { - String var10000 = String.valueOf(this.getPresentFlowVOList()); - return "PassengerFlowVO(presentFlowVOList=" + var10000 + ", updateTime=" + String.valueOf(this.getUpdateTime()) + ", presentNum=" + this.getPresentNum() + ", enters=" + this.getEnters() + ", exits=" + this.getExits() + ", capacity=" + this.getCapacity() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowNowDayVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowNowDayVO.java index 33c49943..5941bddd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowNowDayVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowNowDayVO.java @@ -104,150 +104,4 @@ public class PresentFlowNowDayVO { public void setImgUrl(final String imgUrl) { this.imgUrl = imgUrl; } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PresentFlowNowDayVO)) { - return false; - } else { - PresentFlowNowDayVO other = (PresentFlowNowDayVO)o; - if (!other.canEqual(this)) { - return false; - } else { - label107: { - Object this$presentNum = this.getPresentNum(); - Object other$presentNum = other.getPresentNum(); - if (this$presentNum == null) { - if (other$presentNum == null) { - break label107; - } - } else if (this$presentNum.equals(other$presentNum)) { - break label107; - } - - return false; - } - - Object this$capacity = this.getCapacity(); - Object other$capacity = other.getCapacity(); - if (this$capacity == null) { - if (other$capacity != null) { - return false; - } - } else if (!this$capacity.equals(other$capacity)) { - return false; - } - - Object this$businessState = this.getBusinessState(); - Object other$businessState = other.getBusinessState(); - if (this$businessState == null) { - if (other$businessState != null) { - return false; - } - } else if (!this$businessState.equals(other$businessState)) { - return false; - } - - label86: { - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId == null) { - break label86; - } - } else if (this$canteenId.equals(other$canteenId)) { - break label86; - } - - return false; - } - - label79: { - Object this$canteenName = this.getCanteenName(); - Object other$canteenName = other.getCanteenName(); - if (this$canteenName == null) { - if (other$canteenName == null) { - break label79; - } - } else if (this$canteenName.equals(other$canteenName)) { - break label79; - } - - return false; - } - - label72: { - Object this$startBusinessTime = this.getStartBusinessTime(); - Object other$startBusinessTime = other.getStartBusinessTime(); - if (this$startBusinessTime == null) { - if (other$startBusinessTime == null) { - break label72; - } - } else if (this$startBusinessTime.equals(other$startBusinessTime)) { - break label72; - } - - return false; - } - - Object this$endBusinessTime = this.getEndBusinessTime(); - Object other$endBusinessTime = other.getEndBusinessTime(); - if (this$endBusinessTime == null) { - if (other$endBusinessTime != null) { - return false; - } - } else if (!this$endBusinessTime.equals(other$endBusinessTime)) { - return false; - } - - Object this$imgUrl = this.getImgUrl(); - Object other$imgUrl = other.getImgUrl(); - if (this$imgUrl == null) { - if (other$imgUrl != null) { - return false; - } - } else if (!this$imgUrl.equals(other$imgUrl)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PresentFlowNowDayVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $presentNum = this.getPresentNum(); - result = result * 59 + ($presentNum == null ? 43 : $presentNum.hashCode()); - Object $capacity = this.getCapacity(); - result = result * 59 + ($capacity == null ? 43 : $capacity.hashCode()); - Object $businessState = this.getBusinessState(); - result = result * 59 + ($businessState == null ? 43 : $businessState.hashCode()); - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $canteenName = this.getCanteenName(); - result = result * 59 + ($canteenName == null ? 43 : $canteenName.hashCode()); - Object $startBusinessTime = this.getStartBusinessTime(); - result = result * 59 + ($startBusinessTime == null ? 43 : $startBusinessTime.hashCode()); - Object $endBusinessTime = this.getEndBusinessTime(); - result = result * 59 + ($endBusinessTime == null ? 43 : $endBusinessTime.hashCode()); - Object $imgUrl = this.getImgUrl(); - result = result * 59 + ($imgUrl == null ? 43 : $imgUrl.hashCode()); - return result; - } - - @Generated - public String toString() { - Integer var10000 = this.getPresentNum(); - return "PresentFlowNowDayVO(presentNum=" + var10000 + ", capacity=" + this.getCapacity() + ", businessState=" + this.getBusinessState() + ", canteenName=" + this.getCanteenName() + ", canteenId=" + this.getCanteenId() + ", startBusinessTime=" + String.valueOf(this.getStartBusinessTime()) + ", endBusinessTime=" + String.valueOf(this.getEndBusinessTime()) + ", imgUrl=" + this.getImgUrl() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowVO.java index ebe541b1..71dfe044 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/PresentFlowVO.java @@ -70,105 +70,4 @@ public class PresentFlowVO { this.peakNum = peakNum; } - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof PresentFlowVO)) { - return false; - } else { - PresentFlowVO other = (PresentFlowVO)o; - if (!other.canEqual(this)) { - return false; - } else { - label71: { - Object this$peakNum = this.getPeakNum(); - Object other$peakNum = other.getPeakNum(); - if (this$peakNum == null) { - if (other$peakNum == null) { - break label71; - } - } else if (this$peakNum.equals(other$peakNum)) { - break label71; - } - - return false; - } - - Object this$date = this.getDate(); - Object other$date = other.getDate(); - if (this$date == null) { - if (other$date != null) { - return false; - } - } else if (!this$date.equals(other$date)) { - return false; - } - - label57: { - Object this$presentList = this.getPresentList(); - Object other$presentList = other.getPresentList(); - if (this$presentList == null) { - if (other$presentList == null) { - break label57; - } - } else if (this$presentList.equals(other$presentList)) { - break label57; - } - - return false; - } - - Object this$enterList = this.getEnterList(); - Object other$enterList = other.getEnterList(); - if (this$enterList == null) { - if (other$enterList != null) { - return false; - } - } else if (!this$enterList.equals(other$enterList)) { - return false; - } - - Object this$exitList = this.getExitList(); - Object other$exitList = other.getExitList(); - if (this$exitList == null) { - if (other$exitList == null) { - return true; - } - } else if (this$exitList.equals(other$exitList)) { - return true; - } - - return false; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof PresentFlowVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $peakNum = this.getPeakNum(); - result = result * 59 + ($peakNum == null ? 43 : $peakNum.hashCode()); - Object $date = this.getDate(); - result = result * 59 + ($date == null ? 43 : $date.hashCode()); - Object $presentList = this.getPresentList(); - result = result * 59 + ($presentList == null ? 43 : $presentList.hashCode()); - Object $enterList = this.getEnterList(); - result = result * 59 + ($enterList == null ? 43 : $enterList.hashCode()); - Object $exitList = this.getExitList(); - result = result * 59 + ($exitList == null ? 43 : $exitList.hashCode()); - return result; - } - - @Generated - public String toString() { - String var10000 = String.valueOf(this.getDate()); - return "PresentFlowVO(date=" + var10000 + ", presentList=" + String.valueOf(this.getPresentList()) + ", enterList=" + String.valueOf(this.getEnterList()) + ", exitList=" + String.valueOf(this.getExitList()) + ", peakNum=" + this.getPeakNum() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RangePeriodPeopleNumVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RangePeriodPeopleNumVO.java deleted file mode 100644 index 3d7159a0..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RangePeriodPeopleNumVO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.vo; - -import lombok.Generated; - -public class RangePeriodPeopleNumVO { - private Long population; - private int sort; - - @Generated - public Long getPopulation() { - return this.population; - } - - @Generated - public int getSort() { - return this.sort; - } - - @Generated - public void setPopulation(final Long population) { - this.population = population; - } - - @Generated - public void setSort(final int sort) { - this.sort = sort; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof RangePeriodPeopleNumVO)) { - return false; - } else { - RangePeriodPeopleNumVO other = (RangePeriodPeopleNumVO)o; - if (!other.canEqual(this)) { - return false; - } else if (this.getSort() != other.getSort()) { - return false; - } else { - Object this$population = this.getPopulation(); - Object other$population = other.getPopulation(); - if (this$population == null) { - if (other$population != null) { - return false; - } - } else if (!this$population.equals(other$population)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof RangePeriodPeopleNumVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - result = result * 59 + this.getSort(); - Object $population = this.getPopulation(); - result = result * 59 + ($population == null ? 43 : $population.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getPopulation(); - return "RangePeriodPeopleNumVO(population=" + var10000 + ", sort=" + this.getSort() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RegionNowPopulationVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RegionNowPopulationVO.java deleted file mode 100644 index 55f9e7f7..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/entity/vo/RegionNowPopulationVO.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.bonus.canteen.core.kitchen.entity.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Generated; - -import java.time.LocalDateTime; - -public class RegionNowPopulationVO { - @ApiModelProperty("更新时间") - private LocalDateTime upTime; - @ApiModelProperty("当前区域人数") - private Integer population; - @ApiModelProperty("区域内最大人数") - private Integer maxPopulation; - - @Generated - public LocalDateTime getUpTime() { - return this.upTime; - } - - @Generated - public Integer getPopulation() { - return this.population; - } - - @Generated - public Integer getMaxPopulation() { - return this.maxPopulation; - } - - @Generated - public void setUpTime(final LocalDateTime upTime) { - this.upTime = upTime; - } - - @Generated - public void setPopulation(final Integer population) { - this.population = population; - } - - @Generated - public void setMaxPopulation(final Integer maxPopulation) { - this.maxPopulation = maxPopulation; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof RegionNowPopulationVO)) { - return false; - } else { - RegionNowPopulationVO other = (RegionNowPopulationVO)o; - if (!other.canEqual(this)) { - return false; - } else { - label47: { - Object this$population = this.getPopulation(); - Object other$population = other.getPopulation(); - if (this$population == null) { - if (other$population == null) { - break label47; - } - } else if (this$population.equals(other$population)) { - break label47; - } - - return false; - } - - Object this$maxPopulation = this.getMaxPopulation(); - Object other$maxPopulation = other.getMaxPopulation(); - if (this$maxPopulation == null) { - if (other$maxPopulation != null) { - return false; - } - } else if (!this$maxPopulation.equals(other$maxPopulation)) { - return false; - } - - Object this$upTime = this.getUpTime(); - Object other$upTime = other.getUpTime(); - if (this$upTime == null) { - if (other$upTime != null) { - return false; - } - } else if (!this$upTime.equals(other$upTime)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof RegionNowPopulationVO; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $population = this.getPopulation(); - result = result * 59 + ($population == null ? 43 : $population.hashCode()); - Object $maxPopulation = this.getMaxPopulation(); - result = result * 59 + ($maxPopulation == null ? 43 : $maxPopulation.hashCode()); - Object $upTime = this.getUpTime(); - result = result * 59 + ($upTime == null ? 43 : $upTime.hashCode()); - return result; - } - - @Generated - public String toString() { - String var10000 = String.valueOf(this.getUpTime()); - return "RegionNowPopulationVO(upTime=" + var10000 + ", population=" + this.getPopulation() + ", maxPopulation=" + this.getMaxPopulation() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.java deleted file mode 100644 index 46e42a1f..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.bonus.canteen.core.kitchen.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import net.xnzn.core.kitchen.entity.vo.RangePeriodPeopleNumVO; -import net.xnzn.core.kitchen.entity.vo.RegionNowPopulationVO; -import net.xnzn.core.kitchen.model.RegionalPopulation; -import net.xnzn.framework.data.mybatis.datasource.UseGlobalTs; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -@Mapper -@UseGlobalTs("db") -public interface RegionalPopulationMapper extends BaseMapper { - RegionNowPopulationVO selectRegionalPopulationByDeviceId(@Param("deviceId") Long deviceId); - - @Select({"SELECT LAST(population) AS population, sort FROM regional_population WHERE device_id = #{deviceId} AND crdate = #{queryDate} GROUP BY sort order by sort"}) - List selectRegionalPopulationByTime(@Param("deviceId") Long deviceId, @Param("queryDate") String queryDate); -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.xml deleted file mode 100644 index ebe14419..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/RegionalPopulationMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/DevicePassengerFlow.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/DevicePassengerFlow.java index 29713ef5..65a5de3a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/DevicePassengerFlow.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/DevicePassengerFlow.java @@ -180,222 +180,4 @@ public class DevicePassengerFlow { this.canteenId = canteenId; return this; } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof DevicePassengerFlow)) { - return false; - } else { - DevicePassengerFlow other = (DevicePassengerFlow)o; - if (!other.canEqual(this)) { - return false; - } else { - label167: { - Object this$enters = this.getEnters(); - Object other$enters = other.getEnters(); - if (this$enters == null) { - if (other$enters == null) { - break label167; - } - } else if (this$enters.equals(other$enters)) { - break label167; - } - - return false; - } - - Object this$exits = this.getExits(); - Object other$exits = other.getExits(); - if (this$exits == null) { - if (other$exits != null) { - return false; - } - } else if (!this$exits.equals(other$exits)) { - return false; - } - - label153: { - Object this$passings = this.getPassings(); - Object other$passings = other.getPassings(); - if (this$passings == null) { - if (other$passings == null) { - break label153; - } - } else if (this$passings.equals(other$passings)) { - break label153; - } - - return false; - } - - Object this$returns = this.getReturns(); - Object other$returns = other.getReturns(); - if (this$returns == null) { - if (other$returns != null) { - return false; - } - } else if (!this$returns.equals(other$returns)) { - return false; - } - - label139: { - Object this$id = this.getId(); - Object other$id = other.getId(); - if (this$id == null) { - if (other$id == null) { - break label139; - } - } else if (this$id.equals(other$id)) { - break label139; - } - - return false; - } - - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId != null) { - return false; - } - } else if (!this$canteenId.equals(other$canteenId)) { - return false; - } - - label125: { - Object this$startTime = this.getStartTime(); - Object other$startTime = other.getStartTime(); - if (this$startTime == null) { - if (other$startTime == null) { - break label125; - } - } else if (this$startTime.equals(other$startTime)) { - break label125; - } - - return false; - } - - label118: { - Object this$endTime = this.getEndTime(); - Object other$endTime = other.getEndTime(); - if (this$endTime == null) { - if (other$endTime == null) { - break label118; - } - } else if (this$endTime.equals(other$endTime)) { - break label118; - } - - return false; - } - - Object this$serialNumber = this.getSerialNumber(); - Object other$serialNumber = other.getSerialNumber(); - if (this$serialNumber == null) { - if (other$serialNumber != null) { - return false; - } - } else if (!this$serialNumber.equals(other$serialNumber)) { - return false; - } - - label104: { - Object this$deviceName = this.getDeviceName(); - Object other$deviceName = other.getDeviceName(); - if (this$deviceName == null) { - if (other$deviceName == null) { - break label104; - } - } else if (this$deviceName.equals(other$deviceName)) { - break label104; - } - - return false; - } - - label97: { - Object this$deviceIp = this.getDeviceIp(); - Object other$deviceIp = other.getDeviceIp(); - if (this$deviceIp == null) { - if (other$deviceIp == null) { - break label97; - } - } else if (this$deviceIp.equals(other$deviceIp)) { - break label97; - } - - return false; - } - - Object this$createDate = this.getCreateDate(); - Object other$createDate = other.getCreateDate(); - if (this$createDate == null) { - if (other$createDate != null) { - return false; - } - } else if (!this$createDate.equals(other$createDate)) { - return false; - } - - Object this$createTime = this.getCreateTime(); - Object other$createTime = other.getCreateTime(); - if (this$createTime == null) { - if (other$createTime != null) { - return false; - } - } else if (!this$createTime.equals(other$createTime)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof DevicePassengerFlow; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $enters = this.getEnters(); - result = result * 59 + ($enters == null ? 43 : $enters.hashCode()); - Object $exits = this.getExits(); - result = result * 59 + ($exits == null ? 43 : $exits.hashCode()); - Object $passings = this.getPassings(); - result = result * 59 + ($passings == null ? 43 : $passings.hashCode()); - Object $returns = this.getReturns(); - result = result * 59 + ($returns == null ? 43 : $returns.hashCode()); - Object $id = this.getId(); - result = result * 59 + ($id == null ? 43 : $id.hashCode()); - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $startTime = this.getStartTime(); - result = result * 59 + ($startTime == null ? 43 : $startTime.hashCode()); - Object $endTime = this.getEndTime(); - result = result * 59 + ($endTime == null ? 43 : $endTime.hashCode()); - Object $serialNumber = this.getSerialNumber(); - result = result * 59 + ($serialNumber == null ? 43 : $serialNumber.hashCode()); - Object $deviceName = this.getDeviceName(); - result = result * 59 + ($deviceName == null ? 43 : $deviceName.hashCode()); - Object $deviceIp = this.getDeviceIp(); - result = result * 59 + ($deviceIp == null ? 43 : $deviceIp.hashCode()); - Object $createDate = this.getCreateDate(); - result = result * 59 + ($createDate == null ? 43 : $createDate.hashCode()); - Object $createTime = this.getCreateTime(); - result = result * 59 + ($createTime == null ? 43 : $createTime.hashCode()); - return result; - } - - @Generated - public String toString() { - String var10000 = String.valueOf(this.getStartTime()); - return "DevicePassengerFlow(startTime=" + var10000 + ", endTime=" + this.getEndTime() + ", enters=" + this.getEnters() + ", exits=" + this.getExits() + ", passings=" + this.getPassings() + ", returns=" + this.getReturns() + ", serialNumber=" + this.getSerialNumber() + ", deviceName=" + this.getDeviceName() + ", deviceIp=" + this.getDeviceIp() + ", id=" + this.getId() + ", createDate=" + String.valueOf(this.getCreateDate()) + ", createTime=" + String.valueOf(this.getCreateTime()) + ", canteenId=" + this.getCanteenId() + ")"; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/RegionalPopulation.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/RegionalPopulation.java deleted file mode 100644 index e3798bc2..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/model/RegionalPopulation.java +++ /dev/null @@ -1,300 +0,0 @@ -package com.bonus.canteen.core.kitchen.model; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.collect.Maps; -import io.swagger.annotations.ApiModel; -import lombok.Generated; -import net.xnzn.core.backfield.utils.TsModel; -import net.xnzn.framework.data.timeserial.DataType; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.Map; - -@ApiModel("区域人数") -@TableName("regional_population") -public class RegionalPopulation implements TsModel { - private Long id; - private Instant ts; - private Long canteenId; - private Long deviceId; - private String deviceSn; - private Long population; - private LocalDateTime reportTime; - private Integer sort; - private String crdate; - - public Map toTsTagMap() { - Map tsMap = Maps.newHashMap(); - tsMap.put(StrUtil.toUnderlineCase("deviceId"), DataType.BIGINT(this.getDeviceId())); - tsMap.put(StrUtil.toUnderlineCase("canteenId"), DataType.BIGINT(this.getCanteenId())); - return tsMap; - } - - public Map toTsFiledMap() { - Map tsFieldMap = Maps.newHashMap(); - tsFieldMap.put(StrUtil.toUnderlineCase("id"), DataType.BIGINT(this.getId())); - tsFieldMap.put(StrUtil.toUnderlineCase("deviceId"), DataType.BIGINT(this.getDeviceId())); - tsFieldMap.put(StrUtil.toUnderlineCase("deviceSn"), DataType.VARCHAR(this.getDeviceSn())); - tsFieldMap.put(StrUtil.toUnderlineCase("population"), DataType.BIGINT(this.getPopulation())); - tsFieldMap.put(StrUtil.toUnderlineCase("reportTime"), DataType.BIGINT(this.reportTime.toInstant(ZoneOffset.of("+8")).toEpochMilli())); - tsFieldMap.put(StrUtil.toUnderlineCase("canteenId"), DataType.BIGINT(this.getCanteenId())); - tsFieldMap.put(StrUtil.toUnderlineCase("crdate"), DataType.VARCHAR(this.getCrdate())); - tsFieldMap.put(StrUtil.toUnderlineCase("sort"), DataType.INT(this.getSort())); - return tsFieldMap; - } - - @Generated - public Long getId() { - return this.id; - } - - @Generated - public Instant getTs() { - return this.ts; - } - - @Generated - public Long getCanteenId() { - return this.canteenId; - } - - @Generated - public Long getDeviceId() { - return this.deviceId; - } - - @Generated - public String getDeviceSn() { - return this.deviceSn; - } - - @Generated - public Long getPopulation() { - return this.population; - } - - @Generated - public LocalDateTime getReportTime() { - return this.reportTime; - } - - @Generated - public Integer getSort() { - return this.sort; - } - - @Generated - public String getCrdate() { - return this.crdate; - } - - @Generated - public void setId(final Long id) { - this.id = id; - } - - @Generated - public void setTs(final Instant ts) { - this.ts = ts; - } - - @Generated - public void setCanteenId(final Long canteenId) { - this.canteenId = canteenId; - } - - @Generated - public void setDeviceId(final Long deviceId) { - this.deviceId = deviceId; - } - - @Generated - public void setDeviceSn(final String deviceSn) { - this.deviceSn = deviceSn; - } - - @Generated - public void setPopulation(final Long population) { - this.population = population; - } - - @Generated - public void setReportTime(final LocalDateTime reportTime) { - this.reportTime = reportTime; - } - - @Generated - public void setSort(final Integer sort) { - this.sort = sort; - } - - @Generated - public void setCrdate(final String crdate) { - this.crdate = crdate; - } - - @Generated - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof RegionalPopulation)) { - return false; - } else { - RegionalPopulation other = (RegionalPopulation)o; - if (!other.canEqual(this)) { - return false; - } else { - label119: { - Object this$id = this.getId(); - Object other$id = other.getId(); - if (this$id == null) { - if (other$id == null) { - break label119; - } - } else if (this$id.equals(other$id)) { - break label119; - } - - return false; - } - - Object this$canteenId = this.getCanteenId(); - Object other$canteenId = other.getCanteenId(); - if (this$canteenId == null) { - if (other$canteenId != null) { - return false; - } - } else if (!this$canteenId.equals(other$canteenId)) { - return false; - } - - label105: { - Object this$deviceId = this.getDeviceId(); - Object other$deviceId = other.getDeviceId(); - if (this$deviceId == null) { - if (other$deviceId == null) { - break label105; - } - } else if (this$deviceId.equals(other$deviceId)) { - break label105; - } - - return false; - } - - Object this$population = this.getPopulation(); - Object other$population = other.getPopulation(); - if (this$population == null) { - if (other$population != null) { - return false; - } - } else if (!this$population.equals(other$population)) { - return false; - } - - label91: { - Object this$sort = this.getSort(); - Object other$sort = other.getSort(); - if (this$sort == null) { - if (other$sort == null) { - break label91; - } - } else if (this$sort.equals(other$sort)) { - break label91; - } - - return false; - } - - Object this$ts = this.getTs(); - Object other$ts = other.getTs(); - if (this$ts == null) { - if (other$ts != null) { - return false; - } - } else if (!this$ts.equals(other$ts)) { - return false; - } - - label77: { - Object this$deviceSn = this.getDeviceSn(); - Object other$deviceSn = other.getDeviceSn(); - if (this$deviceSn == null) { - if (other$deviceSn == null) { - break label77; - } - } else if (this$deviceSn.equals(other$deviceSn)) { - break label77; - } - - return false; - } - - label70: { - Object this$reportTime = this.getReportTime(); - Object other$reportTime = other.getReportTime(); - if (this$reportTime == null) { - if (other$reportTime == null) { - break label70; - } - } else if (this$reportTime.equals(other$reportTime)) { - break label70; - } - - return false; - } - - Object this$crdate = this.getCrdate(); - Object other$crdate = other.getCrdate(); - if (this$crdate == null) { - if (other$crdate != null) { - return false; - } - } else if (!this$crdate.equals(other$crdate)) { - return false; - } - - return true; - } - } - } - - @Generated - protected boolean canEqual(final Object other) { - return other instanceof RegionalPopulation; - } - - @Generated - public int hashCode() { - int PRIME = true; - int result = 1; - Object $id = this.getId(); - result = result * 59 + ($id == null ? 43 : $id.hashCode()); - Object $canteenId = this.getCanteenId(); - result = result * 59 + ($canteenId == null ? 43 : $canteenId.hashCode()); - Object $deviceId = this.getDeviceId(); - result = result * 59 + ($deviceId == null ? 43 : $deviceId.hashCode()); - Object $population = this.getPopulation(); - result = result * 59 + ($population == null ? 43 : $population.hashCode()); - Object $sort = this.getSort(); - result = result * 59 + ($sort == null ? 43 : $sort.hashCode()); - Object $ts = this.getTs(); - result = result * 59 + ($ts == null ? 43 : $ts.hashCode()); - Object $deviceSn = this.getDeviceSn(); - result = result * 59 + ($deviceSn == null ? 43 : $deviceSn.hashCode()); - Object $reportTime = this.getReportTime(); - result = result * 59 + ($reportTime == null ? 43 : $reportTime.hashCode()); - Object $crdate = this.getCrdate(); - result = result * 59 + ($crdate == null ? 43 : $crdate.hashCode()); - return result; - } - - @Generated - public String toString() { - Long var10000 = this.getId(); - return "RegionalPopulation(id=" + var10000 + ", ts=" + String.valueOf(this.getTs()) + ", canteenId=" + this.getCanteenId() + ", deviceId=" + this.getDeviceId() + ", deviceSn=" + this.getDeviceSn() + ", population=" + this.getPopulation() + ", reportTime=" + String.valueOf(this.getReportTime()) + ", sort=" + this.getSort() + ", crdate=" + this.getCrdate() + ")"; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mq/PassengerFlowMessageListener.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mq/PassengerFlowMessageListener.java deleted file mode 100644 index ddf0885e..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mq/PassengerFlowMessageListener.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.bonus.canteen.core.kitchen.mq; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Generated; -import net.xnzn.core.common.mq.MqPayload; -import net.xnzn.core.kitchen.entity.dto.SummaryInfo; -import net.xnzn.core.kitchen.entity.enums.CameraUseSceneEnum; -import net.xnzn.core.kitchen.service.DevicePassengerFlowService; -import net.xnzn.core.kitchen.service.RegionalPopulationService; -import net.xnzn.framework.mq.MQListener; -import net.xnzn.framework.mq.MQMessageListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; - -@MQMessageListener( - group = "back-device-passenger-flow", - topic = "backfield", - tag = "back-device-passenger-flow" -) -public class PassengerFlowMessageListener implements MQListener> { - @Generated - private static final Logger log = LoggerFactory.getLogger(PassengerFlowMessageListener.class); - @Autowired - @Lazy - private DevicePassengerFlowService devicePassengerFlowService; - @Autowired - @Lazy - private RegionalPopulationService regionalPopulationService; - - public void onMessage(MqPayload mqPayload) { - SummaryInfo payload = (SummaryInfo)mqPayload.getData(); - JSONObject extendInfo = payload.getExtendInfo(); - if (!ObjectUtil.isEmpty(payload)) { - Integer useScene = extendInfo.getInteger("useScene"); - if (!ObjectUtil.isEmpty(useScene)) { - if (CameraUseSceneEnum.PASSENGER_FLOW.getKey().equals(useScene)) { - log.info("【大华_客流摄像头】-上报数据：{}", payload); - this.devicePassengerFlowService.savePassengerFlow(payload); - } else if (CameraUseSceneEnum.REGION_POPULATION.getKey().equals(useScene)) { - log.info("【大华_区域人数统计】-上报数据：{}", payload); - this.regionalPopulationService.savePassengerFlow(payload); - } - - } - } - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/RegionalPopulationService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/RegionalPopulationService.java deleted file mode 100644 index 57711621..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/RegionalPopulationService.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.bonus.canteen.core.kitchen.service; - -import cn.hutool.core.util.ObjectUtil; -import com.pig4cloud.pigx.common.core.exception.LeException; -import jodd.util.StringUtil; -import lombok.Generated; -import net.xnzn.core.backfield.utils.TsDBUtils; -import net.xnzn.core.common.redis.RedisUtil; -import net.xnzn.core.device.api.DeviceApi; -import net.xnzn.core.device.api.DeviceV2Api; -import net.xnzn.core.device.manage.controller.deprecated.vo.MacMachineVo; -import net.xnzn.core.device.manage.vo.DeviceInfoVO; -import net.xnzn.core.kitchen.entity.dto.SummaryInfo; -import net.xnzn.core.kitchen.entity.dto.TimePeriodRegionPopulationDTO; -import net.xnzn.core.kitchen.entity.vo.RangePeriodPeopleNumVO; -import net.xnzn.core.kitchen.entity.vo.RegionNowPopulationVO; -import net.xnzn.core.kitchen.mapper.RegionalPopulationMapper; -import net.xnzn.core.kitchen.model.RegionalPopulation; -import net.xnzn.framework.data.dataset.Executors; -import net.xnzn.framework.id.Id; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; - -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.temporal.ChronoField; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -@Service -public class RegionalPopulationService { - @Generated - private static final Logger log = LoggerFactory.getLogger(RegionalPopulationService.class); - private final String SAVE_PASSENGER_Flow = "yst:passenger:tenantId:"; - @Autowired - @Lazy - private RegionalPopulationMapper regionalPopulationMapper; - @Autowired - @Lazy - private DeviceApi deviceApi; - @Autowired - @Lazy - private DeviceV2Api deviceV2Api; - - public void savePassengerFlow(SummaryInfo summaryInfo) { - RegionalPopulation regionalPopulation = new RegionalPopulation(); - String machineSn = summaryInfo.getSerialNumber(); - Long tenantId = this.deviceApi.getMerchantIdInSn(machineSn); - MacMachineVo macMachineVo = (MacMachineVo)Executors.readInTenant(tenantId, () -> { - return this.deviceApi.getMachineConfigBySn(machineSn); - }); - regionalPopulation.setId(Id.next()); - regionalPopulation.setDeviceId(macMachineVo.getMachineId()); - regionalPopulation.setDeviceSn(machineSn); - regionalPopulation.setPopulation(summaryInfo.getNInsidePeopleNum()); - regionalPopulation.setCanteenId(macMachineVo.getDiningId()); - regionalPopulation.setReportTime(summaryInfo.getEventTime()); - regionalPopulation.setCrdate(StringUtil.toString(summaryInfo.getEventTime().toLocalDate())); - LocalDateTime eventTime = summaryInfo.getEventTime(); - regionalPopulation.setSort(eventTime.get(ChronoField.MINUTE_OF_DAY) / 5); - Instant ts = LocalDateTime.now().toInstant(ZoneOffset.of("+8")); - if (!RedisUtil.setIfPresentString("yst:passenger:tenantId:" + tenantId + String.valueOf(ts), (String)null, 2L)) { - log.info("时间戳：{},保存客流统计数据：{}", ts, regionalPopulation); - Executors.doInTenant(tenantId, (status) -> { - TsDBUtils.saveToTs(regionalPopulation, ts); - }); - } else { - throw new LeException("数据重复上报"); - } - } - - public List queryPopulationByTime(TimePeriodRegionPopulationDTO param) { - List rangePeriodList = this.regionalPopulationMapper.selectRegionalPopulationByTime(param.getDeviceId(), StringUtil.toString(param.getQueryDate())); - List passengerFlowList = this.createPassengerFlowList(12, param.getQueryDate()); - Iterator var4 = rangePeriodList.iterator(); - - while(var4.hasNext()) { - RangePeriodPeopleNumVO rangePeriodPeopleNumVO = (RangePeriodPeopleNumVO)var4.next(); - passengerFlowList.set(rangePeriodPeopleNumVO.getSort(), rangePeriodPeopleNumVO.getPopulation()); - } - - return passengerFlowList; - } - - public RegionNowPopulationVO queryNowPopulation(Long content) { - RegionNowPopulationVO regionPopulationVO = this.regionalPopulationMapper.selectRegionalPopulationByDeviceId(content); - if (ObjectUtil.isEmpty(regionPopulationVO)) { - return new RegionNowPopulationVO(); - } else { - DeviceInfoVO deviceInfoVoBySn = this.deviceV2Api.getDeviceInfoVoById(content); - Map deviceMetadata = deviceInfoVoBySn.getDeviceMetadata(); - Integer maximumCapacity = Integer.valueOf((String)deviceMetadata.getOrDefault("maximumCapacity", "0")); - regionPopulationVO.setMaxPopulation(maximumCapacity); - return regionPopulationVO; - } - } - - private List createPassengerFlowList(Integer periods, LocalDate date) { - int size = periods * 24; - if (date.isEqual(LocalDate.now())) { - LocalDateTime nowTime = LocalDateTime.now(); - int hour = nowTime.getHour(); - int minute = nowTime.getMinute(); - size = periods * hour + (minute == 0 ? minute + 1 : minute) * periods / 60 + 1; - } - - Long[] arrayInt = new Long[size]; - Arrays.fill(arrayInt, 0L); - List presentNumberList = Arrays.asList(arrayInt); - return presentNumberList; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/DevicePassengerFlowMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/DevicePassengerFlowMapper.xml similarity index 74% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/DevicePassengerFlowMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/DevicePassengerFlowMapper.xml index d417927d..21a3c9cd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/DevicePassengerFlowMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/DevicePassengerFlowMapper.xml @@ -1,8 +1,8 @@ - + - SELECT sum(enters) as enters, sum(exits) as exits, (sum(enters) - sum(exits)) as presentNum from device_passenger_flow where create_date = #{date} @@ -24,7 +24,7 @@ - SELECT canteen_id AS canteenId, (SUM(enters) - SUM(exits)) AS presentNum FROM device_passenger_flow WHERE create_date = #{date} GROUP BY canteen_id - SELECT sum(exits) AS exits, sum(enters) AS enters, sum(passings) AS passings,