获取一个取水口接口返回值中增加阀控器ID

zhubaomin

3 天以前 531c35275bc1700214ef26442380ad3a80d95838

获取一个取水口接口返回值中增加阀控器ID

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java

@@ -15,7 +15,7 @@
 * @Description
 */
@Data
@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "rtuAddr", "protocol"})
@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "controllerId", "rtuAddr", "protocol"})
public class VoAllIntake implements BaseEntity {
    private static final long serialVersionUID = 202412161003001L;

@@ -97,6 +97,12 @@
    private String address;

    /**
     * 阀控器ID
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long controllerId;

    /**
     * RTU地址
     */
    private String rtuAddr;

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -51,6 +51,7 @@
        ge.operateDt,
        blo.`name`                                          AS blockName,
        CONCAT(country.`name`, town.`name`, village.`name`)              AS address,
        con.id AS controllerId,
        con.rtuAddr,
        con.protocol
        FROM pr_intake ge