pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //设备终端工作上报 + 查询设备终端实时值 @Data @EqualsAndHashCode(callSuper=false) public class DataCd80_5BVo extends AlarmVo { public String controllerType;//控制器类型: 01:测控一体阀;57:井电控制器 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd81Vo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //设备终端随机自报 @Data @EqualsAndHashCode(callSuper=false) public class DataCd81Vo extends AlarmVo { public String controllerType;//控制器类型: 01:测控一体阀;57:井电控制器 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //刷卡开泵/阀上报 @Data @EqualsAndHashCode(callSuper=false) public class DataCd84Vo extends AlarmVo { public String controllerType;//控制器类型 01(0x01):测控一体阀;57(0x57):井电控制器 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //平台/APP远程关闭水泵/阀门 + 刷卡关泵/阀上报 @Data @EqualsAndHashCode(callSuper=false) public class DataCd85Vo extends AlarmVo { public String controllerType;//控制器类型 01(0x01):测控一体阀;57(0x57):井电控制器 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //平台/APP远程关闭水泵/阀门 + 刷卡关泵/阀上报 @Data @EqualsAndHashCode(callSuper=false) public class DataCd93_A3Vo extends AlarmVo { public String controllerType;//控制器类型 01(0x01):测控一体阀;57(0x57):井电控制器 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
@@ -1,9 +1,11 @@ package com.dy.common.mw.protocol.p206V202404.upVos; import lombok.Data; import lombok.EqualsAndHashCode; //开关水泵/阀门成功/失败上报 @Data @EqualsAndHashCode(callSuper=false) public class DataCdC2Vo extends AlarmVo { public String controllerType ;//控制器类型: 01:测控一体阀;57:井电控制器 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoBatteryVolt.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; @@ -13,6 +14,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class VoBatteryVolt extends VoIntake { /** pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; @@ -13,6 +14,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class VoCumulativeFlow extends VoIntake { /** pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAccumulateAmount.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author :WuZeYu @@ -12,6 +13,7 @@ * 消费金额 大于 指定值 */ @Data @EqualsAndHashCode(callSuper=false) public class VoIntakeAccumulateAmount extends VoIntake{ private static final long serialVersionUID = 202408051046001L; pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
@@ -2,6 +2,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** * @author :WuZeYu @@ -11,6 +12,7 @@ * 用水时长 > 指定值 (分钟) */ @Data @EqualsAndHashCode(callSuper=false) public class VoIntakeOpenCount extends VoIntake{ private static final long serialVersionUID = 202408051046001L; pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoSignalIntensity.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; @@ -13,6 +14,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class VoSignalIntensity extends VoIntake { /** * 信号强度 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java
@@ -8,6 +8,7 @@ import com.dy.common.util.Callback; import com.dy.common.util.DateTime; import lombok.Data; import lombok.EqualsAndHashCode; /** * @Author: liurunyu @@ -15,6 +16,7 @@ * @Description */ @Data @EqualsAndHashCode(callSuper=false) public class UpgradeRtuDev extends UpgradeRtu { @JSONField(serialize = false) pipIrr-platform/pipIrr-web/pipIrr-web-app/pom.xml
@@ -12,10 +12,8 @@ <packaging>jar</packaging> <artifactId>pipIrr-web-app</artifactId> <version>0.0.1-SNAPSHOT</version> <name>pipIrr-web-app</name> <description>手机App</description> <build> <plugins> pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/qo/QoIssueReport.java
@@ -2,6 +2,7 @@ import com.dy.common.webUtil.QueryConditionVo; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -11,6 +12,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class QoIssueReport extends QueryConditionVo { /** * 巡检员ID pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java
@@ -3,6 +3,7 @@ import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,7 +13,7 @@ * @Description */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DtoToFlowmeterPojo { DtoToFlowmeterPojo INSTANCT = Mappers.getMapper(DtoToFlowmeterPojo.class); // @Mapping(target = "code", source = "code") pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToMoniFlowPojo.java
@@ -3,6 +3,7 @@ import com.dy.pipIrrGlobal.pojoPr.PrMonitoringFlowmeter; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,7 +13,7 @@ * @Description 流量监测站、流量计Dto转Pojo */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DtoToMoniFlowPojo { DtoToMoniFlowPojo INSTANCT = Mappers.getMapper(DtoToMoniFlowPojo.class); @Mapping(target = "monitoringid", source = "monitoringId") pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/qo/OnLineIntakesQO.java
@@ -4,6 +4,7 @@ import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -13,6 +14,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class OnLineIntakesQO extends QueryConditionVo { /** * 中间件返回的RTU在线情况对象数组 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/DtoToPojo.java
@@ -3,6 +3,7 @@ import com.dy.pipIrrGlobal.pojoPr.PrIntakeController; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,7 +13,7 @@ * @Description DtoToPojo 转 PrIntakeController */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DtoToPojo { DtoToPojo INSTANCT = Mappers.getMapper(DtoToPojo.class); @Mapping(target = "intakeid", source = "intakeId") pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java
@@ -3,6 +3,7 @@ import com.dy.pipIrrSell.recharge.DtoRecharge; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,7 +13,7 @@ * @Description 将DtoActiveCard映射为DtoRecharge */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface RechargeDtoMapper { RechargeDtoMapper INSTANCT = Mappers.getMapper(RechargeDtoMapper.class); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/converter/RechargeDtoMapper.java
@@ -4,6 +4,7 @@ import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -13,7 +14,7 @@ * @Description */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface RechargeDtoMapper { RechargeDtoMapper INSTANCT = Mappers.getMapper(RechargeDtoMapper.class); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoReceipt.java
@@ -3,6 +3,7 @@ import com.dy.common.webUtil.QueryConditionVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -12,6 +13,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) @Schema(name = "收据查询条件") public class QoReceipt extends QueryConditionVo { @Schema(description = "交易ID") pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
@@ -3,6 +3,7 @@ import com.dy.pipIrrGlobal.pojoSe.SeClient; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,7 +13,7 @@ * @Description */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DtoClientToSeClient { DtoClientToSeClient INSTANCT = Mappers.getMapper(DtoClientToSeClient.class); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/SeClientToVoClient.java
@@ -4,6 +4,7 @@ import com.dy.pipIrrGlobal.voSe.VoClient; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -13,7 +14,7 @@ * @Description */ @Mapper @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface SeClientToVoClient { SeClientToVoClient INSTANCT = Mappers.getMapper(SeClientToVoClient.class); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/dto/DtoVcRecharge.java
@@ -12,6 +12,7 @@ * @Description */ @Data @EqualsAndHashCode(callSuper=false) @Schema(name = "虚拟卡充值记录查询条件") public class DtoVcRecharge extends QueryConditionVo { pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/qo/QoWalletRecharge.java
@@ -3,6 +3,7 @@ import com.dy.common.webUtil.QueryConditionVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -12,6 +13,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) @Schema(name = "电子钱包充值查询条件") public class QoWalletRecharge extends QueryConditionVo { @Schema(description = "电子钱包账户ID") pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; @@ -12,6 +13,7 @@ * @Description */ @Data @EqualsAndHashCode(callSuper=false) public class AutomaticClose extends DtoBase { public static final long serialVersionUID = 202407231056001L; pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/Recharge.java
@@ -2,6 +2,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -11,6 +12,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class Recharge extends DtoBase { public static final long serialVersionUID = 202406261045001L; pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/qo/QoIssueReport.java
@@ -2,6 +2,7 @@ import com.dy.common.webUtil.QueryConditionVo; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -11,6 +12,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class QoIssueReport extends QueryConditionVo { /** pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/qo/QoVcRecharge.java
@@ -2,6 +2,7 @@ import com.dy.common.webUtil.QueryConditionVo; import lombok.Data; import lombok.EqualsAndHashCode; /** * @author ZhuBaoMin @@ -11,6 +12,7 @@ */ @Data @EqualsAndHashCode(callSuper=false) public class QoVcRecharge extends QueryConditionVo { /**