修改下发缓存命令的等待逻辑，RTU上行数据后，使尽快发送下行命令。

liurunyu

2025-02-25 5e31f7c1f3eaf5cfd3be0e5fc942aa78f3a4133c

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java

@@ -1,7 +1,10 @@
package com.dy.pipIrrGlobal.voSe;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,42 +15,130 @@
 * @author ZhuBaoMin
 * @date 2023/12/22 11:43
 * @LastEditTime 2023/12/22 11:43
 * @Description
 * @Description 农户视图对象
 */

@Data
@Schema(title = "农户视图对象")
@JsonPropertyOrder({"countyId","countryName","townId","townName","villageId","villageName","blockId","blockName","divideId","divideName","typeId","waterTypeName","clientId","name","clientNum","phone","idCard","area","cardCount","address","remarks","operateDt"})
public class VoClient implements BaseEntity {
    private static final long serialVersionUID = 1L;
    private static final long serialVersionUID = 202410282047001L;

    @Schema(title = "ID")
    private Long id;

    @Schema(title = "农户ID")
    private String clientId;
    /**
     * 县ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long countyId;

    @Schema(title = "农户姓名")
    /**
     * 县名称
     */
    private String countryName;

    /**
     * 镇ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long townId;

    /**
     * 镇名称
     */
    private String townName;

    /**
     * 村ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long villageId;

    /**
     * 村名称
     */
    private String villageName;

    /**
     * 片区ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long blockId;

    /**
     * 片区名称
     */
    private String blockName;

    /**
     * 分水房ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long divideId;

    /**
     * 分水房名称
     */
    private String divideName;

    /**
     * 用户类型ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long typeId;

    /**
     * 用户类型名称
     */
    private String waterTypeName;

    /**
     * 农户ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long clientId;

    /**
     * 农户姓名
     */
    private String name;

    @Schema(title = "农户编号")
    /**
     * 农户编号
     */
    private String clientNum;

    @Schema(title = "手机号")
    /**
     * 手机号
     */
    private String phone;

    @Schema(title = "身份证号")
    /**
     * 身份证号
     */
    private String idCard;

    @Schema(title = "卡片数量")
    /**
     * 种植面积
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Double area;

    /**
     * 卡片数量
     */
    private Integer cardCount;

    @Schema(title = "地址")
    /**
     * 地址
     */
    private String address;

    /**
     * 备注
     */
    private String remarks;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Schema(title = "注册时间")
    private Date operateDt;


}